--- loncom/interface/statistics/lonstudentassessment.pm	2003/05/13 15:00:42	1.47
+++ loncom/interface/statistics/lonstudentassessment.pm	2003/10/29 16:20:14	1.73
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.47 2003/05/13 15:00:42 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.73 2003/10/29 16:20:14 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -85,13 +85,25 @@ my $Statistics;
 
 =item $show 'all', 'totals', or 'scores' determines how much data is output
 
+=item $data  determines what performance data is shown
+
+=item $datadescription A short description of the output data selected.
+
+=item $base 'tries' or 'scores' determines the base of the performance shown
+
+=item $single_student_mode evaluates to true if we are showing only one
+student.
+
 =cut
 
 #######################################################
 #######################################################
 my $show_links;
 my $output_mode;
-my $show;
+my $data;
+my $base;
+my $datadescription;
+my $single_student_mode;
 
 #######################################################
 #######################################################
@@ -126,28 +138,35 @@ Inputs:
 #######################################################
 sub BuildStudentAssessmentPage {
     my ($r,$c)=@_;
+
     undef($Statistics);
+    undef($show_links);
+    undef($output_mode);
+    undef($data);
+    undef($base);
+    undef($datadescription);
+    undef($single_student_mode);
+
+    $single_student_mode = 0;
+    $single_student_mode = 1 if ($ENV{'form.SelectedStudent'});
+    if ($ENV{'form.selectstudent'}) {
+        &Apache::lonstatistics::DisplayClasslist($r);
+        return;
+    }
     #
     # Print out the HTML headers for the interface
     #    This also parses the output mode selector
-    #    This step must always be done.
+    #    This step must *always* be done.
     $r->print(&CreateInterface());
     $r->print('<input type="hidden" name="notfirstrun" value="true" />');
+    $r->print('<input type="hidden" name="sort" value="'.
+              $ENV{'form.sort'}.'" />');
     $r->rflush();
-    if (! exists($ENV{'form.notfirstrun'})) {
-        $r->print(<<ENDMSG);
-<p>
-<font size="+1">
-Please make your selections in the boxes above and hit 
-the button marked &quot;Update&nbsp;Display&quot;.
-</font>
-</p>
-ENDMSG
-#        $r->print(&OutputDescriptions());
+    #
+    if (! exists($ENV{'form.notfirstrun'}) && ! $single_student_mode) {
         return;
     }
     #
-    #
     my $initialize     = \&html_initialize;
     my $output_student = \&html_outputstudent;
     my $finish         = \&html_finish;
@@ -156,10 +175,6 @@ ENDMSG
         $initialize     = \&excel_initialize;
         $output_student = \&excel_outputstudent;
         $finish         = \&excel_finish;
-    } elsif ($output_mode eq 'multi-sheet excel') {
-        $initialize     = \&multi_sheet_excel_initialize;
-        $output_student = \&multi_sheet_excel_outputstudent;
-        $finish         = \&multi_sheet_excel_finish;
     } elsif ($output_mode eq 'csv') {
         $initialize     = \&csv_initialize;
         $output_student = \&csv_outputstudent;
@@ -168,9 +183,29 @@ ENDMSG
     #
     if($c->aborted()) {  return ; }
     #
+    # Determine which students we want to look at
+    my @Students;
+    if ($single_student_mode) {
+        @Students = (&Apache::lonstatistics::current_student());
+        $r->print(&next_and_previous_buttons());
+        $r->rflush();
+    } else {
+        @Students = @Apache::lonstatistics::Students;
+    }
+    #
+    # Perform generic initialization tasks
+    #       Since we use lonnet::EXT to retrieve problem weights,
+    #       to ensure current data we must clear the caches out.
+    #       This makes sure that parameter changes at the student level
+    #       are immediately reflected in the chart.
+    &Apache::lonnet::clear_EXT_cache_status();
+    #
+    # Clean out loncoursedata's package data, just to be safe.
+    &Apache::loncoursedata::clear_internal_caches();
+    #
     # Call the initialize routine selected above
     $initialize->($r);
-    foreach my $student (@Apache::lonstatistics::Students) {
+    foreach my $student (@Students) {
         if($c->aborted()) { 
             $finish->($r);
             return ; 
@@ -186,6 +221,54 @@ ENDMSG
 
 #######################################################
 #######################################################
+sub next_and_previous_buttons {
+    my $Str = '';
+    $Str .= '<input type="hidden" name="SelectedStudent" value="'.
+        $ENV{'form.SelectedStudent'}.'" />';
+    #
+    # Build the previous student link
+    my $previous = &Apache::lonstatistics::previous_student();
+    my $previousbutton = '';
+    if (defined($previous)) {
+        my $sname = $previous->{'username'}.':'.$previous->{'domain'};
+        $previousbutton .= '<input type="button" value="'.
+            'Previous Student ('.
+            $previous->{'username'}.'@'.$previous->{'domain'}.')'.
+            '" onclick="document.Statistics.SelectedStudent.value='.
+            "'".$sname."'".';'.
+            'document.Statistics.submit();" />';
+    } else {
+        $previousbutton .= '<input type="button" value="'.
+            'Previous student (none)'.'" />';
+    }
+    #
+    # Build the next student link
+    my $next = &Apache::lonstatistics::next_student();
+    my $nextbutton = '';
+    if (defined($next)) {
+        my $sname = $next->{'username'}.':'.$next->{'domain'};
+        $nextbutton .= '<input type="button" value="'.
+            'Next Student ('.
+            $next->{'username'}.'@'.$next->{'domain'}.')'.
+            '" onclick="document.Statistics.SelectedStudent.value='.
+            "'".$sname."'".';'.
+            'document.Statistics.submit();" />';
+    } else {
+        $nextbutton .= '<input type="button" value="'.
+            'Next student (none)'.'" />';
+    }
+    #
+    # Build the 'all students' button
+    my $all = '';
+    $all .= '<input type="button" value="All Students" '.
+            '" onclick="document.Statistics.SelectedStudent.value='.
+            "''".';'.'document.Statistics.submit();" />';
+    $Str .= $previousbutton.('&nbsp;'x5).$all.('&nbsp;'x5).$nextbutton;
+    return $Str;
+}
+
+#######################################################
+#######################################################
 
 sub get_student_fields_to_show {
     my @to_show = @Apache::lonstatistics::SelectedStudentData;
@@ -226,7 +309,12 @@ sub CreateInterface {
     $Str .= '<td align="center"><b>Student Data</b></td>';
     $Str .= '<td align="center"><b>Enrollment Status</b></td>';
     $Str .= '<td align="center"><b>Sequences and Folders</b></td>';
-    $Str .= '<td align="center"><b>Output Format</b></td>';
+    $Str .= '<td align="center"><b>Output Format</b>'.
+        &Apache::loncommon::help_open_topic("Chart_Output_Formats").
+        '</td>';
+    $Str .= '<td align="center"><b>Output Data</b>'.
+        &Apache::loncommon::help_open_topic("Chart_Output_Data").
+        '</td>';
     $Str .= '</tr>'."\n";
     #
     $Str .= '<tr><td align="center">'."\n";
@@ -249,8 +337,18 @@ sub CreateInterface {
                                               $only_seq_with_assessments);
     $Str .= '</td><td>'."\n";
     $Str .= &CreateAndParseOutputSelector();
+    $Str .= '</td><td>'."\n";
+    $Str .= &CreateAndParseOutputDataSelector();
     $Str .= '</td></tr>'."\n";
     $Str .= '</table>'."\n";
+    $Str .= '<input type="submit" value="Generate Chart" />';
+    $Str .= '&nbsp;'x5;
+    $Str .= '<input type="submit" name="selectstudent" '.
+                                  'value="Select One Student" />';
+    $Str .= '&nbsp;'x5;
+    $Str .= '<input type="submit" name="ClearCache" value="Clear Caches" />';
+    $Str .= '&nbsp;'x5;
+    $Str .= '<br />';
     return $Str;
 }
 
@@ -271,7 +369,6 @@ my @OutputOptions =
        description => 'Output HTML with each symbol linked to the problem '.
 	   'which generated it.',
        mode => 'html',
-       show => 'all',
        show_links => 'yes',
        },
      { name  => 'HTML, with all links',
@@ -280,7 +377,6 @@ my @OutputOptions =
 	   'which generated it.  '.
            'This includes links for unattempted problems.',
        mode => 'html',
-       show => 'all',
        show_links => 'all',
        },
      { name  => 'HTML, without links',
@@ -289,99 +385,28 @@ my @OutputOptions =
 	   ' web page is greatly reduced.  If your browser crashes on the '.
 	   'full display, try this.',
        mode => 'html',
-       show => 'all',
        show_links => 'no',
            },
-     { name  => 'HTML, scores only',
-       value => 'html, scores only',
-       description => 'Output HTML, only showing the total number of correct'.
-	   ' problems (or problem parts) and not the maximum possible for '.
-	   'each student',
-       mode => 'html',
-       show => 'scores',
-       show_links => 'no',
-           },
-     { name  => 'HTML, totals',
-       value => 'html, totals',
-       description => 'Output HTML, but only the summary statistics for each'.
-	   ' sequence selected for each student.',
-       mode => 'html',
-       show => 'totals',
-       show_links => 'no',
-       },
-     { name  => 'HTML, summary table only',
-       value => 'html summary table only',
-       description => 'Output HTML, but only the final summary table for '.
-           'all students across all sequences.',
-       mode => 'html',
-       show => 'final table',
-       show_links => 'no',
-       },
-     { name  => 'Excel, scores only',
-       value => 'excel, scores only',
-       description => 'Output an Excel file (compatable with Excel 95), '.
-	   'with a single column for each sequence showing the students '.
-	   'score.',
-       mode => 'excel',
-       show => 'scores',
-       show_links => 'no',
-           },
-     { name  => 'Excel, totals',
-       value => 'excel, totals',
-       description => 'Output an Excel file (compatable with Excel 95), '.
-	   'with two columns for each sequence, the students score on the '.
-	   'sequence and the students maximum possible on the sequence',
+     { name  => 'Excel',
+       value => 'excel',
+       description => 'Output an Excel file (compatable with Excel 95).',
        mode => 'excel',
-       show => 'totals',
-       show_links => 'no',
-           },
-     { name  => 'multi-sheet Excel',
-       value => 'multi-sheet excel',
-       description => 'Output an Excel file (compatable with Excel 95), '.
-	   'with a seperate worksheet for each sequence you have selected '.
-           'the data for each problem part '.
-           '(number of tries, status, points awarded) will be listed.',
-       mode => 'multi-sheet excel',
-       show => 'totals',
-       show_links => 'no',
-           },
-     { name  => 'multi-sheet Excel, by section',
-       value => 'multi-sheet excel, by section',
-       description => 'Output an Excel file (compatable with Excel 95), '.
-	   'with a seperate worksheet for each sequence you have selected '.
-           'the data for each problem part '.
-           '(number of tries, status, points awarded) will be listed.  '.
-           'There will be one Excel workbook for each section selected.',
-       mode => 'multi-sheet excel',
-       show => 'by section',
-       show_links => 'no',
-           },
-     { name  => 'CSV, everything',
-       value => 'csv, everything',
-       description => '',
-       mode => 'csv',
-       show => 'all',
-       show_links => 'no',
-           },
-     { name  => 'CSV, scores only',
-       value => 'csv, scores only',
-       description => '',
-       mode => 'csv',
-       show => 'scores',
        show_links => 'no',
-           },
-     { name  => 'CSV, totals',
-       value => 'csv, totals',
-       description => '',
+   },
+     { name  => 'CSV',
+       value => 'csv',
+       description => 'Output a comma seperated values file suitable for '.
+           'import into a spreadsheet program.  Using this method as opposed '.
+           'to Excel output allows you to organize your data before importing'.
+           ' it into a spreadsheet program.',
        mode => 'csv',
-       show => 'totals',
        show_links => 'no',
            },
      );
 
 sub OutputDescriptions {
     my $Str = '';
-    $Str .= "<h2>Output Modes</h2>\n";
+    $Str .= "<h2>Output Formats</h2>\n";
     $Str .= "<dl>\n";
     foreach my $outputmode (@OutputOptions) {
 	$Str .="    <dt>".$outputmode->{'name'}."</dt>\n";
@@ -394,9 +419,11 @@ sub OutputDescriptions {
 sub CreateAndParseOutputSelector {
     my $Str = '';
     my $elementname = 'chartoutputmode';
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                            [$elementname]);
     #
     # Format for output options is 'mode, restrictions';
-    my $selected = 'html, with links';
+    my $selected = 'html, without links';
     if (exists($ENV{'form.'.$elementname})) {
         if (ref($ENV{'form.'.$elementname} eq 'ARRAY')) {
             $selected = $ENV{'form.'.$elementname}->[0];
@@ -408,11 +435,9 @@ sub CreateAndParseOutputSelector {
     # Set package variables describing output mode
     $show_links  = 'no';
     $output_mode = 'html';
-    $show        = 'all';
     foreach my $option (@OutputOptions) {
         next if ($option->{'value'} ne $selected);
         $output_mode = $option->{'mode'};
-        $show        = $option->{'show'};
         $show_links  = $option->{'show_links'};
     }
 
@@ -428,6 +453,115 @@ sub CreateAndParseOutputSelector {
     return $Str;
 }
 
+##
+## Data selector stuff
+##
+my @OutputDataOptions =
+    (
+     { name  => 'Scores Summary',
+       base  => 'scores',
+       value => 'sum and total',
+       shortdesc => 'Total Score and Maximum Possible for each '.
+           'Sequence or Folder',
+       longdesc => 'The score of each student as well as the '.
+           ' maximum possible on each Sequence or Folder.',
+       },
+     { name  => 'Scores Per Problem',
+       base  => 'scores',
+       value => 'scores',
+       shortdesc => 'Score on each Problem Part',
+       longdesc =>'The students score on each problem part, computed as'.
+           'the part weight * part awarded',
+       },
+#     { name  => 'Scores Sum',
+#       base  => 'scores',
+#       value => 'sum only',
+#       shortdesc => 'Sum of Scores on each Problem Part',
+#       longdesc =>'The total of the scores of the student on each problem'.
+#           ' part in the sequences or folders selected.',
+#       },
+#     { name  => 'Scores Summary Table Only',
+#       base  => 'scores',
+#       value => 'final table scores',
+#       shortdesc => 'Summary of Scores',
+#       longdesc  => 'The average score on each sequence or folder for the '.
+#           'selected students.',
+#       },
+     { name  =>'Tries',
+       base  =>'tries',
+       value => 'tries',
+       shortdesc => 'Number of Tries before success on each Problem Part',
+       longdesc =>'The number of tries before success on each problem part.',
+       },
+     { name  =>'Parts Correct',
+       base  =>'tries',
+       value => 'parts correct total',
+       shortdesc => 'Number of Problem Parts completed successfully.',
+       longdesc => 'The Number of Problem Parts completed successfully and '.
+           'the maximum possible for each student',
+       },
+#     { name  =>'Parts Correct',
+#       base  =>'tries',
+#       value => 'parts correct',
+#       shortdesc => 'Number of Problem Parts completed successfully.',
+#       longdesc => 'The Number of Problem Parts completed successfully'.
+#           ' on each sequence or folder.',
+#       },
+#     { name  => 'Parts Summary Table Only',
+#       base  => 'tries',
+#       value => 'final table parts',
+#       shortdesc => 'Summary of Parts Correct',
+#       longdesc  => 'A summary table of the average number of problem parts '.
+#           'students were able to get correct on each sequence.',
+#       },
+     );
+
+sub HTMLifyOutputDataDescriptions {
+    my $Str = '';
+    $Str .= "<h2>Output Data</h2>\n";
+    $Str .= "<dl>\n";
+    foreach my $option (@OutputDataOptions) {
+        $Str .= '    <dt>'.$option->{'name'}.'</dt>';
+        $Str .= '<dd>'.$option->{'longdesc'}.'</dd>'."\n";
+    }
+    $Str .= "</dl>\n";
+    return $Str;
+}
+
+sub CreateAndParseOutputDataSelector {
+    my $Str = '';
+    my $elementname = 'chartoutputdata';
+    #
+    my $selected = 'scores';
+    if (exists($ENV{'form.'.$elementname})) {
+        if (ref($ENV{'form.'.$elementname} eq 'ARRAY')) {
+            $selected = $ENV{'form.'.$elementname}->[0];
+        } else {
+            $selected = $ENV{'form.'.$elementname};
+        }
+    }
+    #
+    $data = 'scores';
+    foreach my $option (@OutputDataOptions) {
+        if ($option->{'value'} eq $selected) {
+            $data = $option->{'value'};
+            $base = $option->{'base'};
+            $datadescription = $option->{'shortdesc'};
+        }
+    }
+    #
+    # Build the form element
+    $Str = qq/<select size="5" name="$elementname">/;
+    foreach my $option (@OutputDataOptions) {
+        $Str .= "\n".'    <option value="'.$option->{'value'}.'"';
+        $Str .= " selected " if ($option->{'value'} eq $data);
+        $Str .= ">".$option->{'name'}."<\/option>";
+    }
+    $Str .= "\n</select>";
+    return $Str;
+
+}
+
 #######################################################
 #######################################################
 
@@ -462,13 +596,17 @@ sub html_initialize {
     $padding = ' 'x3;
     $count = 0;
     $nodata_count = 0;
+    undef(%prog_state);
     #
     $r->print("<h3>".$ENV{'course.'.$ENV{'request.course.id'}.'.description'}.
               "&nbsp;&nbsp;".localtime(time)."</h3>");
 
+    if ($data !~ /^final table/) {
+        $r->print("<h3>".$datadescription."</h3>");        
+    }
     #
     # Set up progress window for 'final table' display only
-    if ($show eq 'final table') {
+    if ($data =~ /^final table/) {
         my $studentcount = scalar(@Apache::lonstatistics::Students); 
         %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
             ($r,'Summary Table Status',
@@ -490,11 +628,11 @@ sub html_initialize {
         my $width = $sequence->{'width'};
         $Str .= $title.' 'x($width-$base).$padding;
     }
-    $Str .= "total (of shown problems)</pre>\n";
+    $Str .= "total</pre>\n";
     $Str .= "<pre>";
     #
     # Check for suppression of output
-    if ($show eq 'final table') {
+    if ($data =~ /^final table/) {
         $Str = '';
     }
     $r->print($Str);
@@ -506,7 +644,7 @@ sub html_outputstudent {
     my ($r,$student) = @_;
     my $Str = '';
     #
-    if($count++ % 5 == 0 && $count > 0) {
+    if($count++ % 5 == 0 && $count > 0 && $data !~ /^final table/) {
         $r->print("</pre><pre>");
     }
     # First, the @StudentData fields need to be listed
@@ -527,7 +665,7 @@ sub html_outputstudent {
     }
     if (scalar(@tmp) < 1) {
         $nodata_count++;
-        return if ($show eq 'final table');
+        return if ($data =~ /^final table/);
         $Str .= '<font color="blue">No Course Data</font>'."\n";
         $r->print($Str);
         $r->rflush();
@@ -538,20 +676,27 @@ sub html_outputstudent {
     my $studentstats;
     my $PerformanceStr = '';
     foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        my ($performance,$score,$seq_max) =
-            &StudentPerformanceOnSequence($student,\%StudentsData,
-                                          $seq,$show_links);
-        my $ratio = $score.'/'.$seq_max;
+        my ($performance,$performance_length,$score,$seq_max,$rawdata);
+        if ($base eq 'tries') {
+            ($performance,$performance_length,$score,$seq_max,$rawdata) =
+                &StudentTriesOnSequence($student,\%StudentsData,
+                                        $seq,$show_links);
+        } else {
+            ($performance,$performance_length,$score,$seq_max,$rawdata) =
+                &StudentPerformanceOnSequence($student,\%StudentsData,
+                                              $seq,$show_links);
+        }
+        my $ratio = sprintf("%3d",$score).'/'.sprintf("%3d",$seq_max);
         #
-        if ($show eq 'totals') {
-            $performance = ' 'x(length($seq_max)-length($score)).$ratio;
-            $performance .= ' 'x($seq->{'width'}-length($performance));
-        } elsif ($show eq 'scores') {
-            $performance = $score;
-            $performance .= ' 'x($seq->{'width'}-length($performance));
+        if ($data eq 'sum and total' || $data eq 'parts correct total') {
+            $performance  = $ratio;
+            $performance .= ' 'x($seq->{'width'}-length($ratio));
+        } elsif ($data eq 'sum only' || $data eq 'parts correct') {
+            $performance  = $score;
+            $performance .= ' 'x($seq->{'width'}-length($score));
         } else {
             # Pad with extra spaces
-            $performance .= ' 'x($seq->{'width'}-$seq_max-
+            $performance .= ' 'x($seq->{'width'}-$performance_length-
                                  length($ratio)
                                  ).$ratio;
         }
@@ -566,7 +711,9 @@ sub html_outputstudent {
     my ($score,$max) = (0,0);
     while (my ($symb,$seq_stats) = each (%{$studentstats})) {
         $Statistics->{$symb}->{'score'} += $seq_stats->{'score'};
-        $Statistics->{$symb}->{'max'}   += $seq_stats->{'max'};
+        if ($Statistics->{$symb}->{'max'} < $seq_stats->{'max'}) {
+            $Statistics->{$symb}->{'max'} = $seq_stats->{'max'};
+        }
         $score += $seq_stats->{'score'};
         $max   += $seq_stats->{'max'};
     }
@@ -574,7 +721,7 @@ sub html_outputstudent {
     $Str .= " \n";
     #
     # Check for suppressed output and update the progress window if so...
-    if ($show eq 'final table') {
+    if ($data =~ /^final table/) {
         $Str = '';
         &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
                                                  'last student');
@@ -590,12 +737,16 @@ sub html_finish {
     my ($r) = @_;
     #
     # Check for suppressed output and close the progress window if so
-    if ($show eq 'final table') {
+    if ($data =~ /^final table/) {
         &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
     } else {
         $r->print("</pre>\n"); 
     }
-    $r->print(&StudentAverageTotal());
+    if ($single_student_mode) {
+        $r->print(&SingleStudentTotal());
+    } else {
+        $r->print(&StudentAverageTotal());
+    }
     $r->rflush();
     return;
 }
@@ -616,7 +767,7 @@ sub StudentAverageTotal {
             $ave = 0;
         }
         $total_ave += $ave;
-        my $max = $seq->{'num_assess_parts'};
+        my $max = $Statistics->{$seq->{'symb'}}->{'max'};
         $total_max += $max;
         if ($ave == 0) {
             $ave = "0.00";
@@ -638,80 +789,33 @@ sub StudentAverageTotal {
     return $Str;
 }
 
-}
-
-#######################################################
-#######################################################
-
-=pod
-
-=head2 Multi-Sheet EXCEL subroutines
-
-=item &multi_sheet_excel_initialize($r)
-
-=item &multi_sheet_excel_outputstudent($r,$student)
-
-=item &multi_sheet_excel_finish($r)
-
-=cut
-
-#######################################################
-#######################################################
-{
-
-sub multi_sheet_excel_initialize {
-    my ($r)=@_;
-    $r->print("<h1>Not yet implemented</h1>");
-    # 
-    # Estimate the size of the file.  We would like to have < 5 megs of data.
-    my $max_size = 5000000;
-    my $num_students  = scalar(@Apache::lonstatistics::Students);
-    my $num_sequences = 0;
-    my $num_data_per_part  = 2; # 'status' and 'numtries'
-    my $fields_per_student = scalar(&get_student_fields_to_show());
-    my $bytes_per_field    = 20; # Back of the envelope calculation
+sub SingleStudentTotal {
+    my $student = &Apache::lonstatistics::current_student();
+    my $Str = "<h3>Summary table for ".$student->{'fullname'}." ".
+        $student->{'username'}.'@'.$student->{'domain'}."</h3>\n";
+    $Str .= '<table border=2 cellspacing="1">'."\n";
+    $Str .= 
+        "<tr><th>Sequence or Folder</th><th>Score</th><th>Maximum</th></tr>\n";
+    my $total = 0;
+    my $total_max = 0;
     foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        $num_sequences++ if ($seq->{'num_assess'} > 0);
-        $fields_per_student += $num_data_per_part * $seq->{'num_assess_parts'};
-    }
-    my $size_estimate = $fields_per_student*$num_students*$bytes_per_field;
-    #
-    # Compute number of workbooks
-    my $num_workbooks = 1;
-    if ($size_estimate > $max_size) { # try to stay under 5 megs
-        $num_workbooks += int($size_estimate / $max_size);
-    }
-    if ($show eq 'by section') {
-        if (@Apache::lonstatistics::SelectedSections > 1 && 
-            $Apache::lonstatistics::SelectedSections[0] ne 'all') {
-            $num_workbooks = scalar(@Apache::lonstatistics::SelectedSections);
-        } else {
-            # @Apache::lonstatistics::Sections contains 'all' as well.
-            $num_workbooks = scalar(@Apache::lonstatistics::Sections) - 1;
-        }
+        my $value = $Statistics->{$seq->{'symb'}}->{'score'};
+        my $max = $Statistics->{$seq->{'symb'}}->{'max'};
+        $Str .= '<tr><td>'.$seq->{'title'}.'</td>'.
+            '<td align="right">'.$value.'</td>'.
+                '<td align="right">'.$max.'</td></tr>'."\n";
+        $total += $value;
+        $total_max +=$max;
     }
-    
-    $r->print("Maximum allowed size: ".$max_size." bytes<br />");
-    $r->print("Number of students: ".$num_students."<br />");
-    $r->print("Number of fields per student: ".$fields_per_student."<br />");
-    $r->print("Total number of fields: ".($fields_per_student*$num_students).
-              "<br />");
-    $r->print("Bytes per field: ".$bytes_per_field." (estimated)"."<br />");
-    $r->print("Estimated size: ".$size_estimate." bytes<br />");
-    $r->print("Number of workbooks: ".$num_workbooks."<br />");
-    $r->rflush();
-    return;
-}
-
-sub multi_sheet_excel_outputstudent {
-    my ($r,$student) = @_;
+    $Str .= '<tr><td><b>Total</b></td>'.
+        '<td align="right">'.$total.'</td>'.
+        '<td align="right">'.$total_max."</td></tr>\n";
+    $Str .= "</table>\n";
+    return $Str;
 }
 
-sub multi_sheet_excel_finish {
-    my ($r) = @_;
 }
 
-}
 #######################################################
 #######################################################
 
@@ -739,10 +843,69 @@ my $rows_output;
 my $cols_output;
 
 my %prog_state; # progress window state
+my $request_aborted;
 
 sub excel_initialize {
     my ($r) = @_;
     #
+    undef ($excel_sheet);
+    undef ($excel_workbook);
+    undef ($filename);
+    undef ($rows_output);
+    undef ($cols_output);
+    undef (%prog_state);
+    undef ($request_aborted);
+    #
+    my $total_columns = scalar(&get_student_fields_to_show());
+    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+        # Add 2 because we need a 'sum' and 'total' column for each
+        $total_columns += $seq->{'num_assess_parts'}+2;
+    }
+    if ($data eq 'tries' && $total_columns > 255) {
+        $r->print(<<END);
+<h2>Unable to Complete Request</h2>
+<p>
+LON-CAPA is unable to produce your Excel spreadsheet because your selections
+will result in more than 255 columns.  Excel allows only 255 columns in a
+spreadsheet.
+</p><p>
+You may consider reducing the number of <b>Sequences or Folders</b> you
+have selected.  
+</p><p>
+LON-CAPA can produce <b>CSV</b> files of this data or Excel files of the
+summary data (<b>Parts Correct</b> or <b>Parts Correct & Totals</b>).
+</p>
+END
+       $request_aborted = 1;
+    }
+    if ($data eq 'scores' && $total_columns > 255) {
+        $r->print(<<END);
+<h2>Unable to Complete Request</h2>
+<p>
+LON-CAPA is unable to produce your Excel spreadsheet because your selections
+will result in more than 255 columns.  Excel allows only 255 columns in a
+spreadsheet.
+</p><p>
+You may consider reducing the number of <b>Sequences or Folders</b> you
+have selected.  
+</p><p>
+LON-CAPA can produce <b>CSV</b> files of this data or Excel files of the
+summary data (<b>Scores Sum</b> or <b>Scores Sum & Totals</b>).
+</p>
+END
+       $request_aborted = 1;
+    }
+    if ($data =~ /^final table/) {
+        $r->print(<<END);
+<h2>Unable to Complete Request</h2>
+<p>
+The <b>Summary Table (Scores)</b> option is not available for non-HTML output.
+</p>
+END
+       $request_aborted = 1;
+    }
+    return if ($request_aborted);
+    #
     $filename = '/prtspool/'.
         $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
             time.'_'.rand(1000000000).'.xls';
@@ -773,9 +936,7 @@ sub excel_initialize {
     #
     # Add a worksheet
     my $sheetname = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
-    if (length($sheetname) > 31) {
-        $sheetname = substr($sheetname,0,31);
-    }
+    $sheetname = &Apache::loncommon::clean_excel_name($sheetname);
     $excel_sheet = $excel_workbook->addworksheet($sheetname);
     #
     # Put the course description in the header
@@ -804,21 +965,48 @@ sub excel_initialize {
     $cols_output += scalar(@Sections);
     #
     # Put the date in there too
-    $excel_sheet->write($rows_output,$cols_output++,
+    $excel_sheet->write($rows_output++,$cols_output++,
                         'Compiled on '.localtime(time));
     #
-    $rows_output++;
+    $cols_output = 0;
+    $excel_sheet->write($rows_output++,$cols_output++,$datadescription);
+    #
+    if ($data eq 'tries' || $data eq 'scores') {
+        $rows_output++;
+    }
     #
     # Add the student headers
     $cols_output = 0;
     foreach my $field (&get_student_fields_to_show()) {
         $excel_sheet->write($rows_output,$cols_output++,$field);
     }
+    my $row_offset = 0;
+    if ($data eq 'tries' || $data eq 'scores') {
+        $row_offset = -1;
+    }
     #
-    # Add the Sequence Headers
+    # Add the remaining column headers
     foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        $excel_sheet->write($rows_output,$cols_output,$seq->{'title'});
-        if ($show eq 'totals') {
+        $excel_sheet->write($rows_output+$row_offset,
+                            $cols_output,$seq->{'title'});
+        if ($data eq 'tries' || $data eq 'scores') {
+            foreach my $res (@{$seq->{'contents'}}) {
+                next if ($res->{'type'} ne 'assessment');
+                if (scalar(@{$res->{'parts'}}) > 1) {
+                    foreach my $part (@{$res->{'parts'}}) {
+                        $excel_sheet->write($rows_output,
+                                            $cols_output++,
+                                            $res->{'title'}.' part '.$part);
+                    }
+                } else {
+                    $excel_sheet->write($rows_output,
+                                        $cols_output++,
+                                        $res->{'title'});
+                }
+            }
+            $excel_sheet->write($rows_output,$cols_output++,'score');
+            $excel_sheet->write($rows_output,$cols_output++,'maximum');
+        } elsif ($data eq 'sum and total' || $data eq 'parts correct total') {
             $excel_sheet->write($rows_output+1,$cols_output,'score');
             $excel_sheet->write($rows_output+1,$cols_output+1,'maximum');
             $cols_output += 2;
@@ -828,31 +1016,53 @@ sub excel_initialize {
     }
     #
     # Bookkeeping
-    if ($show eq 'totals') {
+    if ($data eq 'sum and total' || $data eq 'parts correct total') {
         $rows_output += 2;
     } else {
         $rows_output += 1;
     }
     #
     # Output a row for MAX
-    if ($show ne 'totals') {
-        $cols_output = 0;
-        foreach my $field (&get_student_fields_to_show()) {
-            if ($field eq 'username' || $field eq 'fullname' || 
-                $field eq 'id') {
-                $excel_sheet->write($rows_output,$cols_output++,'Maximum');
-            } else {
-                $excel_sheet->write($rows_output,$cols_output++,'');
-            }
+    $cols_output = 0;
+    foreach my $field (&get_student_fields_to_show()) {
+        if ($field eq 'username' || $field eq 'fullname' || 
+            $field eq 'id') {
+            $excel_sheet->write($rows_output,$cols_output++,'Maximum');
+        } else {
+            $excel_sheet->write($rows_output,$cols_output++,'');
         }
-        #
-        # Add the Sequence Headers
-        foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-            $excel_sheet->write($rows_output,$cols_output++,
-                                $seq->{'num_assess_parts'});
+    }
+    #
+    # Add the maximums for each sequence or assessment
+    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+        my $weight;
+        my $max = 0;
+        foreach my $resource (@{$seq->{'contents'}}) {
+            next if ($resource->{'type'} ne 'assessment');
+            foreach my $part (@{$resource->{'parts'}}) {
+                $weight = 1;
+                if ($base eq 'scores') {
+                    $weight = &Apache::lonnet::EXT
+                        ('resource.'.$part.'.weight',$resource->{'symb'},
+                         undef,undef,undef);
+                    if (!defined($weight) || ($weight eq '')) { 
+                        $weight=1;
+                    }
+                }
+                if ($data eq 'scores') {
+                    $excel_sheet->write($rows_output,$cols_output++,$weight);
+                } elsif ($data eq 'tries') {
+                    $excel_sheet->write($rows_output,$cols_output++,'');
+                }
+                $max += $weight;
+            }
+        } 
+        if (! ($data eq 'sum only' || $data eq 'parts correct')) {
+            $excel_sheet->write($rows_output,$cols_output++,'');
         }
-        $rows_output++;
+        $excel_sheet->write($rows_output,$cols_output++,$max);
     }
+    $rows_output++;
     #
     # Let the user know what we are doing
     my $studentcount = scalar(@Apache::lonstatistics::Students); 
@@ -867,11 +1077,14 @@ sub excel_initialize {
         ($r,'Excel File Compilation Status',
          'Excel File Compilation Progress', $studentcount);
     #
+    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
+                                          'Processing first student');
     return;
 }
 
 sub excel_outputstudent {
     my ($r,$student) = @_;
+    return if ($request_aborted);
     return if (! defined($excel_sheet));
     $cols_output=0;
     #
@@ -893,13 +1106,27 @@ sub excel_outputstudent {
     #
     # Write out sequence scores and totals data
     foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        my ($performance,$score,$seq_max) =
-            &StudentPerformanceOnSequence($student,\%StudentsData,
-                                          $seq,'no');
-        if ($show eq 'totals' || $show eq 'scores') {
+        my ($performance,$performance_length,$score,$seq_max,$rawdata);
+        if ($base eq 'tries') {
+            ($performance,$performance_length,$score,$seq_max,$rawdata) =
+                &StudentTriesOnSequence($student,\%StudentsData,
+                                        $seq,'no');
+        } else {
+            ($performance,$performance_length,$score,$seq_max,$rawdata) =
+                &StudentPerformanceOnSequence($student,\%StudentsData,
+                                              $seq,'no');
+        }
+        if ($data eq 'tries' || $data eq 'scores') {
+            foreach my $value (@$rawdata) {
+                $excel_sheet->write($rows_output,$cols_output++,$value);
+            }
+            $excel_sheet->write($rows_output,$cols_output++,$score);
+            $excel_sheet->write($rows_output,$cols_output++,$seq_max);
+        } elsif ($data eq 'sum and total' || $data eq 'sum only' || 
+            $data eq 'parts correct' || $data eq 'parts correct total') {
             $excel_sheet->write($rows_output,$cols_output++,$score);
         }
-        if ($show eq 'totals') {
+        if ($data eq 'sum and total' || $data eq 'parts correct total') {
             $excel_sheet->write($rows_output,$cols_output++,$seq_max);
         }
     }
@@ -915,6 +1142,7 @@ sub excel_outputstudent {
 
 sub excel_finish {
     my ($r) = @_;
+    return if ($request_aborted);
     return if (! defined($excel_sheet));
     #
     # Write the excel file
@@ -955,17 +1183,32 @@ sub excel_finish {
 
 my $outputfile;
 my $filename;
-
+my $request_aborted;
 my %prog_state; # progress window state
 
 sub csv_initialize{
     my ($r) = @_;
     # 
     # Clean up
-    $filename = undef;
-    $outputfile = undef;
+    undef($outputfile);
+    undef($filename);
+    undef($request_aborted);
     undef(%prog_state);
     #
+    # Deal with unimplemented requests
+    $request_aborted = undef;
+    if ($data =~ /final table/) {
+        $r->print(<<END);
+<h2>Unable to Complete Request</h2>
+<p>
+The <b>Summary Table (Scores)</b> option is not available for non-HTML output.
+</p>
+END
+       $request_aborted = 1;
+    }
+    return if ($request_aborted);
+
+    #
     # Open a file
     $filename = '/prtspool/'.
         $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
@@ -983,34 +1226,41 @@ sub csv_initialize{
     print $outputfile '"'.&Apache::loncommon::csv_translate($description).'",'.
         '"'.&Apache::loncommon::csv_translate(scalar(localtime(time))).'"'.
             "\n";
-
     #
     # Print out the headings
     my $Str = '';
     my $Str2 = undef;
     foreach my $field (&get_student_fields_to_show()) {
-        if ($show eq 'scores') {
+        if ($data eq 'sum only') {
             $Str .= '"'.&Apache::loncommon::csv_translate($field).'",';
-        } elsif ($show eq 'totals') {
+        } elsif ($data eq 'sum and total' || $data eq 'parts correct total') {
             $Str .= '"",'; # first row empty on the student fields
             $Str2 .= '"'.&Apache::loncommon::csv_translate($field).'",';
-        } elsif ($show eq 'all') {
-            $Str .= '"'.&Apache::loncommon::csv_translate($field).'",';
+        } elsif ($data eq 'scores' || $data eq 'tries' || 
+                 $data eq 'parts correct') {
+            $Str  .= '"",';
+            $Str2 .= '"'.&Apache::loncommon::csv_translate($field).'",';
         }
     }
     foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        if ($show eq 'scores') {
+        if ($data eq 'sum only' || $data eq 'parts correct') {
             $Str .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}).
                 '",';
-        } elsif ($show eq 'totals') {
+        } elsif ($data eq 'sum and total' || $data eq 'parts correct total') {
             $Str  .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}).
                 '","",';
             $Str2 .= '"score","total possible",';
-        } elsif ($show eq 'all') {
+        } elsif ($data eq 'scores' || $data eq 'tries') {
             $Str  .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}).
                 '",';
-            $Str .= '"",'x($seq->{'num_assess_parts'}-1);
-            $Str .= '"score","total possible",';
+            $Str .= '"",'x($seq->{'num_assess_parts'}-1+2);
+            foreach my $res (@{$seq->{'contents'}}) {
+                next if ($res->{'type'} ne 'assessment');
+                foreach my $part (@{$res->{'parts'}}) {
+                    $Str2 .= '"'.&Apache::loncommon::csv_translate($res->{'title'}.', Part '.$part).'",';
+                }
+            }
+            $Str2 .= '"score","total possible",';
         }
     }
     chop($Str);
@@ -1032,6 +1282,7 @@ sub csv_initialize{
 
 sub csv_outputstudent {
     my ($r,$student) = @_;
+    return if ($request_aborted);
     return if (! defined($outputfile));
     my $Str = '';
     #
@@ -1053,16 +1304,22 @@ sub csv_outputstudent {
     #
     # Output performance data
     foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        my ($performance,$score,$seq_max) =
-            &StudentPerformanceOnSequence($student,\%StudentsData,
-                                          $seq,'no');
-        if ($show eq 'scores') {
+        my ($performance,$performance_length,$score,$seq_max,$rawdata);
+        if ($base eq 'tries') {
+            ($performance,$performance_length,$score,$seq_max,$rawdata) =
+                &StudentTriesOnSequence($student,\%StudentsData,
+                                        $seq,'no');
+        } else {
+            ($performance,$performance_length,$score,$seq_max,$rawdata) =
+                &StudentPerformanceOnSequence($student,\%StudentsData,
+                                              $seq,'no');
+        }
+        if ($data eq 'sum only' || $data eq 'parts correct') {
             $Str .= '"'.$score.'",';
-        } elsif ($show eq 'totals') {
+        } elsif ($data eq 'sum and total' || $data eq 'parts correct total') {
             $Str  .= '"'.$score.'","'.$seq_max.'",';
-        } elsif ($show eq 'all') {
-            $Str .= '"'.join('","',(split(//,$performance),$score,$seq_max)).
-                '",';
+        } elsif ($data eq 'scores' || $data eq 'tries') {
+            $Str .= '"'.join('","',(@$rawdata,$score,$seq_max)).'",';
         }
     }
     chop($Str);
@@ -1076,6 +1333,7 @@ sub csv_outputstudent {
 
 sub csv_finish {
     my ($r) = @_;
+    return if ($request_aborted);
     return if (! defined($outputfile));
     close($outputfile);
     #
@@ -1100,7 +1358,7 @@ sub csv_finish {
 
 =pod
 
-=item &StudentPerformanceOnSequence()
+=item &StudentTriesOnSequence()
 
 Inputs:
 
@@ -1120,17 +1378,22 @@ Inputs:
 
 #######################################################
 #######################################################
-sub StudentPerformanceOnSequence {
+sub StudentTriesOnSequence {
     my ($student,$studentdata,$seq,$links) = @_;
     $links = 'no' if (! defined($links));
     my $Str = '';
     my ($sum,$max) = (0,0);
+    my $performance_length = 0;
+    my @TriesData = ();
+    my $tries;
     foreach my $resource (@{$seq->{'contents'}}) {
         next if ($resource->{'type'} ne 'assessment');
         my $resource_data = $studentdata->{$resource->{'symb'}};
         my $value = '';
         foreach my $partnum (@{$resource->{'parts'}}) {
+            $tries = undef;
             $max++;
+            $performance_length++;
             my $symbol = ' '; # default to space
             #
             if (exists($resource_data->{'resource.'.$partnum.'.solved'})) {
@@ -1147,13 +1410,14 @@ sub StudentPerformanceOnSequence {
                 } elsif ($status eq 'excused') {
                     $symbol = 'x';
                     $max--;
-                } elsif ($status eq 'correct_by_student' &&
+                } elsif (($status eq 'correct_by_scantron' ||
+                          $status eq 'correct_by_student') &&
                     exists($resource_data->{'resource.'.$partnum.'.tries'})){
-                    my $num = $resource_data->{'resource.'.$partnum.'.tries'};
-                    if ($num > 9) {
+                    $tries = $resource_data->{'resource.'.$partnum.'.tries'};
+                    if ($tries > 9) {
                         $symbol = '*';
-                    } elsif ($num > 0) {
-                        $symbol = $num;
+                    } elsif ($tries > 0) {
+                        $symbol = $tries;
                     } else {
                         $symbol = ' ';
                     }
@@ -1173,19 +1437,130 @@ sub StudentPerformanceOnSequence {
                 }
             }
             #
+            if (! defined($tries)) {
+                $tries = $symbol;
+            }
+            push (@TriesData,$tries);
+            #
             if ( ($links eq 'yes' && $symbol ne ' ') ||
                  ($links eq 'all')) {
+                if (length($symbol) > 1) {
+                    &Apache::lonnet::logthis('length of symbol "'.$symbol.'" > 1');
+                }
                 $symbol = '<a href="/adm/grades'.
                     '?symb='.&Apache::lonnet::escape($resource->{'symb'}).
                         '&student='.$student->{'username'}.
-                            '&domain='.$student->{'domain'}.
+                            '&userdom='.$student->{'domain'}.
                                 '&command=submission">'.$symbol.'</a>';
             }
             $value .= $symbol;
         }
         $Str .= $value;
     }
-    return ($Str,$sum,$max);
+    if ($seq->{'randompick'}) {
+        $max = $seq->{'randompick'};
+    }
+    return ($Str,$performance_length,$sum,$max,\@TriesData);
+}
+
+#######################################################
+#######################################################
+
+=pod
+
+=item &StudentPerformanceOnSequence()
+
+Inputs:
+
+=over 4
+
+=item $student
+
+=item $studentdata Hash ref to all student data
+
+=item $seq Hash ref, the sequence we are working on
+
+=item $links if defined we will output links to each resource.
+
+=back
+
+=cut
+
+#######################################################
+#######################################################
+sub StudentPerformanceOnSequence {
+    my ($student,$studentdata,$seq,$links) = @_;
+    $links = 'no' if (! defined($links));
+    my $Str = ''; # final result string
+    my ($score,$max) = (0,0);
+    my $performance_length = 0;
+    my $symbol;
+    my @ScoreData = ();
+    my $partscore;
+    foreach my $resource (@{$seq->{'contents'}}) {
+        next if ($resource->{'type'} ne 'assessment');
+        my $resource_data = $studentdata->{$resource->{'symb'}};
+        foreach my $part (@{$resource->{'parts'}}) {
+            $partscore = undef;
+            my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight',
+                                              $resource->{'symb'},
+                                              $student->{'domain'},
+                                              $student->{'username'},
+                                              $student->{'section'});
+            if (!defined($weight) || ($weight eq '')) { 
+                $weight=1;
+            }
+            #
+            $max += $weight; # see the 'excused' branch below...
+            $performance_length++; # one character per part
+            $symbol = ' '; # default to space
+            #
+            my $awarded = 0;
+            if (exists($resource_data->{'resource.'.$part.'.awarded'})) {
+                $awarded = $resource_data->{'resource.'.$part.'.awarded'};
+                $awarded = 0 if (! $awarded);
+            }
+            #
+            $partscore = $weight*$awarded;
+            $score += $partscore;
+            $symbol = $partscore; 
+            if (abs($symbol - sprintf("%.0f",$symbol)) < 0.001) {
+                $symbol = sprintf("%.0f",$symbol);
+            }
+            if (length($symbol) > 1) {
+                $symbol = '*';
+            }
+            if (exists($resource_data->{'resource.'.$part.'.solved'})) {
+                my $status = $resource_data->{'resource.'.$part.'.solved'};
+                if ($status eq 'excused') {
+                    $symbol = 'x';
+                    $max -= $weight; # Do not count 'excused' problems.
+                }
+            } else {
+                # Unsolved.  Did they try?
+                if (exists($resource_data->{'resource.'.$part.'.tries'})){
+                    $symbol = '.';
+                } else {
+                    $symbol = ' ';
+                }
+            }
+            #
+            if (! defined($partscore)) {
+                $partscore = $symbol;
+            }
+            push (@ScoreData,$partscore);
+            #
+            if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) {
+                $symbol = '<a href="/adm/grades'.
+                    '?symb='.&Apache::lonnet::escape($resource->{'symb'}).
+                    '&student='.$student->{'username'}.
+                    '&userdom='.$student->{'domain'}.
+                    '&command=submission">'.$symbol.'</a>';
+            }
+            $Str .= $symbol;
+        }
+    }
+    return ($Str,$performance_length,$score,$max,\@ScoreData);
 }
 
 #######################################################