--- loncom/interface/statistics/lonstudentassessment.pm	2011/12/21 21:25:51	1.165
+++ loncom/interface/statistics/lonstudentassessment.pm	2023/04/07 16:46:44	1.177
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.165 2011/12/21 21:25:51 www Exp $
+# $Id: lonstudentassessment.pm,v 1.177 2023/04/07 16:46:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -282,7 +282,7 @@ sub next_and_previous_buttons {
     # Build the 'all students' button
     my $all = '';
     $all .= '<input type="button" value="'.&mt('All Students').'" '.
-            '" onclick="document.Statistics.SelectedStudent.value='.
+            ' onclick="document.Statistics.SelectedStudent.value='.
             "''".';'.'document.Statistics.submit();" />';
     $Str .= $previousbutton.('&nbsp;'x5).$all.('&nbsp;'x5).$nextbutton;
     return $Str;
@@ -364,10 +364,6 @@ sub CreateInterface {
     $Str .= &CreateAndParseOutputDataSelector();
     $Str .= '</td></tr>'."\n";
     $Str .= '</table>'."\n";
-    $Str .= '<p>'
-           .&mt('Status:').' '
-           .'<input type="text" name="stats_status" size="60" value="" readonly="readonly" />'
-           .'</p>';
     $Str .= '<input type="submit" name="selectstudent" value="'.
         &mt('Select One Student').'" />';
     $Str .= '&nbsp;'x5;
@@ -434,7 +430,7 @@ my @OutputOptions =
 
 sub OutputDescriptions {
     my $Str = '';
-    $Str .= "<h2>Output Formats</h2>\n";
+    $Str .= '<h2>'.&mt('Output Formats')."</h2>\n";
     $Str .= "<dl>\n";
     foreach my $outputmode (@OutputOptions) {
 	$Str .="    <dt>".$outputmode->{'name'}."</dt>\n";
@@ -469,7 +465,7 @@ sub CreateAndParseOutputSelector {
     $Str = qq/<select size="5" name="$elementname">/;
     foreach my $option (@OutputOptions) {
         $Str .= "\n".'    <option value="'.$option->{'value'}.'"';
-        $Str .= " selected " if ($option->{'value'} eq $selected);
+        $Str .= ' selected="selected"' if ($option->{'value'} eq $selected);
         $Str .= ">".&mt($option->{'name'})."<\/option>";
     }
     $Str .= "\n</select>";
@@ -586,7 +582,7 @@ sub CreateAndParseOutputDataSelector {
     $Str = qq/<select size="5" name="$elementname">/;
     foreach my $option (@OutputDataOptions) {
         $Str .= "\n".'    <option value="'.$option->{'value'}.'"';
-        $Str .= " selected " if ($option->{'value'} eq $chosen_output->{'value'});
+        $Str .= ' selected="selected"' if ($option->{'value'} eq $chosen_output->{'value'});
         $Str .= ">".&mt($option->{'name'})."<\/option>";
     }
     $Str .= "\n</select>";
@@ -609,7 +605,7 @@ sub count_parts {
 sub get_resources {
     my ($navmap,$sequence) = @_;
     my @resources = $navmap->retrieveResources($sequence,
-                                               sub { shift->is_problem(); },
+                                               sub { shift->is_gradable(); },
                                                0,0,0);
     return @resources;
 }
@@ -748,11 +744,12 @@ NEW_WINDOW_CHECKBOX
                             length($title)
                             )).$padding;
     }
-    $total_sum_width = length($total_count)+1;
+    $total_sum_width = length($total_count);
+    if ($total_sum_width < 6) {
+        $total_sum_width = 6;
+    }
     $Str .= "    total</pre>\n";
     $Str .= "<pre>";
-    $r->print($Str);
-    $r->rflush();
 
     $r->print(<<JS);
 <script type="text/javascript">
@@ -813,10 +810,13 @@ JS
     }
     #
     # Initialize progress window
-    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$studentcount);
     #
+    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$studentcount);
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
                                           'Processing first student');
+    $r->print($Str);
+    $r->rflush();
+
     return;
 }
 
@@ -841,6 +841,7 @@ sub html_outputstudent {
         if ($field eq 'comments') {
             $title = '<a href="/adm/'.$student->{'domain'}.'/'.$student->{'username'}.'/'.'aboutme#coursecomment">'.&mt('Comments').'</a>';
         }
+        utf8::decode($title);
         my $base = length($title);
         my $width=$Apache::lonstatistics::StudentData{$field}->{'width'};
         $Str .= $title.' 'x($width-$base).$padding;
@@ -940,6 +941,7 @@ sub html_outputstudent {
         $score = sprintf("%.2f",$score);
         $score = (' 'x(6-length($score))).$score;
     }
+    $max = sprintf("%.2f",$max);
     $Str .= ' '.' 'x($total_sum_width-length($score)).$score.' / '.$max;
     $Str .= " \n";
     #
@@ -1105,9 +1107,9 @@ sub excel_initialize {
         &Apache::lonstatistics::selected_sequences_with_assessments();
     if (! ref($navmap)) {
         # Unable to get data, so bail out
-        $r->print("<h3>".
+        $r->print('<p class="LC_error">'.
                   &mt('Unable to retrieve course information.').
-                  '</h3>');
+                  '</p>');
     }
     #
     my $total_columns = scalar(&get_student_fields_to_show());
@@ -1122,9 +1124,9 @@ sub excel_initialize {
     }
     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>'.$/;
+        '<p class="LC_warning">'.&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 [_1]Sequences or Folders[_2] you have selected.','<b>','</b>').'</p>'.$/.
+        '<p>'.&mt('LON-CAPA can produce [_1]CSV[_2] files of this data or Excel files of the [_1]Scores Summary[_2] data.','<b>','</b>').'</p>'.$/;
     if ($chosen_output->{'base'} eq 'tries' && $total_columns > 255) {
         $r->print($too_many_cols_error_message);
         $request_aborted = 1;
@@ -1181,7 +1183,7 @@ sub excel_initialize {
     my $sectionstring = '';
     my @Sections = &Apache::lonstatistics::get_selected_sections();
     $excel_sheet->write($header_row,$cols_output++,
-                        &Apache::lonstatistics::section_and_enrollment_description('plaintext'),
+                        &Apache::lonstatistics::section_and_enrollment_description('localized'),
                         $format->{'h3'});
     #
     # Put the date in there too
@@ -1205,7 +1207,7 @@ sub excel_initialize {
     # Add the student headers
     $cols_output = 0;
     foreach my $field (&get_student_fields_to_show()) {
-        $excel_sheet->write($resource_name_row,$cols_output++,$field,
+        $excel_sheet->write($resource_name_row,$cols_output++,&mt($field),
                             $format->{'bold'});
     }
     #
@@ -1648,20 +1650,21 @@ sub csv_initialize{
         &Apache::lonstatistics::selected_sequences_with_assessments();
     if (! ref($navmap)) {
         # Unable to get data, so bail out
-        $r->print("<h3>".
+        $r->print('p class="LC_error">'.
                   &mt('Unable to retrieve course information.').
-                  '</h3>');
+                  '</p>');
     }
     #
     # Deal with unimplemented requests
     $request_aborted = undef;
     if ($chosen_output->{'base'} =~ /final table/) {
-        $r->print(<<END);
-<h2>Unable to Complete Request</h2>
-<p>
-The <b>Summary Table (Scores)</b> option is not available for non-HTML output.
-</p>
-END
+        $r->print(
+            '<h2>'.&mt('Unable to Complete Request').'</h2>'
+           .'<p class="LC_warning">'
+           .&mt('The [_1]Summary Table (Scores)[_2] option'
+               .' is not available for non-HTML output.','<b>','</b>')
+           .'</p>'
+        );
        $request_aborted = 1;
     }
     return if ($request_aborted);
@@ -1972,9 +1975,9 @@ sub student_tries_on_sequence {
                  ($links eq 'all')) {
                 my $link = '/adm/grades'.
                     '?symb='.&escape($resource->shown_symb).
-                        '&student='.$student->{'username'}.
-                            '&userdom='.$student->{'domain'}.
-                                '&command=submission';
+                        '&amp;student='.$student->{'username'}.
+                            '&amp;userdom='.$student->{'domain'}.
+                                '&amp;command=submission';
                 $symbol = &link($symbol, $link);
             }
             $value .= $symbol;
@@ -2130,9 +2133,9 @@ sub student_performance_on_sequence {
             if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) {
                 my $link = '/adm/grades' .
                     '?symb='.&escape($resource->shown_symb).
-                    '&student='.$student->{'username'}.
-                    '&userdom='.$student->{'domain'}.
-                    '&command=submission';
+                    '&amp;student='.$student->{'username'}.
+                    '&amp;userdom='.$student->{'domain'}.
+                    '&amp;command=submission';
                 $symbol = &link($symbol, $link);
             }
             $Str .= $symbol;
@@ -2145,7 +2148,7 @@ sub student_performance_on_sequence {
     }
     if ($randompick) {
         my @uniquetotals = keys(%ptsfreq);
-        if ((@uniquetotals = 1) && ($ptsfreq{$uniquetotals[0]} > 0)) {
+        if ((@uniquetotals == 1) && ($ptsfreq{$uniquetotals[0]} > 0)) {
             $max = $max * $randompick/$ptsfreq{$uniquetotals[0]};
         }
     }