--- loncom/interface/statistics/lonstudentassessment.pm	2003/12/05 21:04:34	1.76
+++ loncom/interface/statistics/lonstudentassessment.pm	2004/01/27 16:04:27	1.80
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.76 2003/12/05 21:04:34 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.80 2004/01/27 16:04:27 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,6 +52,7 @@ package Apache::lonstudentassessment;
 use strict;
 use Apache::lonstatistics;
 use Apache::lonhtmlcommon;
+use Apache::loncommon();
 use Apache::loncoursedata;
 use Apache::lonnet; # for logging porpoises
 use Apache::lonlocal;
@@ -908,7 +909,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;
@@ -1034,40 +1035,28 @@ END
                 &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');
             # Create the formula for summing up this sequence
             $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
@@ -1090,6 +1079,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
@@ -1119,20 +1109,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
@@ -1490,44 +1491,56 @@ sub StudentTriesOnSequence {
             $performance_length++;
             my $symbol = ' '; # default to space
             #
+            my $awarded = 0;
+            if (exists($resource_data->{'resource.'.$partnum.'.awarded'})) {
+                $awarded = $resource_data->{'resource.'.$partnum.'.awarded'};
+                $awarded = 0 if (! $awarded);
+            }
+            #
+            my $status = '';
             if (exists($resource_data->{'resource.'.$partnum.'.solved'})) {
-                my $status = $resource_data->{'resource.'.$partnum.'.solved'};
-                if ($status eq 'correct_by_override') {
-                    $symbol = '+';
-                    $sum++;
-                } elsif ($status eq 'incorrect_by_override') {
-                    $symbol = '-';
-                } elsif ($status eq 'ungraded_attempted') {
-                    $symbol = '#';
-                } elsif ($status eq 'incorrect_attempted')  {
-                    $symbol = '.';
-                } elsif ($status eq 'excused') {
+                $status = $resource_data->{'resource.'.$partnum.'.solved'};
+            }
+            #
+            my $tries = 0;
+            if(exists($resource_data->{'resource.'.$partnum.'.tries'})) {
+                $tries = $resource_data->{'resource.'.$partnum.'.tries'};
+            }
+            #
+            if ($awarded > 0) {
+                # The student has gotten the problem correct to some degree
+                if ($status eq 'excused') {
                     $symbol = 'x';
                     $max--;
-                } elsif (($status eq 'correct_by_scantron' ||
-                          $status eq 'correct_by_student') &&
-                    exists($resource_data->{'resource.'.$partnum.'.tries'})){
-                    $tries = $resource_data->{'resource.'.$partnum.'.tries'};
+                } elsif ($status eq 'correct_by_override') {
+                    $symbol = '+';
+                    $sum++;
+                } elsif ($tries > 0) {
                     if ($tries > 9) {
                         $symbol = '*';
-                    } elsif ($tries > 0) {
-                        $symbol = $tries;
                     } else {
-                        $symbol = ' ';
+                        $symbol = $tries;
                     }
                     $sum++;
-                } elsif (exists($resource_data->{'resource.'.
-                                                     $partnum.'.tries'})){
-                    $symbol = '.';
                 } else {
-                    $symbol = ' ';
+                    $symbol = '+';
+                    $sum++;
                 }
             } else {
-                # Unsolved.  Did they try?
-                if (exists($resource_data->{'resource.'.$partnum.'.tries'})){
+                # The student has the problem incorrect or it is ungraded
+                if ($status eq 'excused') {
+                    $symbol = 'x';
+                    $max--;
+                } elsif ($status eq 'incorrect_by_override') {
+                    $symbol = '-';
+                } elsif ($status eq 'ungraded_attempted') {
+                    $symbol = '#';
+                } elsif ($status eq 'incorrect_attempted' ||
+                         $tries > 0)  {
                     $symbol = '.';
                 } else {
-                    $symbol = ' ';
+                    # Problem is wrong and has not been attempted.
+                    $symbol=' ';
                 }
             }
             #