--- loncom/interface/statistics/lonstudentassessment.pm	2003/11/20 20:21:17	1.75
+++ loncom/interface/statistics/lonstudentassessment.pm	2004/02/11 17:42:34	1.86
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.75 2003/11/20 20:21:17 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.86 2004/02/11 17:42:34 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,10 +52,12 @@ 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;
 use Spreadsheet::WriteExcel;
+use Spreadsheet::WriteExcel::Utility();
 
 #######################################################
 #######################################################
@@ -783,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;
 }
@@ -859,6 +859,8 @@ my $cols_output;
 my %prog_state; # progress window state
 my $request_aborted;
 
+my $total_formula;
+
 sub excel_initialize {
     my ($r) = @_;
     #
@@ -869,6 +871,7 @@ sub excel_initialize {
     undef ($cols_output);
     undef (%prog_state);
     undef ($request_aborted);
+    undef ($total_formula);
     #
     my $total_columns = scalar(&get_student_fields_to_show());
     foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
@@ -904,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;
@@ -953,9 +956,22 @@ END
     $sheetname = &Apache::loncommon::clean_excel_name($sheetname);
     $excel_sheet = $excel_workbook->addworksheet($sheetname);
     #
+    # Define some potentially useful formats
+    my $format;
+    $format->{'header'} = $excel_workbook->add_format(bold      => 1, 
+                                                      bottom    => 1,
+                                                      align     => 'center');
+    $format->{'bold'} = $excel_workbook->add_format(bold=>1);
+    $format->{'h1'}   = $excel_workbook->add_format(bold=>1, size=>18);
+    $format->{'h2'}   = $excel_workbook->add_format(bold=>1, size=>16);
+    $format->{'h3'}   = $excel_workbook->add_format(bold=>1, size=>14);
+    $format->{'date'} = $excel_workbook->add_format(num_format=>
+                                                    'mmm d yyyy hh:mm AM/PM');
+    #
     # Put the course description in the header
     $excel_sheet->write($rows_output,$cols_output++,
-                   $ENV{'course.'.$ENV{'request.course.id'}.'.description'});
+                   $ENV{'course.'.$ENV{'request.course.id'}.'.description'},
+                        $format->{'h1'});
     $cols_output += 3;
     #
     # Put a description of the sections listed
@@ -975,80 +991,133 @@ END
             $sectionstring = "Section ".$Sections[0];
         }
     }
-    $excel_sheet->write($rows_output,$cols_output++,$sectionstring);
+    $excel_sheet->write($rows_output,$cols_output++,$sectionstring,
+                        $format->{'h3'});
     $cols_output += scalar(@Sections);
     #
     # Put the date in there too
     $excel_sheet->write($rows_output++,$cols_output++,
-                        'Compiled on '.localtime(time));
+                        'Compiled on '.localtime(time),$format->{'h3'});
     #
     $cols_output = 0;
-    $excel_sheet->write($rows_output++,$cols_output++,$datadescription);
+    $excel_sheet->write($rows_output++,$cols_output++,$datadescription,
+                        $format->{'h3'});
     #
     if ($data eq 'tries' || $data eq 'scores') {
         $rows_output++;
     }
     #
+    # Figure out the rows we need
+    my $sequence_name_row = $rows_output+1;
+    my $resource_name_row = $sequence_name_row+1;
+    my $maximum_data_row = $sequence_name_row+2;
+    my $first_data_row = $sequence_name_row+3;
+    #
     # 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'});
+        $excel_sheet->write($sequence_name_row,,
+                            $cols_output,$seq->{'title'},$format->{'h3'});
+        # Determine starting cell
+        $seq->{'Excel:startcell'}=
+            &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+            ($maximum_data_row,$cols_output);
+        $seq->{'Excel:startcol'}=$cols_output;
         if ($data eq 'tries' || $data eq 'scores') {
+            # 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 ($res->{'type'} ne 'assessment'  || 
+                    ! exists($res->{'parts'})       ||
+                    ref($res->{'parts'}) ne 'ARRAY' ||
+                    scalar(@{$res->{'parts'}}) < 1) {
+                    next;
+                }
                 if (scalar(@{$res->{'parts'}}) > 1) {
                     foreach my $part (@{$res->{'parts'}}) {
-                        $excel_sheet->write($rows_output,
+                        $excel_sheet->write($resource_name_row,
                                             $cols_output++,
-                                            $res->{'title'}.' part '.$part);
+                                            $res->{'title'}.' part '.$part,
+                                            $format->{'bold'});
                     }
                 } else {
-                    $excel_sheet->write($rows_output,
+                    $excel_sheet->write($resource_name_row,
                                         $cols_output++,
-                                        $res->{'title'});
+                                        $res->{'title'},$format->{'bold'});
                 }
+                $count++;
             }
-            $excel_sheet->write($rows_output,$cols_output++,'score');
-            $excel_sheet->write($rows_output,$cols_output++,'maximum');
-        } elsif ($data eq 'sum and total' || $data eq 'parts correct total') {
-            $excel_sheet->write($rows_output+1,$cols_output,'score');
-            $excel_sheet->write($rows_output+1,$cols_output+1,'maximum');
-            $cols_output += 2;
+            # Determine ending cell
+            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
+                            ($maximum_data_row,$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'}.')');
+        }
+        # Determine cell the score is held in
+        $seq->{'Excel:scorecell'} = 
+            &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+            ($maximum_data_row,$cols_output);
+        $seq->{'Excel:scorecol'}=$cols_output;
+        if ($data eq 'parts correct total') {
+            $excel_sheet->write($resource_name_row,$cols_output++,
+                                'parts correct',
+                                $format->{'bold'});
         } else {
-            $cols_output++;
+            $excel_sheet->write($resource_name_row,$cols_output++,
+                                'score',
+                                $format->{'bold'});
         }
-    }
-    #
-    # Bookkeeping
-    if ($data eq 'sum and total' || $data eq 'parts correct total') {
-        $rows_output += 2;
-    } else {
-        $rows_output += 1;
-    }
+        #
+        $total_formula_string.='+'.
+            &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+            ($maximum_data_row,$cols_output-1);
+        $excel_sheet->write($resource_name_row,$cols_output++,
+                            'maximum',
+                            $format->{'bold'});
+    }
+    $excel_sheet->write($resource_name_row,$cols_output++,'Grand Total',
+                        $format->{'bold'});
+    $total_formula = $excel_sheet->store_formula($total_formula_string);
     #
     # 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');
+            $excel_sheet->write($maximum_data_row,$cols_output++,'Maximum',
+                                $format->{'bold'});
         } else {
-            $excel_sheet->write($rows_output,$cols_output++,'');
+            $excel_sheet->write($maximum_data_row,$cols_output++,'');
         }
     }
     #
     # 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
+                        ($maximum_data_row,$seq->{'Excel:scorecol'});
         my $weight;
         my $max = 0;
         foreach my $resource (@{$seq->{'contents'}}) {
@@ -1064,26 +1133,56 @@ END
                     }
                 }
                 if ($data eq 'scores') {
-                    $excel_sheet->write($rows_output,$cols_output++,$weight);
+                    $excel_sheet->write($maximum_data_row,$cols_output++,$weight);
                 } elsif ($data eq 'tries') {
-                    $excel_sheet->write($rows_output,$cols_output++,'');
+                    $excel_sheet->write($maximum_data_row,$cols_output++,'');
                 }
                 $max += $weight;
             }
         } 
         if (! ($data eq 'sum only' || $data eq 'parts correct')) {
-            $excel_sheet->write($rows_output,$cols_output++,'');
+            $excel_sheet->write($maximum_data_row,$cols_output++,'');
+        }
+        #
+        if ($data eq 'tries' || $data eq 'scores') {
+            my %replaceCells;
+            $replaceCells{$seq->{'Excel:startcell'}} = 
+                &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+                ($maximum_data_row,$seq->{'Excel:startcol'});
+            $replaceCells{$seq->{'Excel:endcell'}} = 
+                &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+                ($maximum_data_row,$seq->{'Excel:endcol'});
+            $excel_sheet->repeat_formula($maximum_data_row,$cols_output++,
+                                         $seq->{'Excel:sum'},undef,
+                                         %replaceCells);
+        } else {
+            $excel_sheet->write($maximum_data_row,$cols_output++,
+                                $max);
         }
-        $excel_sheet->write($rows_output,$cols_output++,$max);
+        $grand_total+=$max;
     }
-    $rows_output++;
+    if ($data eq 'tries' || $data eq 'scores') {
+        $excel_sheet->repeat_formula($maximum_data_row,$cols_output++,
+                                     $total_formula,undef,
+                                     %total_cell_translation);
+    } else {
+        $excel_sheet->write($maximum_data_row,$cols_output++,$grand_total);
+    }
+    $rows_output = $first_data_row;
     #
     # 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
@@ -1119,7 +1218,14 @@ sub excel_outputstudent {
     }
     #
     # Write out sequence scores and totals data
+    my %total_cell_translation;
     foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+        $cols_output = $seq->{'Excel:startcol'};
+        # Keep track of cells to translate in total cell
+        $total_cell_translation{$seq->{'Excel:scorecell'}} = 
+            &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+                        ($rows_output,$seq->{'Excel:scorecol'});
+        #
         my ($performance,$performance_length,$score,$seq_max,$rawdata);
         if ($base eq 'tries') {
             ($performance,$performance_length,$score,$seq_max,$rawdata) =
@@ -1134,7 +1240,25 @@ sub excel_outputstudent {
             foreach my $value (@$rawdata) {
                 $excel_sheet->write($rows_output,$cols_output++,$value);
             }
-            $excel_sheet->write($rows_output,$cols_output++,$score);
+            # 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
+            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' || 
             $data eq 'parts correct' || $data eq 'parts correct total') {
@@ -1145,6 +1269,10 @@ sub excel_outputstudent {
         }
     }
     #
+    $excel_sheet->repeat_formula($rows_output,$cols_output++,
+                                 $total_formula,undef,
+                                 %total_cell_translation);
+    #
     # Bookkeeping
     $rows_output++; 
     $cols_output=0;
@@ -1410,44 +1538,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=' ';
                 }
             }
             #