--- loncom/interface/statistics/lonsubmissiontimeanalysis.pm	2008/10/23 09:07:51	1.29
+++ loncom/interface/statistics/lonsubmissiontimeanalysis.pm	2012/05/10 10:29:09	1.35
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonsubmissiontimeanalysis.pm,v 1.29 2008/10/23 09:07:51 bisitz Exp $
+# $Id: lonsubmissiontimeanalysis.pm,v 1.35 2012/05/10 10:29:09 goltermann Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,7 @@ use strict;
 use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
+use Apache::lonquickgrades();
 use Apache::loncoursedata();
 use Apache::lonstatistics;
 use Apache::lonstathelpers;
@@ -66,12 +67,17 @@ sub BuildSubmissionTimePage {
     #
     &Apache::lonstatistics::PrepareClasslist();    
     #
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Submission Time Plots'));
+    &Apache::lonquickgrades::startGradeScreen($r,'statistics');
     $r->print(&CreateInterface());
     #
     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 = 
@@ -81,7 +87,8 @@ sub BuildSubmissionTimePage {
     if (! exists($env{'form.problemchoice'}) ||
         exists($env{'form.SelectAnother'})) {
         my $submit_button = '<input type="submit" name="" value="'.
-            &mt('Graph Problem Submission Times').'" />';
+#           &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::problem_selector('.',
@@ -124,13 +131,16 @@ sub BuildSubmissionTimePage {
         #
         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->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(&Apache::lonstathelpers::render_resource($resource));
             $r->print('<br />');
@@ -180,12 +190,16 @@ sub analyze_times {
          $Apache::lonstatistics::enrollment_status,
          $symb,$part);
     if (! defined($SubData) || ! ref($SubData)) {
-        $html.= '<h2>There is no submission data for this problem at all</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
@@ -262,25 +276,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;
@@ -293,28 +301,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>'.
-                '<td align="right"><nobr>'.
+            $htmltable .=
+               &Apache::loncommon::start_data_table_row().
+                '<td align="right"><span class="LC_nobreak">'.
                 &Apache::lonlocal::locallocaltime($BinEnd[$i]-$binsize).
-                '</nobr></td>'.
-                '<td>&nbsp;</td>'.
-                '<td align="right"><nobr>'.
+                '</span></td>'.
+                '<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">'.$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';
@@ -398,17 +401,17 @@ sub CreateInterface {
     ##
     ## Build the menu
     my $Str = '';
-    $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('Groups').'</th>';
-    $Str .= '<th align="center">'.&mt('Access 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>';
     #
@@ -420,14 +423,9 @@ sub CreateInterface {
     $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 .= '<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;