--- loncom/interface/statistics/lonproblemstatistics.pm	2004/04/01 20:02:56	1.79
+++ loncom/interface/statistics/lonproblemstatistics.pm	2004/05/14 20:30:17	1.85
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemstatistics.pm,v 1.79 2004/04/01 20:02:56 matthew Exp $
+# $Id: lonproblemstatistics.pm,v 1.85 2004/05/14 20:30:17 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -55,6 +55,7 @@ use Apache::loncommon();
 use Apache::lonhtmlcommon;
 use Apache::loncoursedata;
 use Apache::lonstatistics;
+use LONCAPA::lonmetadata();
 use Apache::lonlocal;
 use Spreadsheet::WriteExcel;
 use Apache::lonstathelpers();
@@ -95,13 +96,17 @@ my %SeqStat;    # keys are symbs, values
 ##                                      statistics display?
 ## selected        yes     (yes|no)     Is the column selected by default?
 ##
+## format          no      sprintf format string
+##
+## excel_format    no      excel format type 
+##                               (see &Apache::loncommon::define_excel_formats
 my @Fields = (
            { name => 'problem_num',
              title => 'P#',
              align => 'right',
              color => '#FFFFE6',
              selectable => 'no',
-             selected => 'yes',
+             defaultselected => 'yes',
            },
            { name   => 'container',
              title  => 'Sequence or Folder',
@@ -109,7 +114,7 @@ my @Fields = (
              color  => '#FFFFE6',
              sortable => 'yes',
              selectable => 'no',
-             selected => 'yes',
+             defaultselected => 'yes',
            },
            { name   => 'title',
              title  => 'Title',
@@ -118,14 +123,14 @@ my @Fields = (
              special  => 'link',
              sortable => 'yes', 
              selectable => 'no',
-             selected => 'yes',
+             defaultselected => 'yes',
            },
            { name   => 'part', 
              title  => 'Part',
              align  => 'left',
              color  => '#FFFFE6',
              selectable => 'no',
-             selected => 'yes',
+             defaultselected => 'yes',
            },
            { name   => 'num_students',
              title  => '#Stdnts',
@@ -136,7 +141,7 @@ my @Fields = (
              graphable => 'yes',
              long_title => 'Number of Students Attempting Problem',
              selectable => 'yes',
-             selected => 'yes',
+             defaultselected => 'yes',
            },
            { name   => 'tries',
              title  => 'Tries',
@@ -147,7 +152,7 @@ my @Fields = (
              graphable => 'yes',
              long_title => 'Total Number of Tries',
              selectable => 'yes',
-             selected => 'yes',
+             defaultselected => 'yes',
            },
            { name   => 'max_tries',
              title  => 'Max Tries',
@@ -158,7 +163,7 @@ my @Fields = (
              graphable => 'yes',
              long_title => 'Maximum Number of Tries',
              selectable => 'yes',
-             selected => 'yes',
+             defaultselected => 'yes',
            },
            { name   => 'min_tries',
              title  => 'Min Tries',
@@ -169,7 +174,7 @@ my @Fields = (
              graphable => 'yes',
              long_title => 'Minumum Number of Tries',
              selectable => 'yes',
-             selected => 'yes',
+             defaultselected => 'yes',
            },
            { name   => 'mean_tries',
              title  => 'Mean Tries',
@@ -180,7 +185,7 @@ my @Fields = (
              graphable => 'yes',
              long_title => 'Average Number of Tries',
              selectable => 'yes',
-             selected => 'yes',
+             defaultselected => 'yes',
            },
            { name   => 'std_tries',
              title  => 'S.D. tries',
@@ -191,7 +196,7 @@ my @Fields = (
              graphable => 'yes',
              long_title => 'Standard Deviation of Number of Tries',
              selectable => 'yes',
-             selected => 'yes',
+             defaultselected => 'yes',
            },
            { name   => 'skew_tries',
              title  => 'Skew Tries',
@@ -202,7 +207,7 @@ my @Fields = (
              graphable => 'yes',
              long_title => 'Skew of Number of Tries',
              selectable => 'yes',
-             selected => 'no',
+             defaultselected => 'no',
            },
            { name   => 'num_solved',
              title  => '#YES',
@@ -213,7 +218,7 @@ my @Fields = (
              graphable => 'yes',
              long_title => 'Number of Students able to Solve',
              selectable => 'yes',
-             selected => 'yes',
+             defaultselected => 'yes',
            },
            { name   => 'num_override',
              title  => '#yes',
@@ -224,7 +229,7 @@ my @Fields = (
              graphable => 'yes',
              long_title => 'Number of Students given Override',
              selectable => 'yes',
-             selected => 'yes',
+             defaultselected => 'yes',
            },
            { name   => 'num_wrong',
              title  => '#Wrng',
@@ -235,7 +240,7 @@ my @Fields = (
              graphable => 'yes',
              long_title => 'Percent of students whose final answer is wrong',
              selectable => 'yes',
-             selected => 'yes',
+             defaultselected => 'yes',
            },
            { name   => 'deg_of_diff',
              title  => 'DoDiff',
@@ -247,7 +252,7 @@ my @Fields = (
              long_title => 'Degree of Difficulty'.
                            '[ 1 - ((#YES+#yes) / Tries) ]',
              selectable => 'yes',
-             selected => 'yes',
+             defaultselected => 'yes',
            },
            { name   => 'deg_of_disc',
              title  => 'DoDisc',
@@ -258,8 +263,41 @@ my @Fields = (
              graphable => 'yes',
              long_title => 'Degree of Discrimination',
              selectable => 'yes',
-             selected => 'no',
+             defaultselected => 'no',
            },
+##   duedate included for research purposes.  Commented out most of the time.
+#           { name => 'duedate',
+#             title => 'Due Date',
+#             align => 'left',
+#             color => '#FFFFFF',
+#             sortable => 'yes',
+#             graphable => 'no',
+#             long_title => 'Due date of resource for instructor',
+#             selectable => 'no',
+#             defaultselected => 'yes',
+#            },
+##   opendate included for research purposes.  Commented out most of the time.
+#           { name => 'opendate',
+#             title => 'Open Date',
+#             align => 'left',
+#             color => '#FFFFFF',
+#             sortable => 'yes',
+#             graphable => 'no',
+#             long_title => 'date resource became answerable',
+#             selectable => 'no',
+#             defaultselected => 'yes',
+#            },
+##   symb included for research purposes.  Commented out most of the time.
+#           { name => 'symb',
+#             title => 'Symb',
+#             align => 'left',
+#             color => '#FFFFFF',
+#             sortable => 'yes',
+#             graphable => 'no',
+#             long_title => 'Unique LON-CAPA identifier for problem',
+#             selectable => 'no',
+#             defaultselected => 'yes',
+#            },
 );
 
 my @SeqFields = (
@@ -270,7 +308,7 @@ my @SeqFields = (
              special  => 'no',
              sortable => 'no', 
              selectable => 'yes',
-             selected => 'no',
+             defaultselected => 'no',
            },
            { name   => 'items',
              title  => '#Items',
@@ -281,7 +319,7 @@ my @SeqFields = (
              graphable => 'no',
              long_title => 'Number of Items in Sequence',
              selectable => 'yes',
-             selected => 'no',
+             defaultselected => 'no',
            },
            { name   => 'scoremean',
              title  => 'Score Mean',
@@ -292,7 +330,7 @@ my @SeqFields = (
              graphable => 'no',
              long_title => 'Mean Sequence Score',
              selectable => 'yes',
-             selected => 'no',
+             defaultselected => 'no',
            },
            { name   => 'scorestd',
              title  => 'Score STD',
@@ -303,7 +341,7 @@ my @SeqFields = (
              graphable => 'no',
              long_title => 'Standard Deviation of Sequence Scores',
              selectable => 'yes',
-             selected => 'no',
+             defaultselected => 'no',
            },
            { name   => 'scoremax',
              title  => 'Score Max',
@@ -314,7 +352,7 @@ my @SeqFields = (
              graphable => 'no',
              long_title => 'Maximum Sequence Score',
              selectable => 'yes',
-             selected => 'no',
+             defaultselected => 'no',
            },
            { name   => 'scoremin',
              title  => 'Score Min',
@@ -325,7 +363,7 @@ my @SeqFields = (
              graphable => 'no',
              long_title => 'Minumum Sequence Score',
              selectable => 'yes',
-             selected => 'no',
+             defaultselected => 'no',
            },
            { name   => 'scorecount',
              title  => 'Score N',
@@ -336,7 +374,7 @@ my @SeqFields = (
              graphable => 'no',
              long_title => 'Number of Students in score computations',
              selectable => 'yes',
-             selected => 'no',
+             defaultselected => 'no',
            },
            { name   => 'countmean',
              title  => 'Count Mean',
@@ -347,7 +385,7 @@ my @SeqFields = (
              graphable => 'no',
              long_title => 'Mean Sequence Score',
              selectable => 'yes',
-             selected => 'no',
+             defaultselected => 'no',
            },
            { name   => 'countstd',
              title  => 'Count STD',
@@ -358,7 +396,7 @@ my @SeqFields = (
              graphable => 'no',
              long_title => 'Standard Deviation of Sequence Scores',
              selectable => 'yes',
-             selected => 'no',
+             defaultselected => 'no',
            },
            { name   => 'countmax',
              title  => 'Count Max',
@@ -369,7 +407,7 @@ my @SeqFields = (
              graphable => 'no',
              long_title => 'Maximum Number of Correct Problems',
              selectable => 'yes',
-             selected => 'no',
+             defaultselected => 'no',
            },
            { name   => 'countmin',
              title  => 'Count Min',
@@ -380,7 +418,7 @@ my @SeqFields = (
              graphable => 'no',
              long_title => 'Minumum Number of Correct Problems',
              selectable => 'yes',
-             selected => 'no',
+             defaultselected => 'no',
            },
            { name   => 'count',
              title  => 'Count N',
@@ -391,7 +429,7 @@ my @SeqFields = (
              graphable => 'no',
              long_title => 'Number of Students in score computations',
              selectable => 'yes',
-             selected => 'no',
+             defaultselected => 'no',
            },
            { name   => 'KR-21',
              title  => 'KR-21',
@@ -402,7 +440,7 @@ my @SeqFields = (
              graphable => 'no',
              long_title => 'KR-21 reliability statistic',
              selectable => 'yes',
-             selected => 'no',
+             defaultselected => 'no',
            },           
 );
 
@@ -415,12 +453,28 @@ sub parse_field_selection {
         $ENV{'form.fieldselections'} = [];
         foreach my $field (@Fields) {
             next if ($field->{'selectable'} ne 'yes');
-            if ($field->{'selected'} eq 'yes') {
+            if ($field->{'defaultselected'} eq 'yes') {
                 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') {
+            $NeededFields{'deg_of_diff'}++;
+            $NeededFields{'deg_of_disc'}++;
+        } elsif ($ENV{'form.plot'} eq 'tries statistics') {
+            $NeededFields{'mean_tries'}++;
+            $NeededFields{'std_tries'}++;
+            $NeededFields{'problem_num'}++;
+        } else {
+            $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'}];
@@ -429,8 +483,15 @@ sub parse_field_selection {
     # Set the field data and the selected fields (for easier checking)
     undef(%SelectedFields);
     foreach my $field (@Fields) {
-        next if ($field->{'selectable'} ne 'yes');
-        $field->{'selected'} = 'no';
+        if ($field->{'selectable'} ne 'yes') {
+            $field->{'selected'} = 'yes';
+        } else {
+            $field->{'selected'} = 'no';
+        }
+        if (exists($NeededFields{$field->{'name'}})) {
+            $field->{'selected'} = 'yes';
+            $SelectedFields{$field->{'name'}}++;
+        }
         foreach my $selection (@{$ENV{'form.fieldselections'}}) {
             if ($selection eq $field->{'name'} || $selection eq 'all') {
                 $field->{'selected'} = 'yes';
@@ -438,6 +499,11 @@ sub parse_field_selection {
             }
         }
     }
+    #
+    # Always show all the sequence statistics (for now)
+    foreach my $field (@SeqFields) {
+        $field->{'selected'} = 'yes';
+    }
     return;
 }
 
@@ -470,7 +536,9 @@ select sections, maps, and output.
 ###############################################
 ###############################################
 sub CreateInterface {
+    #
     &parse_field_selection();
+    #
     my $Str = '';
     $Str .= &Apache::lonhtmlcommon::breadcrumbs
         (undef,'Overall Problem Statistics','Statistics_Overall_Key');
@@ -793,15 +861,9 @@ sub sequence_html_header {
 sub sequence_html_output {
     my ($seq) = @_;
     my $data = $SeqStat{$seq->{'symb'}};
-#    $SeqStat{$symb}->{'max'}
-#    $SeqStat{$symb}->{'min'}
-#    $SeqStat{$symb}->{'mean'}
-#    $SeqStat{$symb}->{'std'}
-#    $SeqStat{$symb}->{'count'}
-#    $SeqStat{$symb}->{'max_possible'}
     my $row = '<tr>';
     foreach my $field (@SeqFields) {
-#        next if ($field->{'selected'} ne 'yes');
+        next if ($field->{'selected'} ne 'yes');
         $row .= '<td bgcolor="'.$field->{'color'}.'"';
         if (exists($field->{'align'})) {
             $row .= ' align="'.$field->{'align'}.'"';
@@ -945,6 +1007,11 @@ sub degrees_plot {
     my $diffdata .= '<data>'.join(',',@Labels).'</data>'.$/.
                     '<data>'.join(',',@Diff).'</data>'.$/;
     #
+    my $title = 'Degree of Discrimination\nand Degree of Difficulty';
+    if ($xmax > 50) {
+        $title = 'Degree of Discrimination and Degree of Difficulty';
+    }
+    #
     $plot=<<"END";
 <gnuplot 
     texfont="10"
@@ -955,7 +1022,7 @@ sub degrees_plot {
     align="center"
     border="on"
     transparent="on"
-    alttag="Sample Plot"
+    alttag="Degree of Discrimination and Degree of Difficulty Plot"
     samples="100"
     bgcolor="xffffff"
     height="$height"
@@ -964,7 +1031,7 @@ sub degrees_plot {
         pos="top right"
         title=""
         box="off" />
-    <title>Degree of Discrmination and Degree of Difficulty</title>
+    <title>$title</title>
     <axis xmin="0" ymin="$ymin" xmax="$xmax" ymax="$ymax" color="x000000" />
     <xlabel>Problem Number</xlabel>
     <curve 
@@ -1028,6 +1095,11 @@ 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';
+    }
+    #
     $plot=<<"END";
 <gnuplot 
     texfont="10"
@@ -1038,14 +1110,15 @@ sub tries_data_plot {
     align="center"
     border="on"
     transparent="on"
-    alttag="Sample Plot"
+    alttag="Mean and S.D of Tries Plot"
     samples="100"
     bgcolor="xffffff"
     height="$height"
     width="$width">
-    <title>Mean and S.D. of Tries</title>
+    <title>$title</title>
     <axis xmin="0" ymin="0" xmax="$xmax" ymax="$ymax" color="x000000" />
     <xlabel>Problem Number</xlabel>
+    <ylabel>Number of Tries</ylabel>
     <curve 
         linestyle="yerrorbars"
         name="S.D. Tries" 
@@ -1078,15 +1151,15 @@ sub plot_dropdown {
     my @Additional_Plots = (
                             { graphable=>'yes',
                               name => 'degrees',
-                              title => 'DoDisc and DoDiff' },
+                              title => 'Difficulty Indexes' },
                             { graphable=>'yes',
                               name => 'tries statistics',
-                              title => 'Mean and S.D. of Tries' });
+                              title => 'Tries Statistics' });
     #
     my $Str= "\n".'<select name="plot" size="1">';
     $Str .= '<option name="none"></option>'."\n";
     $Str .= '<option name="none2">none</option>'."\n";
-    foreach my $field (@Fields,@Additional_Plots) {
+    foreach my $field (@Additional_Plots,@Fields) {
         if (! exists($field->{'graphable'}) ||
             $field->{'graphable'} ne 'yes') {
             next;
@@ -1148,6 +1221,8 @@ sub Excel_output {
     }
     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
     ##
@@ -1155,28 +1230,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 = '';
-    my @Sections = @Apache::lonstatistics::SelectedSections;
-    if (scalar(@Sections) > 1) {
-        if (scalar(@Sections) > 2) {
-            my $last = pop(@Sections);
-            $sectionstring = "Sections ".join(', ',@Sections).', and '.$last;
-        } else {
-            $sectionstring = "Sections ".join(' and ',@Sections);
-        }
-    } else {
-        if ($Sections[0] eq 'all') {
-            $sectionstring = "All sections";
-        } else {
-            $sectionstring = "Section ".$Sections[0];
-        }
-    }
-    $excel_sheet->write($rows_output,$cols_output++,$sectionstring);
-    $cols_output += scalar(@Sections);
+    $excel_sheet->write($rows_output,$cols_output++,
+                        &Apache::lonstathelpers::sections_description
+                            (@Apache::lonstatistics::SelectedSections),
+                        $format->{'h3'});
+    $cols_output += scalar(@Apache::lonstatistics::SelectedSections);
     #
     # Time restrictions
     my $time_string;
@@ -1192,6 +1256,10 @@ sub Excel_output {
         # See note above about lonlocal:locallocaltime
         $time_string .= 'Data collected before '.localtime($endtime).'.';
     }
+    if (defined($time_string)) {
+        $excel_sheet->write($rows_output,$cols_output++,$time_string);
+        $cols_output+= 5;
+    }
     #
     # Put the date in there too
     $excel_sheet->write($rows_output,$cols_output++,
@@ -1199,38 +1267,49 @@ sub Excel_output {
     #
     $rows_output++; 
     $cols_output=0;
-    #
-    # Long Headers
-    foreach my $field (@Fields) {
-        next if ($field->{'name'} eq 'problem_num');
-        next if ($field->{'selected'} ne 'yes');
-        if (exists($field->{'long_title'})) {
+    ##
+    ## 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'}};
+        $cols_output=0;
+        foreach my $field (@SeqFields) {
+            next if ($field->{'selected'} ne 'yes');
+            my $fieldformat = undef;
+            if (exists($field->{'excel_format'})) {
+                $fieldformat = $format->{$field->{'excel_format'}};
+            }
             $excel_sheet->write($rows_output,$cols_output++,
-                                $field->{'long_title'});
-        } else {
-            $excel_sheet->write($rows_output,$cols_output++,'');
+                                $data->{$field->{'name'}},$fieldformat);
         }
+        $rows_output++;
+        $cols_output=0;
     }
+    ##
+    ## Resource Statistics
+    ##
     $rows_output++;
     $cols_output=0;
-    # Brief 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 
-        # other character sets....
-        $excel_sheet->write($rows_output,$cols_output++,$field->{'title'});
-    }
-    $rows_output++;
+    &write_headers($excel_sheet,$format,\$rows_output,\$cols_output,
+                   \@Fields);
+    #
     foreach my $data (@StatsArray) {
         $cols_output=0;
         foreach my $field (@Fields) {
             next if ($field->{'selected'} ne 'yes');
             next if ($field->{'name'} eq 'problem_num');
+            my $fieldformat = undef;
+            if (exists($field->{'excel_format'})) {
+                $fieldformat = $format->{$field->{'excel_format'}};
+            }
             $excel_sheet->write($rows_output,$cols_output++,
-                                $data->{$field->{'name'}});
+                                $data->{$field->{'name'}},$fieldformat);
         }
         $rows_output++;
+        $cols_output=0;
     }
     #
     $excel_workbook->close();
@@ -1243,6 +1322,44 @@ sub Excel_output {
     return;
 }
 
+##
+## &write_headers
+##
+sub write_headers {
+    my ($excel_sheet,$format,$rows_output,$cols_output,$Fields) = @_;
+    ##
+    ## First the long titles
+    foreach my $field (@{$Fields}) {
+        next if ($field->{'name'} eq 'problem_num');
+        next if ($field->{'selected'} ne 'yes');
+        if (exists($field->{'long_title'})) {
+            $excel_sheet->write($$rows_output,${$cols_output},
+                                $field->{'long_title'},
+                                $format->{'bold'});
+        } else {
+            $excel_sheet->write($$rows_output,${$cols_output},'');
+        }
+        ${$cols_output}+= 1;
+    }
+    ${$cols_output} =0;
+    ${$rows_output}+=1;
+    ##
+    ## Then the short titles
+    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 
+        # other character sets....
+        $excel_sheet->write($$rows_output,$$cols_output,
+                            $field->{'title'},
+                            $format->{'bold'});
+        $$cols_output+=1;
+    }
+    ${$cols_output} =0;
+    ${$rows_output}+=1;
+    return;
+}
+
 ##################################################
 ##################################################
 ##
@@ -1276,6 +1393,7 @@ sub compute_all_statistics {
     foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
         last if ($c->aborted);
         next if ($seq->{'num_assess'} < 1);
+        &compute_sequence_statistics($seq);
         &compute_statistics_on_sequence($seq);
     }
 }
@@ -1368,6 +1486,7 @@ sub get_statistics {
                         (\@Apache::lonstatistics::SelectedSections,
                          $Apache::lonstatistics::enrollment_status,
                          $symb,$part,$courseid,$starttime,$endtime);
+    $data->{'symb'}        = $symb;
     $data->{'part'}        = $part;
     $data->{'problem_num'} = $problem_num;
     $data->{'container'}   = $sequence->{'title'};
@@ -1379,6 +1498,27 @@ sub get_statistics {
         $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 = '"'.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->{'urlres'}=$urlres;
+        my %storestats = 
+            &LONCAPA::lonmetadata::dynamic_metadata_storage($data);
+        my ($dom,$user) = $urlres=~/^(\w+)\/(\w+)/; 
+        &Apache::lonnet::put('nohist_resevaldata',\%storestats,$dom,$user);
+    }
+    #
+    # 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);
     return $data;
 }
 
@@ -1406,11 +1546,13 @@ sub compute_discrimination_factor {
     }
     #
     # rank
+    my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
     my $ranking = 
         &Apache::loncoursedata::rank_students_by_scores_on_resources
         (\@Resources,
          \@Apache::lonstatistics::SelectedSections,
-         $Apache::lonstatistics::enrollment_status,undef);
+         $Apache::lonstatistics::enrollment_status,undef,
+         $starttime,$endtime);
     #
     # compute their percent scores on the problems in the sequence,
     my $number_to_grab = int(scalar(@{$ranking})/4);
@@ -1422,9 +1564,11 @@ sub compute_discrimination_factor {
             $_->[&Apache::loncoursedata::RNK_student()]; 
           } @{$ranking}[($num_students-$number_to_grab)..($num_students-1)];
     my ($bottom_sum,$bottom_max) = 
-        &Apache::loncoursedata::get_sum_of_scores($resource,$part,\@BottomSet);
+        &Apache::loncoursedata::get_sum_of_scores($resource,$part,\@BottomSet,
+                                                  undef,$starttime,$endtime);
     my ($top_sum,$top_max) = 
-        &Apache::loncoursedata::get_sum_of_scores($resource,$part,\@TopSet);
+        &Apache::loncoursedata::get_sum_of_scores($resource,$part,\@TopSet,
+                                                  undef,$starttime,$endtime);
     my $deg_of_disc;
     if ($top_max == 0 || $bottom_max==0) {
         $deg_of_disc = 'nan';
@@ -1494,10 +1638,10 @@ sub compute_sequence_statistics {
     $SeqStat{$symb}->{'countmax'} = $cmax;
     $SeqStat{$symb}->{'countmin'} = $cmin;
     $SeqStat{$symb}->{'countstd'} = $cSTD;
+    $SeqStat{$symb}->{'countmean'} = $cMean;
     $SeqStat{$symb}->{'count'} = $ccount;
     $SeqStat{$symb}->{'items'} = $K;
     $SeqStat{$symb}->{'KR-21'}=$kr_21;
-
     return;
 }