--- loncom/interface/statistics/lonstudentassessment.pm	2003/12/09 17:00:07	1.78
+++ loncom/interface/statistics/lonstudentassessment.pm	2004/02/06 19:29:00	1.83
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.78 2003/12/09 17:00:07 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.83 2004/02/06 19:29:00 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -785,22 +785,20 @@ sub StudentAverageTotal {
         $total_ave += $ave;
         my $max = $Statistics->{$seq->{'symb'}}->{'max'};
         $total_max += $max;
-        if ($ave == 0) {
-            $ave = "0.00";
-        }
-        $ave .= ' ';
-        $max .= '   ';
+        $ave = sprintf("%.2f",$ave);
         $Str .= '<tr><td>'.$seq->{'title'}.'</td>'.
-            '<td align="right">'.$ave.'</td>'.
-                '<td align="right">'.$max.'</td></tr>'."\n";
+            '<td align="right">'.$ave.'&nbsp;</td>'.
+            '<td align="right">'.$max.'&nbsp;'.'</td></tr>'."\n";
     }
-    $total_ave = int(100*$total_ave)/100; # only two digit
+    $total_ave = sprintf('%.2f',$total_ave); # 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 .= '<tr>'.
+        '<td align="right">'.($num_students-$nodata_count).'</td>'.
+        '<td align="right">'.$total_ave.'&nbsp;'.'</td>'.
+        '<td align="right">'.$total_max.'&nbsp;'.'</td>';
     $Str .= "</table>\n";
     return $Str;
 }
@@ -909,7 +907,7 @@ You may consider reducing the number of
 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>).
+<b>Scores Summary</b> data.
 </p>
 END
        $request_aborted = 1;
@@ -1016,6 +1014,7 @@ END
                 ($rows_output,$cols_output);
             $seq->{'Excel:startcol'}=$cols_output;
             # Put the names of the problems and parts into the sheet
+            my $count = 0;
             foreach my $res (@{$seq->{'contents'}}) {
                 next if ($res->{'type'} ne 'assessment');
                 if (scalar(@{$res->{'parts'}}) > 1) {
@@ -1029,46 +1028,44 @@ END
                                         $cols_output++,
                                         $res->{'title'});
                 }
+                $count++;
             }
             # Determine ending cell
-            $seq->{'Excel:endcell'} = 
-                &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
-                                             ($rows_output,$cols_output-1);
-            $seq->{'Excel:endcol'}=$cols_output-1;
-            # Determine cell the score is held in
-            $seq->{'Excel:scorecell'} = 
-                &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
-                                             ($rows_output,$cols_output);
-            $seq->{'Excel:scorecol'}=$cols_output;
-            $excel_sheet->write($rows_output,$cols_output++,'score');
+            if ($count == 1) {
+                $seq->{'Excel:endcell'} = $seq->{'Excel:startcell'};
+                $seq->{'Excel:endcol'}  = $seq->{'Excel:startcol'};
+            } else {
+                $seq->{'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
+            if (! exists($seq->{'Excel:endcell'}) ||
+                ! defined($seq->{'Excel:endcell'})) {
+                $seq->{'Excel:endcell'} = $seq->{'Excel:startcell'};
+            }
             $seq->{'Excel:sum'}= $excel_sheet->store_formula
                                         ('=SUM('.$seq->{'Excel:startcell'}.
                                              ':'.$seq->{'Excel:endcell'}.')');
-            #
-            $total_formula_string.='+'.
-                &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
-                                        ($rows_output,$cols_output-1);
-            $excel_sheet->write($rows_output,$cols_output++,'maximum');
-        } elsif ($data eq 'sum and total') {
-            $excel_sheet->write($rows_output+1,$cols_output,'score');
-            $total_formula_string.='+'.
-                &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
-                                        ($rows_output+1,$cols_output);
-            $excel_sheet->write($rows_output+1,$cols_output+1,'maximum');
-            $cols_output += 2;
-        } elsif ($data eq 'parts correct total') {
-            $excel_sheet->write($rows_output+1,$cols_output,'parts correct');
-            $total_formula_string.='+'.
-                &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
-                                        ($rows_output+1,$cols_output);
-            $excel_sheet->write($rows_output+1,$cols_output+1,'maximum');
-            $cols_output += 2;
+        }
+        # Determine cell the score is held in
+        $seq->{'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 {
-            $cols_output++;
+            $excel_sheet->write($rows_output,$cols_output++,'score');
         }
+        #
+        $total_formula_string.='+'.
+            &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+            ($rows_output,$cols_output-1);
+        $excel_sheet->write($rows_output,$cols_output++,'maximum');
     }
-    $excel_sheet->write($rows_output,$cols_output,'Grand Total');
+    $excel_sheet->write($rows_output,$cols_output++,'Grand Total');
     $total_formula = $excel_sheet->store_formula($total_formula_string);
     #
     # Bookkeeping
@@ -1091,6 +1088,7 @@ END
     #
     # 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
@@ -1120,20 +1118,31 @@ END
         if (! ($data eq 'sum only' || $data eq 'parts correct')) {
             $excel_sheet->write($rows_output,$cols_output++,'');
         }
-        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'});
+        #
+        if ($data eq 'tries' || $data eq 'scores') {
+            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'});
+            $excel_sheet->repeat_formula($rows_output,$cols_output++,
+                                         $seq->{'Excel:sum'},undef,
+                                         %replaceCells);
+        } else {
+            $excel_sheet->write($rows_output,$cols_output++,
+                                $max);
+        }
+        $grand_total+=$max;
+    }
+    if ($data eq 'tries' || $data eq 'scores') {
         $excel_sheet->repeat_formula($rows_output,$cols_output++,
-                                     $seq->{'Excel:sum'},undef,
-                                     %replaceCells);
+                                     $total_formula,undef,
+                                     %total_cell_translation);
+    } else {
+        $excel_sheet->write($rows_output,$cols_output++,$grand_total);
     }
-    $excel_sheet->repeat_formula($rows_output,$cols_output++,
-                                 $total_formula,undef,
-                                 %total_cell_translation);
     $rows_output++;
     #
     # Let the user know what we are doing
@@ -1207,9 +1216,15 @@ sub excel_outputstudent {
                 &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);
+            if (scalar(keys(%replaceCells)) == 1) {
+                $excel_sheet->repeat_formula($rows_output,$cols_output++,
+                                             $seq->{'Excel:sum'},undef,
+                                             %replaceCells,%replaceCells);
+            } else {
+                $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' ||