--- loncom/interface/statistics/lonproblemstatistics.pm	2005/03/27 05:08:03	1.103
+++ loncom/interface/statistics/lonproblemstatistics.pm	2013/12/30 13:51:37	1.124
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemstatistics.pm,v 1.103 2005/03/27 05:08:03 matthew Exp $
+# $Id: lonproblemstatistics.pm,v 1.124 2013/12/30 13:51:37 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,8 +50,9 @@ Excel files, and plots.
 package Apache::lonproblemstatistics;
 
 use strict;
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon();
+use Apache::lonquickgrades();
 use Apache::lonhtmlcommon;
 use Apache::loncoursedata;
 use Apache::lonstatistics;
@@ -60,6 +61,8 @@ use Apache::lonlocal;
 use Spreadsheet::WriteExcel;
 use Apache::lonstathelpers();
 use Time::HiRes;
+use LONCAPA;
+ 
 
 my @StatsArray;
 my %SeqStat;    # keys are symbs, values are hash refs
@@ -71,6 +74,14 @@ my %SeqStat;    # keys are symbs, values
 ## header for plots created with Graph.pm, both of which more than likely do
 ## not support localization.
 ##
+## Additional Notes:
+## Localization can be done and is done before passing the phrases
+## to the output.
+## This might conflict with special characters, e.g. German Umlaute or
+## chinese characters. Do not use such characters in this case.
+## If this failed, consider that the sequence and folder names
+## are also passed to the output and would fail the same way.
+##
 #
 #
 ##
@@ -82,7 +93,7 @@ my %SeqStat;    # keys are symbs, values
 ## title           yes      any scalar  This is what the user sees to identify
 ##                                      the field.  Passed through &mt().
 ## long_title      yes      any scalar  Used as graph heading and in excel
-##                                      output.  NOT translated
+##                                      output.  Passed through &mt().
 ## align           no    (left|right|center)  HTML cell contents alignment
 ## color           yes      html color  HTML cell background color
 ##                                      used to visually group statistics
@@ -121,11 +132,11 @@ my @Fields = (
              align  => 'left',
              color  => '#FFFFE6',
              special  => 'link',
-             sortable => 'yes', 
+             sortable => 'yes',
              selectable => 'no',
              defaultselected => 'yes',
            },
-           { name   => 'part', 
+           { name   => 'part',
              title  => 'Part',
              align  => 'left',
              color  => '#FFFFE6',
@@ -272,7 +283,7 @@ my @Fields = (
              sortable  => 'yes',
              graphable => 'yes',
              long_title => 'Degree of Difficulty'.
-                           '[ 1 - ((#YES+#yes) / Tries) ]',
+                           ' ~[ 1 - ((#YES+#yes) / Tries) ~]',
              selectable => 'yes',
              defaultselected => 'yes',
            },
@@ -373,7 +384,7 @@ my @SeqFields = (
              align  => 'left',
              color  => '#FFFFE6',
              special  => 'no',
-             sortable => 'no', 
+             sortable => 'no',
              selectable => 'yes',
              defaultselected => 'no',
            },
@@ -508,7 +519,7 @@ my @SeqFields = (
              long_title => 'KR-21 reliability statistic',
              selectable => 'yes',
              defaultselected => 'no',
-           },           
+           },
 );
 
 my %SelectedFields;
@@ -516,35 +527,35 @@ my %SelectedFields;
 sub parse_field_selection {
     #
     # Pull out the defaults
-    if (! defined($ENV{'form.fieldselections'})) {
-        $ENV{'form.fieldselections'} = [];
+    if (! defined($env{'form.fieldselections'})) {
+        $env{'form.fieldselections'} = [];
         foreach my $field (@Fields) {
             next if ($field->{'selectable'} ne 'yes');
             if ($field->{'defaultselected'} eq 'yes') {
-                push(@{$ENV{'form.fieldselections'}},$field->{'name'});
+                push(@{$env{'form.fieldselections'}},$field->{'name'});
             }
         }
     }
     #
     # Make sure the data we are plotting is there
     my %NeededFields;
-    if (exists($ENV{'form.plot'}) && $ENV{'form.plot'} ne '' &&
-        $ENV{'form.plot'} ne 'none') {
-        if ($ENV{'form.plot'} eq 'degrees') {
+    if (exists($env{'form.plot'}) && $env{'form.plot'} ne '' &&
+        $env{'form.plot'} ne 'none') {
+        if ($env{'form.plot'} eq 'degrees') {
             $NeededFields{'deg_of_diff'}++;
             $NeededFields{'deg_of_disc'}++;
-        } elsif ($ENV{'form.plot'} eq 'tries statistics') {
+        } elsif ($env{'form.plot'} eq 'tries statistics') {
             $NeededFields{'mean_tries'}++;
             $NeededFields{'std_tries'}++;
             $NeededFields{'problem_num'}++;
         } else {
-            $NeededFields{$ENV{'form.plot'}}++;
+            $NeededFields{$env{'form.plot'}}++;
         }
     }
     #
     # This should not happen, but in case it does...
-    if (ref($ENV{'form.fieldselections'}) ne 'ARRAY') {
-        $ENV{'form.fieldselections'} = [$ENV{'form.fieldselections'}];
+    if (ref($env{'form.fieldselections'}) ne 'ARRAY') {
+        $env{'form.fieldselections'} = [$env{'form.fieldselections'}];
     }
     #
     # Set the field data and the selected fields (for easier checking)
@@ -559,7 +570,7 @@ sub parse_field_selection {
             $field->{'selected'} = 'yes';
             $SelectedFields{$field->{'name'}}++;
         }
-        foreach my $selection (@{$ENV{'form.fieldselections'}}) {
+        foreach my $selection (@{$env{'form.fieldselections'}}) {
             if ($selection eq $field->{'name'} || $selection eq 'all') {
                 $field->{'selected'} = 'yes';
                 $SelectedFields{$field->{'name'}}++;
@@ -575,7 +586,7 @@ sub parse_field_selection {
 }
 
 sub field_selection_input {
-    my $Str = '<select name="fieldselections" multiple size="5">'."\n";
+    my $Str = '<select name="fieldselections" multiple="multiple" size="5">'."\n";
     $Str .= '<option value="all">all</option>'."\n";
     foreach my $field (@Fields) {
         next if ($field->{'selectable'} ne 'yes');
@@ -608,39 +619,43 @@ sub CreateInterface {
     &parse_field_selection();
     #
     my $Str = '';
-    $Str .= &Apache::lonhtmlcommon::breadcrumbs
-        (undef,'Overall Problem Statistics','Statistics_Overall_Key');
-    $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 align="center"><b>'.&mt('Statistics').'</b></td>';
-    $Str .= '<td rowspan="2">'.
-        &Apache::lonstathelpers::limit_by_time_form().'</td>';
-    $Str .= '</tr>'."\n";
+    $Str .= '<p>';
+    $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('Statistics').'</th>';
+    $Str .= '<th>'.&mt('Plot Graph').'</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><td align="center">';
+    $Str .= '</td><td align="center" valign="top">';
+    $Str .= &Apache::lonstatistics::GroupSelect('Group','multiple',5);
+    $Str .= '</td><td align="center" valign="top">';
     $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
-    $Str .= '</td><td align="center">';
+    $Str .= '</td><td align="center" valign="top">';
     #
     $Str .= &Apache::lonstatistics::map_select('Maps','multiple,all',5);
-    $Str .= '</td><td>'.&field_selection_input();
-    $Str .= '</td></tr>'."\n";
-    $Str .= '</table>'."\n";
-    #
-    $Str .= '<p>'.&mt('Status: [_1]',
-                         '<input type="text" '.
-                         'name="stats_status" size="60" value="" />'
-                         ).
-                         '</nobr></p>';
+    $Str .= '</td><td align="center" valign="top">';
+    $Str .= &field_selection_input();
+    $Str .= '</td><td align="center" valign="top">';
+    $Str .= &plot_dropdown();
+    $Str .= '</td>'."\n";
+    $Str .= '</td><td align="center" valign="top">';
+    $Str .= &Apache::lonstathelpers::limit_by_time_form();
+    $Str .= '</td>'."\n";
+    $Str .=  &Apache::loncommon::end_data_table_row();
+    $Str .= &Apache::loncommon::end_data_table();
     #
+    $Str .= '</p>';
     $Str .= '<input type="submit" name="GenerateStatistics" value="'.
         &mt('Generate Statistics').'" />';
-    $Str .= '&nbsp;'x5;
-    $Str .= 'Plot '.&plot_dropdown().('&nbsp;'x10);
+    $Str .= ('&nbsp;'x10);
     #
     return $Str;
 }
@@ -661,6 +676,11 @@ Main interface to problem statistics.
 my $navmap;
 my @sequences;
 
+sub clean_up {
+    undef($navmap);
+    undef(@sequences);
+}
+
 sub BuildProblemStatisticsPage {
     my ($r,$c)=@_;
     undef($navmap);
@@ -669,6 +689,7 @@ sub BuildProblemStatisticsPage {
     my %Saveable_Parameters = ('Status' => 'scalar',
                                'statsoutputmode' => 'scalar',
                                'Section' => 'array',
+                               'Groups' => 'array',
                                'StudentData' => 'array',
                                'Maps' => 'array',
                                'fieldselections'=> 'array');
@@ -684,12 +705,16 @@ sub BuildProblemStatisticsPage {
     undef(%SeqStat);
     #
     # Finally let the user know we are here
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Overall Problem Statistics',
+                                                'Statistics_Overall_Key'));
+    &Apache::lonquickgrades::startGradeScreen($r,'statistics');
+
     my $interface = &CreateInterface($r);
     $r->print($interface);
-    $r->print('<input type="hidden" name="sortby" value="'.$ENV{'form.sortby'}.
+    $r->print('<input type="hidden" name="sortby" value="'.$env{'form.sortby'}.
               '" />');
     #
-    my @CacheButtonHTML = 
+    my @CacheButtonHTML =
         &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status');
     my $Str;
     foreach my $html (@CacheButtonHTML) {
@@ -697,14 +722,16 @@ sub BuildProblemStatisticsPage {
     }
     #
     $r->print($Str);
-    if (! exists($ENV{'form.firstrun'})) {
-        $r->print('<h3>'.
+    if (! exists($env{'form.firstrun'})) {
+        $r->print('<p class="LC_info"><b>'.
                   &mt('Press "Generate Statistics" when you are ready.').
-                  '</h3><p>'.
+                  '</b></p>'.
+                  '<p class="LC_info">'.
                   &mt('It may take some time to update the student data '.
-                      'for the first analysis.  Future analysis this session '.
-                      ' will not have this delay.').
+                      'for the first analysis. Future analysis this session '.
+                      'will not have this delay.').
                   '</p>');
+	&clean_up();
         return;
     }
     $r->rflush();
@@ -713,44 +740,45 @@ sub BuildProblemStatisticsPage {
     # it does not slow things down noticably.
     &Apache::loncoursedata::populate_weight_table();
     #
-    ($navmap,@sequences) = 
+    ($navmap,@sequences) =
         &Apache::lonstatistics::selected_sequences_with_assessments();
     if (! ref($navmap)) {
-        $r->print('<h1>'.&mt('A course-wide error occured.').'</h1>'.
+        $r->print('<div class="LC_error">'.&mt('A course-wide error occurred.').'</div>'.
                   '<h3>'.$navmap.'</h3>');
+	&clean_up();
         return;
     }
-    if (exists($ENV{'form.Excel'})) {
-        $r->print('<h4>'.
+    if (exists($env{'form.Excel'})) {
+        $r->print('<p>'.
                   &Apache::lonstatistics::section_and_enrollment_description().
-                  '</h4>');
+                  '</p>');
         &Excel_output($r);
-    } else { 
+    } else {
         $r->print('<input type="submit" name="Excel" value="'.
                   &mt('Produce Excel Output').'" />'.'&nbsp;'x5);
         $r->rflush();
-        $r->print('<h4>'.
+        $r->print('<p>'.
                   &Apache::lonstatistics::section_and_enrollment_description().
-                  '</h4>');
+                  '</p>');
         my $count = 0;
         foreach my $seq (@sequences) {
-            my @resources = 
+            my @resources =
                 &Apache::lonstathelpers::get_resources($navmap,$seq);
             $count += scalar(@resources);
         }
         if ($count > 10) {
-            $r->print('<h2>'.
-                      &mt('Compiling statistics for [_1] problems',$count).
-                      '</h2>');
+            $r->print('<p>'.
+                      &mt('Compiling statistics for [quant,_1,problem]',$count).
+                      '</p>');
             if ($count > 30) {
-                $r->print('<h3>'.&mt('This will take some time.').'</h3>');
+                $r->print('<p class="LC_info">'.&mt('This will take some time.').'</p>');
             }
             $r->rflush();
         }
         #
-        my $sortby = $ENV{'form.sortby'};
+        my $sortby = $env{'form.sortby'};
         $sortby = 'container' if (! defined($sortby) || $sortby =~ /^\s*$/);
-        my $plot = $ENV{'form.plot'};
+        my $plot = $env{'form.plot'};
         if ($plot eq '' || $plot eq 'none') {
             undef($plot);
         }
@@ -765,6 +793,7 @@ sub BuildProblemStatisticsPage {
             &output_sequence_statistics($r);
         }
     }
+    &clean_up();
     return;
 }
 
@@ -774,17 +803,15 @@ sub output_sequence_statistics {
     $r->print('<h2>'.&mt('Sequence Statistics').
 	      &Apache::loncommon::help_open_topic('Statistics_Sequence').
 	      '</h2>');
-    $r->print('<table border="0"><tr><td bgcolor="#777777">'."\n".
-              '<table border="0" cellpadding="3">'."\n".
-              '<tr bgcolor="#FFFFE6">');
+    $r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row());
     $r->print(&sequence_html_header());
-    foreach my $seq (@sequences) { 
+    $r->print(&Apache::loncommon::end_data_table_header_row());
+    foreach my $seq (@sequences) {
         last if ($c->aborted);
         &compute_sequence_statistics($seq);
         $r->print(&sequence_html_output($seq));
     }
-    $r->print('</table>');
-    $r->print('</table>');
+    $r->print(&Apache::loncommon::end_data_table());
     $r->rflush();
     return;
 }
@@ -800,22 +827,22 @@ sub output_sequence_statistics {
 sub output_html_by_sequence {
     my ($r) = @_;
     my $c = $r->connection();
-    $r->print(&html_preamble());
+    $r->print('<br>'.&html_preamble());
     #
     foreach my $seq (@sequences) {
         last if ($c->aborted);
         $r->print("<h3>".$seq->compTitle."</h3>".
-                  '<table border="0"><tr><td bgcolor="#777777">'."\n".
-                  '<table border="0" cellpadding="3">'."\n".
-                  '<tr bgcolor="#FFFFE6">'.
-                  &statistics_table_header('no container')."</tr>\n");
+                    &Apache::loncommon::start_data_table().
+                    &Apache::loncommon::start_data_table_header_row().
+                    &statistics_table_header('no container').
+                    &Apache::loncommon::end_data_table_header_row()."\n");
         my @Data = &compute_statistics_on_sequence($seq);
         foreach my $data (@Data) {
-            $r->print('<tr>'.&statistics_html_table_data($data,
-                                                         'no container').
-                      "</tr>\n");
+            $r->print(&Apache::loncommon::start_data_table_row().
+                    &statistics_html_table_data($data,'no container').
+                    &Apache::loncommon::end_data_table_row()."\n");
         }
-        $r->print('</table>'."\n".'</table>'."\n");
+        $r->print(&Apache::loncommon::end_data_table()."\n");
         $r->rflush();
     }
     return;
@@ -825,29 +852,29 @@ sub output_html_stats {
     my ($r)=@_;
     &compute_all_statistics($r);
     $r->print(&html_preamble());
-    &sort_data($ENV{'form.sortby'});
+    &sort_data($env{'form.sortby'});
     #
     my $count=0;
     foreach my $data (@StatsArray) {
         if ($count++ % 50 == 0) {
-            $r->print("</table>\n</table>\n");
-            $r->print('<table border="0"><tr><td bgcolor="#777777">'."\n".
-                      '<table border="0" cellpadding="3">'."\n".
-                      '<tr bgcolor="#FFFFE6">'.
-                      '<tr bgcolor="#FFFFE6">'.
-                      &statistics_table_header().
-                      "</tr>\n");
-        }
-        $r->print('<tr>'.&statistics_html_table_data($data)."</tr>\n");
+            $r->print(&Apache::loncommon::end_data_table());
+            $r->print(&Apache::loncommon::start_data_table().
+                    &Apache::loncommon::start_data_table_row().
+                    &statistics_table_header().
+                    &Apache::loncommon::end_data_table_row());
+        }
+        $r->print(&Apache::loncommon::start_data_table_row().
+                &statistics_html_table_data($data).
+                &Apache::loncommon::end_data_table_row());
     }
-    $r->print("</table>\n</table>\n");
+    $r->print(&Apache::loncommon::end_data_table_row());
     return;
 }
 
 sub html_preamble {
     my $Str='';
     $Str .= "<h2>".
-        $ENV{'course.'.$ENV{'request.course.id'}.'.description'}.
+        $env{'course.'.$env{'request.course.id'}.'.description'}.
         "</h2>\n";
     my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
     if (defined($starttime) || defined($endtime)) {
@@ -857,8 +884,8 @@ sub html_preamble {
                            &Apache::lonlocal::locallocaltime($endtime)
                            ).'</h3>';
     }
-    $Str .= "<h3>".&mt('Compiled on [_1]',
-                       &Apache::lonlocal::locallocaltime(time))."</h3>";
+    $Str .= "<p>".&mt('Compiled on [_1]',
+                       &Apache::lonlocal::locallocaltime(time))."</p>";
     return $Str;
 }
 
@@ -876,7 +903,7 @@ sub statistics_html_table_data {
     foreach my $field (@Fields) {
         next if ($options =~ /no $field->{'name'}/);
         next if ($field->{'selected'} ne 'yes');
-        $row .= '<td bgcolor="'.$field->{'color'}.'"';
+        $row .= '<td style="background-color:'.$field->{'color'}.'"';
         if (exists($field->{'align'})) {
             $row .= ' align="'.$field->{'align'}.'"';
             }
@@ -971,7 +998,7 @@ sub sequence_html_output {
 sub make_plot {
     my ($r,$plot) = @_;
     &compute_all_statistics($r);
-    &sort_data($ENV{'form.sortby'});
+    &sort_data($env{'form.sortby'});
     if ($plot eq 'degrees') {
         &degrees_plot($r);
     } elsif ($plot eq 'tries statistics') {
@@ -988,20 +1015,20 @@ sub make_single_stat_plot {
     my $title; my $yaxis;
     foreach my $field (@Fields) {
         next if ($field->{'name'} ne $datafield);
-        $title = $field->{'long_title'};
-        $yaxis = $field->{'title'};
+        $title = &mt($field->{'long_title'});
+        $yaxis = &mt($field->{'title'});
         last;
     }
     if ($title eq '' || $yaxis eq '') {
         # datafield is something we do not know enough about to plot
-        $r->print('<h3>'.
+        $r->print('<p class="LC_warning">'.
                   &mt('Unable to plot the requested statistic.').
-                  '</h3>');
+                  '</p>');
         return;
     }
     #
     # Build up the data sets to plot
-    my @Labels; 
+    my @Labels;
     my @Data;
     my $max = 1;
     foreach my $data (@StatsArray) {
@@ -1023,7 +1050,7 @@ sub make_single_stat_plot {
     }
     #
     $r->print("<p>".&Apache::loncommon::DrawBarGraph($title,
-                                                     'Problem Number',
+                                                     &mt('Problem Number'),
                                                      $yaxis,
                                                      $max,
                                                      undef, # colors
@@ -1041,7 +1068,7 @@ sub degrees_plot {
     my $plot = '';
     my $ymax = 0;
     my $ymin = 0;
-    my @Disc; my @Diff; my @Labels;    
+    my @Disc; my @Diff; my @Labels;
     foreach my $data (@StatsArray) {
         push(@Labels,$data->{'problem_num'});
         my $disc = $data->{'deg_of_disc'};
@@ -1088,10 +1115,14 @@ sub degrees_plot {
     my $diffdata .= '<data>'.join(',',@Labels).'</data>'.$/.
                     '<data>'.join(',',@Diff).'</data>'.$/;
     #
-    my $title = 'Degree of Discrimination\nand Degree of Difficulty';
+    my $title = &mt('Degree of Discrimination[_1]and Degree of Difficulty','\n');
     if ($xmax > 50) {
-        $title = 'Degree of Discrimination and Degree of Difficulty';
+        $title = &mt('Degree of Discrimination and Degree of Difficulty');
     }
+    my %lt = &Apache::lonlocal::texthash(
+        'alttag' => 'Degree of Discrimination and Degree of Difficulty Plot',
+        'xlabel' => 'Problem Number',
+    );
     #
     $plot=<<"END";
 <gnuplot 
@@ -1103,7 +1134,7 @@ sub degrees_plot {
     align="center"
     border="on"
     transparent="on"
-    alttag="Degree of Discrimination and Degree of Difficulty Plot"
+    alttag="$lt{'alttag'}"
     samples="100"
     bgcolor="xffffff"
     height="$height"
@@ -1114,7 +1145,7 @@ sub degrees_plot {
         box="off" />
     <title>$title</title>
     <axis xmin="0" ymin="$ymin" xmax="$xmax" ymax="$ymax" color="x000000" />
-    <xlabel>Problem Number</xlabel>
+    <xlabel>$lt{'xlabel'}</xlabel>
     <curve 
         linestyle="linespoints" 
         name="DoDisc" 
@@ -1131,7 +1162,7 @@ sub degrees_plot {
     </curve>
 </gnuplot>
 END
-    my $plotresult = 
+    my $plotresult =
         '<p>'.&Apache::lonxml::xmlparse($r,'web',$plot).'</p>'.$/;
     $r->print($plotresult);
     return;
@@ -1176,11 +1207,16 @@ sub tries_data_plot {
                           '<data>'.join(',',@Mean).'</data>'.$/.
                           '<data>'.join(',',@STD).'</data>'.$/;
     #
-    my $title = 'Mean and S.D. of Tries';
-    if ($xmax > 25) {
-        $title = 'Mean and Standard Deviation of Tries';
+    my $title = &mt('Mean and S.D. of Tries');
+    if ($xmax > 30) {
+        $title = &mt('Mean and Standard Deviation of Tries');
     }
     #
+    my %lt = &Apache::lonlocal::texthash(
+        'alttag' => 'Mean and S.D of Tries Plot',
+        'xlabel' => 'Problem Number',
+        'ylabel' => 'Number of Tries',
+    );
     $plot=<<"END";
 <gnuplot 
     texfont="10"
@@ -1191,15 +1227,15 @@ sub tries_data_plot {
     align="center"
     border="on"
     transparent="on"
-    alttag="Mean and S.D of Tries Plot"
+    alttag="$lt{'alttag'}"
     samples="100"
     bgcolor="xffffff"
     height="$height"
     width="$width">
     <title>$title</title>
     <axis xmin="0" ymin="0" xmax="$xmax" ymax="$ymax" color="x000000" />
-    <xlabel>Problem Number</xlabel>
-    <ylabel>Number of Tries</ylabel>
+    <xlabel>$lt{'xlabel'}</xlabel>
+    <ylabel>$lt{'ylabel'}</ylabel>
     <curve 
         linestyle="yerrorbars"
         name="S.D. Tries" 
@@ -1216,7 +1252,7 @@ sub tries_data_plot {
     </curve>
 </gnuplot>
 END
-    my $plotresult = 
+    my $plotresult =
         '<p>'.&Apache::lonxml::xmlparse($r,'web',$plot).'</p>'.$/;
     $r->print($plotresult);
     return;
@@ -1224,9 +1260,10 @@ END
 
 sub plot_dropdown {
     my $current = '';
+    my $title;
     #
-    if (defined($ENV{'form.plot'})) {
-        $current = $ENV{'form.plot'};
+    if (defined($env{'form.plot'})) {
+        $current = $env{'form.plot'};
     }
     #
     my @Additional_Plots = (
@@ -1239,7 +1276,7 @@ sub plot_dropdown {
     #
     my $Str= "\n".'<select name="plot" size="1">';
     $Str .= '<option name="none"></option>'."\n";
-    $Str .= '<option name="none2">none</option>'."\n";
+    $Str .= '<option name="none2">'.&mt('none').'</option>'."\n";
     foreach my $field (@Additional_Plots,@Fields) {
         if (! exists($field->{'graphable'}) ||
             $field->{'graphable'} ne 'yes') {
@@ -1247,9 +1284,11 @@ sub plot_dropdown {
         }
         $Str .= '<option value="'.$field->{'name'}.'"';
         if ($field->{'name'} eq $current) {
-            $Str .= ' selected ';
+            $Str .= ' selected="selected"';
         }
-        $Str.= '>'.&mt($field->{'title'}).'</option>'."\n";
+        $title = &mt($field->{'long_title'});
+        $title = &mt($field->{'title'}) if (!$title);
+        $Str.= '>'.$title.'</option>'."\n";
     }
     $Str .= '</select>'."\n";
     return $Str;
@@ -1279,7 +1318,7 @@ sub Excel_output {
     return if (! defined($excel_workbook));
     #
     # Add a worksheet
-    my $sheetname = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+    my $sheetname = $env{'course.'.$env{'request.course.id'}.'.description'};
     if (length($sheetname) > 31) {
         $sheetname = substr($sheetname,0,31);
     }
@@ -1292,7 +1331,7 @@ sub Excel_output {
     #
     # Put the course description in the header
     $excel_sheet->write($rows_output,$cols_output++,
-                   $ENV{'course.'.$ENV{'request.course.id'}.'.description'},
+                   $env{'course.'.$env{'request.course.id'}.'.description'},
                         $format->{'h1'});
     $cols_output += 3;
     #
@@ -1302,6 +1341,7 @@ sub Excel_output {
                         &Apache::lonstatistics::section_and_enrollment_description('plaintext'),
                         $format->{'h3'});
     $cols_output += scalar(&Apache::lonstatistics::get_selected_sections());
+    $cols_output += scalar(&Apache::lonstatistics::get_selected_groups());
     #
     # Time restrictions
     my $time_string;
@@ -1326,11 +1366,11 @@ sub Excel_output {
     $excel_sheet->write($rows_output,$cols_output++,
                         'Compiled on '.localtime(time));
     #
-    $rows_output++; 
+    $rows_output++;
     $cols_output=0;
     ##
     ## Sequence Statistics
-    ## 
+    ##
     &write_headers($excel_sheet,$format,\$rows_output,\$cols_output,
                    \@SeqFields);
     foreach my $seq (@sequences) {
@@ -1408,7 +1448,7 @@ sub write_headers {
     foreach my $field (@{$Fields}) {
         next if ($field->{'selected'} ne 'yes');
         next if ($field->{'name'} eq 'problem_num');
-        # Use english for excel as I am not sure how well excel handles 
+        # Use english for excel as I am not sure how well excel handles
         # other character sets....
         $excel_sheet->write($$rows_output,$$cols_output,
                             $field->{'title'},
@@ -1432,7 +1472,7 @@ sub compute_statistics_on_sequence {
     my @Data;
     foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)) {
         foreach my $part (@{$res->parts}) {
-            next if ($res->is_survey($part));
+            next if (($res->is_survey($part)) || ($res->is_anonsurvey($part))) ;
             #
             # This is where all the work happens
             my $data = &get_statistics($seq,$res,$part,scalar(@StatsArray)+1);
@@ -1521,13 +1561,13 @@ sub sort_data {
 
 =item &get_statistics()
 
-Wrapper routine from the call to loncoursedata::get_problem_statistics.  
+Wrapper routine from the call to loncoursedata::get_problem_statistics.
 Calls lonstathelpers::get_time_limits() to limit the data set by time
 and &compute_discrimination_factor
 
 Inputs: $sequence, $resource, $part, $problem_num
 
-Returns: Hash reference with statistics data from 
+Returns: Hash reference with statistics data from
 loncoursedata::get_problem_statistics.
 
 =cut
@@ -1539,10 +1579,11 @@ sub get_statistics {
     #
     my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
     my $symb = $resource->symb;
-    my $courseid = $ENV{'request.course.id'};
+    my $courseid = $env{'request.course.id'};
     #
     my $data = &Apache::loncoursedata::get_problem_statistics
                         ([&Apache::lonstatistics::get_selected_sections()],
+                         [&Apache::lonstatistics::get_selected_groups()],
                          $Apache::lonstatistics::enrollment_status,
                          $symb,$part,$courseid,$starttime,$endtime);
     $data->{'symb'}        = $symb;
@@ -1551,10 +1592,10 @@ sub get_statistics {
     $data->{'container'}   = $sequence->compTitle;
     $data->{'title'}       = $resource->compTitle;
     $data->{'title.link'}  = $resource->src.'?symb='.
-        &Apache::lonnet::escape($resource->symb);
+        &escape($resource->symb);
     #
     if ($SelectedFields{'deg_of_disc'}) {
-        $data->{'deg_of_disc'} = 
+        $data->{'deg_of_disc'} =
             &compute_discrimination_factor($resource,$part,$sequence);
     }
     #
@@ -1564,12 +1605,11 @@ sub get_statistics {
         my $sections = '"'.join(' ',@Sections).'"';
         $sections =~ s/&+/_/g;  # Ensure no special characters
         $data->{'sections'}=$sections;
-        $data->{'course'} = $ENV{'request.course.id'};
+        $data->{'course'} = $env{'request.course.id'};
         my $urlres=(&Apache::lonnet::decode_symb($resource->symb))[2];
-        $data->{'urlres'}=$urlres;
-        my %storestats = 
+        my %storestats =
             &LONCAPA::lonmetadata::dynamic_metadata_storage($data);
-        my ($dom,$user) = $urlres=~/^(\w+)\/(\w+)/; 
+        my ($dom,$user) = ($urlres=~m{^($LONCAPA::domain_re)/($LONCAPA::username_re)});
         &Apache::lonnet::put('nohist_resevaldata',\%storestats,$dom,$user);
     }
     #
@@ -1577,16 +1617,16 @@ sub get_statistics {
         ($data->{'num_solved'}+0.1);
     #
     # Get the due date for research purposes (commented out most of the time)
-#    $data->{'duedate'} = 
-#        &Apache::lonnet::EXT('resource.'.$part.'.duedate',$symb);
-#    $data->{'opendate'} = 
-#        &Apache::lonnet::EXT('resource.'.$part.'.opendate',$symb);
-#    $data->{'maxtries'} = 
-#        &Apache::lonnet::EXT('resource.'.$part.'.maxtries',$symb);
-#    $data->{'hinttries'} =
-#        &Apache::lonnet::EXT('resource.'.$part.'.hinttries',$symb);
-    $data->{'weight'} =
-        &Apache::lonnet::EXT('resource.'.$part.'.weight',$symb);
+#    my $duedate = &Apache::lonnet::EXT('resource.'.$part.'.duedate',$symb);;
+#    my $opendate = &Apache::lonnet::EXT('resource.'.$part.'.opendate',$symb);
+#    my $maxtries = &Apache::lonnet::EXT('resource.'.$part.'.maxtries',$symb);
+#    my $hinttries = &Apache::lonnet::EXT('resource.'.$part.'.hinttries',$symb);
+    my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight',$symb);
+    $data->{'weight'} = $weight;
+#    $data->{'duedate'} = $duedate;
+#    $data->{'opendate'} = $opendate;
+#    $data->{'maxtries'} = $maxtries;
+#    $data->{'hinttries'} = $hinttries;
 #    $data->{'resptypes'} = join(',',@{$resource->{'partdata'}->{$part}->{'ResponseTypes'}});
     return $data;
 }
@@ -1617,30 +1657,31 @@ sub compute_discrimination_factor {
     #
     # rank
     my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
-    my $ranking = 
+    my $ranking =
         &Apache::loncoursedata::rank_students_by_scores_on_resources
         (\@Resources,
          [&Apache::lonstatistics::get_selected_sections()],
+         [&Apache::lonstatistics::get_selected_groups()],
          $Apache::lonstatistics::enrollment_status,undef,
-         $starttime,$endtime);
+         $starttime,$endtime, $symb);
     #
     # compute their percent scores on the problems in the sequence,
     my $number_to_grab = int(scalar(@{$ranking})/4);
     my $num_students = scalar(@{$ranking});
-    my @BottomSet = map { $_->[&Apache::loncoursedata::RNK_student()]; 
+    my @BottomSet = map { $_->[&Apache::loncoursedata::RNK_student()];
                       } @{$ranking}[0..$number_to_grab];
-    my @TopSet    = 
-        map { 
-            $_->[&Apache::loncoursedata::RNK_student()]; 
-          } @{$ranking}[($num_students-$number_to_grab)..($num_students-1)];
+    my @TopSet    =
+        map {
+            $_->[&Apache::loncoursedata::RNK_student()];
+          } @{$ranking}[-$number_to_grab..0];
     if (! @BottomSet || (@BottomSet == 1 && $BottomSet[0] eq '') ||
         ! @TopSet    || (@TopSet    == 1 && $TopSet[0]    eq '')) {
         return 'nan';
     }
-    my ($bottom_sum,$bottom_max) = 
+    my ($bottom_sum,$bottom_max) =
         &Apache::loncoursedata::get_sum_of_scores($symb,$part,\@BottomSet,
                                                   undef,$starttime,$endtime);
-    my ($top_sum,$top_max) = 
+    my ($top_sum,$top_max) =
         &Apache::loncoursedata::get_sum_of_scores($symb,$part,\@TopSet,
                                                   undef,$starttime,$endtime);
     my $deg_of_disc;
@@ -1663,10 +1704,10 @@ sub compute_discrimination_factor {
 ##
 ## K=the number of items in your test
 ## M=the mean score on the test
-## s=the standard deviation of the scores on your test 
+## s=the standard deviation of the scores on your test
 ##
 ## then:
-## 
+##
 ## KR-21 rk= [K/(K-1)] * [1- (M*(K-M))/(K*s^2))]
 ##
 ###############################################
@@ -1683,9 +1724,10 @@ sub compute_sequence_statistics {
     my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
     #
     # First compute statistics based on student scores
-    my ($smin,$smax,$sMean,$sSTD,$scount,$sMAX) = 
+    my ($smin,$smax,$sMean,$sSTD,$scount,$sMAX) =
         &Apache::loncoursedata::score_stats
                     ([&Apache::lonstatistics::get_selected_sections()],
+                     [&Apache::lonstatistics::get_selected_groups()],
                      $Apache::lonstatistics::enrollment_status,
                      \@Resources,$starttime,$endtime,undef);
     $SeqStat{$symb}->{'title'}  = $seq->compTitle;
@@ -1697,10 +1739,11 @@ sub compute_sequence_statistics {
     $SeqStat{$symb}->{'max_possible'} = $sMAX;
     #
     # Compute statistics based on the number of correct problems
-    # 'correct' is taken to mean 
+    # 'correct' is taken to mean
     my ($cmin,$cmax,$cMean,$cSTD,$ccount)=
         &Apache::loncoursedata::count_stats
         ([&Apache::lonstatistics::get_selected_sections()],
+         [&Apache::lonstatistics::get_selected_groups()],
          $Apache::lonstatistics::enrollment_status,
          \@Resources,$starttime,$endtime,undef);
     my $K = $part_count;