--- loncom/interface/lonstatistics.pm 2003/12/24 21:54:58 1.92 +++ loncom/interface/lonstatistics.pm 2004/06/24 19:17:49 1.105 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.92 2003/12/24 21:54:58 www Exp $ +# $Id: lonstatistics.pm,v 1.105 2004/06/24 19:17:49 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,21 +57,27 @@ use vars qw( $top_map @Sequences @SelectedMaps - @Assessments); + @Assessments + $enrollment_status); use Apache::lonnet(); use Apache::lonhomework; use Apache::loncommon; use Apache::loncoursedata; use Apache::lonhtmlcommon; +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 Apache::lonmysql; -use Apache::lonlocal; -use Time::HiRes; +use Apache::lonstudentsubmissions(); +use Apache::lonsurveyreports(); ####################################################### ####################################################### @@ -247,8 +238,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 +269,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; @@ -481,13 +472,22 @@ assessments. ####################################################### ####################################################### sub Sequences_with_Assess { + my ($mode) = @_; + $mode = 'selected' if (! defined($mode)); 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); + 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; } @@ -516,20 +516,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; } @@ -920,7 +906,13 @@ Ensures all student data is up to date. ############################################### ############################################### sub Gather_Full_Student_Data { - my ($r) = @_; + my ($r,$formname,$inputname) = @_; + my $status_type; + if (defined($formname)) { + $status_type = 'inline'; + } else { + $status_type = 'popup'; + } my $c = $r->connection(); # &Apache::loncoursedata::clear_internal_caches(); @@ -930,7 +922,8 @@ sub Gather_Full_Student_Data { # Open the progress window my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin ($r,&mt('Student Data Compilation Status'), - &mt('Student Data Compilation Progress'), scalar(@Students)); + &mt('Student Data Compilation Progress'), scalar(@Students), + $status_type,undef,$formname,$inputname); # while (my $student = shift @Students) { return if ($c->aborted()); @@ -949,9 +942,31 @@ sub Gather_Full_Student_Data { sub DisplayClasslist { my ($r)=@_; # - my @Fields = ('fullname','username','domain','id','section'); + # Output some of the standard interface components + my $Str; + $Str .= '

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

'; + $Str .= ''; + $r->print($Str); + $r->rflush(); + # + my @Fields = ('fullname','username','domain','id','section','status'); # - my $Str=''; + $Str = ''; if (! @Students) { if ($SelectedSections[0] eq 'all') { if (lc($ENV{'form.Status'}) eq 'any') { @@ -995,7 +1010,10 @@ sub DisplayClasslist { $Str .= '
'."\n"; $Str .= ''."\n"; foreach my $field (@Fields) { - $Str .= ''; } $Str .= ''."\n"; @@ -1051,10 +1069,25 @@ 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 => 'student_submission_reports', + name => &mt('Student Submission Reports'), + short_description => + &mt('Prepare Excel spreadsheets 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 => @@ -1066,7 +1099,7 @@ sub CreateMainMenu { # # Create the menu my $Str; - $Str .= '

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

'; + $Str .= '

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

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

'. @@ -1117,13 +1150,24 @@ sub handler { 'SelectedStudent']); # # Give the LON-CAPA page header - $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts')); + $r->print(''. + &mt('Course Statistics and Charts'). + "\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(&CreateMainMenu()); + $r->print(&Apache::lonhtmlcommon::breadcrumbs + (undef,&mt('Statistics Main Page')). + &CreateMainMenu()); } else { # if (! &Apache::lonmysql::verify_sql_connection()) { @@ -1163,17 +1207,44 @@ sub handler { 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); - } elsif($GoToPage eq 'DoDiffGraph' || $GoToPage eq 'PercentWrongGraph') { -# &Apache::lonproblemstatistics::BuildGraphicChart($r,$c); - } elsif($GoToPage eq 'Correct-problems Plot') { - # &Apache::lonpercentage::BuildPercentageGraph($r,$c); } # $r->print("\n");

'.$field. + $Str .= ''.$field. '