[LON-CAPA-cvs] cvs: loncom /interface/statistics lonstudentassessment.pm
matthew
lon-capa-cvs@mail.lon-capa.org
Thu, 23 Sep 2004 17:48:01 -0000
matthew Thu Sep 23 13:48:01 2004 EDT
Modified files:
/loncom/interface/statistics lonstudentassessment.pm
Log:
Mostly localization support.
Index: loncom/interface/statistics/lonstudentassessment.pm
diff -u loncom/interface/statistics/lonstudentassessment.pm:1.104 loncom/interface/statistics/lonstudentassessment.pm:1.105
--- loncom/interface/statistics/lonstudentassessment.pm:1.104 Wed Aug 25 17:04:37 2004
+++ loncom/interface/statistics/lonstudentassessment.pm Thu Sep 23 13:48:00 2004
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentassessment.pm,v 1.104 2004/08/25 21:04:37 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.105 2004/09/23 17:48:00 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -776,6 +776,8 @@
}
if (! defined($score)) {
$score = ' ' x $total_sum_width;
+ } else {
+ $score = sprintf("%.0f",$score);
}
$Str .= ' '.' 'x($total_sum_width-length($score)).$score.' / '.$max;
$Str .= " \n";
@@ -803,18 +805,16 @@
}
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)
@@ -822,34 +822,32 @@
} 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.' </td>'.
'<td align="right">'.$max.' '.'</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.' '.'</td>'.
-# '<td align="right">'.$total_max.' '.'</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()) {
@@ -861,7 +859,7 @@
$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";
@@ -925,39 +923,18 @@
# 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);
#