--- loncom/interface/statistics/loncorrectproblemplot.pm	2005/03/14 20:28:22	1.17
+++ loncom/interface/statistics/loncorrectproblemplot.pm	2012/05/03 11:21:33	1.27
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncorrectproblemplot.pm,v 1.17 2005/03/14 20:28:22 matthew Exp $
+# $Id: loncorrectproblemplot.pm,v 1.27 2012/05/03 11:21:33 goltermann Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -28,9 +28,10 @@
 package Apache::loncorrectproblemplot;
 
 use strict;
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
+use Apache::lonquickgrades();
 use Apache::loncoursedata();
 use Apache::lonstatistics;
 use Apache::lonstathelpers;
@@ -59,13 +60,17 @@ sub BuildCorrectProblemsPage {
     my ($r,$c)=@_;
     #
     my %Saveable_Parameters = ('Status' => 'scalar',
-                               'Section' => 'array');
+                               'Section' => 'array',
+                               'Groups' => 'array');
     &Apache::loncommon::store_course_settings('correct_problems_plot',
                                               \%Saveable_Parameters);
     &Apache::loncommon::restore_course_settings('correct_problems_plot',
                                                 \%Saveable_Parameters);
     #
     &Apache::lonstatistics::PrepareClasslist();    
+    
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Correct Problems Plot'));
+    &Apache::lonquickgrades::startGradeScreen($r,'statistics');
     #
     $r->print(&CreateInterface());
     #
@@ -73,7 +78,7 @@ sub BuildCorrectProblemsPage {
     #
     if (@Students < 1) {
         $r->print('<h2>'.
-                  &mt('There are no students in the sections selected').
+                  &mt('There are no students in the sections/groups selected').
                   '</h2>');
     }
     #
@@ -90,7 +95,7 @@ sub BuildCorrectProblemsPage {
     $r->rflush();
     #
     # Determine which problem symbs we are to sum over
-    if (exists($ENV{'form.CreatePlot'})) {
+    if (exists($env{'form.CreatePlot'})) {
         my @ProblemSymbs;
         my $total_weights = 0;
         my $title = '';
@@ -122,9 +127,9 @@ sub BuildCorrectProblemsPage {
                 }
             }
         }
-        $r->print('<h4>'.
+        $r->print('<p>'.
                   &Apache::lonstatistics::section_and_enrollment_description().
-                  '</h4>');
+                  '</p>');
         my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
         if (defined($starttime) || defined($endtime)) {
             # Inform the user what the time limits on the data are.
@@ -135,12 +140,13 @@ sub BuildCorrectProblemsPage {
         &Apache::loncoursedata::populate_weight_table();
         my $score_data = &Apache::loncoursedata::get_student_scores
             ([&Apache::lonstatistics::get_selected_sections()],
+             [&Apache::lonstatistics::get_selected_groups()],
              \@ProblemSymbs,
              $Apache::lonstatistics::enrollment_status,undef,
              $starttime,$endtime);
         $r->print(&AnalyzeScoreData($score_data,$title,$total_weights));
     } else {
-        $r->print('<h3>'.&mt('Make a sequence selection from the "Sequences and Folders" menu and hit "Create Plot" to begin').'</h3>');
+        $r->print('<p>'.&mt('Make a sequence selection from the "Sequences and Folders" menu and hit "Create Plot" to begin').'</p>');
     }
     return;
 }
@@ -164,7 +170,7 @@ sub AnalyzeScoreData {
     #
     # Basic check first
     if (ref($score_data) ne 'ARRAY' || @$score_data < 1) {
-        return '<h2>'.&mt('There is no data to plot').'</h2>';
+        return '<p class="LC_warning">'.&mt('There is no data to plot').'</p>';
     }
     #
     # Determine which bins to use
@@ -186,7 +192,10 @@ sub AnalyzeScoreData {
         '<p>'.
         &mt('Problem weights do not reflect individual student settings.')
         .'</p>'.
-        '<table border="1">'."\n".'<tr><th>Range</th><th>Count</th></tr>'."\n";
+        &Apache::loncommon::start_data_table().
+        &Apache::loncommon::start_data_table_header_row().
+        "\n".'<th>Range</th><th>Count</th>'."\n".
+        &Apache::loncommon::end_data_table_header_row();
     my $sum = 0;
     while (my $bin = shift(@Bins)) {
         push (@Xdata,$bin->{'start'});
@@ -195,12 +204,14 @@ sub AnalyzeScoreData {
         if ($bin->{'count'} > $max) {
             $max = $bin->{'count'};
         }
-        $Str.= '<tr><td>'.$bin->{'start'}.' - '.$bin->{'end'}.'</td>'.
-            '<td>'.$bin->{'count'}.'</td></tr>'."\n";
+        $Str.= &Apache::loncommon::start_data_table_row().
+            '<td>'.$bin->{'start'}.' - '.$bin->{'end'}.'</td>'.
+            '<td>'.$bin->{'count'}.'</td>'.
+            &Apache::loncommon::end_data_table_row().'<br>';
     }
     # scale max to an integer.
     $max = 5*(int($max/5)+1);
-    $Str .= "</table><br />\n";
+    $Str .= &Apache::loncommon::end_data_table()."<br />\n";
     $title = &HTML::Entities::decode($title);
     $Str = "\n<p>".
         &Apache::loncommon::DrawBarGraph($title.' ('.$sum.' students)',
@@ -246,7 +257,7 @@ sub bin_data {
     my @Bins;
     my $count=0;
     my $idx=0;
-    while ($idx < scalar(@$data) && ($endbin-$binend + $binsize)>0) {
+    while ($idx < scalar(@$data) && ($endbin-$binend + $binsize)>=0) {
         my $dataset = $data->[$idx++];
         my ($x,$y) = @{$dataset};
         while ($x > ($binend-.001)) {
@@ -288,36 +299,39 @@ sub CreateInterface {
     ##
     ## Environment variable initialization
     my $Str;
-    $Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Correct Problems Plot');
     $Str .= '<p>';
     #
-    $Str .= '<table cellspacing="5">'."\n";
-    $Str .= '<tr>';
-    $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
-    $Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>';
-    $Str .= '<td align="center"><b>'.&mt('Sequences and Folders').'</b></td>';
-    $Str .= '<td rowspan="2">'.
-        &Apache::lonstathelpers::limit_by_time_form().'</td>';
-    $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 .= '<th>'.&mt('Sequences and Folders').'</th>';
+    $Str .= '<th>'.&mt('Time Period').'</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" valign="top">'."\n";
     $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
     $Str .= '</td>';
     #
-    $Str .= '<td align="center">';
+    $Str .= '<td align="center" valign="top">'."\n";
+    $Str .= &Apache::lonstatistics::GroupSelect('Group','multiple',5);
+    $Str .= '</td>';
+    $Str .= '<td align="center" valign="top">';
     $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
-    $Str .= '</td><td>'."\n";
+    $Str .= '</td>'."\n";
     #
+    $Str .= '<td align="center" valign="top">'."\n";
     $Str .= &Apache::lonstatistics::map_select('Maps','multiple,all',5);
     $Str .= '</td>';
     #
-    $Str .= '</tr>'."\n";
-    $Str .= '</table>'."\n";
+    $Str .= '<td align="center" valign="top">'."\n";
+    $Str .= &Apache::lonstathelpers::limit_by_time_form();
+    $Str .= '</td>';
     #
-    $Str .= '<nobr>'.&mt('Status: [_1]',
-                         '<input type="text" '.
-                         'name="stats_status" size="60" value="" />').
-            '</nobr>'.'</p>';
+    $Str .= &Apache::loncommon::end_data_table_row();
+    $Str .= &Apache::loncommon::end_data_table();
     ##
     return $Str;
 }