--- loncom/interface/statistics/lonstudentassessment.pm	2004/01/27 16:04:27	1.80
+++ loncom/interface/statistics/lonstudentassessment.pm	2006/03/05 02:00:01	1.132
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.80 2004/01/27 16:04:27 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.132 2006/03/05 02:00:01 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,6 +56,8 @@ use Apache::loncommon();
 use Apache::loncoursedata;
 use Apache::lonnet; # for logging porpoises
 use Apache::lonlocal;
+use Apache::grades;
+use Time::HiRes;
 use Spreadsheet::WriteExcel;
 use Spreadsheet::WriteExcel::Utility();
 
@@ -88,12 +90,6 @@ 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.
 
@@ -103,9 +99,7 @@ student.
 #######################################################
 my $show_links;
 my $output_mode;
-my $data;
-my $base;
-my $datadescription;
+my $chosen_output;
 my $single_student_mode;
 
 #######################################################
@@ -145,9 +139,7 @@ sub BuildStudentAssessmentPage {
     undef($Statistics);
     undef($show_links);
     undef($output_mode);
-    undef($data);
-    undef($base);
-    undef($datadescription);
+    undef($chosen_output);
     undef($single_student_mode);
     #
     my %Saveable_Parameters = ('Status' => 'scalar',
@@ -162,8 +154,10 @@ sub BuildStudentAssessmentPage {
     &Apache::lonstatistics::PrepareClasslist();
     #
     $single_student_mode = 0;
-    $single_student_mode = 1 if ($ENV{'form.SelectedStudent'});
-    if ($ENV{'form.selectstudent'}) {
+    $single_student_mode = 1 if ($env{'form.SelectedStudent'});
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                            ['selectstudent']);
+    if ($env{'form.selectstudent'}) {
         &Apache::lonstatistics::DisplayClasslist($r);
         return;
     }
@@ -174,12 +168,15 @@ sub BuildStudentAssessmentPage {
     $r->print(&CreateInterface());
     $r->print('<input type="hidden" name="notfirstrun" value="true" />');
     $r->print('<input type="hidden" name="sort" value="'.
-              $ENV{'form.sort'}.'" />');
+              $env{'form.sort'}.'" />');
     $r->rflush();
     #
-    if (! exists($ENV{'form.notfirstrun'}) && ! $single_student_mode) {
+    if (! exists($env{'form.notfirstrun'}) && ! $single_student_mode) {
         return;
     }
+    $r->print('<h4>'.
+              &Apache::lonstatistics::section_and_enrollment_description().
+              '</h4>');
     #
     my $initialize     = \&html_initialize;
     my $output_student = \&html_outputstudent;
@@ -238,7 +235,7 @@ sub BuildStudentAssessmentPage {
 sub next_and_previous_buttons {
     my $Str = '';
     $Str .= '<input type="hidden" name="SelectedStudent" value="'.
-        $ENV{'form.SelectedStudent'}.'" />';
+        $env{'form.SelectedStudent'}.'" />';
     #
     # Build the previous student link
     my $previous = &Apache::lonstatistics::previous_student();
@@ -316,6 +313,7 @@ the chart page.
 #######################################################
 sub CreateInterface {
     my $Str = '';
+    $Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Chart');
 #    $Str .= &CreateLegend();
     $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';
@@ -334,21 +332,12 @@ sub CreateInterface {
     $Str .= '<tr><td align="center">'."\n";
     $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
     $Str .= '</td><td align="center">';
-    my $only_seq_with_assessments = sub { 
-        my $s=shift;
-        if ($s->{'num_assess'} < 1) { 
-            return 0;
-        } else { 
-            return 1;
-        }
-    };
     $Str .= &Apache::lonstatistics::StudentDataSelect('StudentData','multiple',
                                                       5,undef);
     $Str .= '</td><td>'."\n";
     $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
     $Str .= '</td><td>'."\n";
-    $Str .= &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
-                                              $only_seq_with_assessments);
+    $Str .= &Apache::lonstatistics::map_select('Maps','multiple,all',5);
     $Str .= '</td><td>'."\n";
     $Str .= &CreateAndParseOutputSelector();
     $Str .= '</td><td>'."\n";
@@ -364,6 +353,9 @@ sub CreateInterface {
     $Str .= '<input type="submit" name="ClearCache" value="'.
         &mt('Clear Caches').'" />';
     $Str .= '&nbsp;'x5;
+    $Str .= 
+        &mt('Status [_1]',
+            '<input type="text" name="stats_status" size="60" value="" />');
     $Str .= '<br />';
     return $Str;
 }
@@ -411,7 +403,7 @@ my @OutputOptions =
    },
      { name  => 'CSV',
        value => 'csv',
-       description => 'Output a comma seperated values file suitable for '.
+       description => 'Output a comma separated 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.',
@@ -439,14 +431,9 @@ sub CreateAndParseOutputSelector {
                                             [$elementname]);
     #
     # Format for output options is 'mode, restrictions';
-    my $selected = 'html, without links';
-    if (exists($ENV{'form.'.$elementname})) {
-        if (ref($ENV{'form.'.$elementname} eq 'ARRAY')) {
-            $selected = $ENV{'form.'.$elementname}->[0];
-        } else {
-            $selected = $ENV{'form.'.$elementname};
-        }
-    }
+    my $selected = (&Apache::loncommon::get_env_multiple('form.'.$elementname))[0];
+    $selected = 'html, without links' if (!$selected);
+
     #
     # Set package variables describing output mode
     $show_links  = 'no';
@@ -477,6 +464,16 @@ my @OutputDataOptions =
      { name  => 'Scores Summary',
        base  => 'scores',
        value => 'sum and total',
+       scores => 1,
+       tries  => 0,
+       every_problem => 0,
+       sequence_sum => 1,
+       sequence_max => 1,
+       grand_total => 1,
+       grand_maximum => 1,
+       summary_table => 1,
+       maximum_row => 1,
+       ignore_weight => 0,
        shortdesc => 'Total Score and Maximum Possible for each '.
            'Sequence or Folder',
        longdesc => 'The score of each student as well as the '.
@@ -485,51 +482,57 @@ my @OutputDataOptions =
      { name  => 'Scores Per Problem',
        base  => 'scores',
        value => 'scores',
+       scores => 1,
+       tries  => 0,
+       correct => 0,
+       every_problem => 1,
+       sequence_sum => 1,
+       sequence_max => 1,
+       grand_total => 1,
+       grand_maximum => 1,
+       summary_table => 1,
+       maximum_row => 1,
+       ignore_weight => 0,
        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',
+       scores => 0,
+       tries  => 1,
+       correct => 0,
+       every_problem => 1,
+       sequence_sum => 0,
+       sequence_max => 0,
+       grand_total => 0,
+       grand_maximum => 0,
+       summary_table => 0,
+       maximum_row => 0,
+       ignore_weight => 0,
        shortdesc => 'Number of Tries before success on each Problem Part',
        longdesc =>'The number of tries before success on each problem part.',
+       non_html_notes => 'negative values indicate an incorrect problem',
        },
      { name  =>'Parts Correct',
        base  =>'tries',
        value => 'parts correct total',
+       scores => 0,
+       tries  => 0,
+       correct => 1,
+       every_problem => 1,
+       sequence_sum => 1,
+       sequence_max => 1,
+       grand_total => 1,
+       grand_maximum => 1,
+       summary_table => 1,
+       maximum_row => 0,
+       ignore_weight => 1,
        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 {
@@ -548,21 +551,14 @@ 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};
-        }
-    }
+    my $selected = (&Apache::loncommon::get_env_multiple('form.'.$elementname))[0];
+    $selected = 'scores' if (!$selected);
+
     #
-    $data = 'scores';
+    $chosen_output = $OutputDataOptions[0];
     foreach my $option (@OutputDataOptions) {
         if ($option->{'value'} eq $selected) {
-            $data = $option->{'value'};
-            $base = $option->{'base'};
-            $datadescription = $option->{'shortdesc'};
+            $chosen_output = $option;
         }
     }
     #
@@ -570,7 +566,7 @@ sub CreateAndParseOutputDataSelector {
     $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 .= " selected " if ($option->{'value'} eq $chosen_output->{'value'});
         $Str .= ">".&mt($option->{'name'})."<\/option>";
     }
     $Str .= "\n</select>";
@@ -580,6 +576,26 @@ sub CreateAndParseOutputDataSelector {
 
 #######################################################
 #######################################################
+sub count_parts {
+    my ($navmap,$sequence) = @_;
+    my @resources = &get_resources($navmap,$sequence);
+    my $count = 0;
+    foreach my $res (@resources) {
+        $count += scalar(@{$res->parts});
+    }
+    return $count;
+}
+
+sub get_resources {
+    my ($navmap,$sequence) = @_;
+    my @resources = $navmap->retrieveResources($sequence,
+                                               sub { shift->is_problem(); },
+                                               0,0,0);
+    return @resources;
+}
+
+#######################################################
+#######################################################
 
 =pod
 
@@ -605,6 +621,19 @@ Return a line of the chart for a student
 
     my $nodata_count; # The number of students for which there is no data
     my %prog_state;   # progress state used by loncommon PrgWin routines
+    my $total_sum_width;
+
+    my %width; # Holds sequence width information
+    my @sequences;
+    my $navmap; # Have to keep this around since weakref is a bit zealous
+
+sub html_cleanup {
+    undef(%prog_state);
+    undef(%width);
+    #
+    undef($navmap);
+    undef(@sequences);
+}
 
 sub html_initialize {
     my ($r) = @_;
@@ -612,21 +641,21 @@ sub html_initialize {
     $padding = ' 'x3;
     $count = 0;
     $nodata_count = 0;
-    undef(%prog_state);
+    &html_cleanup();
+    ($navmap,@sequences) = 
+        &Apache::lonstatistics::selected_sequences_with_assessments();
+    if (! ref($navmap)) {
+        # Unable to get data, so bail out
+        $r->print("<h3>".
+                  &mt('Unable to retrieve course information.').
+                  '</h3>');
+    }
     #
-    $r->print("<h3>".$ENV{'course.'.$ENV{'request.course.id'}.'.description'}.
+    $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 ($data =~ /^final table/) {
-        my $studentcount = scalar(@Apache::lonstatistics::Students); 
-        %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-            ($r,'Summary Table Status',
-             'Summary Table Compilation Progress', $studentcount);
+    if ($chosen_output->{'base'} !~ /^final table/) {
+        $r->print("<h3>".$chosen_output->{'shortdesc'}."</h3>");        
     }
     my $Str = "<pre>\n";
     # First, the @StudentData fields need to be listed
@@ -637,36 +666,148 @@ sub html_initialize {
         my $width=$Apache::lonstatistics::StudentData{$field}->{'width'};
         $Str .= $title.' 'x($width-$base).$padding;
     }
-    # Now the selected sequences need to be listed
-    foreach my $sequence (&Apache::lonstatistics::Sequences_with_Assess()){
-        my $title = $sequence->{'title'};
-        my $base  = $sequence->{'base_width'};
-        my $width = $sequence->{'width'};
-        $Str .= $title.' 'x($width-$base).$padding;
-    }
-    $Str .= "total</pre>\n";
-    $Str .= "<pre>";
     #
-    # Check for suppression of output
-    if ($data =~ /^final table/) {
-        $Str = '';
+    # Compute the column widths and output the sequence titles
+    my $total_count;
+    #
+    # Compute sequence widths
+    my $starttime = Time::HiRes::time;
+    foreach my $seq (@sequences) {
+        my $symb = $seq->symb;
+        my $title = $seq->compTitle;
+        $width{$symb}->{'width_sum'} = 0;
+        # Compute width of sum
+        if ($chosen_output->{'sequence_sum'}) {
+            if ($chosen_output->{'every_problem'}) {
+                # Use 1 digit for a space
+                $width{$symb}->{'width_sum'} += 1;            
+            }
+	    $total_count += &count_parts($navmap,$seq);
+            # Use 3 digits for the sum
+            $width{$symb}->{'width_sum'} += 3;
+        }
+        # Compute width of maximum
+        if ($chosen_output->{'sequence_max'}) {
+            if ($width{$symb}->{'width_sum'}>0) {
+                # One digit for the '/'
+                $width{$symb}->{'width_sum'} +=1;
+            }
+            # Use 3 digits for the total
+            $width{$symb}->{'width_sum'}+=3;
+        }
+	#
+        if ($chosen_output->{'every_problem'}) {
+            # one problem per digit
+            $width{$symb}->{'width_parts'}= &count_parts($navmap,$seq);
+            $width{$symb}->{'width_problem'} += $width{$symb}->{'width_parts'};
+        } else {
+            $width{$symb}->{'width_problem'} = 0;
+        }
+        $width{$symb}->{'width_total'} = $width{$symb}->{'width_problem'} + 
+                                     $width{$symb}->{'width_sum'};
+        if ($width{$symb}->{'width_total'} < length(&HTML::Entities::decode($title))) {
+            $width{$symb}->{'width_total'} = length(&HTML::Entities::decode($title));
+        }
+        #
+        # Output the sequence titles
+        $Str .= $title.(' 'x($width{$symb}->{'width_total'}-
+                            length($title)
+                            )).$padding;
     }
+    $total_sum_width = length($total_count)+1;
+    $Str .= "    total</pre>\n";
+    $Str .= "<pre>";
     $r->print($Str);
     $r->rflush();
+
+    $r->print(<<JS);
+<script>
+// get the left offset of a given widget as an absolute position
+function getLeftOffset (element) {
+    return collect(element, "offsetLeft");
+}
+
+// get the top offset of a given widget as an absolute position
+function getTopOffset (element) {
+    return collect(element, "offsetTop");
+}
+
+function collect(element, att) {
+    var val = 0;
+    while(element) {
+        val += element[att];
+        element = element.offsetParent;
+    }
+    return val;
+}
+
+var currentDiv;
+var oldBorder;
+var currentElement;
+function popup_score(element, score) {
+    popdown_score();
+    var left = getLeftOffset(element);
+    var top = getTopOffset(element);
+    var div = document.createElement("div");
+    div.style.border = "1px solid #8888FF";
+    div.style.backgroundColor = "#CCCCFF";
+    div.appendChild(document.createTextNode(score));
+    div.style.position = "absolute";
+    div.style.top = (top - 25) + "px";
+    div.style.left = (left - 10) + "px";
+    currentDiv = div;
+    document.body.insertBefore(div, document.body.children[0]);
+    oldBorder = element.style.border;
+    element.style.border = "1px solid yellow";
+    currentElement = element;
+}
+
+function popdown_score() {
+    if (currentDiv) {
+        document.body.removeChild(currentDiv);
+    }
+    if (currentElement) {
+        currentElement.style.border = oldBorder;
+    }
+    currentDiv = undefined;
+}
+</script>
+JS
+
+    #
+    # Let the user know what we are doing
+    my $studentcount = scalar(@Apache::lonstatistics::Students); 
+    if ($env{'form.SelectedStudent'}) {
+        $studentcount = '1';
+    }
+    #
+    # Initialize progress window
+    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
+        ($r,'HTML Chart Status',
+         'HTML Chart Progress', $studentcount,
+         'inline',undef,'Statistics','stats_status');
+    #
+    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
+                                          'Processing first student');
     return;
 }
 
 sub html_outputstudent {
     my ($r,$student) = @_;
     my $Str = '';
+    return if (! defined($navmap));
     #
-    if($count++ % 5 == 0 && $count > 0 && $data !~ /^final table/) {
+    if($count++ % 5 == 0 && $count > 0) {
         $r->print("</pre><pre>");
     }
     # First, the @StudentData fields need to be listed
     my @to_show = &get_student_fields_to_show();
     foreach my $field (@to_show) {
         my $title=$student->{$field};
+        # Deal with 'comments' - how I love special cases
+        if ($field eq 'comments') {
+            $title = '<a href="/adm/'.$student->{'domain'}.'/'.$student->{'username'}.'/'.'aboutme#coursecomment">'.&mt('Comments').'</a>';
+        }
         my $base = length($title);
         my $width=$Apache::lonstatistics::StudentData{$field}->{'width'};
         $Str .= $title.' 'x($width-$base).$padding;
@@ -675,13 +816,12 @@ sub html_outputstudent {
     my %StudentsData;
     my @tmp = &Apache::loncoursedata::get_current_state
         ($student->{'username'},$student->{'domain'},undef,
-         $ENV{'request.course.id'});
+         $env{'request.course.id'});
     if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) {
         %StudentsData = @tmp;
     }
     if (scalar(@tmp) < 1) {
         $nodata_count++;
-        return if ($data =~ /^final table/);
         $Str .= '<font color="blue">No Course Data</font>'."\n";
         $r->print($Str);
         $r->rflush();
@@ -691,139 +831,158 @@ sub html_outputstudent {
     # By sequence build up the data
     my $studentstats;
     my $PerformanceStr = '';
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+    foreach my $seq (@sequences) {
+        my $symb = $seq->symb;
         my ($performance,$performance_length,$score,$seq_max,$rawdata);
-        if ($base eq 'tries') {
+        if ($chosen_output->{'tries'}) {
             ($performance,$performance_length,$score,$seq_max,$rawdata) =
-                &StudentTriesOnSequence($student,\%StudentsData,
-                                        $seq,$show_links);
+                &student_tries_on_sequence($student,\%StudentsData,
+                                           $navmap,$seq,$show_links);
         } else {
             ($performance,$performance_length,$score,$seq_max,$rawdata) =
-                &StudentPerformanceOnSequence($student,\%StudentsData,
-                                              $seq,$show_links);
+                &student_performance_on_sequence($student,\%StudentsData,
+                                                 $navmap,$seq,$show_links,
+                                                 $chosen_output->{ignore_weight});
+        }
+        my $ratio='';
+        if ($chosen_output->{'every_problem'} && 
+            $chosen_output->{'sequence_sum'}) {
+            $ratio .= ' ';
+        }
+        if ($chosen_output->{'sequence_sum'} && $score ne ' ') {
+            my $score .= sprintf("%3.0f",$score);
+            $ratio .= (' 'x(3-length($score))).$score;
+        } elsif($chosen_output->{'sequence_sum'}) {
+            $ratio .= ' 'x3;
+        }
+        if ($chosen_output->{'sequence_max'}) {
+            if ($chosen_output->{'sequence_sum'}) {
+                $ratio .= '/';
+            }
+            $ratio .= sprintf("%3.0f",$seq_max);
         }
-        my $ratio = sprintf("%3d",$score).'/'.sprintf("%3d",$seq_max);
         #
-        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'}-$performance_length-
-                                 length($ratio)
-                                 ).$ratio;
-        }
+        if (! $chosen_output->{'every_problem'}) {
+            $performance = '';
+	    $performance_length=0;
+        }
+        $performance .= ' 'x($width{$symb}->{'width_total'} -
+                             $performance_length -
+                             $width{$symb}->{'width_sum'}).
+            $ratio;
         #
         $Str .= $performance.$padding;
         #
-        $studentstats->{$seq->{'symb'}}->{'score'}= $score;
-        $studentstats->{$seq->{'symb'}}->{'max'}  = $seq_max;
+        $studentstats->{$symb}->{'score'}= $score;
+        $studentstats->{$symb}->{'max'}  = $seq_max;
     }
     #
     # Total it up and store the statistics info.
-    my ($score,$max) = (0,0);
+    my ($score,$max);
     while (my ($symb,$seq_stats) = each (%{$studentstats})) {
         $Statistics->{$symb}->{'score'} += $seq_stats->{'score'};
         if ($Statistics->{$symb}->{'max'} < $seq_stats->{'max'}) {
             $Statistics->{$symb}->{'max'} = $seq_stats->{'max'};
         }
-        $score += $seq_stats->{'score'};
+        if ($seq_stats->{'score'} ne ' ') {
+            $score += $seq_stats->{'score'};
+            $Statistics->{$symb}->{'num_students'}++;
+        }
         $max   += $seq_stats->{'max'};
     }
-    $Str .= ' '.' 'x(length($max)-length($score)).$score.'/'.$max;
-    $Str .= " \n";
-    #
-    # Check for suppressed output and update the progress window if so...
-    if ($data =~ /^final table/) {
-        $Str = '';
-        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-                                                 'last student');
+    if (! defined($score)) {
+        $score = ' ' x $total_sum_width;
+    } else {
+        $score = sprintf("%.0f",$score);
+        $score = (' 'x(3-length($score))).$score;
     }
+    $Str .= ' '.' 'x($total_sum_width-length($score)).$score.' / '.$max;
+    $Str .= " \n";
     #
     $r->print($Str);
     #
     $r->rflush();
+    &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
     return;
 }    
 
 sub html_finish {
     my ($r) = @_;
+    return if (! defined($navmap));
     #
     # Check for suppressed output and close the progress window if so
-    if ($data =~ /^final table/) {
-        &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
-    } else {
-        $r->print("</pre>\n"); 
-    }
-    if ($single_student_mode) {
-        $r->print(&SingleStudentTotal());
-    } else {
-        $r->print(&StudentAverageTotal());
+    $r->print("</pre>\n"); 
+    if ($chosen_output->{'summary_table'}) {
+        if ($single_student_mode) {
+            $r->print(&SingleStudentTotal());
+        } else {
+            $r->print(&StudentAverageTotal());
+        }
     }
     $r->rflush();
+    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+    &html_cleanup();
     return;
 }
 
 sub StudentAverageTotal {
-    my $Str = "<h3>Summary Tables</h3>\n";
-    my $num_students = scalar(@Apache::lonstatistics::Students);
-    my $total_ave = 0;
-    my $total_max = 0;
+    my $Str = '<h3>'.&mt('Summary Tables').'</h3>'.$/;
     $Str .= '<table border=2 cellspacing="1">'."\n";
-    $Str .= "<tr><th>Title</th><th>Average</th><th>Maximum</th></tr>\n";
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+    $Str .= '<tr>'.
+        '<th>'.&mt('Title').'</th>'.
+        '<th>'.&mt('Average').'</th>'.
+        '<th>'.&mt('Maximum').'</th>'.
+        '</tr>'.$/;
+    foreach my $seq (@sequences) {
+        my $symb = $seq->symb;
         my $ave;
-        if ($num_students > $nodata_count) {
-            $ave = int(100*($Statistics->{$seq->{'symb'}}->{'score'}/
-                            ($num_students-$nodata_count)))/100;
+        my $num_students = $Statistics->{$symb}->{'num_students'};
+        if ($num_students > 0) {
+            $ave = int(100*
+                       ($Statistics->{$symb}->{'score'}/$num_students)
+                       )/100;
         } else {
             $ave = 0;
         }
-        $total_ave += $ave;
-        my $max = $Statistics->{$seq->{'symb'}}->{'max'};
-        $total_max += $max;
-        if ($ave == 0) {
-            $ave = "0.00";
-        }
-        $ave .= '&nbsp;';
-        $max .= '&nbsp;&nbsp;&nbsp;';
-        $Str .= '<tr><td>'.$seq->{'title'}.'</td>'.
-            '<td align="right">'.$ave.'</td>'.
-                '<td align="right">'.$max.'</td></tr>'."\n";
+        my $max = $Statistics->{$symb}->{'max'};
+        $ave = sprintf("%.2f",$ave);
+        $Str .= '<tr><td>'.$seq->compTitle.'</td>'.
+            '<td align="right">'.$ave.'&nbsp;</td>'.
+            '<td align="right">'.$max.'&nbsp;'.'</td></tr>'."\n";
     }
-    $total_ave = int(100*$total_ave)/100; # only two digit
-    $Str .= "</table>\n";
-    $Str .= '<table border=2 cellspacing="1">'."\n";
-    $Str .= '<tr><th>Number of Students</th><th>Average</th>'.
-        "<th>Maximum</th></tr>\n";
-    $Str .= '<tr><td>'.($num_students-$nodata_count).'</td>'.
-        '<td>'.$total_ave.'</td><td>'.$total_max.'</td>';
     $Str .= "</table>\n";
     return $Str;
 }
 
 sub SingleStudentTotal {
+    return if (! defined($navmap));
     my $student = &Apache::lonstatistics::current_student();
-    my $Str = "<h3>Summary table for ".$student->{'fullname'}." ".
-        $student->{'username'}.'@'.$student->{'domain'}."</h3>\n";
+    my $Str = '<h3>'.&mt('Summary table for [_1] ([_2]@[_3])',
+                         $student->{'fullname'},
+                         $student->{'username'},$student->{'domain'}).'</h3>';
+    $Str .= $/;
     $Str .= '<table border=2 cellspacing="1">'."\n";
     $Str .= 
-        "<tr><th>Sequence or Folder</th><th>Score</th><th>Maximum</th></tr>\n";
+        '<tr>'.
+        '<th>'.&mt('Sequence or Folder').'</th>';
+    if ($chosen_output->{'base'} eq 'tries') {
+        $Str .= '<th>'.&mt('Parts Correct').'</th>';
+    } else {
+        $Str .= '<th>'.&mt('Score').'</th>';
+    }
+    $Str .= '<th>'.&mt('Maximum').'</th>'."</tr>\n";
     my $total = 0;
     my $total_max = 0;
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        my $value = $Statistics->{$seq->{'symb'}}->{'score'};
-        my $max = $Statistics->{$seq->{'symb'}}->{'max'};
-        $Str .= '<tr><td>'.$seq->{'title'}.'</td>'.
+    foreach my $seq (@sequences) {
+        my $value = $Statistics->{$seq->symb}->{'score'};
+        my $max = $Statistics->{$seq->symb}->{'max'};
+        $Str .= '<tr><td>'.&HTML::Entities::encode($seq->compTitle).'</td>'.
             '<td align="right">'.$value.'</td>'.
                 '<td align="right">'.$max.'</td></tr>'."\n";
         $total += $value;
         $total_max +=$max;
     }
-    $Str .= '<tr><td><b>Total</b></td>'.
+    $Str .= '<tr><td><b>'.&mt('Total').'</b></td>'.
         '<td align="right">'.$total.'</td>'.
         '<td align="right">'.$total_max."</td></tr>\n";
     $Str .= "</table>\n";
@@ -853,6 +1012,7 @@ sub SingleStudentTotal {
 
 my $excel_sheet;
 my $excel_workbook;
+my $format;
 
 my $filename;
 my $rows_output;
@@ -862,9 +1022,13 @@ my %prog_state; # progress window state
 my $request_aborted;
 
 my $total_formula;
+my $maximum_formula;
+my %formula_data;
 
-sub excel_initialize {
-    my ($r) = @_;
+my $navmap;
+my @sequences;
+
+sub excel_cleanup {
     #
     undef ($excel_sheet);
     undef ($excel_workbook);
@@ -874,60 +1038,52 @@ sub excel_initialize {
     undef (%prog_state);
     undef ($request_aborted);
     undef ($total_formula);
+    undef ($maximum_formula);
     #
-    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
-<b>Scores Summary</b> data.
-</p>
-END
-       $request_aborted = 1;
+    undef(%formula_data);
+    #
+    undef($navmap);
+    undef(@sequences);
+}
+
+sub excel_initialize {
+    my ($r) = @_;
+
+    &excel_cleanup();
+    ($navmap,@sequences) = 
+        &Apache::lonstatistics::selected_sequences_with_assessments();
+    if (! ref($navmap)) {
+        # Unable to get data, so bail out
+        $r->print("<h3>".
+                  &mt('Unable to retrieve course information.').
+                  '</h3>');
     }
-    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;
+    #
+    my $total_columns = scalar(&get_student_fields_to_show());
+    my $num_students = scalar(@Apache::lonstatistics::Students);
+    #
+    foreach my $seq (@sequences) {
+        if ($chosen_output->{'every_problem'}) {
+            $total_columns+=&count_parts($navmap,$seq);
+        }
+        # Add 2 because we need a 'sequence_sum' and 'total' column for each
+        $total_columns += 2;
+    }
+    my $too_many_cols_error_message = 
+        '<h2>'.&mt('Unable to Complete Request').'</h2>'.$/.
+        '<p>'.&mt('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>'.&mt('You may consider reducing the number of <b>Sequences or Folders</b> you have selected.').'</p>'.$/.
+        '<p>'.&mt('LON-CAPA can produce <b>CSV</b> files of this data or Excel files of the <b>Scores Summary</b> data.').'</p>'.$/;
+    if ($chosen_output->{'base'} eq 'tries' && $total_columns > 255) {
+        $r->print($too_many_cols_error_message);
+        $request_aborted = 1;
+    }
+    if ($chosen_output->{'base'} eq 'scores' && $total_columns > 255) {
+        $r->print($too_many_cols_error_message);
+        $request_aborted = 1;
     }
     return if ($request_aborted);
     #
-    $filename = '/prtspool/'.
-        $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
-            time.'_'.rand(1000000000).'.xls';
     #
     $excel_workbook = undef;
     $excel_sheet = undef;
@@ -935,219 +1091,326 @@ END
     $rows_output = 0;
     $cols_output = 0;
     #
-    # Create sheet
-    $excel_workbook = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);
+    # Determine rows 
+    my $header_row = $rows_output++;
+    my $description_row = $rows_output++;
+    my $notes_row = $rows_output++;
+    $rows_output++;        # blank row
+    my $summary_header_row;
+    if ($chosen_output->{'summary_table'}) {
+        $summary_header_row = $rows_output++;
+        $rows_output+= scalar(@sequences);
+        $rows_output++;
+    }
+    my $sequence_name_row = $rows_output++;
+    my $resource_name_row = $rows_output++;
+    my $maximum_data_row = $rows_output++;
+    if (! $chosen_output->{'maximum_row'}) {
+        $rows_output--;
+    }
+    my $first_data_row = $rows_output++;
     #
-    # Check for errors
-    if (! defined($excel_workbook)) {
-        $r->log_error("Error creating excel spreadsheet $filename: $!");
-        $r->print("Problems creating new Excel file.  ".
-                  "This error has been logged.  ".
-                  "Please alert your LON-CAPA administrator");
-        return ;
-    }
-    #
-    # 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);
+    # Create sheet
+    ($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'};
     $sheetname = &Apache::loncommon::clean_excel_name($sheetname);
     $excel_sheet = $excel_workbook->addworksheet($sheetname);
     #
     # Put the course description in the header
-    $excel_sheet->write($rows_output,$cols_output++,
-                   $ENV{'course.'.$ENV{'request.course.id'}.'.description'});
+    $excel_sheet->write($header_row,$cols_output++,
+                   $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);
+    my @Sections = &Apache::lonstatistics::get_selected_sections();
+    $excel_sheet->write($header_row,$cols_output++,
+                        &Apache::lonstatistics::section_and_enrollment_description('plaintext'),
+                        $format->{'h3'});
     #
     # Put the date in there too
-    $excel_sheet->write($rows_output++,$cols_output++,
-                        'Compiled on '.localtime(time));
+    $excel_sheet->write($header_row,$cols_output++,
+                        'Compiled on '.localtime(time),$format->{'h3'});
     #
     $cols_output = 0;
-    $excel_sheet->write($rows_output++,$cols_output++,$datadescription);
+    $excel_sheet->write($description_row,$cols_output++,
+                        $chosen_output->{'shortdesc'},
+                        $format->{'b'});
     #
-    if ($data eq 'tries' || $data eq 'scores') {
-        $rows_output++;
-    }
+    $cols_output = 0;
+    $excel_sheet->write($notes_row,$cols_output++,
+                        $chosen_output->{'non_html_notes'},
+                        $format->{'i'});
+    
+    ##############################################
+    # Output headings for the raw data
+    ##############################################
     #
     # 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;
+        $excel_sheet->write($resource_name_row,$cols_output++,$field,
+                            $format->{'bold'});
     }
     #
     # Add the remaining column headers
     my $total_formula_string = '=0';
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        $excel_sheet->write($rows_output+$row_offset,
-                            $cols_output,$seq->{'title'});
-        if ($data eq 'tries' || $data eq 'scores') {
-            # Determine starting cell
-            $seq->{'Excel:startcell'}=
-                &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
-                ($rows_output,$cols_output);
-            $seq->{'Excel:startcol'}=$cols_output;
+    my $maximum_formula_string = '=0';
+    foreach my $seq (@sequences) {
+        my $symb = $seq->symb;
+        $excel_sheet->write($sequence_name_row,,
+                            $cols_output,$seq->compTitle,$format->{'bold'});
+        # Determine starting cell
+        $formula_data{$symb}->{'Excel:startcell'}=
+            &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+            ($first_data_row,$cols_output);
+        $formula_data{$symb}->{'Excel:startcol'}=$cols_output;
+        my $count = 0;
+        if ($chosen_output->{'every_problem'}) {
             # Put the names of the problems and parts into the sheet
-            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,
+            foreach my $res (&get_resources($navmap,$seq)) {
+                if (scalar(@{$res->parts}) > 1) {
+                    foreach my $part (@{$res->parts}) {
+                        $excel_sheet->write($resource_name_row,
                                             $cols_output++,
-                                            $res->{'title'}.' part '.$part);
+                                            $res->compTitle.' part '.$res->part_display($part),
+                                            $format->{'bold'});
+                        $count++;
                     }
                 } else {
-                    $excel_sheet->write($rows_output,
+                    $excel_sheet->write($resource_name_row,
                                         $cols_output++,
-                                        $res->{'title'});
+                                        $res->compTitle,$format->{'bold'});
+                    $count++;
                 }
             }
-            # Determine ending cell
-            $seq->{'Excel:endcell'} = 
+        }
+        # Determine ending cell
+        if ($count <= 1) {
+            $formula_data{$symb}->{'Excel:endcell'} = $formula_data{$symb}->{'Excel:startcell'};
+            $formula_data{$symb}->{'Excel:endcol'}  = $formula_data{$symb}->{'Excel:startcol'};
+        } else {
+            $formula_data{$symb}->{'Excel:endcell'} = 
                 &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
-                                             ($rows_output,$cols_output-1);
-            $seq->{'Excel:endcol'}=$cols_output-1;
-            # Create the formula for summing up this sequence
-            $seq->{'Excel:sum'}= $excel_sheet->store_formula
-                                        ('=SUM('.$seq->{'Excel:startcell'}.
-                                             ':'.$seq->{'Excel:endcell'}.')');
+                ($first_data_row,$cols_output-1);
+            $formula_data{$symb}->{'Excel:endcol'} = $cols_output-1;
         }
+        # Create the formula for summing up this sequence
+        if (! exists($formula_data{$symb}->{'Excel:endcell'}) ||
+            ! defined($formula_data{$symb}->{'Excel:endcell'})) {
+            $formula_data{$symb}->{'Excel:endcell'} = $formula_data{$symb}->{'Excel:startcell'};
+        }
+
+        my $start = $formula_data{$symb}->{'Excel:startcell'};
+        my $end = $formula_data{$symb}->{'Excel:endcell'};
+        $formula_data{$symb}->{'Excel:sum'}= $excel_sheet->store_formula
+            ("=IF(COUNT($start\:$end),SUM($start\:$end),\"\")");
         # Determine cell the score is held in
-        $seq->{'Excel:scorecell'} = 
+        $formula_data{$symb}->{'Excel:scorecell'} = 
             &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
-            ($rows_output,$cols_output);
-        $seq->{'Excel:scorecol'}=$cols_output;
-        if ($data eq 'parts correct total') {
-            $excel_sheet->write($rows_output,$cols_output++,'parts correct');
-        } else {
-            $excel_sheet->write($rows_output,$cols_output++,'score');
+            ($first_data_row,$cols_output);
+        $formula_data{$symb}->{'Excel:scorecol'}=$cols_output;
+        if ($chosen_output->{'base'} eq 'parts correct total') {
+            $excel_sheet->write($resource_name_row,$cols_output++,
+                                'parts correct',
+                                $format->{'bold'});
+        } elsif ($chosen_output->{'sequence_sum'}) {
+            if ($chosen_output->{'correct'}) {
+                # Only reporting the number correct, so do not call it score
+                $excel_sheet->write($resource_name_row,$cols_output++,
+                                    'sum',
+                                    $format->{'bold'});
+            } else {
+                $excel_sheet->write($resource_name_row,$cols_output++,
+                                    'score',
+                                    $format->{'bold'});
+            }
         }
         #
         $total_formula_string.='+'.
             &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
-            ($rows_output,$cols_output-1);
-        $excel_sheet->write($rows_output,$cols_output++,'maximum');
+            ($first_data_row,$cols_output-1);
+        if ($chosen_output->{'sequence_max'}) {
+            $excel_sheet->write($resource_name_row,$cols_output,
+                                'maximum',
+                                $format->{'bold'});
+            $formula_data{$symb}->{'Excel:maxcell'} = 
+                &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+                ($first_data_row,$cols_output);
+            $formula_data{$symb}->{'Excel:maxcol'}=$cols_output;
+            $maximum_formula_string.='+'.
+                &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+                ($first_data_row,$cols_output);
+            $cols_output++;
+
+        }
     }
-    $excel_sheet->write($rows_output,$cols_output++,'Grand Total');
-    $total_formula = $excel_sheet->store_formula($total_formula_string);
-    #
-    # Bookkeeping
-    if ($data eq 'sum and total' || $data eq 'parts correct total') {
-        $rows_output += 2;
-    } else {
-        $rows_output += 1;
+    if ($chosen_output->{'grand_total'}) {
+        $excel_sheet->write($resource_name_row,$cols_output++,'Total',
+                            $format->{'bold'});
     }
-    #
-    # Output a row for MAX
-    $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++,'');
-        }
+    if ($chosen_output->{'grand_maximum'}) {
+        $excel_sheet->write($resource_name_row,$cols_output++,'Max. Total',
+                            $format->{'bold'});
     }
-    #
-    # Add the maximums for each sequence or assessment
-    my %total_cell_translation;
-    my $grand_total = 0;
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        $total_cell_translation{$seq->{'Excel:scorecell'}} = 
-            &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
-                        ($rows_output,$seq->{'Excel:scorecol'});
-        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;
+    $total_formula = $excel_sheet->store_formula($total_formula_string);
+    $maximum_formula = $excel_sheet->store_formula($maximum_formula_string);
+    ##############################################
+    # Output a row for MAX, if appropriate
+    ##############################################
+    if ($chosen_output->{'maximum_row'}) {
+        $cols_output = 0;
+        foreach my $field (&get_student_fields_to_show()) {
+            if ($field eq 'username' || $field eq 'fullname' || 
+                $field eq 'id') {
+                $excel_sheet->write($maximum_data_row,$cols_output++,'Maximum',
+                                    $format->{'bold'});
+            } else {
+                $excel_sheet->write($maximum_data_row,$cols_output++,'');
+            }
+        }
+        #
+        # Add the maximums for each sequence or assessment
+        my %total_cell_translation;
+        my %maximum_cell_translation;
+        foreach my $seq (@sequences) {
+            my $symb = $seq->symb;
+            $cols_output=$formula_data{$symb}->{'Excel:startcol'};
+            $total_cell_translation{$formula_data{$symb}->{'Excel:scorecell'}}=
+                &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+                ($maximum_data_row,$formula_data{$symb}->{'Excel:scorecol'});
+            $maximum_cell_translation{$formula_data{$symb}->{'Excel:maxcell'}}=
+                &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+                ($maximum_data_row,$formula_data{$symb}->{'Excel:maxcol'});
+            my $weight;
+            my $max = 0;
+            foreach my $resource (&get_resources($navmap,$seq)) {
+                foreach my $part (@{$resource->parts}){
+                    $weight = 1;
+                    if ($chosen_output->{'scores'}) {
+                        $weight = &Apache::lonnet::EXT
+                            ('resource.'.$part.'.weight',$resource->symb,
+                             undef,undef,undef);
+                        if (!defined($weight) || ($weight eq '')) { 
+                            $weight=1;
+                        }
                     }
+                    if ($chosen_output->{'scores'} &&
+                        $chosen_output->{'every_problem'}) {
+                        $excel_sheet->write($maximum_data_row,$cols_output++,
+                                            $weight);
+                    }
+                    $max += $weight;
                 }
-                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 ($chosen_output->{'sequence_sum'} && 
+                $chosen_output->{'every_problem'}) {
+		my %replaceCells=
+		    ('^'.$formula_data{$symb}->{'Excel:startcell'}.':'.
+		         $formula_data{$symb}->{'Excel:endcell'}.'$' =>
+		     &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell($maximum_data_row,$formula_data{$symb}->{'Excel:startcol'}).':'.
+		     &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell($maximum_data_row,$formula_data{$symb}->{'Excel:endcol'}));
+                $excel_sheet->repeat_formula($maximum_data_row,$cols_output++,
+                                             $formula_data{$symb}->{'Excel:sum'},undef,
+					     %replaceCells, %replaceCells);
+			
+            } elsif ($chosen_output->{'sequence_sum'}) {
+                $excel_sheet->write($maximum_data_row,$cols_output++,$max);
             }
-        } 
-        if (! ($data eq 'sum only' || $data eq 'parts correct')) {
-            $excel_sheet->write($rows_output,$cols_output++,'');
+            if ($chosen_output->{'sequence_max'}) {
+                $excel_sheet->write($maximum_data_row,$cols_output++,$max);
+            }
+            #
         }
-        #
-        if ($data eq 'tries' || $data eq 'scores') {
-            my %replaceCells;
-            $replaceCells{$seq->{'Excel:startcell'}} = 
+        if ($chosen_output->{'grand_total'}) {
+            $excel_sheet->repeat_formula($maximum_data_row,$cols_output++,
+                                         $total_formula,undef,
+                                         %total_cell_translation);
+        }
+        if ($chosen_output->{'grand_maximum'}) {
+            $excel_sheet->repeat_formula($maximum_data_row,$cols_output++,
+                                         $maximum_formula,undef,
+                                         %maximum_cell_translation);
+        }
+    } # End of MAXIMUM row output  if ($chosen_output->{'maximum_row'}) {
+    $rows_output = $first_data_row;
+    ##############################################
+    # Output summary table, which actually is above the sequence name row.
+    ##############################################
+    if ($chosen_output->{'summary_table'}) {
+        $cols_output = 0;
+        $excel_sheet->write($summary_header_row,$cols_output++,
+                            'Summary Table',$format->{'bold'});
+        if ($chosen_output->{'maximum_row'}) {
+            $excel_sheet->write($summary_header_row,$cols_output++,
+                                'Maximum',$format->{'bold'});
+        }
+        $excel_sheet->write($summary_header_row,$cols_output++,
+                            'Average',$format->{'bold'});
+        $excel_sheet->write($summary_header_row,$cols_output++,
+                            'Median',$format->{'bold'});
+        $excel_sheet->write($summary_header_row,$cols_output++,
+                            'Std Dev',$format->{'bold'});
+        my $row = $summary_header_row+1;
+        foreach my $seq (@sequences) {
+            my $symb = $seq->symb;
+            $cols_output = 0;
+            $excel_sheet->write($row,$cols_output++,
+                                $seq->compTitle,
+                                $format->{'bold'});
+            if ($chosen_output->{'maximum_row'}) {
+                $excel_sheet->write
+                    ($row,$cols_output++,
+                     '='.
+                     &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+                     ($maximum_data_row,$formula_data{$symb}->{'Excel:scorecol'})
+                     );
+            }
+            my $range = 
                 &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
-                ($rows_output,$seq->{'Excel:startcol'});
-            $replaceCells{$seq->{'Excel:endcell'}} = 
+                ($first_data_row,$formula_data{$symb}->{'Excel:scorecol'}).
+                ':'.
                 &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
-                ($rows_output,$seq->{'Excel:endcol'});
-            $excel_sheet->repeat_formula($rows_output,$cols_output++,
-                                         $seq->{'Excel:sum'},undef,
-                                         %replaceCells);
-        } else {
-            $excel_sheet->write($rows_output,$cols_output++,
-                                $max);
+                ($first_data_row+$num_students-1,$formula_data{$symb}->{'Excel:scorecol'});
+            $excel_sheet->write($row,$cols_output++,
+                                '=AVERAGE('.$range.')');
+            $excel_sheet->write($row,$cols_output++,
+                                '=MEDIAN('.$range.')');
+            $excel_sheet->write($row,$cols_output++,
+                                '=STDEV('.$range.')');
+            $row++;
         }
-        $grand_total+=$max;
     }
-    if ($data eq 'tries' || $data eq 'scores') {
-        $excel_sheet->repeat_formula($rows_output,$cols_output++,
-                                     $total_formula,undef,
-                                     %total_cell_translation);
-    } else {
-        $excel_sheet->write($rows_output,$cols_output++,$grand_total);
-    }
-    $rows_output++;
+    ##############################################
+    #   Take care of non-excel initialization
+    ##############################################
     #
     # Let the user know what we are doing
     my $studentcount = scalar(@Apache::lonstatistics::Students); 
-    $r->print("<h1>Compiling Excel spreadsheet for ".
-              $studentcount.' student');
-    $r->print('s') if ($studentcount > 1);
-    $r->print("</h1>\n");
+    if ($env{'form.SelectedStudent'}) {
+        $studentcount = '1';
+    }
+    if ($studentcount > 1) {
+        $r->print('<h1>'.&mt('Compiling Excel spreadsheet for [_1] students',
+                             $studentcount)."</h1>\n");
+    } else {
+        $r->print('<h1>'.
+                  &mt('Compiling Excel spreadsheet for 1 student').
+                  "</h1>\n");
+    }
     $r->rflush();
     #
     # Initialize progress window
     %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
         ($r,'Excel File Compilation Status',
-         'Excel File Compilation Progress', $studentcount);
+         'Excel File Compilation Progress', $studentcount,
+         'inline',undef,'Statistics','stats_status');
     #
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
                                           'Processing first student');
@@ -1156,14 +1419,20 @@ END
 
 sub excel_outputstudent {
     my ($r,$student) = @_;
-    return if ($request_aborted);
-    return if (! defined($excel_sheet));
+    if ($request_aborted || ! defined($navmap) || ! defined($excel_sheet)) {
+        return;
+    }
     $cols_output=0;
     #
     # Write out student data
     my @to_show = &get_student_fields_to_show();
     foreach my $field (@to_show) {
-        $excel_sheet->write($rows_output,$cols_output++,$student->{$field});
+        my $value = $student->{$field};
+        if ($field eq 'comments') {
+            $value = &Apache::lonmsg::retrieve_instructor_comments
+                ($student->{'username'},$student->{'domain'});
+        }
+        $excel_sheet->write($rows_output,$cols_output++,$value);
     }
     #
     # Get student assessment data
@@ -1171,60 +1440,92 @@ sub excel_outputstudent {
     my @tmp = &Apache::loncoursedata::get_current_state($student->{'username'},
                                                         $student->{'domain'},
                                                         undef,
-                                                   $ENV{'request.course.id'});
+                                                   $env{'request.course.id'});
     if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) {
         %StudentsData = @tmp;
     }
     #
     # Write out sequence scores and totals data
     my %total_cell_translation;
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+    my %maximum_cell_translation;
+    foreach my $seq (@sequences) {
+        my $symb = $seq->symb;
+        $cols_output = $formula_data{$symb}->{'Excel:startcol'};
         # Keep track of cells to translate in total cell
-        $total_cell_translation{$seq->{'Excel:scorecell'}} = 
+        $total_cell_translation{$formula_data{$symb}->{'Excel:scorecell'}} = 
             &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
-                        ($rows_output,$seq->{'Excel:scorecol'});
+                        ($rows_output,$formula_data{$symb}->{'Excel:scorecol'});
+        # and maximum cell
+        $maximum_cell_translation{$formula_data{$symb}->{'Excel:maxcell'}} = 
+            &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+            ($rows_output,$formula_data{$symb}->{'Excel:maxcol'});
         #
         my ($performance,$performance_length,$score,$seq_max,$rawdata);
-        if ($base eq 'tries') {
+        if ($chosen_output->{'tries'} || $chosen_output->{'correct'}){
             ($performance,$performance_length,$score,$seq_max,$rawdata) =
-                &StudentTriesOnSequence($student,\%StudentsData,
-                                        $seq,'no');
+                &student_tries_on_sequence($student,\%StudentsData,
+                                           $navmap,$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);
+                &student_performance_on_sequence($student,\%StudentsData,
+                                                 $navmap,$seq,'no',
+                                                 $chosen_output->{ignore_weight});
+        } 
+        if ($chosen_output->{'every_problem'}) {
+            if ($chosen_output->{'correct'}) {
+                # only indiciate if each item is correct or not
+                foreach my $value (@$rawdata) {
+                    # positive means correct, 0 or negative means
+                    # incorrect
+                    $value = $value > 0 ? 1 : 0;
+                    $excel_sheet->write($rows_output,$cols_output++,$value);
+                }
+            } else {
+                foreach my $value (@$rawdata) {
+                    if ($score eq ' ' || !defined($value)) {
+                        $cols_output++;
+                    } else {                        
+                        $excel_sheet->write($rows_output,$cols_output++,
+                                            $value);
+                    }
+                }
             }
+        }
+        if ($chosen_output->{'sequence_sum'} && 
+            $chosen_output->{'every_problem'}) {
             # Write a formula for the sum of this sequence
-            my %replaceCells;
-            $replaceCells{$seq->{'Excel:startcell'}} = 
-                &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
-                            ($rows_output,$seq->{'Excel:startcol'});
-            $replaceCells{$seq->{'Excel:endcell'}} = 
-                &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
-                            ($rows_output,$seq->{'Excel:endcol'});
-            # The undef is for the format
-            $excel_sheet->repeat_formula($rows_output,$cols_output++,
-                                         $seq->{'Excel:sum'},undef,
-                                         %replaceCells);
-            #
-            $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);
+            my %replaceCells=
+		('^'.$formula_data{$symb}->{'Excel:startcell'}.':'.$formula_data{$symb}->{'Excel:endcell'}.'$'
+		 => 
+		 &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell($rows_output,$formula_data{$symb}->{'Excel:startcol'}).':'.
+		 &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell($rows_output,$formula_data{$symb}->{'Excel:endcol'})
+		 );
+            # The undef is for the format	    
+	    $excel_sheet->repeat_formula($rows_output,$cols_output++,
+					 $formula_data{$symb}->{'Excel:sum'},undef,
+					 %replaceCells, %replaceCells);
+        } elsif ($chosen_output->{'sequence_sum'}) {
+            if ($score eq ' ') {
+                $cols_output++;
+            } else {
+                $excel_sheet->write($rows_output,$cols_output++,$score);
+            }
         }
-        if ($data eq 'sum and total' || $data eq 'parts correct total') {
+        if ($chosen_output->{'sequence_max'}) {
             $excel_sheet->write($rows_output,$cols_output++,$seq_max);
         }
     }
     #
-    $excel_sheet->repeat_formula($rows_output,$cols_output++,
-                                 $total_formula,undef,
-                                 %total_cell_translation);
-
+    if ($chosen_output->{'grand_total'}) {
+        $excel_sheet->repeat_formula($rows_output,$cols_output++,
+                                     $total_formula,undef,
+                                     %total_cell_translation);
+    }
+    if ($chosen_output->{'grand_maximum'}) {
+        $excel_sheet->repeat_formula($rows_output,$cols_output++,
+                                     $maximum_formula,undef,
+                                     %maximum_cell_translation);
+    }
     #
     # Bookkeeping
     $rows_output++; 
@@ -1237,14 +1538,13 @@ sub excel_outputstudent {
 
 sub excel_finish {
     my ($r) = @_;
-    return if ($request_aborted);
-    return if (! defined($excel_sheet));
+    if ($request_aborted || ! defined($navmap) || ! defined($excel_sheet)) {
+	&excel_cleanup();
+        return;
+    }
     #
     # Write the excel file
     $excel_workbook->close();
-    my $c = $r->connection();
-    #
-    return if($c->aborted());
     #
     # Close the progress window
     &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
@@ -1253,6 +1553,7 @@ sub excel_finish {
     $r->print('<br />'.
               '<a href="'.$filename.'">Your Excel spreadsheet.</a>'."\n");
     $r->rflush();
+    &excel_cleanup();
     return;
 }
 
@@ -1280,19 +1581,35 @@ my $outputfile;
 my $filename;
 my $request_aborted;
 my %prog_state; # progress window state
+my $navmap;
+my @sequences;
 
-sub csv_initialize{
-    my ($r) = @_;
-    # 
-    # Clean up
+sub csv_cleanup {
     undef($outputfile);
     undef($filename);
     undef($request_aborted);
     undef(%prog_state);
     #
+    undef($navmap);
+    undef(@sequences);
+}
+
+sub csv_initialize{
+    my ($r) = @_;
+
+    &csv_cleanup();
+    ($navmap,@sequences) = 
+        &Apache::lonstatistics::selected_sequences_with_assessments();
+    if (! ref($navmap)) {
+        # Unable to get data, so bail out
+        $r->print("<h3>".
+                  &mt('Unable to retrieve course information.').
+                  '</h3>');
+    }
+    #
     # Deal with unimplemented requests
     $request_aborted = undef;
-    if ($data =~ /final table/) {
+    if ($chosen_output->{'base'} =~ /final table/) {
         $r->print(<<END);
 <h2>Unable to Complete Request</h2>
 <p>
@@ -1302,89 +1619,102 @@ END
        $request_aborted = 1;
     }
     return if ($request_aborted);
-
+    #
+    # Initialize progress window
+    my $studentcount = scalar(@Apache::lonstatistics::Students);
+    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
+        ($r,'CSV File Compilation Status',
+         'CSV File Compilation Progress', $studentcount,
+         'inline',undef,'Statistics','stats_status');
     #
     # Open a file
-    $filename = '/prtspool/'.
-        $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
-            time.'_'.rand(1000000000).'.csv';
-    unless ($outputfile = Apache::File->new('>/home/httpd'.$filename)) {
-        $r->log_error("Couldn't open $filename for output $!");
-        $r->print("Problems occured in writing the csv file.  ".
-                  "This error has been logged.  ".
-                  "Please alert your LON-CAPA administrator.");
-        $outputfile = undef;
-    }
+    ($outputfile,$filename) = &Apache::loncommon::create_text_file($r,'csv');
+    if (! defined($outputfile)) { return ''; }
     #
     # Datestamp
-    my $description = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+    my $description = $env{'course.'.$env{'request.course.id'}.'.description'};
     print $outputfile '"'.&Apache::loncommon::csv_translate($description).'",'.
         '"'.&Apache::loncommon::csv_translate(scalar(localtime(time))).'"'.
             "\n";
+    print $outputfile '"'.
+        &Apache::loncommon::csv_translate
+        (&Apache::lonstatistics::section_and_enrollment_description()).
+        '"'."\n";
+    foreach my $item ('shortdesc','non_html_notes') {
+        next if (! exists($chosen_output->{$item}));
+        print $outputfile 
+            '"'.&Apache::loncommon::csv_translate($chosen_output->{$item}).'"'.
+            "\n";
+    }
     #
     # Print out the headings
-    my $Str = '';
-    my $Str2 = undef;
+    my $sequence_row = '';
+    my $resource_row = undef;
     foreach my $field (&get_student_fields_to_show()) {
-        if ($data eq 'sum only') {
-            $Str .= '"'.&Apache::loncommon::csv_translate($field).'",';
-        } 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 ($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 ($data eq 'sum only' || $data eq 'parts correct') {
-            $Str .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}).
-                '",';
-        } elsif ($data eq 'sum and total' || $data eq 'parts correct total') {
-            $Str  .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}).
-                '","",';
-            $Str2 .= '"score","total possible",';
-        } elsif ($data eq 'scores' || $data eq 'tries') {
-            $Str  .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}).
-                '",';
-            $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).'",';
+        $sequence_row .='"",';
+        $resource_row .= '"'.&Apache::loncommon::csv_translate($field).'",';
+    }
+    foreach my $seq (@sequences) {
+        $sequence_row .= '"'.
+            &Apache::loncommon::csv_translate($seq->compTitle).'",';
+        my $count = 0;
+        if ($chosen_output->{'every_problem'}) {
+            foreach my $res (&get_resources($navmap,$seq)) {
+                if (scalar(@{$res->parts}) < 1) {
+                    next;
+                }
+                foreach my $part (@{$res->parts}) {
+                    $resource_row .= '"'.
+                        &Apache::loncommon::csv_translate
+                        ($res->compTitle.', Part '.$res->part_display($part)).'",';
+                    $count++;
                 }
             }
-            $Str2 .= '"score","total possible",';
         }
-    }
-    chop($Str);
-    $Str .= "\n";
-    print $outputfile $Str;
-    if (defined($Str2)) {
-        chop($Str2);
-        $Str2 .= "\n";
-        print $outputfile $Str2;
-    }
-    #
-    # Initialize progress window
-    my $studentcount = scalar(@Apache::lonstatistics::Students);
-    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,'CSV File Compilation Status',
-         'CSV File Compilation Progress', $studentcount);
+        $sequence_row.='"",'x$count;
+        if ($chosen_output->{'sequence_sum'}) {
+            if($chosen_output->{'correct'}) {
+                $resource_row .= '"sum",';
+            } else {
+                $resource_row .= '"score",';
+            }
+        }
+        if ($chosen_output->{'sequence_max'}) {
+            $sequence_row.= '"",';
+            $resource_row .= '"maximum possible",';
+        }
+    }
+    if ($chosen_output->{'grand_total'}) {
+        $sequence_row.= '"",';
+        $resource_row.= '"Total",';
+    } 
+    if ($chosen_output->{'grand_maximum'}) {
+        $sequence_row.= '"",';
+        $resource_row.= '"Maximum",';
+    } 
+    chomp($sequence_row);
+    chomp($resource_row);
+    print $outputfile $sequence_row."\n";
+    print $outputfile $resource_row."\n";
     return;
 }
 
 sub csv_outputstudent {
     my ($r,$student) = @_;
-    return if ($request_aborted);
-    return if (! defined($outputfile));
+    if ($request_aborted || ! defined($navmap) || ! defined($outputfile)) {
+        return;
+    }
     my $Str = '';
     #
     # Output student fields
     my @to_show = &get_student_fields_to_show();
     foreach my $field (@to_show) {
-        $Str .= '"'.&Apache::loncommon::csv_translate($student->{$field}).'",';
+        my $value = $student->{$field};
+        if ($field eq 'comments') {
+            $value = &Apache::lonmsg::retrieve_instructor_comments
+                ($student->{'username'},$student->{'domain'});
+        }        
+        $Str .= '"'.&Apache::loncommon::csv_translate($value).'",';
     }
     #
     # Get student assessment data
@@ -1392,30 +1722,55 @@ sub csv_outputstudent {
     my @tmp = &Apache::loncoursedata::get_current_state($student->{'username'},
                                                         $student->{'domain'},
                                                         undef,
-                                                   $ENV{'request.course.id'});
+                                                   $env{'request.course.id'});
     if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) {
         %StudentsData = @tmp;
     }
     #
     # Output performance data
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+    my $total = 0;
+    my $maximum = 0;
+    foreach my $seq (@sequences) {
         my ($performance,$performance_length,$score,$seq_max,$rawdata);
-        if ($base eq 'tries') {
+        if ($chosen_output->{'tries'}){
             ($performance,$performance_length,$score,$seq_max,$rawdata) =
-                &StudentTriesOnSequence($student,\%StudentsData,
-                                        $seq,'no');
+                &student_tries_on_sequence($student,\%StudentsData,
+                                           $navmap,$seq,'no');
         } else {
             ($performance,$performance_length,$score,$seq_max,$rawdata) =
-                &StudentPerformanceOnSequence($student,\%StudentsData,
-                                              $seq,'no');
+                &student_performance_on_sequence($student,\%StudentsData,
+                                                 $navmap,$seq,'no',
+                                                 $chosen_output->{ignore_weight});
+        }
+        if ($chosen_output->{'every_problem'}) {
+            if ($chosen_output->{'correct'}) {
+                $score = 0;
+                # Deal with number of parts correct data
+                $Str .= '"'.join('","',( map { if ($_>0) { 
+                                                   $score += 1;
+                                                   1; 
+                                               } else { 
+                                                   0; 
+                                               }
+                                             } @$rawdata)).'",';
+            } else {
+                $Str .= '"'.join('","',(@$rawdata)).'",';
+            }
         }
-        if ($data eq 'sum only' || $data eq 'parts correct') {
+        if ($chosen_output->{'sequence_sum'}) {
             $Str .= '"'.$score.'",';
-        } elsif ($data eq 'sum and total' || $data eq 'parts correct total') {
-            $Str  .= '"'.$score.'","'.$seq_max.'",';
-        } elsif ($data eq 'scores' || $data eq 'tries') {
-            $Str .= '"'.join('","',(@$rawdata,$score,$seq_max)).'",';
+        } 
+        if ($chosen_output->{'sequence_max'}) {
+            $Str .= '"'.$seq_max.'",';
         }
+        $total+=$score;
+        $maximum += $seq_max;
+    }
+    if ($chosen_output->{'grand_total'}) {
+        $Str .= '"'.$total.'",';
+    }
+    if ($chosen_output->{'grand_maximum'}) {
+        $Str .= '"'.$maximum.'",';
     }
     chop($Str);
     $Str .= "\n";
@@ -1428,26 +1783,38 @@ sub csv_outputstudent {
 
 sub csv_finish {
     my ($r) = @_;
-    return if ($request_aborted);
-    return if (! defined($outputfile));
+    if ($request_aborted || ! defined($navmap) || ! defined($outputfile)) {
+	&csv_cleanup();
+        return;
+    }
     close($outputfile);
     #
-    my $c = $r->connection();
-    return if ($c->aborted());
-    #
     # Close the progress window
     &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
     #
     # Tell the user where to get their csv file
     $r->print('<br />'.
-              '<a href="'.$filename.'">Your csv file.</a>'."\n");
+              '<a href="'.$filename.'">'.&mt('Your csv file.').'</a>'."\n");
     $r->rflush();
+    &csv_cleanup();
     return;
     
 }
 
 }
 
+# This function will return an HTML string including a star, with
+# a mouseover popup showing the "real" value. An optional second
+# argument lets you show something other than a star.
+sub show_star {
+    my $popup = shift;
+    my $symbol = shift || '*';
+    # Escape the popup for JS.
+    $popup =~ s/([^-a-zA-Z0-9:;,._ ()|!\/?=&*])/'\\' . sprintf("%lo", ord($1))/ge;
+    
+    return "<span onmouseover='popup_score(this, \"$popup\");return false;' onmouseout='popdown_score();return false;' style='border: 1px solid #339933; margin: -1px;'>$symbol</span>";
+}
+
 #######################################################
 #######################################################
 
@@ -1473,19 +1840,19 @@ Inputs:
 
 #######################################################
 #######################################################
-sub StudentTriesOnSequence {
-    my ($student,$studentdata,$seq,$links) = @_;
+sub student_tries_on_sequence {
+    my ($student,$studentdata,$navmap,$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 $hasdata = 0; # flag - true if the student has any data on the sequence
+    foreach my $resource (&get_resources($navmap,$seq)) {
+        my $resource_data = $studentdata->{$resource->symb};
         my $value = '';
-        foreach my $partnum (@{$resource->{'parts'}}) {
+        foreach my $partnum (@{$resource->parts()}) {
             $tries = undef;
             $max++;
             $performance_length++;
@@ -1505,6 +1872,7 @@ sub StudentTriesOnSequence {
             my $tries = 0;
             if(exists($resource_data->{'resource.'.$partnum.'.tries'})) {
                 $tries = $resource_data->{'resource.'.$partnum.'.tries'};
+                $hasdata =1;
             }
             #
             if ($awarded > 0) {
@@ -1517,7 +1885,7 @@ sub StudentTriesOnSequence {
                     $sum++;
                 } elsif ($tries > 0) {
                     if ($tries > 9) {
-                        $symbol = '*';
+                        $symbol = show_star($tries);
                     } else {
                         $symbol = $tries;
                     }
@@ -1534,7 +1902,7 @@ sub StudentTriesOnSequence {
                 } elsif ($status eq 'incorrect_by_override') {
                     $symbol = '-';
                 } elsif ($status eq 'ungraded_attempted') {
-                    $symbol = '#';
+                    $symbol = 'u';
                 } elsif ($status eq 'incorrect_attempted' ||
                          $tries > 0)  {
                     $symbol = '.';
@@ -1545,9 +1913,15 @@ sub StudentTriesOnSequence {
             }
             #
             if (! defined($tries)) {
-                $tries = $symbol;
+                $tries = 0;
+            }
+            if ($status =~ /^(incorrect|ungraded)/) {
+                # Bug 3390: show '-' for tries on incorrect problems 
+                # (csv & excel only)
+                push(@TriesData,-$tries);
+            } else {
+                push (@TriesData,$tries);
             }
-            push (@TriesData,$tries);
             #
             if ( ($links eq 'yes' && $symbol ne ' ') ||
                  ($links eq 'all')) {
@@ -1555,7 +1929,7 @@ sub StudentTriesOnSequence {
                     &Apache::lonnet::logthis('length of symbol "'.$symbol.'" > 1');
                 }
                 $symbol = '<a href="/adm/grades'.
-                    '?symb='.&Apache::lonnet::escape($resource->{'symb'}).
+                    '?symb='.&Apache::lonnet::escape($resource->symb).
                         '&student='.$student->{'username'}.
                             '&userdom='.$student->{'domain'}.
                                 '&command=submission">'.$symbol.'</a>';
@@ -1564,8 +1938,11 @@ sub StudentTriesOnSequence {
         }
         $Str .= $value;
     }
-    if ($seq->{'randompick'}) {
-        $max = $seq->{'randompick'};
+    if ($seq->randompick()) {
+        $max = $seq->randompick();
+    }
+    if (! $hasdata && $sum == 0) {
+        $sum = ' ';
     }
     return ($Str,$performance_length,$sum,$max,\@TriesData);
 }
@@ -1575,7 +1952,7 @@ sub StudentTriesOnSequence {
 
 =pod
 
-=item &StudentPerformanceOnSequence()
+=item &student_performance_on_sequence
 
 Inputs:
 
@@ -1595,8 +1972,8 @@ Inputs:
 
 #######################################################
 #######################################################
-sub StudentPerformanceOnSequence {
-    my ($student,$studentdata,$seq,$links) = @_;
+sub student_performance_on_sequence {
+    my ($student,$studentdata,$navmap,$seq,$links,$awarded_only) = @_;
     $links = 'no' if (! defined($links));
     my $Str = ''; # final result string
     my ($score,$max) = (0,0);
@@ -1604,16 +1981,20 @@ sub StudentPerformanceOnSequence {
     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'}}) {
+    my $hasdata = 0; # flag, 0 if there were no submissions on the sequence
+    foreach my $resource (&get_resources($navmap,$seq)) {
+        my $symb = $resource->symb;
+        my $resource_data = $studentdata->{$symb};
+        foreach my $part (@{$resource->parts()}) {
             $partscore = undef;
-            my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight',
-                                              $resource->{'symb'},
-                                              $student->{'domain'},
-                                              $student->{'username'},
-                                              $student->{'section'});
+            my $weight;
+            if (!$awarded_only){
+                $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight',
+                                               $symb,
+                                               $student->{'domain'},
+                                               $student->{'username'},
+                                               $student->{'section'});
+            }
             if (!defined($weight) || ($weight eq '')) { 
                 $weight=1;
             }
@@ -1622,31 +2003,43 @@ sub StudentPerformanceOnSequence {
             $performance_length++; # one character per part
             $symbol = ' '; # default to space
             #
-            my $awarded = 0;
+            my $awarded;
             if (exists($resource_data->{'resource.'.$part.'.awarded'})) {
                 $awarded = $resource_data->{'resource.'.$part.'.awarded'};
                 $awarded = 0 if (! $awarded);
+                $hasdata = 1;
             }
             #
-            $partscore = $weight*$awarded;
+            $partscore = &Apache::grades::compute_points($weight,$awarded);
+            if (! defined($awarded)) {
+                $partscore = undef;
+            }
             $score += $partscore;
             $symbol = $partscore; 
             if (abs($symbol - sprintf("%.0f",$symbol)) < 0.001) {
                 $symbol = sprintf("%.0f",$symbol);
             }
             if (length($symbol) > 1) {
-                $symbol = '*';
+                $symbol = show_star($symbol);
             }
-            if (exists($resource_data->{'resource.'.$part.'.solved'})) {
+            if (exists($resource_data->{'resource.'.$part.'.solved'}) &&
+                $resource_data->{'resource.'.$part.'.solved'} ne '') {
                 my $status = $resource_data->{'resource.'.$part.'.solved'};
                 if ($status eq 'excused') {
                     $symbol = 'x';
                     $max -= $weight; # Do not count 'excused' problems.
+                } elsif ($status eq 'ungraded_attempted') {
+                    $symbol = 'u';
                 }
-            } else {
+                $hasdata = 1;
+            } elsif ($resource_data->{'resource.'.$part.'.award'} eq 'DRAFT') {
+                $symbol = 'd';
+                $hasdata = 1;
+            } elsif (!exists($resource_data->{'resource.'.$part.'.awarded'})){
                 # Unsolved.  Did they try?
                 if (exists($resource_data->{'resource.'.$part.'.tries'})){
                     $symbol = '.';
+                    $hasdata = 1;
                 } else {
                     $symbol = ' ';
                 }
@@ -1659,7 +2052,7 @@ sub StudentPerformanceOnSequence {
             #
             if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) {
                 $symbol = '<a href="/adm/grades'.
-                    '?symb='.&Apache::lonnet::escape($resource->{'symb'}).
+                    '?symb='.&Apache::lonnet::escape($symb).
                     '&student='.$student->{'username'}.
                     '&userdom='.$student->{'domain'}.
                     '&command=submission">'.$symbol.'</a>';
@@ -1667,6 +2060,9 @@ sub StudentPerformanceOnSequence {
             $Str .= $symbol;
         }
     }
+    if (! $hasdata && $score == 0) {
+        $score = ' ';
+    }
     return ($Str,$performance_length,$score,$max,\@ScoreData);
 }
 
@@ -1687,13 +2083,13 @@ problems.
 #######################################################
 sub CreateLegend {
     my $Str = "<p><pre>".
-              "   1  correct by student in 1 try\n".
-              "   7  correct by student in 7 tries\n".
+              " digit score or number of tries to get correct ".
               "   *  correct by student in more than 9 tries\n".
 	      "   +  correct by hand grading or override\n".
               "   -  incorrect by override\n".
 	      "   .  incorrect attempted\n".
-	      "   #  ungraded attempted\n".
+	      "   u  ungraded attempted\n".
+              "   d  draft answer saved but not submitted\n".
               "      not attempted (blank field)\n".
 	      "   x  excused".
               "</pre><p>";