--- loncom/interface/statistics/lonsubmissiontimeanalysis.pm	2004/07/06 16:01:48	1.17
+++ loncom/interface/statistics/lonsubmissiontimeanalysis.pm	2008/12/11 14:55:27	1.31
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonsubmissiontimeanalysis.pm,v 1.17 2004/07/06 16:01:48 matthew Exp $
+# $Id: lonsubmissiontimeanalysis.pm,v 1.31 2008/12/11 14:55:27 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -28,7 +28,7 @@
 package Apache::lonsubmissiontimeanalysis;
 
 use strict;
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::loncoursedata();
@@ -37,7 +37,6 @@ use Apache::lonstathelpers;
 use Apache::lonlocal;
 use HTML::Entities();
 use Time::Local();
-use Spreadsheet::WriteExcel();
 
 my $plotcolors = ['#33ff00', 
                   '#ff33cc', '#990000', '#aaaa66', '#663399', '#ff9933',
@@ -72,20 +71,25 @@ sub BuildSubmissionTimePage {
     my @Students = @Apache::lonstatistics::Students;
     #
     if (@Students < 1) {
-        $r->print('<h2>There are no students in the sections selected</h2>');
+        $r->print('<div class="LC_warning">'
+                 .&mt('There are no students in the sections selected.'
+                 .'</div>')
+        );
     }
     #
     my @CacheButtonHTML = 
         &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status');
     $r->rflush();
     #
-    if (! exists($ENV{'form.problemchoice'}) ||
-        exists($ENV{'form.SelectAnother'})) {
-        $r->print('<input type="submit" name="" value="'.
-                  &mt('Graph Problem Submission Times').'" />');
-        $r->print('&nbsp;'x5);
+    if (! exists($env{'form.problemchoice'}) ||
+        exists($env{'form.SelectAnother'})) {
+        my $submit_button = '<input type="submit" name="" value="'.
+#           &mt('Graph Problem Submission Times').'" />';
+            &mt('Generate Graph').'" />';
+        $r->print($submit_button.'&nbsp;'x5);
         $r->print('<h3>'.&mt('Please select a problem to analyze').'</h3>');
-        $r->print(&Apache::lonstathelpers::ProblemSelector('.'));
+        $r->print(&Apache::lonstathelpers::problem_selector('.',
+                                                            $submit_button));
     } else {
         foreach my $button (@SubmitButtons) {
             $r->print('<input type="submit" name="'.$button->{'name'}.'" '.
@@ -99,41 +103,50 @@ sub BuildSubmissionTimePage {
         #
         # Determine which problem we are to analyze
         my $current_problem = &Apache::lonstathelpers::get_target_from_id
-            ($ENV{'form.problemchoice'});
+            ($env{'form.problemchoice'});
         #
-        my ($prev,$curr,$next) = 
+        my ($navmap,$prev,$curr,$next) = 
             &Apache::lonstathelpers::get_prev_curr_next($current_problem,
                                                         '.',
                                                         'part');
-        if (exists($ENV{'form.PrevProblemAnalysis'}) && defined($prev)) {
+        if (exists($env{'form.PrevProblemAnalysis'}) && defined($prev)) {
             $current_problem = $prev;
-        } elsif (exists($ENV{'form.NextProblemAnalysis'}) && defined($next)) {
+        } elsif (exists($env{'form.NextProblemAnalysis'}) && defined($next)) {
             $current_problem = $next;
         } else {
             $current_problem = $curr;
         }
         #
         # Store the current problem choice and send it out in the form
-        $ENV{'form.problemchoice'} = 
+        $env{'form.problemchoice'} = 
             &Apache::lonstathelpers::make_target_id($current_problem);
         $r->print('<input type="hidden" name="problemchoice" value="'.
-                  $ENV{'form.problemchoice'}.'" />');
+                  $env{'form.problemchoice'}.'" />');
         #
         $r->print('<hr />');
         $r->rflush();
         #
         my $resource = $current_problem->{'resource'};
         if (! defined($resource)) {
-            $r->print('resource is undefined');
+            $r->print('<div class="LC_warning">'
+                     .&mt('Resource is undefined.')
+                     .'</div>'
+            );
         } else {
-            $r->print('<h1>'.$resource->{'title'}.'</h1>');
-            $r->print('<h3>'.$resource->{'src'}.'</h3>');
+            $r->print('<h1>'.$resource->compTitle.'</h1>');
+            $r->print('<h3>'.$resource->src.'</h3>');
+            $r->print('<h4>'.
+                 &Apache::lonstatistics::section_and_enrollment_description().
+                      '</h4>');
             $r->rflush();
+            $r->print('<hr />');
             $r->print(&Apache::lonstathelpers::render_resource($resource));
-            $r->print('<br />');
+            $r->print('<hr /><br />');
             $r->rflush();
-            $r->print(&analyze_times($r,$resource,\@Students,
-                                     $current_problem->{'part'}));
+	    if (@Students) {	    
+		$r->print(&analyze_times($r,$resource->symb,\@Students,
+					 $current_problem->{'part'}));
+	    }
         }
         $r->print('<hr />');
     }
@@ -158,7 +171,7 @@ sub get_week_start {
 }
 
 sub analyze_times {
-    my ($r,$resource,$students,$part) = @_;
+    my ($r,$symb,$students,$part) = @_;
     my $htmltable;
     #
     # Convenience arrays
@@ -170,14 +183,21 @@ sub analyze_times {
     my $html; # holds results of analysis
     # Get the data
     my $SubData = &Apache::loncoursedata::get_response_time_data
-        ($students,$resource->{'symb'},$part);
+        ([&Apache::lonstatistics::get_selected_sections()],
+         [&Apache::lonstatistics::get_selected_groups()],
+         $Apache::lonstatistics::enrollment_status,
+         $symb,$part);
     if (! defined($SubData) || ! ref($SubData)) {
-        $html.= '<h2>There is no submission data for this problem</h2>';
+        $html.= '<div class="LC_warning">'
+               .&mt('There is no submission data for this problem at all.')
+               .'</div>';
         return $html;
     }
     my $NumSub = scalar(@{$SubData});
     if (! @{$SubData}) {
-        $html.= '<h2>There is no submission data for this problem</h2>';
+        $html.= '<div class="LC_warning">'
+               .&mt('There is no submission data for this problem.')
+               .'</div>';
         return $html;
     }
     # Process the data
@@ -199,6 +219,7 @@ sub analyze_times {
     my @Xlabel=($WeekDay[$wday]); # Labels of itmes
     my @BinEnd;                   # The end time of each bin
     my $cumulative_answers = 0;   # The sum of @AnsData
+    my %students;       # which students have attempted the problem?
     #
     foreach my $row (@$SubData) {
         my $subtime = &get_time_from_row($row);
@@ -221,6 +242,7 @@ sub analyze_times {
         $max = $Ydata[$bincount] if ($max < $Ydata[$bincount]);
         $AnsData[$bincount] += &successful_submission($row);
         $cumulative_answers += &successful_submission($row);
+        $students{$row->[&Apache::loncoursedata::RT_student_id()]}++;
     }
     #
     # Pad the data to a full day
@@ -238,7 +260,7 @@ sub analyze_times {
             $Xlabel[$bincount] = '';
         }
     }
-    my $numstudents = scalar(@$students);
+    my $numstudents = scalar(keys(%students));
     #
     # Determine a nice maximum value to use
     foreach my $maximum (10,15,20,25,30,40,50,60,70,80,90,100,
@@ -260,35 +282,47 @@ sub analyze_times {
         '<th valign="bottom">'.&mt('Begin').'</th>'.
         '<th>'.('&nbsp;'x3).'</th>'.
         '<th valign="bottom">'.&mt('End').'</th>'.
-        '<th valign="bottom">'.&mt('Submissions').'</th>'.
+        '<th valign="bottom">'.&mt('Submissions (plotted)').'</th>'.
         '<th>'.('&nbsp;'x3).'</th>'.
-        '<th valign="bottom">'.&mt('Correct Submissions').'</th>'.
+        '<th valign="bottom">'.&mt('Correct Submissions (not plotted)').'</th>'.
         '<th>'.('&nbsp;'x3).'</th>'.
-        '<th valign="bottom">'.&mt('Cumulative Percent Correct').'</th>'.
+        '<th valign="bottom">'.&mt('Cumulative Correct of those attempting the problem (not plotted)').'</th>'.
+        '<th>'.('&nbsp;'x3).'</th>'.
+        '<th valign="bottom">'.&mt('Cumulative Percent Correct of those attempting the problem (not plotted)').'</th>'.
+        '<th>'.('&nbsp;'x3).'</th>'.
+        '<th valign="bottom">'.&mt('Cumulative Percent Correct of selected students (plotted)').'</th>'.
         '</tr>'.
         '</thead>'.
         '<tbody>';
     my @CumulativeCorrect=(0);
-    my @CumulativeCorrectPercent;
+    my @corr_as_percent_of_selected;
+    my @corr_as_percent_of_answering;
     for (my $i=0;$i<=$#Ydata;$i++) {
         $CumulativeCorrect[$i]=$CumulativeCorrect[-1]+$AnsData[$i];
-        $CumulativeCorrectPercent[$i] = (int(100*$CumulativeCorrect[$i]/$numstudents));
+        $corr_as_percent_of_answering[$i] = 
+            sprintf('%3.1f',100*$CumulativeCorrect[$i]/$numstudents);
+        $corr_as_percent_of_selected[$i] = 
+            sprintf('%3.1f',100*$CumulativeCorrect[$i]/scalar(@$students));
         if ($Ydata[$i] != 0) {
             next if (! defined($BinEnd[$i]) || $BinEnd[$i] == 0);
             $htmltable .= 
                 '<tr>'.
-                '<td align="right"><nobr>'.
+                '<td align="right"><span class="LC_nobreak">'.
                 &Apache::lonlocal::locallocaltime($BinEnd[$i]-$binsize).
-                '</nobr></td>'.
+                '</span></td>'.
                 '<td>&nbsp;</td>'.
-                '<td align="right"><nobr>'.
+                '<td align="right"><span class="LC_nobreak">'.
                     &Apache::lonlocal::locallocaltime($BinEnd[$i]).'</td>'.
-                '</nobr></td>'.
+                '</span></td>'.
                 '<td align="right">'.$Ydata[$i].('&nbsp;'x3).'</td>'.
                 '<td>&nbsp;</td>'.
                 '<td align="right">'.$AnsData[$i].('&nbsp;'x3).'</td>'.
                 '<td>&nbsp;</td>'.
-                '<td align="right">'.$CumulativeCorrectPercent[$i].'</td>'.
+                '<td align="right">'.$CumulativeCorrect[$i].'</td>'.
+                '<td>&nbsp;</td>'.
+                '<td align="right">'.$corr_as_percent_of_answering[$i].'</td>'.
+                '<td>&nbsp;</td>'.
+                '<td align="right">'.$corr_as_percent_of_selected[$i].'</td>'.
                 '</tr>'.$/;
         }
     }
@@ -314,7 +348,7 @@ sub analyze_times {
                                               $plotcolors,
                                               \@Xlabel,
                                               \@Ydata,0,$max,
-                                              \@CumulativeCorrectPercent,0,100,
+                                              \@corr_as_percent_of_selected,0,100,
                                               (xskip => $bins_per_day,
                                                x_ticks => $bins_per_day,
                                                x_tick_offset => $bins_per_day,
@@ -335,7 +369,6 @@ sub successful_submission {
         return $row->[&Apache::loncoursedata::RT_awarded()];
     }
     return undef;
-    return 0;
 }
 
 sub get_time_from_row {
@@ -371,36 +404,44 @@ sub Process_Row {
 sub CreateInterface {
     ##
     ## Environment variable initialization
-    if (! exists$ENV{'form.AnalyzeOver'}) {
-        $ENV{'form.AnalyzeOver'} = 'Tries';
+    if (! exists$env{'form.AnalyzeOver'}) {
+        $env{'form.AnalyzeOver'} = 'Tries';
     }
     ##
     ## Build the menu
     my $Str = '';
-    $Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Submission Time Plots');
+    $Str .= &Apache::lonhtmlcommon::breadcrumbs('Submission Time Plots');
     $Str .= '<p>';
-    $Str .= '<table cellspacing="5">'."\n";
-    $Str .= '<tr>';
-    $Str .= '<th align="center">'.&mt('Sections').'</th>';
-    $Str .= '<th align="center">'.&mt('Enrollment Status').'</th>';
-    $Str .= '</tr>'."\n";
+    $Str .= &Apache::loncommon::start_data_table();
+    $Str .= &Apache::loncommon::start_data_table_header_row();
+    $Str .= '<th>'.&mt('Sections').'</th>';
+    $Str .= '<th>'.&mt('Groups').'</th>';
+    $Str .= '<th>'.&mt('Access Status').'</th>';
+    $Str .= &Apache::loncommon::end_data_table_header_row();
     ##
     ## 
-    $Str .= '<tr><td align="center">'."\n";
+    $Str .= &Apache::loncommon::start_data_table_row();
+    $Str .= '<td align="center">'."\n";
     $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',4);
     $Str .= '</td>';
     #
+    $Str .= '<td align="center">'."\n";
+    $Str .= &Apache::lonstatistics::GroupSelect('Group','multiple',4);
+    $Str .= '</td>';
+    #
     $Str .= '<td align="center">';
     $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,4);
     $Str .= '</td>';
     #
-    $Str .= '</tr>'."\n";
-    $Str .= '</table>'."\n";
+    $Str .= &Apache::loncommon::end_data_table_row();
+    $Str .= &Apache::loncommon::end_data_table();
     #
-    $Str .= '<nobr>'.&mt('Status: [_1]',
-                         '<input type="text" '.
-                         'name="stats_status" size="60" value="" />').
-            '</nobr>'.'</p>';
+    $Str .= '<p><span class="LC_nobreak">'
+           .&mt('Status: [_1]',
+                    '<input type="text" name="stats_status"'
+                   .' size="60" value="" readonly="readonly" />')
+           .'</span></p>';
+    $Str .= '</p>';
     ##
     return $Str;
 }