--- loncom/interface/statistics/lonstudentassessment.pm 2004/01/27 16:04:27 1.80 +++ loncom/interface/statistics/lonstudentassessment.pm 2004/02/18 15:43:00 1.91 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentassessment.pm,v 1.80 2004/01/27 16:04:27 matthew Exp $ +# $Id: lonstudentassessment.pm,v 1.91 2004/02/18 15:43:00 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -88,12 +88,6 @@ my $Statistics; =item $show 'all', 'totals', or 'scores' determines how much data is output -=item $data determines what performance data is shown - -=item $datadescription A short description of the output data selected. - -=item $base 'tries' or 'scores' determines the base of the performance shown - =item $single_student_mode evaluates to true if we are showing only one student. @@ -103,9 +97,7 @@ student. ####################################################### my $show_links; my $output_mode; -my $data; -my $base; -my $datadescription; +my $chosen_output; my $single_student_mode; ####################################################### @@ -145,9 +137,7 @@ sub BuildStudentAssessmentPage { undef($Statistics); undef($show_links); undef($output_mode); - undef($data); - undef($base); - undef($datadescription); + undef($chosen_output); undef($single_student_mode); # my %Saveable_Parameters = ('Status' => 'scalar', @@ -477,6 +467,14 @@ my @OutputDataOptions = { name => 'Scores Summary', base => 'scores', value => 'sum and total', + scores => 1, + tries => 0, + every_problem => 0, + sequence_sum => 1, + sequence_max => 1, + grand_total => 1, + summary_table => 1, + maximum_row => 1, shortdesc => 'Total Score and Maximum Possible for each '. 'Sequence or Folder', longdesc => 'The score of each student as well as the '. @@ -485,51 +483,50 @@ my @OutputDataOptions = { name => 'Scores Per Problem', base => 'scores', value => 'scores', + scores => 1, + tries => 0, + correct => 0, + every_problem => 1, + sequence_sum => 1, + sequence_max => 1, + grand_total => 1, + summary_table => 1, + maximum_row => 1, shortdesc => 'Score on each Problem Part', longdesc =>'The students score on each problem part, computed as'. 'the part weight * part awarded', }, -# { name => 'Scores Sum', -# base => 'scores', -# value => 'sum only', -# shortdesc => 'Sum of Scores on each Problem Part', -# longdesc =>'The total of the scores of the student on each problem'. -# ' part in the sequences or folders selected.', -# }, -# { name => 'Scores Summary Table Only', -# base => 'scores', -# value => 'final table scores', -# shortdesc => 'Summary of Scores', -# longdesc => 'The average score on each sequence or folder for the '. -# 'selected students.', -# }, { name =>'Tries', base =>'tries', value => 'tries', + scores => 0, + tries => 1, + correct => 0, + every_problem => 1, + sequence_sum => 0, + sequence_max => 0, + grand_total => 0, + summary_table => 0, + maximum_row => 0, shortdesc => 'Number of Tries before success on each Problem Part', longdesc =>'The number of tries before success on each problem part.', }, { name =>'Parts Correct', base =>'tries', value => 'parts correct total', + scores => 0, + tries => 0, + correct => 1, + every_problem => 1, + sequence_sum => 1, + sequence_max => 1, + grand_total => 1, + summary_table => 1, + maximum_row => 0, shortdesc => 'Number of Problem Parts completed successfully.', longdesc => 'The Number of Problem Parts completed successfully and '. 'the maximum possible for each student', }, -# { name =>'Parts Correct', -# base =>'tries', -# value => 'parts correct', -# shortdesc => 'Number of Problem Parts completed successfully.', -# longdesc => 'The Number of Problem Parts completed successfully'. -# ' on each sequence or folder.', -# }, -# { name => 'Parts Summary Table Only', -# base => 'tries', -# value => 'final table parts', -# shortdesc => 'Summary of Parts Correct', -# longdesc => 'A summary table of the average number of problem parts '. -# 'students were able to get correct on each sequence.', -# }, ); sub HTMLifyOutputDataDescriptions { @@ -557,12 +554,10 @@ sub CreateAndParseOutputDataSelector { } } # - $data = 'scores'; + $chosen_output = $OutputDataOptions[0]; foreach my $option (@OutputDataOptions) { if ($option->{'value'} eq $selected) { - $data = $option->{'value'}; - $base = $option->{'base'}; - $datadescription = $option->{'shortdesc'}; + $chosen_output = $option; } } # @@ -570,7 +565,7 @@ sub CreateAndParseOutputDataSelector { $Str = qq/"; @@ -617,16 +612,8 @@ sub html_initialize { $r->print("
\n"; # First, the @StudentData fields need to be listed @@ -637,20 +624,46 @@ sub html_initialize { my $width=$Apache::lonstatistics::StudentData{$field}->{'width'}; $Str .= $title.' 'x($width-$base).$padding; } - # Now the selected sequences need to be listed + # + # Compute the column widths and output the sequence titles foreach my $sequence (&Apache::lonstatistics::Sequences_with_Assess()){ - my $title = $sequence->{'title'}; - my $base = $sequence->{'base_width'}; - my $width = $sequence->{'width'}; - $Str .= $title.' 'x($width-$base).$padding; + # + # Comptue column widths + $sequence->{'width_sum'} = 0; + if ($chosen_output->{'sequence_sum'}) { + # Use 3 digits for the sum + $sequence->{'width_sum'} = 3; + } + if ($chosen_output->{'sequence_max'}) { + if ($sequence->{'width_sum'}>0) { + # One digit for the '/' + $sequence->{'width_sum'} +=1; + } + # 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'}; + } else { + $sequence->{'width_problem'} = 0; + } + $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'}; + } + # + # Output the sequence titles + $Str .= + $sequence->{'title'}.' 'x($sequence->{'width_total'}- + length($sequence->{'title'}) + ).$padding; } $Str .= "total\n"; $Str .= "
"; - # - # Check for suppression of output - if ($data =~ /^final table/) { - $Str = ''; - } $r->print($Str); $r->rflush(); return; @@ -660,7 +673,7 @@ sub html_outputstudent { my ($r,$student) = @_; my $Str = ''; # - if($count++ % 5 == 0 && $count > 0 && $data !~ /^final table/) { + if($count++ % 5 == 0 && $count > 0) { $r->print("
"); } # First, the @StudentData fields need to be listed @@ -681,7 +694,6 @@ sub html_outputstudent { } if (scalar(@tmp) < 1) { $nodata_count++; - return if ($data =~ /^final table/); $Str .= 'No Course Data'."\n"; $r->print($Str); $r->rflush(); @@ -693,7 +705,7 @@ sub html_outputstudent { my $PerformanceStr = ''; foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { my ($performance,$performance_length,$score,$seq_max,$rawdata); - if ($base eq 'tries') { + if ($chosen_output->{'tries'}) { ($performance,$performance_length,$score,$seq_max,$rawdata) = &StudentTriesOnSequence($student,\%StudentsData, $seq,$show_links); @@ -702,20 +714,22 @@ sub html_outputstudent { &StudentPerformanceOnSequence($student,\%StudentsData, $seq,$show_links); } - my $ratio = sprintf("%3d",$score).'/'.sprintf("%3d",$seq_max); + my $ratio=''; + if ($chosen_output->{'sequence_sum'}) { + $ratio .= sprintf("%3d",$score); + } + if ($chosen_output->{'sequence_max'}) { + if ($chosen_output->{'sequence_sum'}) { + $ratio .= '/'; + } + $ratio .= sprintf("%3d",$seq_max); + } # - if ($data eq 'sum and total' || $data eq 'parts correct total') { - $performance = $ratio; - $performance .= ' 'x($seq->{'width'}-length($ratio)); - } elsif ($data eq 'sum only' || $data eq 'parts correct') { - $performance = $score; - $performance .= ' 'x($seq->{'width'}-length($score)); - } else { - # Pad with extra spaces - $performance .= ' 'x($seq->{'width'}-$performance_length- - length($ratio) - ).$ratio; + if (! $chosen_output->{'every_problem'}) { + $performance = ''; } + $performance .= ' 'x($seq->{'width_problem'}-$performance_length). + $ratio; # $Str .= $performance.$padding; # @@ -736,13 +750,6 @@ sub html_outputstudent { $Str .= ' '.' 'x(length($max)-length($score)).$score.'/'.$max; $Str .= " \n"; # - # Check for suppressed output and update the progress window if so... - if ($data =~ /^final table/) { - $Str = ''; - &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, - 'last student'); - } - # $r->print($Str); # $r->rflush(); @@ -753,15 +760,13 @@ sub html_finish { my ($r) = @_; # # Check for suppressed output and close the progress window if so - if ($data =~ /^final table/) { - &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); - } else { - $r->print("\n"); - } - if ($single_student_mode) { - $r->print(&SingleStudentTotal()); - } else { - $r->print(&StudentAverageTotal()); + $r->print("\n"); + if ($chosen_output->{'summary_table'}) { + if ($single_student_mode) { + $r->print(&SingleStudentTotal()); + } else { + $r->print(&StudentAverageTotal()); + } } $r->rflush(); return; @@ -785,22 +790,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 .= '
Number of Students | Average | '. "Maximum |
---|---|---|
'.($num_students-$nodata_count).' | '. - ''.$total_ave.' | '.$total_max.' | '; + $Str .= '
'.($num_students-$nodata_count).' | '. + ''.$total_ave.' '.' | '. + ''.$total_max.' '.' | '; $Str .= "
@@ -897,7 +905,7 @@ summary data (Parts Correct or 255) {
+ if ($chosen_output->{'base'} eq 'scores' && $total_columns > 255) {
$r->print(<
@@ -914,15 +922,6 @@ LON-CAPA can produce CSV files of
END
$request_aborted = 1;
}
- if ($data =~ /^final table/) {
- $r->print(<
-The Summary Table (Scores) option is not available for non-HTML output.
-
@@ -1302,7 +1424,12 @@ END
$request_aborted = 1;
}
return if ($request_aborted);
-
+ #
+ # Initialize progress window
+ my $studentcount = scalar(@Apache::lonstatistics::Students);
+ %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
+ ($r,'CSV File Compilation Status',
+ 'CSV File Compilation Progress', $studentcount);
#
# Open a file
$filename = '/prtspool/'.
@@ -1323,55 +1450,54 @@ END
"\n";
#
# Print out the headings
- my $Str = '';
- my $Str2 = undef;
+ my $sequence_row = '';
+ my $resource_row = undef;
foreach my $field (&get_student_fields_to_show()) {
- if ($data eq 'sum only') {
- $Str .= '"'.&Apache::loncommon::csv_translate($field).'",';
- } elsif ($data eq 'sum and total' || $data eq 'parts correct total') {
- $Str .= '"",'; # first row empty on the student fields
- $Str2 .= '"'.&Apache::loncommon::csv_translate($field).'",';
- } elsif ($data eq 'scores' || $data eq 'tries' ||
- $data eq 'parts correct') {
- $Str .= '"",';
- $Str2 .= '"'.&Apache::loncommon::csv_translate($field).'",';
- }
+ $sequence_row .='"",';
+ $resource_row .= '"'.&Apache::loncommon::csv_translate($field).'",';
}
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
- if ($data eq 'sum only' || $data eq 'parts correct') {
- $Str .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}).
- '",';
- } elsif ($data eq 'sum and total' || $data eq 'parts correct total') {
- $Str .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}).
- '","",';
- $Str2 .= '"score","total possible",';
- } elsif ($data eq 'scores' || $data eq 'tries') {
- $Str .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}).
- '",';
- $Str .= '"",'x($seq->{'num_assess_parts'}-1+2);
+ $sequence_row .= '"'.
+ &Apache::loncommon::csv_translate($seq->{'title'}).'",';
+ my $count = 0;
+ if ($chosen_output->{'every_problem'}) {
foreach my $res (@{$seq->{'contents'}}) {
- next if ($res->{'type'} ne 'assessment');
+ if ($res->{'type'} ne 'assessment' ||
+ ! exists($res->{'parts'}) ||
+ ref($res->{'parts'}) ne 'ARRAY' ||
+ scalar(@{$res->{'parts'}}) < 1) {
+ next;
+ }
foreach my $part (@{$res->{'parts'}}) {
- $Str2 .= '"'.&Apache::loncommon::csv_translate($res->{'title'}.', Part '.$part).'",';
+ $resource_row .= '"'.
+ &Apache::loncommon::csv_translate($res->{'title'}.
+ ', Part '.$part
+ ).'",';
+ $count++;
}
}
- $Str2 .= '"score","total possible",';
+ }
+ $sequence_row.='"",'x$count;
+ if ($chosen_output->{'sequence_sum'}) {
+ if($chosen_output->{'correct'}) {
+ $resource_row .= '"sum",';
+ } else {
+ $resource_row .= '"score",';
+ }
+ }
+ if ($chosen_output->{'sequence_max'}) {
+ $sequence_row.= '"",';
+ $resource_row .= '"maximum possible",';
}
}
- chop($Str);
- $Str .= "\n";
- print $outputfile $Str;
- if (defined($Str2)) {
- chop($Str2);
- $Str2 .= "\n";
- print $outputfile $Str2;
- }
- #
- # Initialize progress window
- my $studentcount = scalar(@Apache::lonstatistics::Students);
- %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
- ($r,'CSV File Compilation Status',
- 'CSV File Compilation Progress', $studentcount);
+ if ($chosen_output->{'grand_total'}) {
+ $sequence_row.= '"",';
+ $resource_row.= '"Total",';
+ }
+ chomp($sequence_row);
+ chomp($resource_row);
+ print $outputfile $sequence_row."\n";
+ print $outputfile $resource_row."\n";
return;
}
@@ -1398,9 +1524,10 @@ sub csv_outputstudent {
}
#
# Output performance data
+ my $total = 0;
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
my ($performance,$performance_length,$score,$seq_max,$rawdata);
- if ($base eq 'tries') {
+ if ($chosen_output->{'tries'}){
($performance,$performance_length,$score,$seq_max,$rawdata) =
&StudentTriesOnSequence($student,\%StudentsData,
$seq,'no');
@@ -1409,13 +1536,31 @@ sub csv_outputstudent {
&StudentPerformanceOnSequence($student,\%StudentsData,
$seq,'no');
}
- if ($data eq 'sum only' || $data eq 'parts correct') {
+ if ($chosen_output->{'every_problem'}) {
+ if ($chosen_output->{'correct'}) {
+ $score = 0;
+ # Deal with number of parts correct data
+ $Str .= '"'.join('","',( map { if ($_>0) {
+ $score += 1;
+ 1;
+ } else {
+ 0;
+ }
+ } @$rawdata)).'",';
+ } else {
+ $Str .= '"'.join('","',(@$rawdata)).'",';
+ }
+ }
+ if ($chosen_output->{'sequence_sum'}) {
$Str .= '"'.$score.'",';
- } elsif ($data eq 'sum and total' || $data eq 'parts correct total') {
- $Str .= '"'.$score.'","'.$seq_max.'",';
- } elsif ($data eq 'scores' || $data eq 'tries') {
- $Str .= '"'.join('","',(@$rawdata,$score,$seq_max)).'",';
+ }
+ if ($chosen_output->{'sequence_max'}) {
+ $Str .= '"'.$seq_max.'",';
}
+ $total+=$score;
+ }
+ if ($chosen_output->{'grand_total'}) {
+ $Str .= '"'.$total.'",';
}
chop($Str);
$Str .= "\n";
Compiling Excel spreadsheet for ".
- $studentcount.' student');
- $r->print('s') if ($studentcount > 1);
- $r->print("
\n");
+ if ($ENV{'form.SelectedStudent'}) {
+ $studentcount = '1';
+ }
+ if ($studentcount > 1) {
+ $r->print(''.&mt('Compiling Excel spreadsheet for [_1] students',
+ $studentcount)."
\n");
+ } else {
+ $r->print(''.
+ &mt('Compiling Excel spreadsheet for 1 student').
+ "
\n");
+ }
$r->rflush();
#
# Initialize progress window
@@ -1179,13 +1284,14 @@ sub excel_outputstudent {
# Write out sequence scores and totals data
my %total_cell_translation;
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+ $cols_output = $seq->{'Excel:startcol'};
# Keep track of cells to translate in total cell
$total_cell_translation{$seq->{'Excel:scorecell'}} =
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
($rows_output,$seq->{'Excel:scorecol'});
#
my ($performance,$performance_length,$score,$seq_max,$rawdata);
- if ($base eq 'tries') {
+ if ($chosen_output->{'tries'} || $chosen_output->{'correct'}){
($performance,$performance_length,$score,$seq_max,$rawdata) =
&StudentTriesOnSequence($student,\%StudentsData,
$seq,'no');
@@ -1193,11 +1299,23 @@ sub excel_outputstudent {
($performance,$performance_length,$score,$seq_max,$rawdata) =
&StudentPerformanceOnSequence($student,\%StudentsData,
$seq,'no');
- }
- if ($data eq 'tries' || $data eq 'scores') {
- foreach my $value (@$rawdata) {
- $excel_sheet->write($rows_output,$cols_output++,$value);
+ }
+ if ($chosen_output->{'every_problem'}) {
+ if ($chosen_output->{'correct'}) {
+ # only indiciate if each item is correct or not
+ foreach my $value (@$rawdata) {
+ # nonzero means correct
+ $value = 1 if ($value > 0);
+ $excel_sheet->write($rows_output,$cols_output++,$value);
+ }
+ } else {
+ foreach my $value (@$rawdata) {
+ $excel_sheet->write($rows_output,$cols_output++,$value);
+ }
}
+ }
+ if ($chosen_output->{'sequence_sum'} &&
+ $chosen_output->{'every_problem'}) {
# Write a formula for the sum of this sequence
my %replaceCells;
$replaceCells{$seq->{'Excel:startcell'}} =
@@ -1207,24 +1325,28 @@ sub excel_outputstudent {
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
($rows_output,$seq->{'Excel:endcol'});
# The undef is for the format
- $excel_sheet->repeat_formula($rows_output,$cols_output++,
- $seq->{'Excel:sum'},undef,
- %replaceCells);
- #
- $excel_sheet->write($rows_output,$cols_output++,$seq_max);
- } elsif ($data eq 'sum and total' || $data eq 'sum only' ||
- $data eq 'parts correct' || $data eq 'parts correct total') {
+ if (scalar(keys(%replaceCells)) == 1) {
+ $excel_sheet->repeat_formula($rows_output,$cols_output++,
+ $seq->{'Excel:sum'},undef,
+ %replaceCells,%replaceCells);
+ } else {
+ $excel_sheet->repeat_formula($rows_output,$cols_output++,
+ $seq->{'Excel:sum'},undef,
+ %replaceCells);
+ }
+ } elsif ($chosen_output->{'sequence_sum'}) {
$excel_sheet->write($rows_output,$cols_output++,$score);
}
- if ($data eq 'sum and total' || $data eq 'parts correct total') {
+ if ($chosen_output->{'sequence_max'}) {
$excel_sheet->write($rows_output,$cols_output++,$seq_max);
}
}
#
- $excel_sheet->repeat_formula($rows_output,$cols_output++,
- $total_formula,undef,
- %total_cell_translation);
-
+ if ($chosen_output->{'grand_total'}) {
+ $excel_sheet->repeat_formula($rows_output,$cols_output++,
+ $total_formula,undef,
+ %total_cell_translation);
+ }
#
# Bookkeeping
$rows_output++;
@@ -1292,7 +1414,7 @@ sub csv_initialize{
#
# Deal with unimplemented requests
$request_aborted = undef;
- if ($data =~ /final table/) {
+ if ($chosen_output->{'base'} =~ /final table/) {
$r->print(<