--- loncom/interface/statistics/lonproblemstatistics.pm	2004/04/01 21:14:32	1.80
+++ loncom/interface/statistics/lonproblemstatistics.pm	2004/04/06 15:45:13	1.83
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemstatistics.pm,v 1.80 2004/04/01 21:14:32 matthew Exp $
+# $Id: lonproblemstatistics.pm,v 1.83 2004/04/06 15:45:13 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -461,6 +461,11 @@ sub parse_field_selection {
             }
         }
     }
+    #
+    # Always show all the sequence statistics (for now)
+    foreach my $field (@SeqFields) {
+        $field->{'selected'} = 'yes';
+    }
     return;
 }
 
@@ -818,15 +823,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'}.'"';
@@ -970,6 +969,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"
@@ -980,7 +984,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"
@@ -989,7 +993,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 
@@ -1053,6 +1057,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"
@@ -1063,14 +1072,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" 
@@ -1103,15 +1113,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;
@@ -1173,6 +1183,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
     ##
@@ -1180,28 +1192,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;
@@ -1217,6 +1218,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++,
@@ -1224,29 +1229,31 @@ 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');
             $excel_sheet->write($rows_output,$cols_output++,
-                                $field->{'long_title'});
-        } else {
-            $excel_sheet->write($rows_output,$cols_output++,'');
+                                $data->{$field->{'name'}});
         }
+        $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) {
@@ -1256,6 +1263,7 @@ sub Excel_output {
                                 $data->{$field->{'name'}});
         }
         $rows_output++;
+        $cols_output=0;
     }
     #
     $excel_workbook->close();
@@ -1268,6 +1276,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;
+}
+
 ##################################################
 ##################################################
 ##
@@ -1301,6 +1347,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);
     }
 }
@@ -1404,6 +1451,26 @@ sub get_statistics {
         $data->{'deg_of_disc'} = 
             &compute_discrimination_factor($resource,$part,$sequence);
     }
+    #
+    # Store in metadata if computations were done for all students
+    if ($Apache::lonstatistics::SelectedSections[0] eq 'all' &&
+        $data->{'num_students'} > 1) {
+        my %storestats;
+        #
+        my $urlres=(&Apache::lonnet::decode_symb($resource->{'symb'}))[2];
+        my ($dom,$user) = $urlres=~/^(\w+)\/(\w+)/; 
+        my $preamble = $courseid.'___'.$urlres.'___';
+        #
+        $storestats{$preamble.'timestamp'}  = time;
+        $storestats{$preamble.'stdno'}      = $data->{'num_students'};
+        $storestats{$preamble.'avetries'}   = $data->{'mean_tries'};
+        $storestats{$preamble.'difficulty'} = $data->{'deg_of_diff'};
+        if ($SelectedFields{'deg_of_disc'}) {
+            $storestats{$preamble.'discrimination'} = $data->{'deg_of_disc'};
+        }
+        #
+        &Apache::lonnet::put('nohist_resevaldata',\%storestats,$dom,$user);
+    }
     return $data;
 }
 
@@ -1431,11 +1498,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);
@@ -1447,9 +1516,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';
@@ -1519,10 +1590,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;
 }