--- loncom/interface/statistics/lonsubmissiontimeanalysis.pm	2011/01/17 00:19:41	1.32
+++ loncom/interface/statistics/lonsubmissiontimeanalysis.pm	2020/11/18 15:31:40	1.38
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonsubmissiontimeanalysis.pm,v 1.32 2011/01/17 00:19:41 www Exp $
+# $Id: lonsubmissiontimeanalysis.pm,v 1.38 2020/11/18 15:31:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -75,8 +75,8 @@ sub BuildSubmissionTimePage {
     #
     if (@Students < 1) {
         $r->print('<div class="LC_warning">'
-                 .&mt('There are no students in the sections selected.'
-                 .'</div>')
+                 .&mt('There are no students in the sections selected.')
+                 .'</div>'
         );
     }
     #
@@ -105,20 +105,9 @@ sub BuildSubmissionTimePage {
         $r->rflush();
         #
         # Determine which problem we are to analyze
-        my $current_problem = &Apache::lonstathelpers::get_target_from_id
-            ($env{'form.problemchoice'});
-        #
-        my ($navmap,$prev,$curr,$next) = 
-            &Apache::lonstathelpers::get_prev_curr_next($current_problem,
-                                                        '.',
-                                                        'part');
-        if (exists($env{'form.PrevProblemAnalysis'}) && defined($prev)) {
-            $current_problem = $prev;
-        } elsif (exists($env{'form.NextProblemAnalysis'}) && defined($next)) {
-            $current_problem = $next;
-        } else {
-            $current_problem = $curr;
-        }
+        my ($navmap,$current_problem) = &get_current_problem(); # need to retrieve $navmap
+                                                                # to support $resource->* calls
+                                                                # for src and compTitle (below)
         #
         # Store the current problem choice and send it out in the form
         $env{'form.problemchoice'} = 
@@ -138,13 +127,12 @@ sub BuildSubmissionTimePage {
         } else {
             $r->print('<h1>'.$resource->compTitle.'</h1>');
             $r->print('<h3>'.$resource->src.'</h3>');
-            $r->print('<h4>'.
+            $r->print('<p>'.
                  &Apache::lonstatistics::section_and_enrollment_description().
-                      '</h4>');
+                      '</p>');
             $r->rflush();
-            $r->print('<hr />');
             $r->print(&Apache::lonstathelpers::render_resource($resource));
-            $r->print('<hr /><br />');
+            $r->print('<br />');
             $r->rflush();
 	    if (@Students) {	    
 		$r->print(&analyze_times($r,$resource->symb,\@Students,
@@ -155,6 +143,23 @@ sub BuildSubmissionTimePage {
     }
 }
 
+sub get_current_problem {
+    my $current_problem = &Apache::lonstathelpers::get_target_from_id
+        ($env{'form.problemchoice'});
+    my ($navmap,$prev,$curr,$next) =
+        &Apache::lonstathelpers::get_prev_curr_next($current_problem,
+                                                    '.',
+                                                    'part');
+    if (exists($env{'form.PrevProblemAnalysis'}) && defined($prev)) {
+        $current_problem = $prev;
+    } elsif (exists($env{'form.NextProblemAnalysis'}) && defined($next)) {
+        $current_problem = $next;
+    } else {
+        $current_problem = $curr;
+    }
+    return ($navmap,$current_problem);
+}
+
 #########################################################
 #########################################################
 ##
@@ -220,7 +225,7 @@ sub analyze_times {
     my @Ydata=(0);      # number of submissions
     my @AnsData=(0);    # number of correct submissions
     my @Xlabel=($WeekDay[$wday]); # Labels of itmes
-    my @BinEnd;                   # The end time of each bin
+    my @BinEnd=($endtime);        # The end time of each bin
     my $cumulative_answers = 0;   # The sum of @AnsData
     my %students;       # which students have attempted the problem?
     #
@@ -232,7 +237,7 @@ sub analyze_times {
             $Ydata[$bincount]   = 0;
             $AnsData[$bincount] = 0;
             $endtime += $binsize;
-            push(@BinEnd,$endtime);
+            $BinEnd[$bincount] = $endtime;
             if ($bincount % (86400/$binsize) == 0) {
                 $wday++;
                 $wday %= 7;
@@ -254,7 +259,7 @@ sub analyze_times {
         $Ydata[$bincount]=0;
         $AnsData[$bincount]=0;
         $endtime += $binsize;
-        push(@BinEnd,$endtime);
+        $BinEnd[$bincount]=$endtime;
         if ($bincount % (86400/$binsize) == 0) {
             $wday ++;
             $wday %= 7;
@@ -277,25 +282,19 @@ sub analyze_times {
     }
     #
     # Build the data table
-    $htmltable = '<p>'.
-        '<table rules="groups" frame="border" '.
-        'summary="Student submission data">'.
-        '<thead>'.
-        '<tr>'.
+    $htmltable = '<br><h3>'.&mt('Student submission data').'</h3><p>'.
+        &Apache::loncommon::start_data_table().
+        &Apache::loncommon::start_data_table_header_row().
+        &Apache::loncommon::start_data_table_row().
         '<th valign="bottom">'.&mt('Begin').'</th>'.
-        '<th>'.('&nbsp;'x3).'</th>'.
         '<th valign="bottom">'.&mt('End').'</th>'.
         '<th valign="bottom">'.&mt('Submissions (plotted)').'</th>'.
-        '<th>'.('&nbsp;'x3).'</th>'.
         '<th valign="bottom">'.&mt('Correct Submissions (not plotted)').'</th>'.
-        '<th>'.('&nbsp;'x3).'</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>'.
+        &Apache::loncommon::end_data_table_row().
+        &Apache::loncommon::end_data_table_header_row().
         '<tbody>';
     my @CumulativeCorrect=(0);
     my @corr_as_percent_of_selected;
@@ -308,28 +307,23 @@ sub analyze_times {
             sprintf('%3.1f',100*$CumulativeCorrect[$i]/scalar(@$students));
         if ($Ydata[$i] != 0) {
             next if (! defined($BinEnd[$i]) || $BinEnd[$i] == 0);
-            $htmltable .= 
-                '<tr>'.
+            $htmltable .=
+               &Apache::loncommon::start_data_table_row().
                 '<td align="right"><span class="LC_nobreak">'.
                 &Apache::lonlocal::locallocaltime($BinEnd[$i]-$binsize).
                 '</span></td>'.
-                '<td>&nbsp;</td>'.
                 '<td align="right"><span class="LC_nobreak">'.
                     &Apache::lonlocal::locallocaltime($BinEnd[$i]).'</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">'.$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>'.$/;
+               &Apache::loncommon::end_data_table_row().$/;
         }
     }
-    $htmltable .= '</tbody></table></p>';
+    $htmltable .= '</tbody>'.&Apache::loncommon::end_data_table().'</p>';
     #
     # Build the plot
     my $title = '';#'Number of Submissions and Number Correct';
@@ -438,11 +432,6 @@ sub CreateInterface {
     $Str .= &Apache::loncommon::end_data_table_row();
     $Str .= &Apache::loncommon::end_data_table();
     #
-    $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;