--- loncom/interface/statistics/lonstudentassessment.pm	2004/05/18 17:43:36	1.101
+++ loncom/interface/statistics/lonstudentassessment.pm	2004/09/23 17:48:00	1.105
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.101 2004/05/18 17:43:36 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.105 2004/09/23 17:48:00 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -607,6 +607,7 @@ 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;
 
 sub html_initialize {
     my ($r) = @_;
@@ -633,6 +634,7 @@ sub html_initialize {
     }
     #
     # Compute the column widths and output the sequence titles
+    my $total_count;
     foreach my $sequence (&Apache::lonstatistics::Sequences_with_Assess()){
         #
         # Comptue column widths
@@ -642,6 +644,7 @@ sub html_initialize {
                 # Use 1 digit for a space
                 $sequence->{'width_sum'} += 1;            
             }
+	    $total_count += $sequence->{'num_assess_parts'};
             # Use 3 digits for the sum
             $sequence->{'width_sum'} += 3;
         }
@@ -672,7 +675,8 @@ sub html_initialize {
                                       length($sequence->{'title'})
                                       ).$padding;
     }
-    $Str .= "total</pre>\n";
+    $total_sum_width = length($total_count)+1;
+    $Str .= "    total</pre>\n";
     $Str .= "<pre>";
     $r->print($Str);
     $r->rflush();
@@ -690,6 +694,10 @@ sub html_outputstudent {
     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;
@@ -767,9 +775,11 @@ sub html_outputstudent {
         $max   += $seq_stats->{'max'};
     }
     if (! defined($score)) {
-        $score = ' 'x3;
+        $score = ' ' x $total_sum_width;
+    } else {
+        $score = sprintf("%.0f",$score);
     }
-    $Str .= ' '.' 'x(length($max)-length($score)).$score.'/'.$max;
+    $Str .= ' '.' 'x($total_sum_width-length($score)).$score.' / '.$max;
     $Str .= " \n";
     #
     $r->print($Str);
@@ -795,18 +805,16 @@ sub html_finish {
 }
 
 sub StudentAverageTotal {
-    my $Str = "<h3>Summary Tables</h3>\n";
-#    my $max_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";
+    $Str .= '<tr>'.
+        '<th>'.&mt('Title').'</th>'.
+        '<th>'.&mt('Average').'</th>'.
+        '<th>'.&mt('Maximum').'</th>'.
+        '</tr>'.$/;
     foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
         my $ave;
         my $num_students = $Statistics->{$seq->{'symb'}}->{'num_students'};
-#        if ($num_students > $max_students) {
-#            $max_students = $num_students;
-#        }
         if ($num_students > 0) {
             $ave = int(100*
                        ($Statistics->{$seq->{'symb'}}->{'score'}/$num_students)
@@ -814,34 +822,32 @@ sub StudentAverageTotal {
         } else {
             $ave = 0;
         }
-#        $total_ave += $ave;
         my $max = $Statistics->{$seq->{'symb'}}->{'max'};
-#        $total_max += $max;
         $ave = sprintf("%.2f",$ave);
         $Str .= '<tr><td>'.$seq->{'title'}.'</td>'.
             '<td align="right">'.$ave.'&nbsp;</td>'.
             '<td align="right">'.$max.'&nbsp;'.'</td></tr>'."\n";
     }
-#    $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 align="right">'.$max_students.'</td>'.
-#        '<td align="right">'.$total_ave.'&nbsp;'.'</td>'.
-#        '<td align="right">'.$total_max.'&nbsp;'.'</td>';
-#    $Str .= "</table>\n";
     return $Str;
 }
 
 sub SingleStudentTotal {
     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()) {
@@ -853,7 +859,7 @@ sub SingleStudentTotal {
         $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";
@@ -917,39 +923,18 @@ sub excel_initialize {
         # 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(<<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;
+        $r->print($too_many_cols_error_message);
+        $request_aborted = 1;
     }
     if ($chosen_output->{'base'} 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;
+        $r->print($too_many_cols_error_message);
+        $request_aborted = 1;
     }
     return if ($request_aborted);
     #
@@ -1321,7 +1306,12 @@ sub excel_outputstudent {
     # 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
@@ -1582,7 +1572,12 @@ sub csv_outputstudent {
     # 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
@@ -1768,7 +1763,7 @@ sub StudentTriesOnSequence {
                 }
             }
             #
-            if (! defined($tries)) {
+            if (! defined($tries) || $symbol eq '.') {
                 $tries = $symbol;
             }
             push (@TriesData,$tries);