--- loncom/interface/statistics/lonstudentassessment.pm 2004/02/20 16:24:20 1.92
+++ loncom/interface/statistics/lonstudentassessment.pm 2004/07/13 15:03:34 1.102
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentassessment.pm,v 1.92 2004/02/20 16:24:20 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.102 2004/07/13 15:03:34 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -153,6 +153,8 @@ sub BuildStudentAssessmentPage {
#
$single_student_mode = 0;
$single_student_mode = 1 if ($ENV{'form.SelectedStudent'});
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['selectstudent']);
if ($ENV{'form.selectstudent'}) {
&Apache::lonstatistics::DisplayClasslist($r);
return;
@@ -402,7 +404,7 @@ my @OutputOptions =
},
{ name => 'CSV',
value => 'csv',
- description => 'Output a comma seperated values file suitable for '.
+ description => 'Output a comma separated values file suitable for '.
'import into a spreadsheet program. Using this method as opposed '.
'to Excel output allows you to organize your data before importing'.
' it into a spreadsheet program.',
@@ -474,6 +476,7 @@ my @OutputDataOptions =
sequence_sum => 1,
sequence_max => 1,
grand_total => 1,
+ grand_maximum => 1,
summary_table => 1,
maximum_row => 1,
shortdesc => 'Total Score and Maximum Possible for each '.
@@ -491,6 +494,7 @@ my @OutputDataOptions =
sequence_sum => 1,
sequence_max => 1,
grand_total => 1,
+ grand_maximum => 1,
summary_table => 1,
maximum_row => 1,
shortdesc => 'Score on each Problem Part',
@@ -507,6 +511,7 @@ my @OutputDataOptions =
sequence_sum => 0,
sequence_max => 0,
grand_total => 0,
+ grand_maximum => 0,
summary_table => 0,
maximum_row => 0,
shortdesc => 'Number of Tries before success on each Problem Part',
@@ -522,6 +527,7 @@ my @OutputDataOptions =
sequence_sum => 1,
sequence_max => 1,
grand_total => 1,
+ grand_maximum => 1,
summary_table => 1,
maximum_row => 0,
shortdesc => 'Number of Problem Parts completed successfully.',
@@ -601,6 +607,7 @@ Return a line of the chart for a student
my $nodata_count; # The number of students for which there is no data
my %prog_state; # progress state used by loncommon PrgWin routines
+ my $total_sum_width;
sub html_initialize {
my ($r) = @_;
@@ -627,13 +634,19 @@ sub html_initialize {
}
#
# Compute the column widths and output the sequence titles
+ my $total_count;
foreach my $sequence (&Apache::lonstatistics::Sequences_with_Assess()){
#
# Comptue column widths
$sequence->{'width_sum'} = 0;
if ($chosen_output->{'sequence_sum'}) {
+ if ($chosen_output->{'every_problem'}) {
+ # Use 1 digit for a space
+ $sequence->{'width_sum'} += 1;
+ }
+ $total_count += $sequence->{'num_assess_parts'};
# Use 3 digits for the sum
- $sequence->{'width_sum'} = 3;
+ $sequence->{'width_sum'} += 3;
}
if ($chosen_output->{'sequence_max'}) {
if ($sequence->{'width_sum'}>0) {
@@ -643,6 +656,7 @@ sub html_initialize {
# Use 3 digits for the total
$sequence->{'width_sum'}+=3;
}
+ #
if ($chosen_output->{'every_problem'}) {
# one problem per digit
$sequence->{'width_problem'} = $sequence->{'num_assess_parts'};
@@ -651,10 +665,8 @@ sub html_initialize {
}
$sequence->{'width_total'} = $sequence->{'width_problem'} +
$sequence->{'width_sum'};
- if ($sequence->{'width_total'} < length($sequence->{'title'})) {
- $sequence->{'width_total'} = length($sequence->{'title'});
- $sequence->{'width_problem'} =
- $sequence->{'width_total'} - $sequence->{'width_sum'};
+ if ($sequence->{'width_total'} < length(&HTML::Entities::decode($sequence->{'title'}))) {
+ $sequence->{'width_total'} = length(&HTML::Entities::decode($sequence->{'title'}));
}
#
# Output the sequence titles
@@ -663,7 +675,8 @@ sub html_initialize {
length($sequence->{'title'})
).$padding;
}
- $Str .= "total\n";
+ $total_sum_width = length($total_count)+1;
+ $Str .= " total\n";
$Str .= "";
$r->print($Str);
$r->rflush();
@@ -716,20 +729,26 @@ sub html_outputstudent {
$seq,$show_links);
}
my $ratio='';
- if ($chosen_output->{'sequence_sum'}) {
- $ratio .= sprintf("%3d",$score);
+ if ($chosen_output->{'every_problem'}) {
+ $ratio .= ' ';
+ }
+ if ($chosen_output->{'sequence_sum'} && $score ne ' ') {
+ $ratio .= sprintf("%3.0f",$score);
+ } elsif($chosen_output->{'sequence_sum'}) {
+ $ratio .= ' 'x3;
}
if ($chosen_output->{'sequence_max'}) {
if ($chosen_output->{'sequence_sum'}) {
$ratio .= '/';
}
- $ratio .= sprintf("%3d",$seq_max);
+ $ratio .= sprintf("%3.0f",$seq_max);
}
#
if (! $chosen_output->{'every_problem'}) {
$performance = '';
+ $performance_length=0;
}
- $performance .= ' 'x($seq->{'width_problem'}-$performance_length).
+ $performance .= ' 'x($seq->{'width_total'}-$performance_length-$seq->{'width_sum'}).
$ratio;
#
$Str .= $performance.$padding;
@@ -739,16 +758,22 @@ sub html_outputstudent {
}
#
# Total it up and store the statistics info.
- my ($score,$max) = (0,0);
+ my ($score,$max);
while (my ($symb,$seq_stats) = each (%{$studentstats})) {
$Statistics->{$symb}->{'score'} += $seq_stats->{'score'};
if ($Statistics->{$symb}->{'max'} < $seq_stats->{'max'}) {
$Statistics->{$symb}->{'max'} = $seq_stats->{'max'};
}
- $score += $seq_stats->{'score'};
+ if ($seq_stats->{'score'} ne ' ') {
+ $score += $seq_stats->{'score'};
+ $Statistics->{$symb}->{'num_students'}++;
+ }
$max += $seq_stats->{'max'};
}
- $Str .= ' '.' 'x(length($max)-length($score)).$score.'/'.$max;
+ if (! defined($score)) {
+ $score = ' ' x $total_sum_width;
+ }
+ $Str .= ' '.' 'x($total_sum_width-length($score)).$score.' / '.$max;
$Str .= " \n";
#
$r->print($Str);
@@ -775,37 +800,42 @@ sub html_finish {
sub StudentAverageTotal {
my $Str = "Summary Tables
\n";
- my $num_students = scalar(@Apache::lonstatistics::Students);
- my $total_ave = 0;
- my $total_max = 0;
+# my $max_students;
+# my $total_ave = 0;
+# my $total_max = 0;
$Str .= ''."\n";
$Str .= "| Title | Average | Maximum |
|---|
\n";
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
my $ave;
- if ($num_students > $nodata_count) {
- $ave = int(100*($Statistics->{$seq->{'symb'}}->{'score'}/
- ($num_students-$nodata_count)))/100;
+ 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)
+ )/100;
} else {
$ave = 0;
}
- $total_ave += $ave;
+# $total_ave += $ave;
my $max = $Statistics->{$seq->{'symb'}}->{'max'};
- $total_max += $max;
+# $total_max += $max;
$ave = sprintf("%.2f",$ave);
$Str .= '| '.$seq->{'title'}.' | '.
''.$ave.' | '.
''.$max.' '.' |
'."\n";
}
- $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.' '.' | ';
+# $total_ave = sprintf('%.2f',$total_ave); # only two digit
$Str .= "
\n";
+# $Str .= ''."\n";
+# $Str .= '| Number of Students | Average | '.
+# "Maximum |
|---|
\n";
+# $Str .= ''.
+# '| '.$max_students.' | '.
+# ''.$total_ave.' '.' | '.
+# ''.$total_max.' '.' | ';
+# $Str .= "
\n";
return $Str;
}
@@ -866,6 +896,7 @@ my %prog_state; # progress window state
my $request_aborted;
my $total_formula;
+my $maximum_formula;
sub excel_initialize {
my ($r) = @_;
@@ -878,6 +909,7 @@ sub excel_initialize {
undef (%prog_state);
undef ($request_aborted);
undef ($total_formula);
+ undef ($maximum_formula);
#
my $total_columns = scalar(&get_student_fields_to_show());
my $num_students = scalar(@Apache::lonstatistics::Students);
@@ -1026,6 +1058,7 @@ END
#
# Add the remaining column headers
my $total_formula_string = '=0';
+ my $maximum_formula_string = '=0';
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
$excel_sheet->write($sequence_name_row,,
$cols_output,$seq->{'title'},$format->{'bold'});
@@ -1103,16 +1136,30 @@ END
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
($first_data_row,$cols_output-1);
if ($chosen_output->{'sequence_max'}) {
- $excel_sheet->write($resource_name_row,$cols_output++,
+ $excel_sheet->write($resource_name_row,$cols_output,
'maximum',
$format->{'bold'});
+ $seq->{'Excel:maxcell'} =
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+ ($first_data_row,$cols_output);
+ $seq->{'Excel:maxcol'}=$cols_output;
+ $maximum_formula_string.='+'.
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+ ($first_data_row,$cols_output);
+ $cols_output++;
+
}
}
if ($chosen_output->{'grand_total'}) {
$excel_sheet->write($resource_name_row,$cols_output++,'Total',
$format->{'bold'});
}
+ if ($chosen_output->{'grand_maximum'}) {
+ $excel_sheet->write($resource_name_row,$cols_output++,'Max. Total',
+ $format->{'bold'});
+ }
$total_formula = $excel_sheet->store_formula($total_formula_string);
+ $maximum_formula = $excel_sheet->store_formula($maximum_formula_string);
##############################################
# Output a row for MAX, if appropriate
##############################################
@@ -1130,11 +1177,15 @@ END
#
# Add the maximums for each sequence or assessment
my %total_cell_translation;
+ my %maximum_cell_translation;
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
$cols_output=$seq->{'Excel:startcol'};
$total_cell_translation{$seq->{'Excel:scorecell'}} =
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
($maximum_data_row,$seq->{'Excel:scorecol'});
+ $maximum_cell_translation{$seq->{'Excel:maxcell'}} =
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+ ($maximum_data_row,$seq->{'Excel:maxcol'});
my $weight;
my $max = 0;
foreach my $resource (@{$seq->{'contents'}}) {
@@ -1183,6 +1234,11 @@ END
$total_formula,undef,
%total_cell_translation);
}
+ if ($chosen_output->{'grand_maximum'}) {
+ $excel_sheet->repeat_formula($maximum_data_row,$cols_output++,
+ $maximum_formula,undef,
+ %total_cell_translation);
+ }
} # End of MAXIMUM row output if ($chosen_output->{'maximum_row'}) {
$rows_output = $first_data_row;
##############################################
@@ -1284,6 +1340,7 @@ sub excel_outputstudent {
#
# Write out sequence scores and totals data
my %total_cell_translation;
+ my %maximum_cell_translation;
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
$cols_output = $seq->{'Excel:startcol'};
# Keep track of cells to translate in total cell
@@ -1311,7 +1368,12 @@ sub excel_outputstudent {
}
} else {
foreach my $value (@$rawdata) {
- $excel_sheet->write($rows_output,$cols_output++,$value);
+ if ($score eq ' ' || !defined($value)) {
+ $cols_output++;
+ } else {
+ $excel_sheet->write($rows_output,$cols_output++,
+ $value);
+ }
}
}
}
@@ -1336,7 +1398,11 @@ sub excel_outputstudent {
%replaceCells);
}
} elsif ($chosen_output->{'sequence_sum'}) {
- $excel_sheet->write($rows_output,$cols_output++,$score);
+ if ($score eq ' ') {
+ $cols_output++;
+ } else {
+ $excel_sheet->write($rows_output,$cols_output++,$score);
+ }
}
if ($chosen_output->{'sequence_max'}) {
$excel_sheet->write($rows_output,$cols_output++,$seq_max);
@@ -1348,6 +1414,11 @@ sub excel_outputstudent {
$total_formula,undef,
%total_cell_translation);
}
+ if ($chosen_output->{'grand_maximum'}) {
+ $excel_sheet->repeat_formula($rows_output,$cols_output++,
+ $maximum_formula,undef,
+ %total_cell_translation);
+ }
#
# Bookkeeping
$rows_output++;
@@ -1495,6 +1566,10 @@ END
$sequence_row.= '"",';
$resource_row.= '"Total",';
}
+ if ($chosen_output->{'grand_maximum'}) {
+ $sequence_row.= '"",';
+ $resource_row.= '"Maximum",';
+ }
chomp($sequence_row);
chomp($resource_row);
print $outputfile $sequence_row."\n";
@@ -1526,6 +1601,7 @@ sub csv_outputstudent {
#
# Output performance data
my $total = 0;
+ my $maximum = 0;
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
my ($performance,$performance_length,$score,$seq_max,$rawdata);
if ($chosen_output->{'tries'}){
@@ -1559,10 +1635,14 @@ sub csv_outputstudent {
$Str .= '"'.$seq_max.'",';
}
$total+=$score;
+ $maximum += $seq_max;
}
if ($chosen_output->{'grand_total'}) {
$Str .= '"'.$total.'",';
}
+ if ($chosen_output->{'grand_maximum'}) {
+ $Str .= '"'.$maximum.'",';
+ }
chop($Str);
$Str .= "\n";
print $outputfile $Str;
@@ -1586,7 +1666,7 @@ sub csv_finish {
#
# Tell the user where to get their csv file
$r->print('
'.
- 'Your csv file.'."\n");
+ ''.&mt('Your csv file.').''."\n");
$r->rflush();
return;
@@ -1627,6 +1707,7 @@ sub StudentTriesOnSequence {
my $performance_length = 0;
my @TriesData = ();
my $tries;
+ my $hasdata = 0; # flag - true if the student has any data on the sequence
foreach my $resource (@{$seq->{'contents'}}) {
next if ($resource->{'type'} ne 'assessment');
my $resource_data = $studentdata->{$resource->{'symb'}};
@@ -1651,6 +1732,7 @@ sub StudentTriesOnSequence {
my $tries = 0;
if(exists($resource_data->{'resource.'.$partnum.'.tries'})) {
$tries = $resource_data->{'resource.'.$partnum.'.tries'};
+ $hasdata =1;
}
#
if ($awarded > 0) {
@@ -1713,6 +1795,9 @@ sub StudentTriesOnSequence {
if ($seq->{'randompick'}) {
$max = $seq->{'randompick'};
}
+ if (! $hasdata && $sum == 0) {
+ $sum = ' ';
+ }
return ($Str,$performance_length,$sum,$max,\@TriesData);
}
@@ -1750,6 +1835,7 @@ sub StudentPerformanceOnSequence {
my $symbol;
my @ScoreData = ();
my $partscore;
+ my $hasdata = 0; # flag, 0 if there were no submissions on the sequence
foreach my $resource (@{$seq->{'contents'}}) {
next if ($resource->{'type'} ne 'assessment');
my $resource_data = $studentdata->{$resource->{'symb'}};
@@ -1768,13 +1854,17 @@ sub StudentPerformanceOnSequence {
$performance_length++; # one character per part
$symbol = ' '; # default to space
#
- my $awarded = 0;
+ my $awarded;
if (exists($resource_data->{'resource.'.$part.'.awarded'})) {
$awarded = $resource_data->{'resource.'.$part.'.awarded'};
$awarded = 0 if (! $awarded);
+ $hasdata = 1;
}
#
$partscore = $weight*$awarded;
+ if (! defined($awarded)) {
+ $partscore = undef;
+ }
$score += $partscore;
$symbol = $partscore;
if (abs($symbol - sprintf("%.0f",$symbol)) < 0.001) {
@@ -1789,10 +1879,12 @@ sub StudentPerformanceOnSequence {
$symbol = 'x';
$max -= $weight; # Do not count 'excused' problems.
}
+ $hasdata = 1;
} else {
# Unsolved. Did they try?
if (exists($resource_data->{'resource.'.$part.'.tries'})){
$symbol = '.';
+ $hasdata = 1;
} else {
$symbol = ' ';
}
@@ -1813,6 +1905,9 @@ sub StudentPerformanceOnSequence {
$Str .= $symbol;
}
}
+ if (! $hasdata && $score == 0) {
+ $score = ' ';
+ }
return ($Str,$performance_length,$score,$max,\@ScoreData);
}