--- loncom/interface/statistics/lonstudentassessment.pm	2003/10/07 14:38:30	1.70
+++ loncom/interface/statistics/lonstudentassessment.pm	2003/12/05 21:04:34	1.76
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.70 2003/10/07 14:38:30 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.76 2003/12/05 21:04:34 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -54,7 +54,9 @@ use Apache::lonstatistics;
 use Apache::lonhtmlcommon;
 use Apache::loncoursedata;
 use Apache::lonnet; # for logging porpoises
+use Apache::lonlocal;
 use Spreadsheet::WriteExcel;
+use Spreadsheet::WriteExcel::Utility();
 
 #######################################################
 #######################################################
@@ -138,7 +140,7 @@ Inputs:
 #######################################################
 sub BuildStudentAssessmentPage {
     my ($r,$c)=@_;
-
+    #
     undef($Statistics);
     undef($show_links);
     undef($output_mode);
@@ -146,7 +148,18 @@ sub BuildStudentAssessmentPage {
     undef($base);
     undef($datadescription);
     undef($single_student_mode);
-
+    #
+    my %Saveable_Parameters = ('Status' => 'scalar',
+                               'chartoutputmode' => 'scalar',
+                               'chartoutputdata' => 'scalar',
+                               'Section' => 'array',
+                               'StudentData' => 'array',
+                               'Maps' => 'array');
+    &Apache::loncommon::store_course_settings('chart',\%Saveable_Parameters);
+    &Apache::loncommon::restore_course_settings('chart',\%Saveable_Parameters);
+    #
+    &Apache::lonstatistics::PrepareClasslist();
+    #
     $single_student_mode = 0;
     $single_student_mode = 1 if ($ENV{'form.SelectedStudent'});
     if ($ENV{'form.selectstudent'}) {
@@ -305,14 +318,14 @@ sub CreateInterface {
 #    $Str .= &CreateLegend();
     $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';
-    $Str .= '<td align="center"><b>Sections</b></td>';
-    $Str .= '<td align="center"><b>Student Data</b></td>';
-    $Str .= '<td align="center"><b>Enrollment Status</b></td>';
-    $Str .= '<td align="center"><b>Sequences and Folders</b></td>';
-    $Str .= '<td align="center"><b>Output Format</b>'.
+    $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
+    $Str .= '<td align="center"><b>'.&mt('Student Data</b>').'</td>';
+    $Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>';
+    $Str .= '<td align="center"><b>'.&mt('Sequences and Folders').'</b></td>';
+    $Str .= '<td align="center"><b>'.&mt('Output Format').'</b>'.
         &Apache::loncommon::help_open_topic("Chart_Output_Formats").
         '</td>';
-    $Str .= '<td align="center"><b>Output Data</b>'.
+    $Str .= '<td align="center"><b>'.&mt('Output Data').'</b>'.
         &Apache::loncommon::help_open_topic("Chart_Output_Data").
         '</td>';
     $Str .= '</tr>'."\n";
@@ -341,12 +354,14 @@ sub CreateInterface {
     $Str .= &CreateAndParseOutputDataSelector();
     $Str .= '</td></tr>'."\n";
     $Str .= '</table>'."\n";
-    $Str .= '<input type="submit" value="Generate Chart" />';
+    $Str .= '<input type="submit" name="Generate Chart" value="'.
+        &mt('Generate Chart').'" />';
     $Str .= '&nbsp;'x5;
-    $Str .= '<input type="submit" name="selectstudent" '.
-                                  'value="Select One Student" />';
+    $Str .= '<input type="submit" name="selectstudent" value="'.
+        &mt('Select One Student').'" />';
     $Str .= '&nbsp;'x5;
-    $Str .= '<input type="submit" name="ClearCache" value="Clear Caches" />';
+    $Str .= '<input type="submit" name="ClearCache" value="'.
+        &mt('Clear Caches').'" />';
     $Str .= '&nbsp;'x5;
     $Str .= '<br />';
     return $Str;
@@ -419,6 +434,8 @@ sub OutputDescriptions {
 sub CreateAndParseOutputSelector {
     my $Str = '';
     my $elementname = 'chartoutputmode';
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                            [$elementname]);
     #
     # Format for output options is 'mode, restrictions';
     my $selected = 'html, without links';
@@ -445,7 +462,7 @@ sub CreateAndParseOutputSelector {
     foreach my $option (@OutputOptions) {
         $Str .= "\n".'    <option value="'.$option->{'value'}.'"';
         $Str .= " selected " if ($option->{'value'} eq $selected);
-        $Str .= ">".$option->{'name'}."<\/option>";
+        $Str .= ">".&mt($option->{'name'})."<\/option>";
     }
     $Str .= "\n</select>";
     return $Str;
@@ -456,21 +473,7 @@ sub CreateAndParseOutputSelector {
 ##
 my @OutputDataOptions =
     (
-     { name  => 'Scores',
-       base  => 'scores',
-       value => 'scores',
-       shortdesc => 'Score on each Problem Part',
-       longdesc =>'The students score on each problem part, computed as'.
-           'the part weight * part awarded',
-       },
-     { name  => 'Scores Sum',
-       base  => 'scores',
-       value => 'sum only',
-       shortdesc => 'Sum of Scores on each Problem Part',
-       longdesc =>'The total of the scores of the student on each problem'.
-           ' part in the sequences or folders selected.',
-       },
-     { name  => 'Scores Sum & Maximums',
+     { name  => 'Scores Summary',
        base  => 'scores',
        value => 'sum and total',
        shortdesc => 'Total Score and Maximum Possible for each '.
@@ -478,13 +481,27 @@ my @OutputDataOptions =
        longdesc => 'The score of each student as well as the '.
            ' maximum possible on each Sequence or Folder.',
        },
-     { name  => 'Scores Summary Table Only',
+     { name  => 'Scores Per Problem',
        base  => 'scores',
-       value => 'final table scores',
-       shortdesc => 'Summary of Scores',
-       longdesc  => 'The average score on each sequence or folder for the '.
-           'selected students.',
+       value => 'scores',
+       shortdesc => 'Score on each Problem Part',
+       longdesc =>'The students score on each problem part, computed as'.
+           'the part weight * part awarded',
        },
+#     { name  => 'Scores Sum',
+#       base  => 'scores',
+#       value => 'sum only',
+#       shortdesc => 'Sum of Scores on each Problem Part',
+#       longdesc =>'The total of the scores of the student on each problem'.
+#           ' part in the sequences or folders selected.',
+#       },
+#     { name  => 'Scores Summary Table Only',
+#       base  => 'scores',
+#       value => 'final table scores',
+#       shortdesc => 'Summary of Scores',
+#       longdesc  => 'The average score on each sequence or folder for the '.
+#           'selected students.',
+#       },
      { name  =>'Tries',
        base  =>'tries',
        value => 'tries',
@@ -493,25 +510,25 @@ my @OutputDataOptions =
        },
      { 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 Correct & Maximums',
-       base  =>'tries',
        value => 'parts correct total',
        shortdesc => 'Number of Problem Parts completed successfully.',
        longdesc => 'The Number of Problem Parts completed successfully and '.
            'the maximum possible for each student',
        },
-     { name  => 'Parts 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.',
-       },
+#     { 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 {
@@ -553,7 +570,7 @@ sub CreateAndParseOutputDataSelector {
     foreach my $option (@OutputDataOptions) {
         $Str .= "\n".'    <option value="'.$option->{'value'}.'"';
         $Str .= " selected " if ($option->{'value'} eq $data);
-        $Str .= ">".$option->{'name'}."<\/option>";
+        $Str .= ">".&mt($option->{'name'})."<\/option>";
     }
     $Str .= "\n</select>";
     return $Str;
@@ -843,6 +860,8 @@ my $cols_output;
 my %prog_state; # progress window state
 my $request_aborted;
 
+my $total_formula;
+
 sub excel_initialize {
     my ($r) = @_;
     #
@@ -853,6 +872,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()) {
@@ -984,10 +1004,17 @@ END
     }
     #
     # 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;
+            # 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) {
@@ -1002,16 +1029,46 @@ END
                                         $res->{'title'});
                 }
             }
+            # 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');
+            # 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' || $data eq 'parts correct total') {
+        } 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;
         } else {
             $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') {
@@ -1032,7 +1089,11 @@ END
     }
     #
     # Add the maximums for each sequence or assessment
+    my %total_cell_translation;
     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'}}) {
@@ -1058,8 +1119,20 @@ END
         if (! ($data eq 'sum only' || $data eq 'parts correct')) {
             $excel_sheet->write($rows_output,$cols_output++,'');
         }
-        $excel_sheet->write($rows_output,$cols_output++,$max);
-    }
+        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);
+    }
+    $excel_sheet->repeat_formula($rows_output,$cols_output++,
+                                 $total_formula,undef,
+                                 %total_cell_translation);
     $rows_output++;
     #
     # Let the user know what we are doing
@@ -1103,7 +1176,13 @@ sub excel_outputstudent {
     }
     #
     # Write out sequence scores and totals data
+    my %total_cell_translation;
     foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+        # 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) =
@@ -1118,7 +1197,19 @@ 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
+            $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') {
@@ -1129,6 +1220,11 @@ sub excel_outputstudent {
         }
     }
     #
+    $excel_sheet->repeat_formula($rows_output,$cols_output++,
+                                 $total_formula,undef,
+                                 %total_cell_translation);
+
+    #
     # Bookkeeping
     $rows_output++; 
     $cols_output=0;