";
#
# Check for suppression of output
- if ($show eq 'final table') {
+ if ($data =~ /^final table/) {
$Str = '';
}
$r->print($Str);
@@ -592,7 +635,7 @@ sub html_outputstudent {
}
if (scalar(@tmp) < 1) {
$nodata_count++;
- return if ($show eq 'final table');
+ return if ($data =~ /^final table/);
$Str .= 'No Course Data'."\n";
$r->print($Str);
$r->rflush();
@@ -603,17 +646,24 @@ sub html_outputstudent {
my $studentstats;
my $PerformanceStr = '';
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
- my ($performance,$performance_length,$score,$seq_max) =
- &StudentPerformanceOnSequence($student,\%StudentsData,
- $seq,$show_links);
- my $ratio = $score.'/'.$seq_max;
+ my ($performance,$performance_length,$score,$seq_max,$rawdata);
+ if ($base eq 'tries') {
+ ($performance,$performance_length,$score,$seq_max,$rawdata) =
+ &StudentTriesOnSequence($student,\%StudentsData,
+ $seq,$show_links);
+ } else {
+ ($performance,$performance_length,$score,$seq_max,$rawdata) =
+ &StudentPerformanceOnSequence($student,\%StudentsData,
+ $seq,$show_links);
+ }
+ my $ratio = sprintf("%3d",$score).'/'.sprintf("%3d",$seq_max);
#
- if ($show eq 'totals') {
- $performance = ' 'x(length($seq_max)-length($score)).$ratio;
- $performance .= ' 'x($seq->{'width'}-length($performance));
- } elsif ($show eq 'scores') {
- $performance = $score;
- $performance .= ' 'x($seq->{'width'}-length($performance));
+ 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-
@@ -631,7 +681,9 @@ sub html_outputstudent {
my ($score,$max) = (0,0);
while (my ($symb,$seq_stats) = each (%{$studentstats})) {
$Statistics->{$symb}->{'score'} += $seq_stats->{'score'};
- $Statistics->{$symb}->{'max'} += $seq_stats->{'max'};
+ if ($Statistics->{$symb}->{'max'} < $seq_stats->{'max'}) {
+ $Statistics->{$symb}->{'max'} = $seq_stats->{'max'};
+ }
$score += $seq_stats->{'score'};
$max += $seq_stats->{'max'};
}
@@ -639,7 +691,7 @@ sub html_outputstudent {
$Str .= " \n";
#
# Check for suppressed output and update the progress window if so...
- if ($show eq 'final table') {
+ if ($data =~ /^final table/) {
$Str = '';
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
'last student');
@@ -655,7 +707,7 @@ sub html_finish {
my ($r) = @_;
#
# Check for suppressed output and close the progress window if so
- if ($show eq 'final table') {
+ if ($data =~ /^final table/) {
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
} else {
$r->print("\n");
@@ -685,7 +737,7 @@ sub StudentAverageTotal {
$ave = 0;
}
$total_ave += $ave;
- my $max = $seq->{'num_assess_parts'};
+ my $max = $Statistics->{$seq->{'symb'}}->{'max'};
$total_max += $max;
if ($ave == 0) {
$ave = "0.00";
@@ -775,15 +827,15 @@ sub multi_sheet_excel_initialize {
if ($size_estimate > $max_size) { # try to stay under 5 megs
$num_workbooks += int($size_estimate / $max_size);
}
- if ($show eq 'by section') {
- if (@Apache::lonstatistics::SelectedSections > 1 &&
- $Apache::lonstatistics::SelectedSections[0] ne 'all') {
- $num_workbooks = scalar(@Apache::lonstatistics::SelectedSections);
- } else {
- # @Apache::lonstatistics::Sections contains 'all' as well.
- $num_workbooks = scalar(@Apache::lonstatistics::Sections) - 1;
- }
- }
+# if ($data eq ) {
+# if (@Apache::lonstatistics::SelectedSections > 1 &&
+# $Apache::lonstatistics::SelectedSections[0] ne 'all') {
+# $num_workbooks = scalar(@Apache::lonstatistics::SelectedSections);
+# } else {
+# # @Apache::lonstatistics::Sections contains 'all' as well.
+# $num_workbooks = scalar(@Apache::lonstatistics::Sections) - 1;
+# }
+# }
$r->print("Maximum allowed size: ".$max_size." bytes+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. +
+You may consider reducing the number of Sequences or Folders you +have selected. +
+LON-CAPA can produce CSV files of this data or Excel files of the +summary data (Parts Correct or Parts Correct & Totals). +
+END + $request_aborted = 1; + } + if ($data eq 'scores' && $total_columns > 255) { + $r->print(<+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. +
+You may consider reducing the number of Sequences or Folders you +have selected. +
+LON-CAPA can produce CSV files of this data or Excel files of the +summary data (Scores Sum or Scores Sum & Totals). +
+END + $request_aborted = 1; + } + if ($data =~ /^final table/) { + $r->print(<+The Summary Table (Scores) option is not available for non-HTML output. +
+END + $request_aborted = 1; + } + return if ($request_aborted); + # $filename = '/prtspool/'. $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'. time.'_'.rand(1000000000).'.xls'; @@ -898,21 +1002,48 @@ sub excel_initialize { $cols_output += scalar(@Sections); # # Put the date in there too - $excel_sheet->write($rows_output,$cols_output++, + $excel_sheet->write($rows_output++,$cols_output++, 'Compiled on '.localtime(time)); # - $rows_output++; + $cols_output = 0; + $excel_sheet->write($rows_output++,$cols_output++,$datadescription); + # + if ($data eq 'tries' || $data eq 'scores') { + $rows_output++; + } # # Add the student headers $cols_output = 0; foreach my $field (&get_student_fields_to_show()) { $excel_sheet->write($rows_output,$cols_output++,$field); } + my $row_offset = 0; + if ($data eq 'tries' || $data eq 'scores') { + $row_offset = -1; + } # - # Add the Sequence Headers + # Add the remaining column headers foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - $excel_sheet->write($rows_output,$cols_output,$seq->{'title'}); - if ($show eq 'totals') { + $excel_sheet->write($rows_output+$row_offset, + $cols_output,$seq->{'title'}); + if ($data eq 'tries' || $data eq 'scores') { + foreach my $res (@{$seq->{'contents'}}) { + next if ($res->{'type'} ne 'assessment'); + if (scalar(@{$res->{'parts'}}) > 1) { + foreach my $part (@{$res->{'parts'}}) { + $excel_sheet->write($rows_output, + $cols_output++, + $res->{'title'}.' part '.$part); + } + } else { + $excel_sheet->write($rows_output, + $cols_output++, + $res->{'title'}); + } + } + $excel_sheet->write($rows_output,$cols_output++,'score'); + $excel_sheet->write($rows_output,$cols_output++,'maximum'); + } elsif ($data eq 'sum and total' || $data eq 'parts correct total') { $excel_sheet->write($rows_output+1,$cols_output,'score'); $excel_sheet->write($rows_output+1,$cols_output+1,'maximum'); $cols_output += 2; @@ -922,31 +1053,53 @@ sub excel_initialize { } # # Bookkeeping - if ($show eq 'totals') { + if ($data eq 'sum and total' || $data eq 'parts correct total') { $rows_output += 2; } else { $rows_output += 1; } # # Output a row for MAX - if ($show ne 'totals') { - $cols_output = 0; - foreach my $field (&get_student_fields_to_show()) { - if ($field eq 'username' || $field eq 'fullname' || - $field eq 'id') { - $excel_sheet->write($rows_output,$cols_output++,'Maximum'); - } else { - $excel_sheet->write($rows_output,$cols_output++,''); - } + $cols_output = 0; + foreach my $field (&get_student_fields_to_show()) { + if ($field eq 'username' || $field eq 'fullname' || + $field eq 'id') { + $excel_sheet->write($rows_output,$cols_output++,'Maximum'); + } else { + $excel_sheet->write($rows_output,$cols_output++,''); } - # - # Add the Sequence Headers - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - $excel_sheet->write($rows_output,$cols_output++, - $seq->{'num_assess_parts'}); + } + # + # Add the maximums for each sequence or assessment + foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { + my $weight; + my $max = 0; + foreach my $resource (@{$seq->{'contents'}}) { + next if ($resource->{'type'} ne 'assessment'); + foreach my $part (@{$resource->{'parts'}}) { + $weight = 1; + if ($base eq 'scores') { + $weight = &Apache::lonnet::EXT + ('resource.'.$part.'.weight',$resource->{'symb'}, + undef,undef,undef); + if (!defined($weight) || ($weight eq '')) { + $weight=1; + } + } + if ($data eq 'scores') { + $excel_sheet->write($rows_output,$cols_output++,$weight); + } elsif ($data eq 'tries') { + $excel_sheet->write($rows_output,$cols_output++,''); + } + $max += $weight; + } + } + if (! ($data eq 'sum only' || $data eq 'parts correct')) { + $excel_sheet->write($rows_output,$cols_output++,''); } - $rows_output++; + $excel_sheet->write($rows_output,$cols_output++,$max); } + $rows_output++; # # Let the user know what we are doing my $studentcount = scalar(@Apache::lonstatistics::Students); @@ -966,6 +1119,7 @@ sub excel_initialize { sub excel_outputstudent { my ($r,$student) = @_; + return if ($request_aborted); return if (! defined($excel_sheet)); $cols_output=0; # @@ -987,13 +1141,27 @@ sub excel_outputstudent { # # Write out sequence scores and totals data foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - my ($performance,$performance_length,$score,$seq_max) = - &StudentPerformanceOnSequence($student,\%StudentsData, - $seq,'no'); - if ($show eq 'totals' || $show eq 'scores') { + my ($performance,$performance_length,$score,$seq_max,$rawdata); + if ($base eq 'tries') { + ($performance,$performance_length,$score,$seq_max,$rawdata) = + &StudentTriesOnSequence($student,\%StudentsData, + $seq,'no'); + } else { + ($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); + } + $excel_sheet->write($rows_output,$cols_output++,$score); + $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') { $excel_sheet->write($rows_output,$cols_output++,$score); } - if ($show eq 'totals') { + if ($data eq 'sum and total' || $data eq 'parts correct total') { $excel_sheet->write($rows_output,$cols_output++,$seq_max); } } @@ -1009,6 +1177,7 @@ sub excel_outputstudent { sub excel_finish { my ($r) = @_; + return if ($request_aborted); return if (! defined($excel_sheet)); # # Write the excel file @@ -1049,7 +1218,7 @@ sub excel_finish { my $outputfile; my $filename; - +my $request_aborted; my %prog_state; # progress window state sub csv_initialize{ @@ -1060,6 +1229,20 @@ sub csv_initialize{ $outputfile = undef; undef(%prog_state); # + # Deal with unimplemented requests + $request_aborted = undef; + if ($data =~ /final table/) { + $r->print(<+The Summary Table (Scores) option is not available for non-HTML output. +
+END + $request_aborted = 1; + } + return if ($request_aborted); + + # # Open a file $filename = '/prtspool/'. $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'. @@ -1077,35 +1260,36 @@ sub csv_initialize{ print $outputfile '"'.&Apache::loncommon::csv_translate($description).'",'. '"'.&Apache::loncommon::csv_translate(scalar(localtime(time))).'"'. "\n"; - # # Print out the headings my $Str = ''; my $Str2 = undef; foreach my $field (&get_student_fields_to_show()) { - if ($show eq 'scores') { + if ($data eq 'sum only') { $Str .= '"'.&Apache::loncommon::csv_translate($field).'",'; - } elsif ($show eq 'totals') { + } 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 ($show eq 'all') { + } elsif ($data eq 'scores' || $data eq 'tries' || + $data eq 'parts correct') { $Str .= '"",'; $Str2 .= '"'.&Apache::loncommon::csv_translate($field).'",'; } } foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - if ($show eq 'scores') { + if ($data eq 'sum only' || $data eq 'parts correct') { $Str .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}). '",'; - } elsif ($show eq 'totals') { + } elsif ($data eq 'sum and total' || $data eq 'parts correct total') { $Str .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}). '","",'; $Str2 .= '"score","total possible",'; - } elsif ($show eq 'all') { + } elsif ($data eq 'scores' || $data eq 'tries') { $Str .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}). '",'; $Str .= '"",'x($seq->{'num_assess_parts'}-1+2); foreach my $res (@{$seq->{'contents'}}) { + next if ($res->{'type'} ne 'assessment'); foreach my $part (@{$res->{'parts'}}) { $Str2 .= '"'.&Apache::loncommon::csv_translate($res->{'title'}.', Part '.$part).'",'; } @@ -1132,6 +1316,7 @@ sub csv_initialize{ sub csv_outputstudent { my ($r,$student) = @_; + return if ($request_aborted); return if (! defined($outputfile)); my $Str = ''; # @@ -1153,16 +1338,22 @@ sub csv_outputstudent { # # Output performance data foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - my ($performance,$performance_length,$score,$seq_max) = - &StudentPerformanceOnSequence($student,\%StudentsData, - $seq,'no'); - if ($show eq 'scores') { + my ($performance,$performance_length,$score,$seq_max,$rawdata); + if ($base eq 'tries') { + ($performance,$performance_length,$score,$seq_max,$rawdata) = + &StudentTriesOnSequence($student,\%StudentsData, + $seq,'no'); + } else { + ($performance,$performance_length,$score,$seq_max,$rawdata) = + &StudentPerformanceOnSequence($student,\%StudentsData, + $seq,'no'); + } + if ($data eq 'sum only' || $data eq 'parts correct') { $Str .= '"'.$score.'",'; - } elsif ($show eq 'totals') { + } elsif ($data eq 'sum and total' || $data eq 'parts correct total') { $Str .= '"'.$score.'","'.$seq_max.'",'; - } elsif ($show eq 'all') { - $Str .= '"'.join('","',(split(//,$performance),$score,$seq_max)). - '",'; + } elsif ($data eq 'scores' || $data eq 'tries') { + $Str .= '"'.join('","',(@$rawdata,$score,$seq_max)).'",'; } } chop($Str); @@ -1176,6 +1367,7 @@ sub csv_outputstudent { sub csv_finish { my ($r) = @_; + return if ($request_aborted); return if (! defined($outputfile)); close($outputfile); # @@ -1200,7 +1392,7 @@ sub csv_finish { =pod -=item &StudentPerformanceOnSequence() +=item &StudentTriesOnSequence() Inputs: @@ -1220,17 +1412,20 @@ Inputs: ####################################################### ####################################################### -sub StudentPerformanceOnSequence { +sub StudentTriesOnSequence { my ($student,$studentdata,$seq,$links) = @_; $links = 'no' if (! defined($links)); my $Str = ''; my ($sum,$max) = (0,0); my $performance_length = 0; + my @TriesData = (); + my $tries; foreach my $resource (@{$seq->{'contents'}}) { next if ($resource->{'type'} ne 'assessment'); my $resource_data = $studentdata->{$resource->{'symb'}}; my $value = ''; foreach my $partnum (@{$resource->{'parts'}}) { + $tries = undef; $max++; $performance_length++; my $symbol = ' '; # default to space @@ -1251,11 +1446,11 @@ sub StudentPerformanceOnSequence { $max--; } elsif ($status eq 'correct_by_student' && exists($resource_data->{'resource.'.$partnum.'.tries'})){ - my $num = $resource_data->{'resource.'.$partnum.'.tries'}; - if ($num > 9) { + $tries = $resource_data->{'resource.'.$partnum.'.tries'}; + if ($tries > 9) { $symbol = '*'; - } elsif ($num > 0) { - $symbol = $num; + } elsif ($tries > 0) { + $symbol = $tries; } else { $symbol = ' '; } @@ -1274,9 +1469,11 @@ sub StudentPerformanceOnSequence { $symbol = ' '; } } -# if ($symbol ne ' ') { -# $attempted_sum++; -# } + # + if (! defined($tries)) { + $tries = $symbol; + } + push (@TriesData,$tries); # if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) { @@ -1296,7 +1493,102 @@ sub StudentPerformanceOnSequence { if ($seq->{'randompick'}) { $max = $seq->{'randompick'}; } - return ($Str,$performance_length,$sum,$max); + return ($Str,$performance_length,$sum,$max,\@TriesData); +} + +####################################################### +####################################################### + +=pod + +=item &StudentPerformanceOnSequence() + +Inputs: + +=over 4 + +=item $student + +=item $studentdata Hash ref to all student data + +=item $seq Hash ref, the sequence we are working on + +=item $links if defined we will output links to each resource. + +=back + +=cut + +####################################################### +####################################################### +sub StudentPerformanceOnSequence { + my ($student,$studentdata,$seq,$links) = @_; + $links = 'no' if (! defined($links)); + my $Str = ''; # final result string + my ($score,$max) = (0,0); + my $performance_length = 0; + my $symbol; + my @ScoreData = (); + my $partscore; + foreach my $resource (@{$seq->{'contents'}}) { + next if ($resource->{'type'} ne 'assessment'); + my $resource_data = $studentdata->{$resource->{'symb'}}; + foreach my $part (@{$resource->{'parts'}}) { + $partscore = undef; + my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight', + $resource->{'symb'}, + $student->{'domain'}, + $student->{'username'}, + $student->{'section'}); + if (!defined($weight) || ($weight eq '')) { + $weight=1; + } + # + $max += $weight; # see the 'excused' branch below... + $performance_length++; # one character per part + $symbol = ' '; # default to space + # + my $awarded = 0; + if (exists($resource_data->{'resource.'.$part.'.awarded'})) { + $awarded = $resource_data->{'resource.'.$part.'.awarded'}; + } + # + $partscore = $weight*$awarded; + $score += $partscore; + $symbol = $weight; + if (length($symbol) > 1) { + $symbol = '*'; + } + if (exists($resource_data->{'resource.'.$part.'.solved'})) { + my $status = $resource_data->{'resource.'.$part.'.solved'}; + if ($status eq 'excused') { + $symbol = 'x'; + $max -= $weight; # Do not count 'excused' problems. + } + } else { + # Unsolved. Did they try? + if (exists($resource_data->{'resource.'.$part.'.tries'})){ + $symbol = '.'; + } else { + $symbol = ' '; + } + } + # + if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) { + $symbol = ''.$symbol.''; + } + if (! defined($partscore)) { + $partscore = $symbol; + } + push (@ScoreData,$partscore); + } + $Str .= $symbol; + } + return ($Str,$performance_length,$score,$max,\@ScoreData); } #######################################################