--- loncom/interface/lonstatistics.pm 2003/10/03 15:40:47 1.78.2.2
+++ loncom/interface/lonstatistics.pm 2003/10/15 18:01:10 1.86
@@ -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.86 2003/10/15 18:01:10 www 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 .= "<h2>Output Modes</h2>\n";
+ $Str .= "<dl>\n";
+ foreach my $outputmode (@OutputOptions) {
+ $Str .=" <dt>".$outputmode->{'name'}."</dt>\n";
+ $Str .=" <dd>".$outputmode->{'description'}."</dd>\n";
+ }
+ $Str .= "</dl>\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/<select size="5" name="$elementname">/;
+ foreach my $option (@OutputOptions) {
+ if (exists($option->{'special'}) &&
+ $option->{'special'} =~ /do not show/) {
+ next;
+ }
+ $Str .= "\n".' <option value="'.$option->{'value'}.'"';
+ $Str .= " selected " if ($option->{'value'} eq $selected);
+ $Str .= ">".&mt($option->{'name'})."<\/option>";
+ }
+ $Str .= "\n</select>";
+ 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,41 @@ 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 = '<input type="hidden" name="reportSelected" value="'.$current.'">';
-# $Str .= '<table border="0"><tbody><tr>'."\n";
-# $Str .= '<td align="center"><b>Report:</b></td>'."\n";
-# $Str .= '<td align="center">';
-# $Str .= '<select name="reportSelected" '.
-# 'onchange="document.Statistics.submit()">'."\n";
-# foreach (sort(keys(%$reports))) {
-# $Str .= '<option value="'.$_.'"';
-# if($current eq $_) {
-# $Str .= ' selected';
-# }
-# $Str .= '>'.$reports->{$_}.'</option>'."\n";
-# }
-# $Str .= '</select></td>'."\n";
-# #
-# $Str .= '<td>'.(' 'x30).'</td>';
-# $Str .= '<td align="center">'.
-# '<input type="submit" name="ClearCache" value="Clear Caches" />'.
-# "</td>\n";
-# $Str .= '</tr></tbody></table>'."\n";
-# $Str .= '<hr>'."\n";
+ # Create the menu
+ my $Str;
+ $Str = "<h2>".&mt('Statistics and Problem Analysis')."</h2>\n";
+ $Str .= &mt('Please select a report to generate.');
+ $Str .= "<dl>\n";
+ foreach my $reportdata (@reports) {
+ $Str .=' <dt><a href="/adm/statistics?reportSelected='.
+ $reportdata->{'internal_name'}.'" >'.
+ $reportdata->{'name'}."</a></dt>\n";
+ $Str .= ' <dd>'.$reportdata->{'short_description'}.
+ "</dd>\n";
+ }
+ $Str .="</dl>\n";
#
return $Str;
}
@@ -926,10 +1081,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 +1121,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(<<END);
-<h2><font color="Red">Unable to connect to database!</font></h2>
-<p>
-Please notify the server administrator <b>$serveradmin</b>.
-</p><p>
-Course Statistics and Charts cannot be retrieved until the database is
-restarted. Your data is intact but cannot be displayed at this time.
-</p>
-</body>
-</html>
-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('<form name="Statistics" ');
- $r->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('<h2><font color="Red">'.
+ &mt('Unable to connect to database!').
+ '</font></h2>');
+ $r->print('<p>'.
+ &mt('Please notify the server administrator ').
+ '<b>'.$serveradmin.'</b></p>');
+ $r->print('<p>'.
+ &mt('Course Statistics and Charts cannot be '.
+ 'retrieved until the database is restarted. '.
+ 'Your data is intact but cannot be displayed '.
+ 'at this time.').'</p>');
+ $r->print('</body></html>');
+ 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('<form name="Statistics" ');
+ $r->print('method="post" action="/adm/statistics">');
+ $r->rflush();
+ #
+ my $GoToPage = $ENV{'form.reportSelected'};
+ $r->print('<input type="hidden" name="reportSelected" value="'.
+ $GoToPage.'">');
+ 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("</form>\n");
}
- #
- $r->print("</form>\n");
$r->print("</body>\n</html>\n");
$r->rflush();
#