--- loncom/interface/statistics/lonstudentassessment.pm 2004/01/27 16:58:05 1.81
+++ loncom/interface/statistics/lonstudentassessment.pm 2004/01/27 19:50:03 1.82
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentassessment.pm,v 1.81 2004/01/27 16:58:05 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.82 2004/01/27 19:50:03 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -785,22 +785,20 @@ sub StudentAverageTotal {
$total_ave += $ave;
my $max = $Statistics->{$seq->{'symb'}}->{'max'};
$total_max += $max;
- if ($ave == 0) {
- $ave = "0.00";
- }
- $ave .= ' ';
- $max .= ' ';
+ $ave = sprintf("%.2f",$ave);
$Str .= '
'.$seq->{'title'}.' | '.
- ''.$ave.' | '.
- ''.$max.' |
'."\n";
+ ''.$ave.' | '.
+ ''.$max.' '.' | '."\n";
}
- $total_ave = int(100*$total_ave)/100; # only two digit
+ $total_ave = sprintf('%.2f',$total_ave); # only two digit
$Str .= "\n";
$Str .= ''."\n";
$Str .= 'Number of Students | Average | '.
"Maximum |
\n";
- $Str .= ''.($num_students-$nodata_count).' | '.
- ''.$total_ave.' | '.$total_max.' | ';
+ $Str .= '
'.
+ ''.($num_students-$nodata_count).' | '.
+ ''.$total_ave.' '.' | '.
+ ''.$total_max.' '.' | ';
$Str .= "
\n";
return $Str;
}
@@ -1016,6 +1014,7 @@ END
($rows_output,$cols_output);
$seq->{'Excel:startcol'}=$cols_output;
# Put the names of the problems and parts into the sheet
+ my $count = 0;
foreach my $res (@{$seq->{'contents'}}) {
next if ($res->{'type'} ne 'assessment');
if (scalar(@{$res->{'parts'}}) > 1) {
@@ -1029,12 +1028,17 @@ END
$cols_output++,
$res->{'title'});
}
+ $count++;
}
# Determine ending cell
- $seq->{'Excel:endcell'} =
+ if ($count == 1) {
+ $seq->{'Excel:endcell'} = $seq->{'Excel:startcell'};
+ $seq->{'Excel:endcol'} = $seq->{'Excel:startcol'};
+ } else {
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
- ($rows_output,$cols_output-1);
- $seq->{'Excel:endcol'}=$cols_output-1;
+ ($rows_output,$cols_output-1);
+ $seq->{'Excel:endcol'} = $cols_output-1;
+ }
# Create the formula for summing up this sequence
$seq->{'Excel:sum'}= $excel_sheet->store_formula
('=SUM('.$seq->{'Excel:startcell'}.