--- loncom/interface/lonstatistics.pm 2003/11/16 21:20:47 1.91 +++ loncom/interface/lonstatistics.pm 2004/02/12 16:29:00 1.95 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.91 2003/11/16 21:20:47 matthew Exp $ +# $Id: lonstatistics.pm,v 1.95 2004/02/12 16:29:00 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::lonsubmissiontimeanalysis; - use Apache::lonproblemstatistics; - use Apache::lonstudentassessment; - use Apache::lonpercentage; - use Apache::lonmysql; =over 4 =cut @@ -72,7 +57,8 @@ use vars qw( $top_map @Sequences @SelectedMaps - @Assessments); + @Assessments + $enrollment_status); use Apache::lonnet(); use Apache::lonhomework; @@ -81,6 +67,7 @@ use Apache::loncoursedata; use Apache::lonhtmlcommon; use Apache::lonproblemanalysis(); use Apache::lonsubmissiontimeanalysis(); +use Apache::loncorrectproblemplot(); use Apache::lonproblemstatistics(); use Apache::lonstudentassessment(); use Apache::lonpercentage; @@ -247,8 +234,8 @@ sub PrepareClasslist { } # # get the status requested - my $requested_status = 'Active'; - $requested_status = $ENV{'form.Status'} if (exists($ENV{'form.Status'})); + $enrollment_status = 'Active'; + $enrollment_status = $ENV{'form.Status'} if (exists($ENV{'form.Status'})); # # Process the classlist while (my ($student,$student_data) = each (%$classlist)) { @@ -278,8 +265,8 @@ sub PrepareClasslist { foreach my $sect (@SelectedSections) { if ( (($sect eq 'all') || ($section eq $sect)) && - (($studenthash->{'status'} eq $requested_status) || - ($requested_status eq 'Any')) + (($studenthash->{'status'} eq $enrollment_status) || + ($enrollment_status eq 'Any')) ){ push (@Students,$studenthash); last; @@ -516,20 +503,6 @@ sub PrepareCourseData { $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'}; - # - # Use 3 digits for each the sum and total, which means 7 total... - my $num_col = $num_parts+7; - if ($num_col < $name_length) { - $num_col = $name_length; - } - $seq->{'base_width'} = $name_length; - $seq->{'width'} = $num_col; - } return; } @@ -1051,10 +1024,15 @@ sub CreateMainMenu { &mt('Detailed statistics and graphs of student performance on problems.'), }, { internal_name => 'submissiontime_analysis', - name => &mt('Submission Time Analysis'), + name => &mt('Submission Time Plots'), short_description => &mt('Display and analysis of submission times on assessments.'), }, + { 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 => @@ -1105,21 +1083,11 @@ sub handler { } } # - # 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'); - } - &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'}, @@ -1127,7 +1095,9 @@ sub handler { 'SelectedStudent']); # # Give the LON-CAPA page header - $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts')); + $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts'). + &Apache::loncommon::help_open_faq(139). + &Apache::loncommon::help_open_bug('Statistics and Charts')); $r->rflush(); # # Either print out a menu for them or send them to a report @@ -1178,6 +1148,8 @@ sub handler { &Apache::lonproblemanalysis::BuildProblemAnalysisPage($r,$c); } elsif($GoToPage eq 'submissiontime_analysis') { &Apache::lonsubmissiontimeanalysis::BuildSubmissionTimePage($r,$c); + } elsif($GoToPage eq 'correct_problems_plot') { + &Apache::loncorrectproblemplot::BuildCorrectProblemsPage($r,$c); } elsif($GoToPage eq 'student_assessment') { &Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c); } elsif($GoToPage eq 'DoDiffGraph' || $GoToPage eq 'PercentWrongGraph') {