--- loncom/interface/statistics/lonstudentassessment.pm 2012/12/16 16:59:34 1.171 +++ 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.171 2012/12/16 16:59:34 raeburn 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 .= ''; $Str .= $previousbutton.(' 'x5).$all.(' 'x5).$nextbutton; return $Str; @@ -430,7 +430,7 @@ my @OutputOptions = sub OutputDescriptions { my $Str = ''; - $Str .= "

Output Formats

\n"; + $Str .= '

'.&mt('Output Formats')."

\n"; $Str .= "
\n"; foreach my $outputmode (@OutputOptions) { $Str .="
".$outputmode->{'name'}."
\n"; @@ -465,7 +465,7 @@ sub CreateAndParseOutputSelector { $Str = qq/"; @@ -582,7 +582,7 @@ sub CreateAndParseOutputDataSelector { $Str = qq/"; @@ -605,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; } @@ -744,7 +744,10 @@ 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\n"; $Str .= "
";
 
@@ -938,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";
     #
@@ -1103,9 +1107,9 @@ sub excel_initialize {
         &Apache::lonstatistics::selected_sequences_with_assessments();
     if (! ref($navmap)) {
         # Unable to get data, so bail out
-        $r->print("

". + $r->print('

'. &mt('Unable to retrieve course information.'). - '

'); + '

'); } # my $total_columns = scalar(&get_student_fields_to_show()); @@ -1121,8 +1125,8 @@ sub excel_initialize { my $too_many_cols_error_message = '

'.&mt('Unable to Complete Request').'

'.$/. '

'.&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.').'

'.$/. - '

'.&mt('You may consider reducing the number of Sequences or Folders you have selected.').'

'.$/. - '

'.&mt('LON-CAPA can produce CSV files of this data or Excel files of the Scores Summary data.').'

'.$/; + '

'.&mt('You may consider reducing the number of [_1]Sequences or Folders[_2] you have selected.','','').'

'.$/. + '

'.&mt('LON-CAPA can produce [_1]CSV[_2] files of this data or Excel files of the [_1]Scores Summary[_2] data.','','').'

'.$/; if ($chosen_output->{'base'} eq 'tries' && $total_columns > 255) { $r->print($too_many_cols_error_message); $request_aborted = 1; @@ -1646,9 +1650,9 @@ sub csv_initialize{ &Apache::lonstatistics::selected_sequences_with_assessments(); if (! ref($navmap)) { # Unable to get data, so bail out - $r->print("

". + $r->print('p class="LC_error">'. &mt('Unable to retrieve course information.'). - '

'); + '

'); } # # Deal with unimplemented requests @@ -1971,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'; + '&student='.$student->{'username'}. + '&userdom='.$student->{'domain'}. + '&command=submission'; $symbol = &link($symbol, $link); } $value .= $symbol; @@ -2129,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'; + '&student='.$student->{'username'}. + '&userdom='.$student->{'domain'}. + '&command=submission'; $symbol = &link($symbol, $link); } $Str .= $symbol; @@ -2144,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]}; } }