--- loncom/interface/statistics/loncorrectproblemplot.pm	2004/12/10 20:41:39	1.14
+++ loncom/interface/statistics/loncorrectproblemplot.pm	2012/05/12 03:07:46	1.28.2.1
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncorrectproblemplot.pm,v 1.14 2004/12/10 20:41:39 matthew Exp $
+# $Id: loncorrectproblemplot.pm,v 1.28.2.1 2012/05/12 03:07:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -28,7 +28,7 @@
 package Apache::loncorrectproblemplot;
 
 use strict;
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::loncoursedata();
@@ -59,13 +59,16 @@ 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'));
     #
     $r->print(&CreateInterface());
     #
@@ -73,7 +76,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,35 +93,41 @@ 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_parts = 0;
+        my $total_weights = 0;
         my $title = '';
-        if ($Apache::lonstatistics::SelectedMaps[0] ne 'all') {
-            foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()){
+        my @maps = &Apache::lonstatistics::get_selected_maps('Maps');
+        my ($navmap,@sequences) =
+            &Apache::lonstatistics::selected_sequences_with_assessments();
+        if ($maps[0] ne 'all') {
+            foreach my $seq (@sequences) {
                 if ($title eq '') {
-                    $title = $seq->{'title'};
+                    $title = $seq->compTitle;
                 } else {
                     $title = 'Multiple Sequences';
                 }
-                foreach my $res (@{$seq->{'contents'}}) {
-                    next if ($res->{'type'} ne 'assessment');
-                    foreach my $part (@{$res->{'parts'}}) {
-                        $total_parts++;
-                        push(@ProblemSymbs,{symb=>$res->{'symb'},
-                                            part=>$part});
-                    }
-                }
             }
         } else {
-            $title = "All Problems";
-            foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()){
-                foreach my $res (@{$seq->{'contents'}}) {
-                    next if ($res->{'type'} ne 'assessment');
-                    $total_parts += scalar(@{$res->{'parts'}});
+            $title = 'All Problems';
+        }
+        foreach my $seq (@sequences) {
+            my @resources = 
+                &Apache::lonstathelpers::get_resources($navmap,$seq);
+            foreach my $res (@resources) {
+                foreach my $partid (@{$res->parts}) {
+                    push(@ProblemSymbs,{symb=>$res->symb,
+                                        part=>$partid});
+                    $total_weights += 
+                        &Apache::lonnet::EXT('resource.'.$partid.'.weight',
+                                             $res->symb,
+                                             undef,undef,undef);
                 }
             }
         }
+        $r->print('<p>'.
+                  &Apache::lonstatistics::section_and_enrollment_description().
+                  '</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.
@@ -126,14 +135,16 @@ sub BuildCorrectProblemsPage {
                           &Apache::lonlocal::locallocaltime($starttime),
                           &Apache::lonlocal::locallocaltime($endtime)));
         }
+        &Apache::loncoursedata::populate_weight_table();
         my $score_data = &Apache::loncoursedata::get_student_scores
-            (\@Apache::lonstatistics::SelectedSections,
+            ([&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_parts));
+        $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;
 }
@@ -153,11 +164,11 @@ return html with a plot of the data and
 #########################################################
 #########################################################
 sub AnalyzeScoreData {
-    my ($score_data,$title,$total_parts) = @_;
+    my ($score_data,$title,$maximum) = @_;
     #
     # 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
@@ -176,7 +187,13 @@ sub AnalyzeScoreData {
     my @Bins = &bin_data($score_data,$binsize,$lowest,$highest);
     my @Xdata; my @Ydata; my $max;
     my $Str = 
-        '<table border="1">'."\n".'<tr><th>Range</th><th>Count</th></tr>'."\n";
+        '<p>'.
+        &mt('Problem weights do not reflect individual student settings.')
+        .'</p>'.
+        &Apache::loncommon::start_data_table().
+        &Apache::loncommon::start_data_table_header_row().
+        '<th>'.&mt('Range').'</th><th>'.&mt('Count').'</th>'.
+        &Apache::loncommon::end_data_table_header_row();
     my $sum = 0;
     while (my $bin = shift(@Bins)) {
         push (@Xdata,$bin->{'start'});
@@ -185,21 +202,22 @@ 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.' N = '.$sum,
-                                 'Correct Problems (max possible = '.$total_parts.')',
-                                                       'Number of students',
-                                                       $max,
-                                                       undef, # colors
-                                                       \@Xdata,
-                                                       \@Ydata).
-                                                           "\n<br />\n".$Str;
+    $Str = "\n<p>".
+        &Apache::loncommon::DrawBarGraph($title.' ('.$sum.' students)',
+                              'Correct Problems (max possible = '.$maximum.')',
+                                         'Number of students',
+                                         $max,undef, # colors
+                                         \@Xdata,\@Ydata).
+                                         "\n<br />\n".$Str;
     $Str .= '</p>'."\n";
     return $Str;                                               
 }
@@ -237,7 +255,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)) {
@@ -279,46 +297,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";
     #
-    my $only_seq_with_assessments = sub { 
-        my $s=shift;
-        if ($s->{'num_assess'} < 1) { 
-            return 0;
-        } else { 
-            return 1;
-        }
-    };
-    $Str .= &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
-                                              $only_seq_with_assessments);
+    $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;
 }