--- loncom/interface/lonstatistics.pm 2003/02/25 20:47:47 1.60 +++ loncom/interface/lonstatistics.pm 2005/01/05 20:34:20 1.112 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.60 2003/02/25 20:47:47 matthew Exp $ +# $Id: lonstatistics.pm,v 1.112 2005/01/05 20:34:20 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,21 +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 GDBM_File; - =over 4 =cut @@ -61,20 +46,38 @@ package Apache::lonstatistics; use strict; use Apache::Constants qw(:common :http); +use vars qw( + @FullClasslist + @Students + @Sections + @SelectedSections + %StudentData + @StudentDataOrder + @SelectedStudentData + $top_map + @Sequences + @SelectedMaps + @Assessments + $enrollment_status); + 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::lonmysql; +use Apache::lonlocal; +use Time::HiRes; +# +# Statistics Packages +use Apache::lonproblemanalysis(); +use Apache::lonsubmissiontimeanalysis(); +use Apache::loncorrectproblemplot(); +use Apache::lonproblemstatistics(); +use Apache::lonstudentassessment(); use Apache::lonpercentage; -use GDBM_File; - -use vars qw/@FullClasslist @Students @Sections @SelectedSections - $curr_student $prev_student $next_student - $top_map @Sequences @Assessments /; +use Apache::lonstudentsubmissions(); +use Apache::lonsurveyreports(); ####################################################### ####################################################### @@ -104,10 +107,6 @@ use vars qw/@FullClasslist @Students @Se # # Classlist variables # -my @FullClasslist; -my @Students; -my @Sections; -my @SelectedSections; my $curr_student; my $prev_student; my $next_student; @@ -131,6 +130,12 @@ undef the following package variables: =item @SelectedSections +=item %StudentData + +=item @StudentDataOrder + +=item @SelectedStudentData + =item $curr_student =item $prev_student @@ -148,6 +153,8 @@ sub clear_classlist_variables { undef(@Students); undef(@Sections); undef(@SelectedSections); + undef(%StudentData); + undef(@SelectedStudentData); undef($curr_student); undef($prev_student); undef($next_student); @@ -173,6 +180,10 @@ the following package variables: =item @SelectedSections +=item %StudentData + +=item @SelectedStudentData + =item $curr_student =item $prev_student @@ -189,7 +200,6 @@ upon the calling context. ####################################################### ####################################################### sub PrepareClasslist { - my $r = shift; my %Sections; &clear_classlist_variables(); # @@ -201,26 +211,49 @@ sub PrepareClasslist { $cdom,$cnum); if (exists($ENV{'form.Section'})) { if (ref($ENV{'form.Section'})) { - @SelectedSections = @$ENV{'form.Section'}; - # Remove the empty sections - for (my $i=0; $i<=$#SelectedSections; $i++) { - if ($SelectedSections[$i] =~ /^\s*$/) { - splice(@SelectedSections,$i,1); - } - } - } else { - if ($ENV{'form.Section'} !~ /^\s*$/) { - @SelectedSections = ($ENV{'form.Section'}); - } + @SelectedSections = @{$ENV{'form.Section'}}; + } elsif ($ENV{'form.Section'} !~ /^\s*$/) { + @SelectedSections = ($ENV{'form.Section'}); } } - @SelectedSections = ('any') if (! @SelectedSections); + @SelectedSections = ('all') if (! @SelectedSections); + foreach (@SelectedSections) { + if ($_ eq 'all') { + @SelectedSections = ('all'); + } + } + # + # Deal with instructors with restricted section access + if ($ENV{'request.course.sec'} !~ /^\s*$/) { + @SelectedSections = ($ENV{'request.course.sec'}); + } + # + # Set up %StudentData + @StudentDataOrder = qw/fullname username domain id section status comments/; + foreach my $field (@StudentDataOrder) { + $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'})); # # Process the classlist while (my ($student,$student_data) = each (%$classlist)) { my $studenthash = (); for (my $i=0; $i< scalar(@$field_names);$i++) { - $studenthash->{$field_names->[$i]}=$student_data->[$i]; + my $field = $field_names->[$i]; + # Store the data + $studenthash->{$field}=$student_data->[$i]; + # Keep track of the width of the fields + next if (! exists($StudentData{$field})); + my $length = length($student_data->[$i]); + if ($StudentData{$field}->{'width'} < $length) { + $StudentData{$field}->{'width'} = $length; + } } push (@FullClasslist,$studenthash); # @@ -234,7 +267,11 @@ sub PrepareClasslist { # # Only put in the list those students we are interested in foreach my $sect (@SelectedSections) { - if (($sect eq 'any') || ($section eq $sect)) { + if ( (($sect eq 'all') || + ($section eq $sect)) && + (($studenthash->{'status'} eq $enrollment_status) || + ($enrollment_status eq 'Any')) + ){ push (@Students,$studenthash); last; } @@ -242,20 +279,25 @@ sub PrepareClasslist { } # # Put the consolidated section data in the right place - @Sections = sort {$a cmp $b} keys(%Sections); + if ($ENV{'request.course.sec'} !~ /^\s*$/) { + @Sections = ($ENV{'request.course.sec'}); + } else { + @Sections = sort {$a cmp $b} keys(%Sections); + unshift(@Sections,'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; - @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) || @@ -263,27 +305,113 @@ 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 (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 ($i == $#Students) { - $next_student = 'none'; + } + # + if (exists($ENV{'form.StudentData'})) { + if (ref($ENV{'form.StudentData'}) eq 'ARRAY') { + @SelectedStudentData = @{$ENV{'form.StudentData'}}; } else { - $next_student = $Students[$i+1]; + @SelectedStudentData = ($ENV{'form.StudentData'}); + } + } else { + @SelectedStudentData = ('username'); + } + foreach (@SelectedStudentData) { + if ($_ eq 'all') { + @SelectedStudentData = ('all'); + last; } } + # + return; } + ####################################################### ####################################################### -# -# Course Sequences variables -# -my $top_map; -my @Sequences; -my @Assessments; + +=pod + +=item get_students + +Returns a list of the selected students + +=cut + +####################################################### +####################################################### +sub get_students { + if (! @Students) { + &PrepareClasslist() + } + 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; +} ####################################################### ####################################################### @@ -307,6 +435,68 @@ sub clear_sequence_variables { =pod +=item &SetSelectedMaps($elementname) + +Sets the @SelectedMaps array from $ENV{'form.'.$elementname}; + +=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'); + } +} + + +####################################################### +####################################################### + +=pod + +=item &Sequences_with_Assess() + +Returns an array containing the subset of @Sequences which contain +assessments. + +=cut + +####################################################### +####################################################### +sub Sequences_with_Assess { + my ($mode) = @_; + $mode = 'selected' if (! defined($mode)); + my @Sequences_to_Show; + foreach my $sequence (@Sequences) { + next if ($sequence->{'num_assess'} < 1); + if ($mode eq 'all') { + push (@Sequences_to_Show,$sequence); + } elsif ($mode eq 'selected') { + foreach my $map_symb (@SelectedMaps) { + if ($sequence->{'symb'} eq $map_symb || $map_symb eq 'all'){ + push (@Sequences_to_Show,$sequence); + last; # Only put it in once + } + } + } + + } + return @Sequences_to_Show; +} + +####################################################### +####################################################### + +=pod + =item &PrepareCourseData($r) =cut @@ -316,7 +506,8 @@ sub clear_sequence_variables { sub PrepareCourseData { my ($r) = @_; &clear_sequence_variables(); - my ($top,$sequences,$assessments) = &Apache::loncoursedata::get_sequence_assessment_data(); + 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'); @@ -324,29 +515,132 @@ sub PrepareCourseData { } $top_map = $top if (ref($top)); @Sequences = @{$sequences} if (ref($sequences) eq 'ARRAY'); - @Assessments = @{$assessments} if (ref($assessments) eq 'HASH'); + @Assessments = @{$assessments} if (ref($assessments) eq 'ARRAY'); + return; +} + +####################################################### +####################################################### =pod - ## - ## Debugging code - ## - foreach my $s (@Sequences) { - next if ($s->{'title'} ne 'Bioenergetics: Enzyme Regulation'); - &Apache::lonnet::logthis('-----------------------------------'); - &Apache::lonnet::logthis('title = '.$s->{'title'}); - &Apache::lonnet::logthis('symb = '.$s->{'symb'}); - &Apache::lonnet::logthis('num_assess = '.$s->{'num_assess'}); - foreach my $a (@{$s->{'contents'}}) { - &Apache::lonnet::logthis(' --------------------------------'); - &Apache::lonnet::logthis(' title = '.$a->{'title'}); - &Apache::lonnet::logthis(' symb = '.$a->{'symb'}); +=item &log_sequence($sequence,$recursive,$padding) + +Write data about the sequence to a logfile. If $recursive is not +undef the data is written recursively. $padding is used for recursive +calls. + +=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; +} + +############################################## +############################################## + +=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 - return; +############################################## +############################################## +sub StudentDataSelect { + my ($elementname,$status,$numvisible)=@_; + if ($numvisible < 1) { + return; + } + # + # Build the form element + my $Str = "\n"; + $Str .= '\n"; + return $Str; } ############################################## @@ -354,7 +648,7 @@ sub PrepareCourseData { =pod -=item &MapSelect($elementname,$status,$numvisible,$selected,$restriction) +=item &MapSelect($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. @@ -368,10 +662,6 @@ If the top sequence is selected, the val =item $numvisible The number of options to be visible -=item $selected Array ref to the names of the already selected maps. -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. @@ -382,30 +672,13 @@ false. The code must expect a reference ############################################## ############################################## sub MapSelect { - my ($elementname,$status,$numvisible,$selected,$restriction)=@_; + my ($elementname,$status,$numvisible,$restriction)=@_; if ($numvisible < 1) { return; } # # Set up array of selected items - my @Selected; - if (! defined($selected)) { - if (exists($ENV{'form.'.$elementname})) { - if (ref($ENV{'form.'.$elementname})) { - @Selected = @$ENV{'form.'.$elementname}; - } else { - @Selected = ($ENV{'form.'.$elementname}); - } - } else { - @Selected = (); - } - } else { - if (ref($selected)) { - @Selected = @$selected; - } else { - @Selected = ($selected); - } - } + &SetSelectedMaps($elementname); # # Set up the restriction call if (! defined($restriction)) { @@ -420,23 +693,40 @@ sub MapSelect { } $Str .= 'size="'.$numvisible.'" >'."\n"; # + # Deal with 'all' + foreach (@SelectedMaps) { + if ($_ eq 'all') { + @SelectedMaps = ('all'); + last; + } + } + # + # Put in option for 'all' + $Str .= ' \n"; + $Str .= '>'.$seq->{'title'}."\n"; } $Str .= "\n"; return $Str; } - ############################################## ############################################## @@ -447,6 +737,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 and @SelectedSections =over 4 =item $elementname The name of the HTML form element @@ -455,13 +746,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 @@ -474,6 +758,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 .= ''; + $r->print($Str); + $r->rflush(); # - my $Str=''; + my @Fields = ('fullname','username','domain','id','section','status'); + # + $Str = ''; + if (! @Students) { + if ($SelectedSections[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 .= '

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

'; + } + } 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 .= '

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

'; + } + } + $Str.= ''. + &mt('Click here to 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 .= '
'."\n"; $Str .= ''."\n"; foreach my $field (@Fields) { - $Str .= ''; } $Str .= ''."\n"; # my $alternate = 0; - foreach my $student (@Students) { + foreach my $student (@Students) { # @Students is a package variable my $sname = $student->{'username'}.':'.$student->{'domain'}; if($alternate) { $Str .= ''; @@ -891,13 +967,16 @@ sub DisplayClasslist { # foreach my $field (@Fields) { $Str .= '
'.$field. + $Str .= ''.&mt($field). '
'; - if ($field eq 'fullname') { + if ($field eq 'fullname' || $field eq 'username') { $Str .= ''; + $Str .= &Apache::lonnet::escape('student_assessment'); + $Str .= '&sort='.&Apache::lonnet::escape($ENV{'form.sort'}); + $Str .= '&SelectedStudent='; + $Str .= &Apache::lonnet::escape($sname).'">'; $Str .= $student->{$field}.' '; $Str .= ''; + } elsif ($field eq 'status') { + $Str .= &mt($student->{$field}); } else { $Str .= $student->{$field}; } @@ -913,288 +992,230 @@ sub DisplayClasslist { return; } -sub BuildClasslist { - my ($cacheDB,$students,$studentInformation,$headings,$r)=@_; - - my %cache; - unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) { - return 'Unable to tie database.'; - } - -# my $Ptr = ''; -# $Ptr .= ''; -# $Ptr .= ''."\n"; -# $Ptr .= '
Select Sections'; -# $Ptr .= ''."\n"; -# my @sectionsSelected = split(':',$cache{'sectionsSelected'}); -# my @sections = split(':',$cache{'sectionList'}); -# $Ptr .= &Apache::lonhtmlcommon::MultipleSectionSelect(\@sections, -# \@sectionsSelected, -# 'Statistics'); -# $Ptr .= '

'; -# $r->print($Ptr); -# $r->rflush(); -# my %mySections = (); -# foreach (@sections) { $mySections{$_} = 'True'; } -# $r->print("
$cache{'sectionsSelected'}
"); - - my $Str=''; - $Str .= '
'."\n"; - $Str .= ''."\n"; - - my $displayString = ''."\n"; - $Str .= &Apache::lonhtmlcommon::CreateHeadings(\%cache, - $studentInformation, - $headings, $displayString); - $Str .= ''."\n"; - - my $alternate=0; - foreach (@$students) { -# if ($mySections{$cache{$_.':'.'section'}} ne 'True') {next;} - my ($username, $domain) = split(':', $_); - if($alternate) { - $Str .= ''; - } else { - $Str .= ''; - } - $alternate = ($alternate + 1) % 2; - foreach my $data (@$studentInformation) { - $Str .= ''."\n"; - } - } - - $Str .= ''."\n"; - $Str .= '
DISPLAYDATA 
'; - if($data eq 'fullname') { - $Str .= ''; - $Str .= $cache{$_.':'.$data}.' '; - $Str .= ''; - } elsif($data eq 'updateTime') { - $Str .= ''; - $Str .= $cache{$_.':'.$data}.' '; - $Str .= ' '; - } else { - $Str .= $cache{$_.':'.$data}.' '; - } - - $Str .= '
'."\n"; - $r->print($Str); - $r->rflush(); - - untie(%cache); - - return; -} - +############################################## +############################################## sub CreateMainMenu { - my ($status, $reports)=@_; - - my $Str = ''; - - $Str .= ''."\n"; - $Str .= ''."\n"; - $Str .= ''."\n"; - $Str .= ''."\n"; - $Str .= ''."\n"; - $Str .= ''."\n"; - - $Str .= ''."\n"; - - $Str .= '
Select a ReportStudent Status
{'reportSelected'} eq $reports->{$_}) { - $Str .= ' selected=""'; - } - $Str .= '>'.$reports->{$_}.''."\n"; - } - $Str .= ''; - $Str .= &Apache::lonhtmlcommon::StatusOptions($status, 'Statistics'); - $Str .= '
'."\n"; - $Str .= '
'."\n"; - - return $Str; -} - -sub BuildStatistics { - my ($r)=@_; - - my $c = $r->connection; - my @studentInformation=('fullname','section','id','domain','username', - 'updateTime'); - my @headings=('Full Name', 'Section', 'PID', 'Domain', 'User Name', - 'Last Updated'); - my $spacing = ' '; - - my %reports = ('classlist' => 'Class list', - 'problem_statistics' => 'Problem Statistics', - 'student_assessment' => 'Student Assessment', - 'percentage' => 'Correct-problems Plot', -# 'activitylog' => 'Activity Log', - 'reportSelected' => 'Class list'); - - my %cache; - my $courseID=$ENV{'request.course.id'}; - my $cacheDB = "/home/httpd/perl/tmp/$ENV{'user.name'}". - "_$ENV{'user.domain'}_$courseID\_statistics.db"; - - $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts')); - - my ($returnValue, $students) = &PrepareData($c, $cacheDB, - \@studentInformation, - \@headings,$r); - if($returnValue ne 'OK') { - $r->print($returnValue."\n".''); - return OK; - } - if(!$c->aborted()) { - &Apache::loncoursedata::CheckForResidualDownload($cacheDB, - 'true', 'true', - $courseID, - $r, $c); - } - - my $GoToPage; - if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) { - $GoToPage = $cache{'reportSelected'}; - $reports{'reportSelected'} = $cache{'reportSelected'}; - if(defined($cache{'reportKey'}) && - !exists($reports{$cache{'reportKey'}}) && - $cache{'reportKey'} ne 'false') { - $reports{$cache{'reportKey'}} = $cache{'reportSelected'}; - } - - if(defined($cache{'OptionResponses'})) { - $reports{'problem_analysis'} = 'Option Response Analysis'; - } - - $r->print('
print('method="post" action="/adm/statistics">'); - $r->print(&CreateMainMenu($cache{'Status'}, \%reports)); - $r->rflush(); - untie(%cache); - } else { - $r->print('Unable to tie database.'); - return OK; - } - - if($GoToPage eq 'Activity Log') { - &Apache::lonproblemstatistics::Activity(); - } elsif($GoToPage eq 'Problem Statistics') { - &Apache::lonproblemstatistics::BuildProblemStatisticsPage($cacheDB, - $students, - $courseID, - $c,$r); - } elsif($GoToPage eq 'Option Response Analysis') { - &Apache::lonproblemanalysis::BuildProblemAnalysisPage($cacheDB, $r); - } elsif($GoToPage eq 'Student Assessment') { - &Apache::lonstudentassessment::BuildStudentAssessmentPage($cacheDB, - $students, - $courseID, - 'Statistics', - \@headings, - $spacing, - \@studentInformation, - $r, $c); - } elsif($GoToPage eq 'Analyze') { - &Apache::lonproblemanalysis::BuildAnalyzePage($cacheDB, $students, - $courseID, $r); - } elsif($GoToPage eq 'DoDiffGraph' || $GoToPage eq 'PercentWrongGraph') { - my $courseDescription = $ENV{'course.'.$courseID.'.description'}; - $courseDescription =~ s/\ /"_"/eg; - &Apache::lonproblemstatistics::BuildGraphicChart($GoToPage, $cacheDB, - $courseDescription, - $students, $courseID, - $r, $c); - } elsif($GoToPage eq 'Class list') { - &DisplayClasslist($r); -# &BuildClasslist($cacheDB, $students, \@studentInformation, -# \@headings, $r); - } elsif($GoToPage eq 'Correct-problems Plot') { - &Apache::lonpercentage::BuildPercentageGraph($cacheDB, $students, - $courseID, $c, $r); + # + # 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"; } - - $r->print('
'."\n"); - $r->print("\n".''."\n".''); - $r->rflush(); - - return OK; + $Str .="\n"; + # + return $Str; } -# ================================================================ Main Handler - +############################################## +############################################## sub handler { my $r=shift; - -# $jr = $r; - + my $c = $r->connection(); + # + # Check for overloading my $loaderror=&Apache::lonnet::overloaderror($r); if ($loaderror) { return $loaderror; } $loaderror= &Apache::lonnet::overloaderror($r, $ENV{'course.'.$ENV{'request.course.id'}.'.home'}); if ($loaderror) { return $loaderror; } - - unless(&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) { + # + # Check for access + if (! &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'); + $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; } - - unless($ENV{'request.course.fn'}) { - my $requrl=$r->uri; - $ENV{'user.error.msg'}="$requrl:bre:0:0:Course not initialized"; - return HTTP_NOT_ACCEPTABLE; - } - - $r->content_type('text/html'); + # + # Send the header + &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']); - - &PrepareClasslist($r); - - &PrepareCourseData($r); - - &BuildStatistics($r); - + ['sort','reportSelected', + 'SelectedStudent']); + # + # Give the LON-CAPA page header + 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(''. + &mt('Course Statistics and Charts'). + ''.$style. + "\n". + &Apache::loncommon::bodytag('Course Statistics and Charts')); + $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 + (undef,&mt('Statistics Main Page')). + &CreateMainMenu()); + } else { + # + 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 '). + ''.$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(''); + 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'}; + # + # Set up the statistics and chart environment + &PrepareCourseData($r); + # + $r->print(''); + if($GoToPage eq 'activitylog') { +# &Apache::lonproblemstatistics::Activity(); + } 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); + } + # + $r->print("
\n"); + } + $r->print("\n\n"); + $r->rflush(); + # return OK; } + 1; +####################################################### +####################################################### + =pod =back =cut +####################################################### +####################################################### + __END__