--- loncom/interface/statistics/lonstudentassessment.pm 2010/02/12 15:11:08 1.150.2.4 +++ loncom/interface/statistics/lonstudentassessment.pm 2009/09/22 14:28:56 1.157 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentassessment.pm,v 1.150.2.4 2010/02/12 15:11:08 raeburn Exp $ +# $Id: lonstudentassessment.pm,v 1.157 2009/09/22 14:28:56 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -255,7 +255,7 @@ sub next_and_previous_buttons { 'document.Statistics.submit();" />'; } else { $previousbutton .= ''; + &mt('Previous Student').'" disabled="disabled" />'; } # # Build the next student link @@ -267,11 +267,11 @@ sub next_and_previous_buttons { &mt('Next Student ([_1])', $next->{'username'}.':'.$next->{'domain'}). '" onclick="document.Statistics.SelectedStudent.value='. - "'$sname'".';'. + "'".$sname."'".';'. 'document.Statistics.submit();" />'; } else { $nextbutton .= ''; + &mt('Next Student').'" disabled="disabled" />'; } # # Build the 'all students' button @@ -361,20 +361,19 @@ sub CreateInterface { $Str .= &CreateAndParseOutputDataSelector(); $Str .= ''."\n"; $Str .= ''."\n"; - $Str .= '
'. - &mt('Status:').' '. - ''. - '
'; + $Str .= '' + .&mt('Status:').' ' + .'' + .'
'; $Str .= ''; $Str .= ' 'x5; $Str .= ''; - $Str .= ''. - ''. - '
'; - + $Str .= '' + .'' + .'
'; return $Str; } @@ -555,8 +554,7 @@ my @OutputDataOptions = sub HTMLifyOutputDataDescriptions { my $Str = ''; - $Str .= ''. - &mt('Unable to retrieve course information.'). - '
'); + $r->print('' + .&mt('Unable to retrieve course information.') + .'
'); } # If we're showing links, show a checkbox to open in new @@ -715,8 +713,8 @@ NEW_WINDOW_CHECKBOX $width{$symb}->{'width_sum'} += 1; } $total_count += &count_parts($navmap,$seq); - # Use 3 digits for the sum - $width{$symb}->{'width_sum'} += 3; + # Use 6 digits for the sum + $width{$symb}->{'width_sum'} += 6; } # Compute width of maximum if ($chosen_output->{'sequence_max'}) { @@ -724,8 +722,8 @@ NEW_WINDOW_CHECKBOX # One digit for the '/' $width{$symb}->{'width_sum'} +=1; } - # Use 3 digits for the total - $width{$symb}->{'width_sum'}+=3; + # Use 6 digits for the total + $width{$symb}->{'width_sum'}+=6; } # if ($chosen_output->{'every_problem'}) { @@ -887,16 +885,17 @@ sub html_outputstudent { $ratio .= ' '; } if ($chosen_output->{'sequence_sum'} && $score ne ' ') { - my $score .= sprintf("%3.0f",$score); - $ratio .= (' 'x(3-length($score))).$score; + my $score .= sprintf("%3.2f",$score); + $ratio .= (' 'x(6-length($score))).$score; } elsif($chosen_output->{'sequence_sum'}) { - $ratio .= ' 'x3; + $ratio .= ' 'x6; } if ($chosen_output->{'sequence_max'}) { if ($chosen_output->{'sequence_sum'}) { $ratio .= '/'; } - $ratio .= sprintf("%3.0f",$seq_max); + my $sequence_total=sprintf("%3.2f",$seq_max); + $ratio .= $sequence_total.(' 'x(6-length($sequence_total))); } # if (! $chosen_output->{'every_problem'}) { @@ -930,8 +929,8 @@ sub html_outputstudent { if (! defined($score)) { $score = ' ' x $total_sum_width; } else { - $score = sprintf("%.0f",$score); - $score = (' 'x(3-length($score))).$score; + $score = sprintf("%.2f",$score); + $score = (' 'x(6-length($score))).$score; } $Str .= ' '.' 'x($total_sum_width-length($score)).$score.' / '.$max; $Str .= " \n";