--- loncom/interface/lonstatistics.pm 2005/04/07 07:34:52 1.124 +++ loncom/interface/lonstatistics.pm 2010/01/06 19:41:49 1.148.2.2 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.124 2005/04/07 07:34:52 albertel Exp $ +# $Id: lonstatistics.pm,v 1.148.2.2 2010/01/06 19:41:49 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -28,19 +28,7 @@ # ### -=pod - -=head1 NAME - -lonstatistics - -=head1 SYNOPSIS -Main handler for statistics and chart. - -=over 4 - -=cut package Apache::lonstatistics; @@ -49,7 +37,8 @@ use Apache::Constants qw(:common :http); use vars qw( @FullClasslist @Students - @Sections + @Sections + @Groups %StudentData @StudentDataOrder @SelectedStudentData @@ -62,6 +51,7 @@ use Apache::loncoursedata; use Apache::lonhtmlcommon; use Apache::lonmysql; use Apache::lonlocal; +use Apache::longroup; use Time::HiRes; # # Statistics Packages @@ -73,32 +63,9 @@ use Apache::lonstudentassessment(); use Apache::lonpercentage; use Apache::lonstudentsubmissions(); use Apache::lonsurveyreports(); +use Apache::longradinganalysis(); +use LONCAPA; -####################################################### -####################################################### - -=pod - -=item Package Variables - -=item @FullClasslist The full classlist - -=item @Students The students we are concerned with for this invocation - -=item @Sections The sections available in this class - -=item $curr_student The student currently being examined - -=item $prev_student The student previous in the classlist - -=item $next_student The student next in the classlist - -=over - -=cut - -####################################################### -####################################################### # # Classlist variables # @@ -106,45 +73,12 @@ my $curr_student; my $prev_student; my $next_student; -####################################################### -####################################################### - -=pod - -=item &clear_classlist_variables() - -undef the following package variables: - -=over - -=item @FullClasslist - -=item @Students -=item @Sections - -=item %StudentData - -=item @StudentDataOrder - -=item @SelectedStudentData - -=item $curr_student - -=item $prev_student - -=item $next_student - -=back - -=cut - -####################################################### -####################################################### sub clear_classlist_variables { undef(@FullClasslist); undef(@Students); undef(@Sections); + undef(@Groups); undef(%StudentData); undef(@SelectedStudentData); undef($curr_student); @@ -152,43 +86,7 @@ sub clear_classlist_variables { undef($next_student); } -####################################################### -####################################################### - -=pod -=item &PrepareClasslist() - -Build up the classlist information. The classlist information is kept in -the following package variables: - -=over - -=item @FullClasslist - -=item @Students - -=item @Sections - -=item %StudentData - -=item @SelectedStudentData - -=item $curr_student - -=item $prev_student - -=item $next_student - -=back - -$curr_student, $prev_student, and $next_student may not be defined, depending -upon the calling context. - -=cut - -####################################################### -####################################################### sub PrepareClasslist { my %Sections; &clear_classlist_variables(); @@ -197,9 +95,10 @@ sub PrepareClasslist { my $cid = $env{'request.course.id'}; my $cdom = $env{'course.'.$cid.'.domain'}; my $cnum = $env{'course.'.$cid.'.num'}; - my ($classlist,$field_names) = &Apache::loncoursedata::get_classlist($cid, - $cdom,$cnum); + my ($classlist,$field_names) = &Apache::loncoursedata::get_classlist($cdom, + $cnum); my @selected_sections = &get_selected_sections(); + my @selected_groups = &get_selected_groups(); # # Deal with instructors with restricted section access if ($env{'request.course.sec'} !~ /^\s*$/) { @@ -207,7 +106,7 @@ sub PrepareClasslist { } # # Set up %StudentData - @StudentDataOrder = qw/fullname username domain id section status comments/; + @StudentDataOrder = qw/fullname username domain id section status groups comments/; foreach my $field (@StudentDataOrder) { $StudentData{$field}->{'title'} = &mt($field); $StudentData{$field}->{'base_width'} = length(&mt($field)); @@ -219,6 +118,17 @@ sub PrepareClasslist { $enrollment_status = 'Active'; $enrollment_status = $env{'form.Status'} if (exists($env{'form.Status'})); # + # Get groupmembership + my ($classgroups,$studentgroups); + my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum); + if (%curr_groups) { + ($classgroups,$studentgroups) = + &Apache::loncoursedata::get_group_memberships($classlist, + $field_names, + $cdom,$cnum); + } + my $now = time; + # Process the classlist while (my ($student,$student_data) = each (%$classlist)) { my $studenthash = (); @@ -233,6 +143,16 @@ sub PrepareClasslist { $StudentData{$field}->{'width'} = $length; } } + my @studentsgroups = &Apache::loncoursedata::get_students_groups + ($student,$enrollment_status, + $classgroups); + if (@studentsgroups) { + $studenthash->{'groups'} = join(', ',@studentsgroups); + $studenthash->{'groupref'} = \@studentsgroups; + } else { + $studenthash->{'groups'} = 'none'; + $studenthash->{'groupref'} = []; + } push (@FullClasslist,$studenthash); # # Build up a list of sections @@ -250,8 +170,27 @@ sub PrepareClasslist { (($studenthash->{'status'} eq $enrollment_status) || ($enrollment_status eq 'Any')) ){ - push (@Students,$studenthash); - last; + my $groupcheck = 0; + if (grep(/^all$/,@selected_groups)) { + push(@Students,$studenthash); + last; + } elsif (grep(/^none$/,@selected_groups)) { + if ($studenthash->{'groups'} eq 'none') { + push(@Students,$studenthash); + last; + } + } else { + foreach my $group (@selected_groups) { + if (grep(/^$group$/,@studentsgroups)) { + push(@Students,$studenthash); + $groupcheck = 1; + last; + } + } + if ($groupcheck) { + last; + } + } } } } @@ -260,15 +199,24 @@ sub PrepareClasslist { if ($env{'request.course.sec'} !~ /^\s*$/) { @Sections = ($env{'request.course.sec'}); } else { - @Sections = sort {$a cmp $b} keys(%Sections); + @Sections = sort { + if ($a == $a && $b == $b ) { return $a <=> $b; } + return $a cmp $b; + } keys(%Sections); + unshift(@Sections,'all'); # Put 'all' at the front of the list } + # Sort the groups + @Groups = sort {$a cmp $b} keys(%{$studentgroups}); + unshift(@Groups,'all'); # Put 'all' at the front of the list + # # Sort the Students my $sortby = 'fullname'; $sortby = $env{'form.sort'} if (exists($env{'form.sort'})); - my @TmpStudents = sort { $a->{$sortby} cmp $b->{$sortby} || - $a->{'fullname'} cmp $b->{'fullname'} } @Students; + my @TmpStudents = sort { lc($a->{$sortby}) cmp lc($b->{$sortby}) || + lc($a->{'fullname'}) cmp lc($b->{'fullname'}) || + lc($a->{'username'}) cmp lc($b->{'username'}) } @Students; @Students = @TmpStudents; # # Now deal with that current student thing.... @@ -313,19 +261,7 @@ sub PrepareClasslist { return; } -####################################################### -####################################################### -=pod - -=item get_selected_sections - -Returns an array of the selected sections - -=cut - -####################################################### -####################################################### sub get_selected_sections { my @selected_sections = &Apache::loncommon::get_env_multiple('form.Section'); @@ -343,81 +279,90 @@ sub get_selected_sections { return @selected_sections; } -####################################################### -####################################################### - -=pod - -=item §ion_and_enrollment_description -Returns a string describing the currenly selected section(s) and -enrollment status. - -Inputs: mode = 'plaintext' or 'localized' (defaults to 'localized') - 'plaintext' is used for example in Excel spreadsheets. -Returns: scalar description string. +sub get_selected_groups { + my @selected_groups = + &Apache::loncommon::get_env_multiple('form.Group'); + @selected_groups = ('all') if (! @selected_groups); + foreach my $grp (@selected_groups) { + if ($grp eq 'all') { + @selected_groups = ('all'); + last; + } + } + return @selected_groups; +} + -=cut -####################################################### -####################################################### sub section_and_enrollment_description { my ($mode) = @_; if (! defined($mode)) { $mode = 'localized'; } my @sections = &Apache::lonstatistics::get_selected_sections(); + my @groups = &Apache::lonstatistics::get_selected_groups(); my $description; if ($mode eq 'localized') { - $description = &mt('Unable to determine section and enrollment'); + $description = &mt('Unable to determine section, groups and access status'); } elsif ($mode eq 'plaintext') { - $description = 'Unable to determine section and enrollment'; + $description = 'Unable to determine section, groups and access status'; } else { $description = 'Bad parameter passed to lonstatistics::section_and_enrollment_description'; &Apache::lonnet::logthis($description); } - if (scalar(@sections) == 1 && $sections[0] ne 'all') { + $description = §ion_or_group_text($mode,'section',@sections). + ' '.§ion_or_group_text($mode,'group',@groups); + if ($mode eq 'localized') { + $description .= ' '.&mt($env{'form.Status'}.' access status.'); + } elsif ($mode eq 'plaintext') { + $description .= ' '.$env{'form.Status'}.' access status.'; + } + return $description; +} + + + + +sub section_or_group_text { + my ($mode,$type,@items) = @_; + my $text; + my %phrases = (); + %{$phrases{'section'}} = ( + single => 'Section', + all => 'All sections', + plural => 'Sections', + ); + %{$phrases{'group'}} = ( + single => 'Group', + all => 'All groups', + plural => 'Groups', + ); + if (scalar(@items) == 1 && $items[0] ne 'all') { if ($mode eq 'localized') { - $description = &mt('Section [_1]. [_2] enrollment status.', - $sections[0],$env{'form.Status'}); + $text = &mt($phrases{$type}{single}.' [_1].',$items[0]); } elsif ($mode eq 'plaintext') { - $description = 'Section '.$sections[0].'. '. - $env{'form.Status'}.' enrollment status.'; + $text = $phrases{$type}{single}.' '.$items[0].'.'; + } - } elsif (scalar(@sections) && $sections[0] eq 'all') { + } elsif (scalar(@items) && $items[0] eq 'all') { if ($mode eq 'localized') { - $description = &mt('All sections. [_1] enrollment status.', - $env{'form.Status'}); + $text = &mt($phrases{$type}{all}.'.'); } elsif ($mode eq 'plaintext') { - $description = 'All sections. '. - $env{'form.Status'}.' enrollment status.'; + $text = $phrases{$type}{all}.'.'; } - } elsif (scalar(@sections)) { - my $lastsection = pop(@sections); + } elsif (scalar(@items)) { + my $lastitem = pop(@items); if ($mode eq 'localized') { - $description = &mt('Sections [_1] and [_2]. [_3] enrollment status.', - join(', ',@sections),$lastsection, - $env{'form.Status'}); + $text = &mt($phrases{$type}{plural}.' [_1] and [_2].', + join(', ',@items),$lastitem); } elsif ($mode eq 'plaintext') { - $description = - 'Sections '.join(', ',@sections).' and '.$lastsection.'. '. - $env{'form.Status'}.' enrollment status.'; + $text = $phrases{$type}{plural}.' '.join(', ',@items).' and '. + $lastitem.'.'; } } - return $description; + return $text; } -####################################################### -####################################################### - -=pod - -=item get_students - -Returns a list of the selected students - -=cut -####################################################### -####################################################### sub get_students { if (! @Students) { &PrepareClasslist() @@ -425,84 +370,26 @@ sub get_students { return @Students; } -####################################################### -####################################################### -=pod - -=item ¤t_student() -Returns a pointer to a hash containing data about the currently -selected student. - -=cut - -####################################################### -####################################################### sub current_student { return $curr_student; } -####################################################### -####################################################### - -=pod - -=item &previous_student() - -Returns a pointer to a hash containing data about the student prior -in the list of students. Or something. -=cut -####################################################### -####################################################### sub previous_student { return $prev_student; } -####################################################### -####################################################### - -=pod - -=item &next_student() - -Returns a pointer to a hash containing data about the next student -to be viewed. -=cut -####################################################### -####################################################### sub next_student { return $next_student; } -############################################## -############################################## -=pod - -=item &StudentDataSelect($elementname,$status,$numvisible,$selected) - -Returns html for a selection box allowing the user to choose one (or more) -of the fields of student data available (fullname, username, id, section, etc) -=over 4 - -=item $elementname The name of the HTML form element - -=item $status 'multiple' or 'single' selection box - -=item $numvisible The number of options to be visible - -=back - -=cut - -############################################## -############################################## sub StudentDataSelect { my ($elementname,$status,$numvisible)=@_; if ($numvisible < 1) { @@ -513,7 +400,7 @@ sub StudentDataSelect { my $Str = "\n"; $Str .= ' form element used to specify the maps. - -Returns: Array of symbs of selected maps or the description 'all'. - If form.$elementname does not exist, 'all' is returned. - -=cut - -####################################################### -####################################################### sub get_selected_maps { my ($elementname) = @_; my @selected_maps = @@ -573,25 +446,8 @@ sub get_selected_maps { } -####################################################### -####################################################### - -=pod - -=item &selected_sequences_with_assessments -Retrieve the sequences which were selected by the user to show. -Input: $mode: scalar. Either 'selected' or 'all'. If not specified, - 'selected' is used. - -Returns: an array containing a navmap object and navmap resources, - or an array containing a scalar with an error message. - -=cut - -####################################################### -####################################################### sub selected_sequences_with_assessments { my ($mode) = @_; $mode = 'selected' if (! defined($mode)); @@ -602,8 +458,13 @@ sub selected_sequences_with_assessments # my @sequences = $navmap->retrieveResources(undef, sub { shift->is_map(); },1,0,1); + my $toplevelseq = $navmap->getById('0.0'); + if (!grep(/^\Q$toplevelseq\E$/,@sequences)) { + unshift(@sequences,$toplevelseq); + } + my @sequences_with_assessments; - for my $sequence ($navmap->getById('0.0'), @sequences) { + foreach my $sequence (@sequences) { if ($navmap->hasResource($sequence,sub { shift->is_problem(); },0,1)){ push(@sequences_with_assessments,$sequence); } @@ -626,31 +487,7 @@ sub selected_sequences_with_assessments return $navmap,@sequences_to_show; } -############################################## -############################################## - -=pod - -=item &map_select($elementname,$status,$numvisible,$restriction) - -Returns html for a selection box allowing the user to choose one (or more) -of the sequences in the course. The values of the sequences are the symbs. -If the top sequence is selected, the value 'top' will result. -=over 4 - -=item $elementname The name of the HTML form element - -=item $status 'multiple' or 'single' selection box - -=item $numvisible The number of options to be visible - -=back - -=cut - -############################################## -############################################## sub map_select { my ($elementname,$status,$numvisible)=@_; if ($numvisible < 1) { @@ -664,7 +501,7 @@ sub map_select { my $form = "\n"; $form .= ''."\n"; # @@ -756,8 +569,43 @@ sub SectionSelect { return $Str; } -################################################## -################################################## + +sub GroupSelect { + my ($elementname,$status,$numvisible)=@_; + if ($numvisible < 1) { + return; + } + # + # Make sure we have the data we need to continue + if (! @Groups) { + &PrepareClasslist(); + } + # + # Build the form element + my $Str = "\n"; + $Str .= '\n"; +} + + + + sub DisplayClasslist { my ($r)=@_; &Apache::lonhtmlcommon::add_breadcrumb @@ -765,16 +613,20 @@ sub DisplayClasslist { # # Output some of the standard interface components my $Str; - $Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Select One Student'); + $Str .= &Apache::lonhtmlcommon::breadcrumbs('Select One Student'); $Str .= '

'."\n"; $Str .= ''; $Str .= ''; - $Str .= ''; + $Str .= ''; + $Str .= ''; $Str .= ''.$/; $Str .= ''; $Str .= ''; + $Str .= ''; $Str .= ''; @@ -786,52 +638,61 @@ sub DisplayClasslist { $r->print($Str); $r->rflush(); # - my @Fields = ('fullname','username','domain','id','section','status'); + my @Fields = ('fullname','username','domain','id','section','status','groups'); # $Str = ''; my @selected_sections = &get_selected_sections(); if (! @Students) { if ($selected_sections[0] eq 'all') { - if (lc($env{'form.Status'}) eq 'any') { - $Str .= '

'. - &mt('There are no students in the course.'). - '

'; - } elsif (lc($env{'form.Status'}) eq 'active') { - $Str .= '

'. + if (lc($env{'form.Status'}) eq 'active') { + $Str .= '

'. &mt('There are no currently enrolled students in the course.'). - '

'; + '

'; } elsif (lc($env{'form.Status'}) eq 'expired') { - $Str .= '

'. + $Str .= '

'. &mt('There are no previously enrolled students in the course.'). - '

'; + '

'; + } elsif (lc($env{'form.Status'}) eq 'future') { + $Str .= '

'. + &mt('There are no students with future access in the course.'). + '

'; + } else { # 'any' and any others + $Str .= '

'. + &mt('There are no students in the course.'). + '

'; } } else { - my $sections; - if (lc($env{'form.Status'}) eq 'any') { - $Str .= '

'. - &mt('There are no students in the selected sections.'). - '

'; - } elsif (lc($env{'form.Status'}) eq 'active') { - $Str .= '

'. + if (lc($env{'form.Status'}) eq 'active') { + $Str .= '

'. &mt('There are no currently enrolled students in the selected sections.'). - '

'; + '

'; } elsif (lc($env{'form.Status'}) eq 'expired') { - $Str .= '

'. + $Str .= '

'. &mt('There are no previously enrolled students in the selected sections.'). - '

'; + '

'; + } elsif (lc($env{'form.Status'}) eq 'future') { + $Str .= '

'. + &mt('There are no students with future access in the selected sections.'). + '

'; + } else { # 'any' and any others + $Str .= '

'. + &mt('There are no students in the selected sections.'). + '

'; } } - $Str.= ''. - &mt('Click here to return to the chart').''; + $Str.= '

' + .'' + .&mt('Return to the chart').'' + .'

'; $r->print($Str); $r->rflush(); return; } - # "Click" is asinine but it is probably not my place to change the world. - $Str .= '

Click on a students name or username to view their chart

'; - $Str .= '
'.&mt('Sections').''.&mt('Enrollment Status').''.&mt('Groups').''.&mt('Access Status').'
'. &Apache::lonstatistics::SectionSelect('Section','multiple',5). ''. + &Apache::lonstatistics::GroupSelect('Group','multiple',5). + ''. &Apache::lonhtmlcommon::StatusOptions(undef,undef,5). '
'."\n"; - $Str .= ''."\n"; + $Str .= '

'.&mt('Select One Student').'

' + .'

'.&mt("Click on a student's name or username to view their chart").'

' + .&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row(); foreach my $field (@Fields) { $Str .= ''; } - $Str .= ''."\n"; + $Str .= &Apache::loncommon::end_data_table_header_row(); # - my $alternate = 0; foreach my $student (@Students) { # @Students is a package variable my $sname = $student->{'username'}.':'.$student->{'domain'}; - if($alternate) { - $Str .= ''; - } else { - $Str .= ''; - } - $alternate = ($alternate + 1) % 2; + $Str .= &Apache::loncommon::start_data_table_row(); # foreach my $field (@Fields) { $Str .= ''; } - $Str .= "\n"; + $Str .= &Apache::loncommon::end_data_table_row(); } - $Str .= '
'.&mt($field). '
'; if ($field eq 'fullname' || $field eq 'username') { $Str .= ''; - $Str .= $student->{$field}.' '; + $Str .= &escape($sname).'">'; + $Str .= $student->{$field}.' '; $Str .= ''; } elsif ($field eq 'status') { $Str .= &mt($student->{$field}); @@ -868,9 +723,9 @@ sub DisplayClasslist { } $Str .= '
'."\n"; + $Str .= &Apache::loncommon::end_data_table(); # $r->print($Str); $r->rflush(); @@ -878,67 +733,61 @@ sub DisplayClasslist { return; } -############################################## -############################################## + + sub CreateMainMenu { # # Define menu data - my @reports = ({ internal_name => 'problem_statistics', - name => &mt('Overall Problem Statistics'), - short_description => - &mt('Student performance statistics on all problems.'), - }, - { internal_name => 'problem_analysis', - name => &mt('Detailed Problem Analysis'), - short_description => - &mt('Detailed statistics and graphs of student performance on problems.'), - }, - { internal_name => 'submissiontime_analysis', - name => &mt('Submission Time Plots'), - short_description => - &mt('Display and analysis of submission times on assessments.'), - }, - { internal_name => 'student_submission_reports', - name => &mt('Student Submission Reports'), - short_description => - &mt('Prepare reports of student submissions.'), - }, - { internal_name => 'survey_reports', - name => &mt('Survey Reports'), - short_description => - &mt('Prepare reports on survey results.'), - }, - { internal_name => 'correct_problems_plot', - name => &mt('Correct Problems Plot'), - short_description => - &mt('Display a histogram of student performance in the course.'), - }, -# { internal_name => 'student_assessment', -# name => &mt('Problem Status Chart'), -# short_description => -# &mt('Brief view of each students performance in course.'), -# }, - # 'percentage' => 'Correct-problems Plot', - # 'activitylog' => 'Activity Log', - ); - # - # Create the menu - my $Str; - $Str .= '

'.&mt('Please select a report to generate').'

'; - foreach my $reportdata (@reports) { - $Str .='

'. - $reportdata->{'name'}."

\n"; - $Str .= ' '.(' 'x8).$reportdata->{'short_description'}. - "\n"; - } - $Str .="\n"; - # - return $Str; + my @reports = ( + {categorytitle => 'Statistics and Analyses', + items => [ + {url => '/adm/statistics?reportSelected=problem_statistics', + permission => 'F', + icon => 'document-open.png', + linktext => ('Overall Problem Statistics'), + linktitle => ('Student performance statistics on all problems.')}, + + {url => '/adm/statistics?reportSelected=problem_analysis', + permission => 'F', + icon => 'edit-find.png', + linktext => ('Detailed Problem Analysis'), + linktitle => ('Detailed statistics and graphs of student performance on problems.')}, + ]}, + {categorytitle => 'Plots', + items => [ + {url => '/adm/statistics?reportSelected=submissiontime_analysis', + permission => 'F', + icon => 'subtimpl.png', + linktext => ('Submission Time Plots'), + linktitle => ('Display and analysis of submission times on assessments.')}, + + {url => '/adm/statistics?reportSelected=correct_problems_plot', + permission => 'F', + icon => 'coprplot.png', + linktext => ('Correct Problems Plot'), + linktitle => ('Display a histogram of student performance in the course.')}, + ]}, + {categorytitle => 'Reports', + items => [ + {url => '/adm/statistics?reportSelected=student_submission_reports', + permission => 'F', + icon => 'edit-copy.png', + linktext => ('Student Submission Reports'), + linktitle => ('Prepare reports of student submissions.')}, + + {url => '/adm/statistics?reportSelected=survey_reports', + permission => 'F', + icon => 'docs.png', + linktext => ('Survey Reports'), + linktitle => ('Prepare reports on survey results.')}, + ]}); + +return &Apache::lonhtmlcommon::generate_menu(@reports); + } -############################################## -############################################## + + sub handler { my $r=shift; my $c = $r->connection(); @@ -968,6 +817,28 @@ sub handler { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; if ($r->header_only) { return OK; } + my $gcicustom = &Apache::loncommon::needs_gci_custom(); + if ($gcicustom) { + my $now = time; + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom); + my $duedate = $courseopt->{$env{'request.course.id'}.'.0.duedate'}; + if ((!$duedate) || ($duedate > $now)) { + $r->print(&Apache::loncommon::start_page("Course Statistics")); + $r->print('

'.&mt('Display of statistics').'

'); + if ($duedate > $now) { + $r->print('

'.&mt('Aggregate test performance data will be available after the Concept Test end date: [_1].', + &Apache::lonlocal::locallocaltime($duedate)).'

'); + } else { + $r->print('

'. + &mt('Aggregate test performance data unavailable without definition of an end date for the Concept Test.').'

'); + } + $r->print(&Apache::loncommon::end_page()); + return OK; + } + } + # # Extract form elements from query string &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, @@ -983,12 +854,9 @@ sub handler { td.essay { border: 1px solid gray; } ENDSTYLE - my $html=&Apache::lonxml::xmlbegin(); - $r->print($html.''. - &mt('Course Statistics and Charts'). - ''.$style. - "\n". - &Apache::loncommon::bodytag('Course Statistics and Charts')); + + $r->print(&Apache::loncommon::start_page('Course Statistics and Charts', + $style)); $r->rflush(); # # Either print out a menu for them or send them to a report @@ -1000,25 +868,25 @@ ENDSTYLE bug=>'Statistics and Charts'}); if (! exists($env{'form.reportSelected'}) || $env{'form.reportSelected'} eq '') { - $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,&mt('Statistics Main Page')). + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Statistics Main Page'). &CreateMainMenu()); } else { # if (! &Apache::lonmysql::verify_sql_connection()) { my $serveradmin = $r->dir_config('lonAdmEMail'); - $r->print('

'. + $r->print('

'. &mt('Unable to connect to database!'). - '

'); - $r->print('

'. - &mt('Please notify the server administrator '). - ''.$serveradmin.'

'); + '

'); + $r->print('

' + .&mt('Please notify the server administrator [_1]', + ,''.$serveradmin.'') + .'

'); $r->print('

'. &mt('Course Statistics and Charts cannot be '. - 'retrieved until the database is restarted. '. + 'retrieved until the database is restarted. '. 'Your data is intact but cannot be displayed '. 'at this time.').'

'); - $r->print(''); + $r->print(&Apache::loncommon::end_page()); return; } # @@ -1076,12 +944,21 @@ ENDSTYLE &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/statistics?reportselected=student_assessment', text=>'Chart'}); - &Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c); - } + if ($gcicustom) { + $r->print(&mt('Only aggregate performance data is available for Concept Tests.')); + } else { + &Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c); + } + } elsif($GoToPage eq 'grading_analysis') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/statistics?reportselected=grading_anaylsis', + text=>'Grading Analysis'}); + &Apache::longradinganalysis::build_grading_analysis_page($r,$c); + } # $r->print("\n"); } - $r->print("\n\n"); + $r->print(&Apache::loncommon::end_page()); $r->rflush(); # return OK; @@ -1089,17 +966,227 @@ ENDSTYLE 1; -####################################################### -####################################################### +__END__ =pod +=head1 NAME + +lonstatistics + +=head1 SYNOPSIS + +Main handler for statistics and chart. + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + + +=head1 PACKAGE VARIABLES + +=over + +=item @FullClasslist The full classlist + +=item @Students The students we are concerned with for this invocation + +=item @Sections The sections available in this class + +=item @Groups The groups available in the class + +=item $curr_student The student currently being examined + +=item $prev_student The student previous in the classlist + +=item $next_student The student next in the classlist + =back -=cut +=head1 SUBROUTINES -####################################################### -####################################################### +=over -__END__ +=item &clear_classlist_variables() + +undef the following package variables: + +=over 4 + +=item * @FullClasslist + +=item * @Students + +=item * @Sections + +=item * @Groups + +=item * %StudentData + +=item * @StudentDataOrder + +=item * @SelectedStudentData + +=item * $curr_student + +=item * $prev_student + +=item * $next_student + +=back + +=item &PrepareClasslist() + +Build up the classlist information. The classlist information is kept in +the following package variables: + +=over 4 + +=item * @FullClasslist + +=item * @Students + +=item * @Sections + +=item * @Groups + +=item * %StudentData + +=item * @SelectedStudentData + +=item * $curr_student + +=item * $prev_student + +=item * $next_student + +=back + +$curr_student, $prev_student, and $next_student may not be defined, depending +upon the calling context. + +=item get_selected_sections() + +Returns an array of the selected sections + +=item get_selected_groups() + +Returns an array of the selected groups + +=item §ion_and_enrollment_description() + +Returns a string describing the currently selected section(s), group(s) and +access status. + +Inputs: mode = 'plaintext' or 'localized' (defaults to 'localized') + 'plaintext' is used for example in Excel spreadsheets. +Returns: scalar description string. + +=item section_or_group_text() + +=item get_students() + +Returns a list of the selected students + +=item ¤t_student() + +Returns a pointer to a hash containing data about the currently +selected student. + +=item &previous_student() + +Returns a pointer to a hash containing data about the student prior +in the list of students. Or something. + +=item &next_student() + +Returns a pointer to a hash containing data about the next student +to be viewed. + +=item &StudentDataSelect($elementname,$status,$numvisible,$selected) + +Returns html for a selection box allowing the user to choose one (or more) +of the fields of student data available (fullname, username, id, section, etc) + +=over 4 + +=item * $elementname The name of the HTML form element + +=item * $status 'multiple' or 'single' selection box + +=item * $numvisible The number of options to be visible + +=back + +=item &get_selected_maps($elementname) + +Input: Name of the