--- loncom/interface/lonstatistics.pm 2003/10/03 15:40:47 1.78.2.2 +++ loncom/interface/lonstatistics.pm 2003/10/23 15:12:45 1.88 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.78.2.2 2003/10/03 15:40:47 albertel Exp $ +# $Id: lonstatistics.pm,v 1.88 2003/10/23 15:12:45 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -83,6 +83,7 @@ use Apache::lonproblemstatistics(); use Apache::lonstudentassessment(); use Apache::lonpercentage; use Apache::lonmysql; +use Apache::lonlocal; use Time::HiRes; ####################################################### @@ -797,6 +798,150 @@ sub SectionSelect { return $Str; } +####################################################### +####################################################### + +=pod + +=item &CreateAndParseOutputSelector() + +Construct a selection list of options for output and parse output selections. + +=cut + +####################################################### +####################################################### +sub OutputDescriptions { + my (@OutputOptions) = @_; + my $Str = ''; + $Str .= "

Output Modes

\n"; + $Str .= "
\n"; + foreach my $outputmode (@OutputOptions) { + $Str .="
".$outputmode->{'name'}."
\n"; + $Str .="
".$outputmode->{'description'}."
\n"; + } + $Str .= "
\n"; + return $Str; +} + +sub CreateAndParseOutputSelector { + my ($elementname,$default,@OutputOptions) = @_; + my $output_mode; + my $show; + my $Str = ''; + # + # Format for output options is 'mode, restrictions'; + my $selected = $default; + if (exists($ENV{'form.'.$elementname})) { + if (ref($ENV{'form.'.$elementname} eq 'ARRAY')) { + $selected = $ENV{'form.'.$elementname}->[0]; + } else { + $selected = $ENV{'form.'.$elementname}; + } + } + # + # Set package variables describing output mode + $output_mode = 'html'; + $show = 'all'; + foreach my $option (@OutputOptions) { + next if ($option->{'value'} ne $selected); + $output_mode = $option->{'mode'}; + $show = $option->{'show'}; + } + # + # Build the form element + $Str = qq/"; + return ($Str,$output_mode,$show); +} + +############################################### +############################################### + +=pod + +=item &Gather_Student_Data() + +Ensures all student data is up to date. + +=cut + +############################################### +############################################### +sub Gather_Student_Data { + my ($r) = @_; + my $c = $r->connection(); + # + &Apache::loncoursedata::clear_internal_caches(); + # + my @Sequences = &Apache::lonstatistics::Sequences_with_Assess(); + # + my @Students = @Apache::lonstatistics::Students; + # + # Open the progress window + my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin + ($r,'Statistics Compilation Status', + 'Statistics Compilation Progress', scalar(@Students)); + # + while (my $student = shift @Students) { + return if ($c->aborted()); + my ($status,undef) = &Apache::loncoursedata::ensure_current_data + ($student->{'username'},$student->{'domain'}, + $ENV{'request.course.id'}); + &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, + &mt('last student')); + } + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); + $r->rflush(); +} + +############################################### +############################################### + +=pod + +=item &Gather_Full_Student_Data() + +Ensures all student data is up to date. + +=cut + +############################################### +############################################### +sub Gather_Full_Student_Data { + my ($r) = @_; + my $c = $r->connection(); + # + &Apache::loncoursedata::clear_internal_caches(); + # + my @Students = @Apache::lonstatistics::Students; + # + # Open the progress window + my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin + ($r,&mt('Student Data Compilation Status'), + &mt('Student Data Compilation Progress'), scalar(@Students)); + # + while (my $student = shift @Students) { + return if ($c->aborted()); + my ($status,undef) = &Apache::loncoursedata::ensure_current_full_data + ($student->{'username'},$student->{'domain'}, + $ENV{'request.course.id'}); + &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, + &mt('last student')); + } + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); + $r->rflush(); +} + ################################################## ################################################## sub DisplayClasslist { @@ -891,31 +1036,38 @@ sub DisplayClasslist { ############################################## ############################################## sub CreateMainMenu { - my ($status,$reports,$current)=@_; # - my $Str = ''; + # 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 => '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 .= ''."\n"; -# $Str .= ''."\n"; -# $Str .= ''."\n"; -# # -# $Str .= ''; -# $Str .= '\n"; -# $Str .= '
Report:'; -# $Str .= ''.(' 'x30).''. -# ''. -# "
'."\n"; -# $Str .= '
'."\n"; + # 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; } @@ -926,10 +1078,6 @@ sub handler { my $r=shift; my $c = $r->connection(); # - &Apache::loncoursedata::clear_internal_caches(); - # - &Apache::loncoursedata::clear_internal_caches(); - # # Check for overloading my $loaderror=&Apache::lonnet::overloaderror($r); if ($loaderror) { return $loaderror; } @@ -970,71 +1118,67 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['sort','reportSelected', 'SelectedStudent']); - if (! exists($ENV{'form.reportSelected'})) { - $ENV{'form.reportSelected'} = 'student_assessment'; - } # # Give the LON-CAPA page header $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts')); $r->rflush(); + # + # Either print out a menu for them or send them to a report + if (! exists($ENV{'form.reportSelected'}) || + $ENV{'form.reportSelected'} eq '') { + $r->print(&CreateMainMenu()); + } else { # - 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; - } - # - # Clean out the caches - if (exists($ENV{'form.ClearCache'})) { - &Apache::loncoursedata::delete_caches($ENV{'requres.course.id'}); - } - # - # Set up the statistics and chart environment - &PrepareClasslist(); - &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'})); - $r->rflush(); - # - 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 '). + ''.$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'}); + } + # + # Set up the statistics and chart environment + &PrepareClasslist(); + &PrepareCourseData($r); + # + # 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') { + } elsif($GoToPage eq 'problem_statistics') { + &Apache::lonproblemstatistics::BuildProblemStatisticsPage($r,$c); + } elsif($GoToPage eq 'problem_analysis') { + &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 'Correct-problems Plot') { -# &Apache::lonpercentage::BuildPercentageGraph($r,$c); + } elsif($GoToPage eq 'Correct-problems Plot') { + # &Apache::lonpercentage::BuildPercentageGraph($r,$c); + } + # + $r->print("
\n"); } - # - $r->print("\n"); $r->print("\n\n"); $r->rflush(); #