--- loncom/interface/statistics/lonproblemstatistics.pm	2004/07/22 17:33:29	1.92
+++ loncom/interface/statistics/lonproblemstatistics.pm	2010/02/28 23:58:54	1.118
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemstatistics.pm,v 1.92 2004/07/22 17:33:29 matthew Exp $
+# $Id: lonproblemstatistics.pm,v 1.118 2010/02/28 23:58:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,7 +50,7 @@ Excel files, and plots.
 package Apache::lonproblemstatistics;
 
 use strict;
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon;
 use Apache::loncoursedata;
@@ -60,6 +60,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
@@ -121,11 +123,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',
@@ -231,6 +233,17 @@ my @Fields = (
              selectable => 'yes',
              defaultselected => 'yes',
            },
+           { name   => 'tries_per_correct',
+             title  => 'tries/correct',
+             align  => 'right',
+             color  => '#FFDDDD',
+             format => '%4.1f',
+             sortable  => 'yes',
+             graphable => 'yes',
+             long_title => 'Tries per Correct Answer',
+             selectable => 'yes',
+             defaultselected => 'yes',
+           },
            { name   => 'num_wrong',
              title  => '#Wrng',
              align  => 'right',
@@ -238,6 +251,17 @@ my @Fields = (
              format => '%4.1f',
              sortable  => 'yes',
              graphable => 'yes',
+             long_title => 'Number of students whose final answer is wrong',
+             selectable => 'yes',
+             defaultselected => 'yes',
+           },
+           { name   => 'per_wrong',
+             title  => '%Wrng',
+             align  => 'right',
+             color  => '#FFDDDD',
+             format => '%4.1f',
+             sortable  => 'yes',
+             graphable => 'yes',
              long_title => 'Percent of students whose final answer is wrong',
              selectable => 'yes',
              defaultselected => 'yes',
@@ -309,6 +333,40 @@ my @Fields = (
 #             selectable => 'no',
 #             defaultselected => 'yes',
 #            },
+##   maxtries included for research purposes.  Commented out most of the time.
+#           { name => 'maxtries',
+#             title => 'Maxtries',
+#             align => 'left',
+#             color => '#FFFFFF',
+#             sortable => 'no',
+#             graphable => 'no',
+#             long_title => 'Maximum number of tries',
+#             selectable => 'no',
+#             defaultselected => 'yes',
+#            },
+##   hinttries included for research purposes.  Commented out most of the time.
+#           { name => 'hinttries',
+#             title => 'hinttries',
+#             align => 'left',
+#             color => '#FFFFFF',
+#             sortable => 'no',
+#             graphable => 'no',
+#             long_title => 'Number of tries before a hint appears',
+#             selectable => 'no',
+#             defaultselected => 'yes',
+#            },
+#
+##   problem weight for instructor
+           { name => 'weight',
+             title => 'weight',
+             align => 'right',
+             color => '#FFFFFF',
+             sortable => 'no',
+             graphable => 'no',
+             long_title => 'Problem weight (for instructor)',
+             selectable => 'yes',
+             defaultselected => 'yes',
+            },
 );
 
 my @SeqFields = (
@@ -317,7 +375,7 @@ my @SeqFields = (
              align  => 'left',
              color  => '#FFFFE6',
              special  => 'no',
-             sortable => 'no', 
+             sortable => 'no',
              selectable => 'yes',
              defaultselected => 'no',
            },
@@ -452,7 +510,7 @@ my @SeqFields = (
              long_title => 'KR-21 reliability statistic',
              selectable => 'yes',
              defaultselected => 'no',
-           },           
+           },
 );
 
 my %SelectedFields;
@@ -460,35 +518,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)
@@ -503,7 +561,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'}}++;
@@ -519,7 +577,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');
@@ -552,48 +610,51 @@ 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 .= &Apache::lonhtmlcommon::breadcrumbs('Overall Problem Statistics',
+						'Statistics_Overall_Key');
+    $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">';
     #
-    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><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 .= &Apache::lonstatistics::map_select('Maps','multiple,all',5);
+    $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><span class="LC_nobreak">'
+           .&mt('Status: [_1]',
+                    '<input type="text" name="stats_status"'
+                   .' size="60" value="" readonly="readonly" />')
+           .'</span></p>';
     #
+    $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;
 }
@@ -611,12 +672,23 @@ Main interface to problem statistics.
 
 ###############################################
 ###############################################
+my $navmap;
+my @sequences;
+
+sub clean_up {
+    undef($navmap);
+    undef(@sequences);
+}
+
 sub BuildProblemStatisticsPage {
     my ($r,$c)=@_;
+    undef($navmap);
+    undef(@sequences);
     #
     my %Saveable_Parameters = ('Status' => 'scalar',
                                'statsoutputmode' => 'scalar',
                                'Section' => 'array',
+                               'Groups' => 'array',
                                'StudentData' => 'array',
                                'Maps' => 'array',
                                'fieldselections'=> 'array');
@@ -634,10 +706,10 @@ sub BuildProblemStatisticsPage {
     # Finally let the user know we are here
     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) {
@@ -645,14 +717,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();
@@ -661,15 +735,31 @@ sub BuildProblemStatisticsPage {
     # it does not slow things down noticably.
     &Apache::loncoursedata::populate_weight_table();
     #
-    if (exists($ENV{'form.Excel'})) {
+    ($navmap,@sequences) =
+        &Apache::lonstatistics::selected_sequences_with_assessments();
+    if (! ref($navmap)) {
+        $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>'.
+                  &Apache::lonstatistics::section_and_enrollment_description().
+                  '</h4>');
         &Excel_output($r);
-    } else { 
+    } else {
         $r->print('<input type="submit" name="Excel" value="'.
                   &mt('Produce Excel Output').'" />'.'&nbsp;'x5);
         $r->rflush();
+        $r->print('<h4>'.
+                  &Apache::lonstatistics::section_and_enrollment_description().
+                  '</h4>');
         my $count = 0;
-        foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-            $count += $seq->{'num_assess_parts'};
+        foreach my $seq (@sequences) {
+            my @resources =
+                &Apache::lonstathelpers::get_resources($navmap,$seq);
+            $count += scalar(@resources);
         }
         if ($count > 10) {
             $r->print('<h2>'.
@@ -681,9 +771,9 @@ sub BuildProblemStatisticsPage {
             $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);
         }
@@ -698,6 +788,7 @@ sub BuildProblemStatisticsPage {
             &output_sequence_statistics($r);
         }
     }
+    &clean_up();
     return;
 }
 
@@ -711,9 +802,8 @@ sub output_sequence_statistics {
               '<table border="0" cellpadding="3">'."\n".
               '<tr bgcolor="#FFFFE6">');
     $r->print(&sequence_html_header());
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+    foreach my $seq (@sequences) {
         last if ($c->aborted);
-        next if ($seq->{'num_assess'} < 1);
         &compute_sequence_statistics($seq);
         $r->print(&sequence_html_output($seq));
     }
@@ -736,10 +826,9 @@ sub output_html_by_sequence {
     my $c = $r->connection();
     $r->print(&html_preamble());
     #
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+    foreach my $seq (@sequences) {
         last if ($c->aborted);
-        next if ($seq->{'num_assess'} < 1);
-        $r->print("<h3>".$seq->{'title'}."</h3>".
+        $r->print("<h3>".$seq->compTitle."</h3>".
                   '<table border="0"><tr><td bgcolor="#777777">'."\n".
                   '<table border="0" cellpadding="3">'."\n".
                   '<tr bgcolor="#FFFFE6">'.
@@ -760,7 +849,7 @@ 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) {
@@ -782,7 +871,7 @@ sub output_html_stats {
 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)) {
@@ -876,7 +965,7 @@ sub sequence_html_header {
 
 sub sequence_html_output {
     my ($seq) = @_;
-    my $data = $SeqStat{$seq->{'symb'}};
+    my $data = $SeqStat{$seq->symb};
     my $row = '<tr>';
     foreach my $field (@SeqFields) {
         next if ($field->{'selected'} ne 'yes');
@@ -906,7 +995,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') {
@@ -936,7 +1025,7 @@ sub make_single_stat_plot {
     }
     #
     # Build up the data sets to plot
-    my @Labels; 
+    my @Labels;
     my @Data;
     my $max = 1;
     foreach my $data (@StatsArray) {
@@ -976,7 +1065,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'};
@@ -1066,7 +1155,7 @@ sub degrees_plot {
     </curve>
 </gnuplot>
 END
-    my $plotresult = 
+    my $plotresult =
         '<p>'.&Apache::lonxml::xmlparse($r,'web',$plot).'</p>'.$/;
     $r->print($plotresult);
     return;
@@ -1151,7 +1240,7 @@ sub tries_data_plot {
     </curve>
 </gnuplot>
 END
-    my $plotresult = 
+    my $plotresult =
         '<p>'.&Apache::lonxml::xmlparse($r,'web',$plot).'</p>'.$/;
     $r->print($plotresult);
     return;
@@ -1160,8 +1249,8 @@ END
 sub plot_dropdown {
     my $current = '';
     #
-    if (defined($ENV{'form.plot'})) {
-        $current = $ENV{'form.plot'};
+    if (defined($env{'form.plot'})) {
+        $current = $env{'form.plot'};
     }
     #
     my @Additional_Plots = (
@@ -1205,40 +1294,21 @@ sub Excel_output {
     &compute_all_statistics($r);
     my $c = $r->connection;
     return if ($c->aborted());
+    #
+    my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
     ##
     ## Create the excel workbook
-    my $filename = '/prtspool/'.
-        $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
-        time.'_'.rand(1000000000).'.xls';
-    my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
-    #
-    # Create sheet
-    my $excel_workbook = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);
-    #
-    # Check for errors
-    if (! defined($excel_workbook)) {
-        $r->log_error("Error creating excel spreadsheet $filename: $!");
-        $r->print(&mt("Problems creating new Excel file.  ".
-                  "This error has been logged.  ".
-                  "Please alert your LON-CAPA administrator."));
-        return 0;
-    }
-    #
-    # The excel spreadsheet stores temporary data in files, then put them
-    # together.  If needed we should be able to disable this (memory only).
-    # The temporary directory must be specified before calling 'addworksheet'.
-    # File::Temp is used to determine the temporary directory.
-    $excel_workbook->set_tempdir($Apache::lonnet::tmpdir);
+    my ($excel_workbook,$filename,$format) =
+        &Apache::loncommon::create_workbook($r);
+    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);
     }
     my $excel_sheet = $excel_workbook->addworksheet(
         &Apache::loncommon::clean_excel_name($sheetname));
-    #
-    my $format = &Apache::loncommon::define_excel_formats($excel_workbook);
     ##
     ## Begin creating excel sheet
     ##
@@ -1246,17 +1316,17 @@ 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;
     #
     # Put a description of the sections listed
     my $sectionstring = '';
     $excel_sheet->write($rows_output,$cols_output++,
-                        &Apache::lonstathelpers::sections_description
-                            (@Apache::lonstatistics::SelectedSections),
+                        &Apache::lonstatistics::section_and_enrollment_description('plaintext'),
                         $format->{'h3'});
-    $cols_output += scalar(@Apache::lonstatistics::SelectedSections);
+    $cols_output += scalar(&Apache::lonstatistics::get_selected_sections());
+    $cols_output += scalar(&Apache::lonstatistics::get_selected_groups());
     #
     # Time restrictions
     my $time_string;
@@ -1281,16 +1351,15 @@ 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 (&Apache::lonstatistics::Sequences_with_Assess()) {
-        next if ($seq->{'num_assess'} < 1);
-        my $data = $SeqStat{$seq->{'symb'}};
+    foreach my $seq (@sequences) {
+        my $data = $SeqStat{$seq->symb};
         $cols_output=0;
         foreach my $field (@SeqFields) {
             next if ($field->{'selected'} ne 'yes');
@@ -1364,7 +1433,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'},
@@ -1386,10 +1455,9 @@ sub write_headers {
 sub compute_statistics_on_sequence {
     my ($seq) = @_;
     my @Data;
-    foreach my $res (@{$seq->{'contents'}}) {
-        next if ($res->{'type'} ne 'assessment');
-        foreach my $part (@{$res->{'parts'}}) {
-            next if ($res->{'partdata'}->{$part}->{'Survey'});
+    foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)) {
+        foreach my $part (@{$res->parts}) {
+            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);
@@ -1407,9 +1475,8 @@ sub compute_all_statistics {
         return;
     }
     my $c = $r->connection;
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+    foreach my $seq (@sequences) {
         last if ($c->aborted);
-        next if ($seq->{'num_assess'} < 1);
         &compute_sequence_statistics($seq);
         &compute_statistics_on_sequence($seq);
     }
@@ -1479,13 +1546,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
@@ -1496,46 +1563,56 @@ sub get_statistics {
     my ($sequence,$resource,$part,$problem_num) = @_;
     #
     my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
-    my $symb = $resource->{'symb'};
-    my $courseid = $ENV{'request.course.id'};
+    my $symb = $resource->symb;
+    my $courseid = $env{'request.course.id'};
     #
     my $data = &Apache::loncoursedata::get_problem_statistics
-                        (\@Apache::lonstatistics::SelectedSections,
+                        ([&Apache::lonstatistics::get_selected_sections()],
+                         [&Apache::lonstatistics::get_selected_groups()],
                          $Apache::lonstatistics::enrollment_status,
                          $symb,$part,$courseid,$starttime,$endtime);
     $data->{'symb'}        = $symb;
     $data->{'part'}        = $part;
     $data->{'problem_num'} = $problem_num;
-    $data->{'container'}   = $sequence->{'title'};
-    $data->{'title'}       = $resource->{'title'};
-    $data->{'title.link'}  = $resource->{'src'}.'?symb='.
-        &Apache::lonnet::escape($resource->{'symb'});
+    $data->{'container'}   = $sequence->compTitle;
+    $data->{'title'}       = $resource->compTitle;
+    $data->{'title.link'}  = $resource->src.'?symb='.
+        &escape($resource->symb);
     #
     if ($SelectedFields{'deg_of_disc'}) {
-        $data->{'deg_of_disc'} = 
+        $data->{'deg_of_disc'} =
             &compute_discrimination_factor($resource,$part,$sequence);
     }
     #
     # Store in metadata if computations were done for all students
     if ($data->{'num_students'} > 1) {
-        my @Sections = @Apache::lonstatistics::SelectedSections;
+        my @Sections = &Apache::lonstatistics::get_selected_sections();
         my $sections = '"'.join(' ',@Sections).'"';
         $sections =~ s/&+/_/g;  # Ensure no special characters
         $data->{'sections'}=$sections;
-        $data->{'course'} = $ENV{'request.course.id'};
-        my $urlres=(&Apache::lonnet::decode_symb($resource->{'symb'}))[2];
+        $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);
     }
     #
+    $data->{'tries_per_correct'} = $data->{'tries'} / 
+        ($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);
+#    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;
 }
@@ -1556,40 +1633,42 @@ Returns: integer between -1 and 1
 ###############################################
 ###############################################
 sub compute_discrimination_factor {
-    my ($resource,$part,$sequence) = @_;
+    my ($resource,$part,$seq) = @_;
+    my $symb = $resource->symb;
     my @Resources;
-    foreach my $res (@{$sequence->{'contents'}}) {
-        next if ($res->{'symb'} eq $resource->{'symb'});
-        push (@Resources,$res->{'symb'});
+    foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)){
+        next if ($res->symb eq $symb);
+        push (@Resources,$res->symb);
     }
     #
     # rank
     my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
-    my $ranking = 
+    my $ranking =
         &Apache::loncoursedata::rank_students_by_scores_on_resources
         (\@Resources,
-         \@Apache::lonstatistics::SelectedSections,
+         [&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) = 
-        &Apache::loncoursedata::get_sum_of_scores($resource,$part,\@BottomSet,
+    my ($bottom_sum,$bottom_max) =
+        &Apache::loncoursedata::get_sum_of_scores($symb,$part,\@BottomSet,
                                                   undef,$starttime,$endtime);
-    my ($top_sum,$top_max) = 
-        &Apache::loncoursedata::get_sum_of_scores($resource,$part,\@TopSet,
+    my ($top_sum,$top_max) =
+        &Apache::loncoursedata::get_sum_of_scores($symb,$part,\@TopSet,
                                                   undef,$starttime,$endtime);
     my $deg_of_disc;
     if ($top_max == 0 || $bottom_max==0) {
@@ -1611,31 +1690,33 @@ 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))]
 ##
 ###############################################
 ###############################################
 sub compute_sequence_statistics {
     my ($seq) = @_;
-    my $symb = $seq->{'symb'};
+    my $symb = $seq->symb;
     my @Resources;
-    foreach my $res (@{$seq->{'contents'}}) {
-        next if ($res->{'type'} ne 'assessment');
-        push (@Resources,$res->{'symb'});
+    my $part_count;
+    foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)) {
+        push (@Resources,$res->symb);
+        $part_count += scalar(@{$res->parts});
     }
     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::SelectedSections,
+                    ([&Apache::lonstatistics::get_selected_sections()],
+                     [&Apache::lonstatistics::get_selected_groups()],
                      $Apache::lonstatistics::enrollment_status,
                      \@Resources,$starttime,$endtime,undef);
-    $SeqStat{$symb}->{'title'}  = $seq->{'title'};
+    $SeqStat{$symb}->{'title'}  = $seq->compTitle;
     $SeqStat{$symb}->{'scoremax'}  = $smax;
     $SeqStat{$symb}->{'scoremin'}  = $smin;
     $SeqStat{$symb}->{'scoremean'} = $sMean;
@@ -1644,13 +1725,14 @@ 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::SelectedSections,
+        ([&Apache::lonstatistics::get_selected_sections()],
+         [&Apache::lonstatistics::get_selected_groups()],
          $Apache::lonstatistics::enrollment_status,
          \@Resources,$starttime,$endtime,undef);
-    my $K = $seq->{'num_assess_parts'};
+    my $K = $part_count;
     my $kr_21;
     if ($K > 1 && $cSTD > 0) {
         $kr_21 =  ($K/($K-1)) * (1 - $cMean*($K-$cMean)/($K*$cSTD**2));