--- loncom/interface/lonstatistics.pm 2003/04/18 15:50:55 1.66 +++ loncom/interface/lonstatistics.pm 2008/09/16 15:40:15 1.141 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.66 2003/04/18 15:50:55 matthew Exp $ +# $Id: lonstatistics.pm,v 1.141 2008/09/16 15:40:15 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,20 +38,6 @@ lonstatistics Main handler for statistics and chart. -=head1 PACKAGES USED - - use strict; - use Apache::Constants qw(:common :http); - use Apache::lonnet(); - use Apache::lonhomework; - use Apache::loncommon; - use Apache::loncoursedata; - use Apache::lonhtmlcommon; - use Apache::lonproblemanalysis; - use Apache::lonproblemstatistics; - use Apache::lonstudentassessment; - use Apache::lonpercentage; - use Apache::lonmysql; =over 4 =cut @@ -63,27 +49,34 @@ use Apache::Constants qw(:common :http); use vars qw( @FullClasslist @Students - @Sections - @SelectedSections + @Sections + @Groups %StudentData @StudentDataOrder @SelectedStudentData - $top_map - @Sequences - @SelectedMaps - @Assessments); + $enrollment_status); -use Apache::lonnet(); +use Apache::lonnet; use Apache::lonhomework; use Apache::loncommon; use Apache::loncoursedata; use Apache::lonhtmlcommon; +use Apache::lonmysql; +use Apache::lonlocal; +use Apache::longroup; +use Time::HiRes; +# +# Statistics Packages use Apache::lonproblemanalysis(); +use Apache::lonsubmissiontimeanalysis(); +use Apache::loncorrectproblemplot(); use Apache::lonproblemstatistics(); use Apache::lonstudentassessment(); use Apache::lonpercentage; -use Apache::lonmysql; -use Time::HiRes; +use Apache::lonstudentsubmissions(); +use Apache::lonsurveyreports(); +use Apache::longradinganalysis(); +use LONCAPA; ####################################################### ####################################################### @@ -98,6 +91,8 @@ use Time::HiRes; =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 @@ -134,7 +129,7 @@ undef the following package variables: =item @Sections -=item @SelectedSections +=item @Groups =item %StudentData @@ -158,7 +153,7 @@ sub clear_classlist_variables { undef(@FullClasslist); undef(@Students); undef(@Sections); - undef(@SelectedSections); + undef(@Groups); undef(%StudentData); undef(@SelectedStudentData); undef($curr_student); @@ -184,7 +179,7 @@ the following package variables: =item @Sections -=item @SelectedSections +=item @Groups =item %StudentData @@ -206,40 +201,47 @@ upon the calling context. ####################################################### ####################################################### sub PrepareClasslist { - my $r = shift; my %Sections; &clear_classlist_variables(); # # Retrieve the classlist - 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); - if (exists($ENV{'form.Section'})) { - if (ref($ENV{'form.Section'})) { - @SelectedSections = @{$ENV{'form.Section'}}; - } elsif ($ENV{'form.Section'} !~ /^\s*$/) { - @SelectedSections = ($ENV{'form.Section'}); - } - } - @SelectedSections = ('all') if (! @SelectedSections); - foreach (@SelectedSections) { - if ($_ eq 'all') { - @SelectedSections = ('all'); - } + 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($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*$/) { + @selected_sections = ($env{'request.course.sec'}); } # # Set up %StudentData - @StudentDataOrder = qw/fullname username domain id section status/; + @StudentDataOrder = qw/fullname username domain id section status groups comments/; foreach my $field (@StudentDataOrder) { - $StudentData{$field}->{'title'} = $field; - $StudentData{$field}->{'base_width'} = length($field); + $StudentData{$field}->{'title'} = &mt($field); + $StudentData{$field}->{'base_width'} = length(&mt($field)); $StudentData{$field}->{'width'} = $StudentData{$field}->{'base_width'}; } - # + # get the status requested + $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 = (); @@ -254,6 +256,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 @@ -265,29 +277,66 @@ sub PrepareClasslist { $Sections{$section}++; # # Only put in the list those students we are interested in - foreach my $sect (@SelectedSections) { - if (($sect eq 'all') || ($section eq $sect)) { - push (@Students,$studenthash); - last; + foreach my $sect (@selected_sections) { + if ( (($sect eq 'all') || + ($section eq $sect)) && + (($studenthash->{'status'} eq $enrollment_status) || + ($enrollment_status eq 'Any')) + ){ + 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; + } + } } } } # # Put the consolidated section data in the right place - @Sections = sort {$a cmp $b} keys(%Sections); - unshift(@Sections,'all'); # Put 'all' at the front of the list + if ($env{'request.course.sec'} !~ /^\s*$/) { + @Sections = ($env{'request.course.sec'}); + } else { + @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; + $sortby = $env{'form.sort'} if (exists($env{'form.sort'})); + 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.... - if (exists($ENV{'form.StudentAssessmentStudent'})) { + $curr_student = undef; + if (exists($env{'form.SelectedStudent'})) { my ($current_uname,$current_dom) = - split(':',$ENV{'form.StudentAssessmentStudent'}); + split(':',$env{'form.SelectedStudent'}); my $i; for ($i = 0; $i<=$#Students; $i++) { next if (($Students[$i]->{'username'} ne $current_uname) || @@ -295,26 +344,25 @@ sub PrepareClasslist { $curr_student = $Students[$i]; last; # If we get here, we have our student. } - if ($i == 0) { - $prev_student = 'none'; - } else { - $prev_student = $Students[$i-1]; - } - if ($i == $#Students) { - $next_student = 'none'; - } else { - $next_student = $Students[$i+1]; + if (defined($curr_student)) { + if ($i == 0) { + $prev_student = undef; + } else { + $prev_student = $Students[$i-1]; + } + if ($i == $#Students) { + $next_student = undef; + } else { + $next_student = $Students[$i+1]; + } } } # - if (exists($ENV{'form.StudentData'})) { - if (ref($ENV{'form.StudentData'}) eq 'ARRAY') { - @SelectedStudentData = @{$ENV{'form.StudentData'}}; - } else { - @SelectedStudentData = ($ENV{'form.StudentData'}); - } + if (exists($env{'form.StudentData'})) { + @SelectedStudentData = + &Apache::loncommon::get_env_multiple('form.StudentData'); } else { - @SelectedStudentData = ('fullname'); + @SelectedStudentData = ('username'); } foreach (@SelectedStudentData) { if ($_ eq 'all') { @@ -331,135 +379,173 @@ sub PrepareClasslist { =pod -=item ¤t_student() +=item get_selected_sections -Returns a pointer to a hash containing data about the currently -selected student. +Returns an array of the selected sections =cut ####################################################### ####################################################### -sub current_student { - if (defined($curr_student)) { - return $curr_student; - } else { - return 'All Students'; +sub get_selected_sections { + my @selected_sections = + &Apache::loncommon::get_env_multiple('form.Section'); + @selected_sections = ('all') if (! @selected_sections); + foreach (@selected_sections) { + if ($_ eq 'all') { + @selected_sections = ('all'); + } + } + # + # Deal with instructors with restricted section access + if ($env{'request.course.sec'} !~ /^\s*$/) { + @selected_sections = ($env{'request.course.sec'}); } + return @selected_sections; } ####################################################### ####################################################### - + =pod - -=item &previous_student() - -Returns a pointer to a hash containing data about the student prior -in the list of students. Or something. - + +=item get_selected_groups + +Returns an array of the selected groups + =cut - + ####################################################### ####################################################### -sub previous_student { - if (defined($prev_student)) { - return $prev_student; - } else { - return 'No Student Selected'; +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; } - -####################################################### -####################################################### - + =pod -=item &next_student() +=item §ion_and_enrollment_description -Returns a pointer to a hash containing data about the next student -to be viewed. +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. =cut ####################################################### ####################################################### -sub next_student { - if (defined($next_student)) { - return $next_student; +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, groups and access status'); + } elsif ($mode eq 'plaintext') { + $description = 'Unable to determine section, groups and access status'; } else { - return 'No Student Selected'; + $description = 'Bad parameter passed to lonstatistics::section_and_enrollment_description'; + &Apache::lonnet::logthis($description); + } + $description = §ion_or_group_text($mode,'section',@sections). + ' '.§ion_or_group_text($mode,'group',@groups); + if ($mode eq 'localized') { + $description .= &mt(' [_1] access status.',$env{'form.Status'}); + } elsif ($mode eq 'plaintext') { + $description .= ' '.$env{'form.Status'}.' access status.'; } + return $description; } ####################################################### ####################################################### -=pod - -=item &clear_sequence_variables() - -=cut - -####################################################### -####################################################### -sub clear_sequence_variables { - undef($top_map); - undef(@Sequences); - undef(@Assessments); +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') { + $text = &mt('[_1] [_2].',$phrases{$type}{single},$items[0]); + } elsif ($mode eq 'plaintext') { + $text = $phrases{$type}{single}.' '.$items[0].'.'; + + } + } elsif (scalar(@items) && $items[0] eq 'all') { + if ($mode eq 'localized') { + $text = &mt('[_1].',$phrases{$type}{all}); + } elsif ($mode eq 'plaintext') { + $text = $phrases{$type}{all}.'.'; + } + } elsif (scalar(@items)) { + my $lastitem = pop(@items); + if ($mode eq 'localized') { + $text = &mt('[_1] [_2] and [_3].',$phrases{$type}{plural}, + join(', ',@items),$lastitem); + } elsif ($mode eq 'plaintext') { + $text = $phrases{$type}{plural}.' '.join(', ',@items).' and '. + $lastitem.'.'; + } + } + return $text; } -####################################################### -####################################################### =pod -=item &SetSelectedMaps($elementname) +=item get_students -Sets the @SelectedMaps array from $ENV{'form.'.$elementname}; +Returns a list of the selected students =cut ####################################################### ####################################################### -sub SetSelectedMaps { - my $elementname = shift; - if (exists($ENV{'form.'.$elementname})) { - if (ref($ENV{'form.'.$elementname})) { - @SelectedMaps = @{$ENV{'form.'.$elementname}}; - } else { - @SelectedMaps = ($ENV{'form.'.$elementname}); - } - } else { - @SelectedMaps = ('all'); +sub get_students { + if (! @Students) { + &PrepareClasslist() } + return @Students; } - ####################################################### ####################################################### =pod -=item &Sequences_with_Assess() +=item ¤t_student() -Returns an array containing the subset of @Sequences which contain -assessments. +Returns a pointer to a hash containing data about the currently +selected student. =cut ####################################################### ####################################################### -sub Sequences_with_Assess { - my @Sequences_to_Show; - foreach my $map_symb (@SelectedMaps) { - foreach my $sequence (@Sequences) { - next if ($sequence->{'symb'} ne $map_symb && $map_symb ne 'all'); - next if ($sequence->{'num_assess'} < 1); - push (@Sequences_to_Show,$sequence); - } - } - return @Sequences_to_Show; +sub current_student { + return $curr_student; } ####################################################### @@ -467,42 +553,17 @@ sub Sequences_with_Assess { =pod -=item &PrepareCourseData($r) +=item &previous_student() + +Returns a pointer to a hash containing data about the student prior +in the list of students. Or something. =cut ####################################################### ####################################################### -sub PrepareCourseData { - my ($r) = @_; - &clear_sequence_variables(); - my ($top,$sequences,$assessments) = - &Apache::loncoursedata::get_sequence_assessment_data(); - if (! defined($top) || ! ref($top)) { - # There has been an error, better report it - &Apache::lonnet::logthis('top is undefined'); - return; - } - $top_map = $top if (ref($top)); - @Sequences = @{$sequences} if (ref($sequences) eq 'ARRAY'); - @Assessments = @{$assessments} if (ref($assessments) eq 'ARRAY'); - # - # Compute column widths - foreach my $seq (@Sequences) { - my $name_length = length($seq->{'title'}); - my $num_parts = $seq->{'num_assess_parts'}; - # - # The number of columns needed for the summation text: - # " 1/5" = 1+3 columns, " 10/99" = 1+5 columns - my $sum_length = 1+1+2*(length($num_parts)); - my $num_col = $num_parts+$sum_length; - if ($num_col < $name_length) { - $num_col = $name_length; - } - $seq->{'base_width'} = $name_length; - $seq->{'width'} = $num_col; - } - return; +sub previous_student { + return $prev_student; } ####################################################### @@ -510,60 +571,17 @@ sub PrepareCourseData { =pod -=item &log_sequence($sequence,$recursive,$padding) +=item &next_student() -Write data about the sequence to a logfile. If $recursive is not -undef the data is written recursively. $padding is used for recursive -calls. +Returns a pointer to a hash containing data about the next student +to be viewed. =cut ####################################################### ####################################################### -sub log_sequence { - my ($seq,$recursive,$padding) = @_; - $padding = '' if (! defined($padding)); - if (ref($seq) ne 'HASH') { - &Apache::lonnet::logthis('log_sequence passed bad sequnce'); - return; - } - &Apache::lonnet::logthis($padding.'sequence '.$seq->{'title'}); - while (my($key,$value) = each(%$seq)) { - next if ($key eq 'contents'); - if (ref($value) eq 'ARRAY') { - for (my $i=0;$i< scalar(@$value);$i++) { - &Apache::lonnet::logthis($padding.$key.'['.$i.']='. - $value->[$i]); - } - } else { - &Apache::lonnet::logthis($padding.$key.'='.$value); - } - } - if (defined($recursive)) { - &Apache::lonnet::logthis($padding.'-'x20); - &Apache::lonnet::logthis($padding.'contains:'); - foreach my $item (@{$seq->{'contents'}}) { - if ($item->{'type'} eq 'container') { - &log_sequence($item,$recursive,$padding.' '); - } else { - &Apache::lonnet::logthis($padding.'title = '.$item->{'title'}); - while (my($key,$value) = each(%$item)) { - next if ($key eq 'title'); - if (ref($value) eq 'ARRAY') { - for (my $i=0;$i< scalar(@$value);$i++) { - &Apache::lonnet::logthis($padding.$key.'['.$i.']='. - $value->[$i]); - } - } else { - &Apache::lonnet::logthis($padding.$key.'='.$value); - } - } - } - } - &Apache::lonnet::logthis($padding.'end contents of '.$seq->{'title'}); - &Apache::lonnet::logthis($padding.'-'x20); - } - return; +sub next_student { + return $next_student; } ############################################## @@ -629,12 +647,101 @@ sub StudentDataSelect { return $Str; } +####################################################### +####################################################### + +=pod + +=item &get_selected_maps($elementname) + +Input: Name of the '."\n"; - # - # Deal with 'all' - foreach (@SelectedMaps) { - if ($_ eq 'all') { - @SelectedMaps = ('all'); - last; - } + $form .= 'multiple="true" '; } + $form .= 'size="'.$numvisible.'" >'."\n"; # # Put in option for 'all' - $Str .= ' \n"; + $form .= '>'.$seq->compTitle."\n"; } - $Str .= "\n"; - return $Str; + $form .= "\n"; + return $form; } ############################################## @@ -723,6 +817,7 @@ sub MapSelect { Returns html for a selection box allowing the user to choose one (or more) of the sections in the course. +Uses the package variables @Sections =over 4 =item $elementname The name of the HTML form element @@ -731,13 +826,6 @@ of the sections in the course. =item $numvisible The number of options to be visible -=item $selected Array ref to the names of the already selected sections. -If undef, $ENV{'form.'.$elementname} is used. -If $ENV{'form.'.$elementname} is also empty, none will be selected. - -=item $restriction Code reference to subroutine which returns true or -false. The code must expect a reference to a sequence data structure. - =back =cut @@ -750,6 +838,11 @@ sub SectionSelect { return; } # + # Make sure we have the data we need to continue + if (! @Sections) { + &PrepareClasslist() + } + # # Build the form element my $Str = "\n"; $Str .= '\n"; +} + + ################################################## ################################################## sub DisplayClasslist { my ($r)=@_; + &Apache::lonhtmlcommon::add_breadcrumb + ({text=>'Select One Student'}); + # + # Output some of the standard interface components + my $Str; + $Str .= &Apache::lonhtmlcommon::breadcrumbs('Select One Student'); + $Str .= '

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

'; + $Str .= ''; + $r->print($Str); + $r->rflush(); # - my @Fields = ('fullname','username','domain','id','section'); + my @Fields = ('fullname','username','domain','id','section','status','groups'); # - my $Str=''; - $Str .= '
'."\n"; - $Str .= ''."\n"; + $Str = ''; + my @selected_sections = &get_selected_sections(); + if (! @Students) { + if ($selected_sections[0] eq 'all') { + 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 .= '

'. + &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 { + 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 .= '

'. + &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('Return to the chart').'' + .'

'; + $r->print($Str); + $r->rflush(); + return; + } + + $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 .= '
'.$field. + $Str .= ''.&mt($field). '
'; - if ($field eq 'fullname') { + if ($field eq 'fullname' || $field eq 'username') { $Str .= ''; + $Str .= &escape('student_assessment'); + $Str .= '&sort='.&escape($env{'form.sort'}); + $Str .= '&SelectedStudent='; + $Str .= &escape($sname).'">'; $Str .= $student->{$field}.' '; $Str .= ''; + } elsif ($field eq 'status') { + $Str .= &mt($student->{$field}); } else { $Str .= $student->{$field}; } $Str .= '
'."\n"; + $Str .= &Apache::loncommon::end_data_table(); # $r->print($Str); $r->rflush(); @@ -826,36 +1057,63 @@ sub DisplayClasslist { ############################################## ############################################## sub CreateMainMenu { - my ($status,$reports,$current)=@_; - # - my $Str = ''; - # - $Str .= ''."\n"; - $Str .= ''."\n"; - $Str .= ''."\n"; - $Str .= ''."\n"; - $Str .= ''."\n"; # - $Str .= ''."\n"; - # - $Str .= ''."\n"; - # - $Str .= '
Select a ReportStudent Status
'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 => 'grading_analysis', +# name => &mt('Detailed Grading Analysis'), +# short_description => +# &mt('Display statistics about who graded who.'), +# }, +# { 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', + ); # - $Str .= ''; - $Str .= ''; - $Str .= &Apache::lonhtmlcommon::StatusOptions($status, 'Statistics'); - $Str .= '
'."\n"; - $Str .= '
'."\n"; + $Str .="\n"; # return $Str; } @@ -871,99 +1129,142 @@ sub handler { if ($loaderror) { return $loaderror; } $loaderror= &Apache::lonnet::overloaderror($r, - $ENV{'course.'.$ENV{'request.course.id'}.'.home'}); + $env{'course.'.$env{'request.course.id'}.'.home'}); if ($loaderror) { return $loaderror; } # # Check for access - unless(&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) { - $ENV{'user.error.msg'}= - $r->uri.":vgr:0:0:Cannot view grades for complete course"; - return HTTP_NOT_ACCEPTABLE; - } - # - # Set document type for header only - if($r->header_only) { - if ($ENV{'browser.mathml'}) { - $r->content_type('text/xml'); - } else { - $r->content_type('text/html'); + if (! &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) { + $env{'user.error.msg'}= + $r->uri.":vgr:0:0:Cannot view grades for complete course"; + if (! &Apache::lonnet::allowed('vgr', + $env{'request.course.id'}.'/'.$env{'request.course.sec'})) { + $env{'user.error.msg'}= + $r->uri.":vgr:0:0:Cannot view grades with given role"; + return HTTP_NOT_ACCEPTABLE; } - &Apache::loncommon::no_cache($r); - $r->send_http_header; - return OK; } # # Send the header - $r->content_type('text/html'); + &Apache::loncommon::no_cache($r); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; + if ($r->header_only) { return OK; } # # Extract form elements from query string &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['sort','reportSelected', - 'StudentAssessmentStudent']); - if (! exists($ENV{'form.reportSelected'})) { - $ENV{'form.reportSelected'} = 'student_assessment'; - } + 'SelectedStudent']); # # Give the LON-CAPA page header - $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts')); - $r->rflush(); - # - if (! &Apache::lonmysql::verify_sql_connection()) { - my $serveradmin = $r->dir_config('lonAdmEMail'); - $r->print(<Unable to connect to database! -

-Please notify the server administrator $serveradmin. -

-Course Statistics and Charts cannot be retrieved until the database is -restarted. Your data is intact but cannot be displayed at this time. -

- - -END - return; - } - # - # Set up the statistics and chart environment - &PrepareClasslist($r); - &PrepareCourseData($r); - # - # Begin form output - $r->print('
print('method="post" action="/adm/statistics">'); - # - # Print main menu - my %reports = ('classlist' => 'Class list', - 'problem_statistics' => 'Problem Statistics', - 'student_assessment' => 'Problem Status Chart', - 'percentage' => 'Correct-problems Plot', - 'option_response' => 'Option Response Analysis', -# 'activitylog' => 'Activity Log', - ); - $r->print(&CreateMainMenu($ENV{'form.status'}, - \%reports,$ENV{'form.reportSelected'})); + my $style = < + ul.sub_studentans { list-style-type: none } + ul.sub_correctans { list-style-type: none } + tr.even { background-color: \#CCCCCC } + td.essay { border: 1px solid gray; } + +ENDSTYLE + + $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 + &Apache::lonhtmlcommon::clear_breadcrumbs(); + &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/statistics', + title=>'Statistics', + text =>'Statistics', + faq=>139, + bug=>'Statistics and Charts'}); + if (! exists($env{'form.reportSelected'}) || + $env{'form.reportSelected'} eq '') { + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Statistics Main Page'). + &CreateMainMenu()); + } else { # - my $GoToPage = $ENV{'form.reportSelected'}; - if($GoToPage eq 'activitylog') { + if (! &Apache::lonmysql::verify_sql_connection()) { + my $serveradmin = $r->dir_config('lonAdmEMail'); + $r->print('

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

'); + $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. '. + 'Your data is intact but cannot be displayed '. + 'at this time.').'

'); + $r->print(&Apache::loncommon::end_page()); + return; + } + # + # Clean out the caches + if (exists($env{'form.ClearCache'})) { + &Apache::loncoursedata::delete_caches($env{'requres.course.id'}); + } + # + # Begin form output + $r->print('print('method="post" action="/adm/statistics">'); + $r->rflush(); + # + my $GoToPage = $env{'form.reportSelected'}; + # + $r->print(''); + if($GoToPage eq 'activitylog') { # &Apache::lonproblemstatistics::Activity(); - } elsif($GoToPage eq 'problem_statistics') { - &Apache::lonproblemstatistics::BuildProblemStatisticsPage($r,$c); - } elsif($GoToPage eq 'option_response') { -# &Apache::lonproblemanalysis::BuildProblemAnalysisPage($r,$c); - } elsif($GoToPage eq 'student_assessment') { - &Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c); - } elsif($GoToPage eq 'DoDiffGraph' || $GoToPage eq 'PercentWrongGraph') { -# &Apache::lonproblemstatistics::BuildGraphicChart($r,$c); - } elsif($GoToPage eq 'classlist') { - &DisplayClasslist($r); - } elsif($GoToPage eq 'Correct-problems Plot') { -# &Apache::lonpercentage::BuildPercentageGraph($r,$c); + } elsif($GoToPage eq 'problem_statistics') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/statistics?reportselected=problem_statistics', + text=>'Overall Problem Statistics'}); + &Apache::lonproblemstatistics::BuildProblemStatisticsPage($r,$c); + } elsif($GoToPage eq 'problem_analysis') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/statistics?reportselected=problem_analysis', + text=>'Detailed Problem Analysis'}); + &Apache::lonproblemanalysis::BuildProblemAnalysisPage($r,$c); + } elsif($GoToPage eq 'submissiontime_analysis') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=> + '/adm/statistics?reportselected=submissiontime_analysis', + text=>'Submission Time Plots'}); + &Apache::lonsubmissiontimeanalysis::BuildSubmissionTimePage($r,$c); + } elsif($GoToPage eq 'student_submission_reports') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=> + '/adm/statistics?reportselected=student_submission_reports', + text=>'Student Submission Reports'}); + &Apache::lonstudentsubmissions::BuildStudentSubmissionsPage($r,$c); + } elsif($GoToPage eq 'survey_reports') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=> + '/adm/statistics?reportselected=survey_reports', + text=>'Survey Reports'}); + &Apache::lonsurveyreports::BuildSurveyReportsPage($r,$c); + } elsif($GoToPage eq 'correct_problems_plot') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/statistics?reportselected=correct_problems_plot', + text=>'Correct Problems Plot'}); + &Apache::loncorrectproblemplot::BuildCorrectProblemsPage($r,$c); + } elsif($GoToPage eq 'student_assessment') { + &Apache::lonhtmlcommon::clear_breadcrumbs(); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/statistics?reportselected=student_assessment', + text=>'Chart'}); + &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"); - $r->print("\n\n"); + $r->print(&Apache::loncommon::end_page()); $r->rflush(); # return OK;