[LON-CAPA-cvs] cvs: loncom /interface/statistics lonstudentassessment.pm
matthew
lon-capa-cvs@mail.lon-capa.org
Tue, 10 Jun 2003 15:42:51 -0000
This is a MIME encoded message
--matthew1055259771
Content-Type: text/plain
matthew Tue Jun 10 11:42:51 2003 EDT
Modified files:
/loncom/interface/statistics lonstudentassessment.pm
Log:
Portion of Bug 1664: Chart now shows problem weight * partial credit.
A new selection box 'Output Data' was created to seperate the output
mode (html, excel, csv) from the data being output.
The variable $base indicates the base (tries or scores) for the data
being output.
Modified all major routines (initialize, outputstudent, finish) for
each output method (html, excel, csv) to deal with this new structure.
Excel output of raw scores or tries on each problem part is now allowed!
Created &StudentTriesOnSequence and rewrote &StudentPerformanceOnSequence
to return the tries and scores.
--matthew1055259771
Content-Type: text/plain
Content-Disposition: attachment; filename="matthew-20030610114251.txt"
Index: loncom/interface/statistics/lonstudentassessment.pm
diff -u loncom/interface/statistics/lonstudentassessment.pm:1.53 loncom/interface/statistics/lonstudentassessment.pm:1.54
--- loncom/interface/statistics/lonstudentassessment.pm:1.53 Sat Jun 7 10:45:41 2003
+++ loncom/interface/statistics/lonstudentassessment.pm Tue Jun 10 11:42:51 2003
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentassessment.pm,v 1.53 2003/06/07 14:45:41 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.54 2003/06/10 15:42:51 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -85,6 +85,12 @@
=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.
@@ -94,7 +100,9 @@
#######################################################
my $show_links;
my $output_mode;
-my $show;
+my $data;
+my $base;
+my $datadescription;
my $single_student_mode;
#######################################################
@@ -135,7 +143,7 @@
#
# Print out the HTML headers for the interface
# This also parses the output mode selector
- # This step must always be done.
+ # This step must *always* be done.
$r->print(&CreateInterface());
$r->print('<input type="hidden" name="notfirstrun" value="true" />');
$r->print('<input type="hidden" name="sort" value="'.
@@ -154,7 +162,6 @@
return;
}
#
- #
my $initialize = \&html_initialize;
my $output_student = \&html_outputstudent;
my $finish = \&html_finish;
@@ -163,10 +170,6 @@
$initialize = \&excel_initialize;
$output_student = \&excel_outputstudent;
$finish = \&excel_finish;
-# } elsif ($output_mode eq 'multi-sheet excel') {
-# $initialize = \&multi_sheet_excel_initialize;
-# $output_student = \&multi_sheet_excel_outputstudent;
-# $finish = \&multi_sheet_excel_finish;
} elsif ($output_mode eq 'csv') {
$initialize = \&csv_initialize;
$output_student = \&csv_outputstudent;
@@ -292,6 +295,7 @@
$Str .= '<td align="center"><b>Enrollment Status</b></td>';
$Str .= '<td align="center"><b>Sequences and Folders</b></td>';
$Str .= '<td align="center"><b>Output Format</b></td>';
+ $Str .= '<td align="center"><b>Output Data</b></td>';
$Str .= '</tr>'."\n";
#
$Str .= '<tr><td align="center">'."\n";
@@ -314,6 +318,8 @@
$only_seq_with_assessments);
$Str .= '</td><td>'."\n";
$Str .= &CreateAndParseOutputSelector();
+ $Str .= '</td><td>'."\n";
+ $Str .= &CreateAndParseOutputDataSelector();
$Str .= '</td></tr>'."\n";
$Str .= '</table>'."\n";
return $Str;
@@ -336,7 +342,6 @@
description => 'Output HTML with each symbol linked to the problem '.
'which generated it.',
mode => 'html',
- show => 'all',
show_links => 'yes',
},
{ name => 'HTML, with all links',
@@ -345,7 +350,6 @@
'which generated it. '.
'This includes links for unattempted problems.',
mode => 'html',
- show => 'all',
show_links => 'all',
},
{ name => 'HTML, without links',
@@ -354,52 +358,14 @@
' web page is greatly reduced. If your browser crashes on the '.
'full display, try this.',
mode => 'html',
- show => 'all',
- show_links => 'no',
- },
- { name => 'HTML, scores only',
- value => 'html, scores only',
- description => 'Output HTML, only showing the total number of correct'.
- ' problems (or problem parts) and not the maximum possible for '.
- 'each student',
- mode => 'html',
- show => 'scores',
- show_links => 'no',
- },
- { name => 'HTML, totals',
- value => 'html, totals',
- description => 'Output HTML, but only the summary statistics for each'.
- ' sequence selected for each student.',
- mode => 'html',
- show => 'totals',
- show_links => 'no',
- },
- { name => 'HTML, summary table only',
- value => 'html summary table only',
- description => 'Output HTML, but only the final summary table for '.
- 'all students across all sequences.',
- mode => 'html',
- show => 'final table',
- show_links => 'no',
- },
- { name => 'Excel, scores only',
- value => 'excel, scores only',
- description => 'Output an Excel file (compatable with Excel 95), '.
- 'with a single column for each sequence showing the students '.
- 'score.',
- mode => 'excel',
- show => 'scores',
show_links => 'no',
},
- { name => 'Excel, totals',
- value => 'excel, totals',
- description => 'Output an Excel file (compatable with Excel 95), '.
- 'with two columns for each sequence, the students score on the '.
- 'sequence and the students maximum possible on the sequence',
+ { name => 'Excel',
+ value => 'excel',
+ description => 'Output an Excel file (compatable with Excel 95).',
mode => 'excel',
- show => 'totals',
show_links => 'no',
- },
+ },
# { name => 'multi-sheet Excel',
# value => 'multi-sheet excel',
# description => 'Output an Excel file (compatable with Excel 95), '.
@@ -407,7 +373,6 @@
# 'the data for each problem part '.
# '(number of tries, status, points awarded) will be listed.',
# mode => 'multi-sheet excel',
-# show => 'totals',
# show_links => 'no',
# },
# { name => 'multi-sheet Excel, by section',
@@ -418,28 +383,13 @@
# '(number of tries, status, points awarded) will be listed. '.
# 'There will be one Excel workbook for each section selected.',
# mode => 'multi-sheet excel',
-# show => 'by section',
# show_links => 'no',
# },
- { name => 'CSV, everything',
- value => 'csv, everything',
- description => '',
+ { name => 'CSV',
+ value => 'csv',
+ description => 'Output a comma seperated values file suitable for '.
+ 'import into a spreadsheet.',
mode => 'csv',
- show => 'all',
- show_links => 'no',
- },
- { name => 'CSV, scores only',
- value => 'csv, scores only',
- description => '',
- mode => 'csv',
- show => 'scores',
- show_links => 'no',
- },
- { name => 'CSV, totals',
- value => 'csv, totals',
- description => '',
- mode => 'csv',
- show => 'totals',
show_links => 'no',
},
);
@@ -473,11 +423,9 @@
# Set package variables describing output mode
$show_links = 'no';
$output_mode = 'html';
- $show = 'all';
foreach my $option (@OutputOptions) {
next if ($option->{'value'} ne $selected);
$output_mode = $option->{'mode'};
- $show = $option->{'show'};
$show_links = $option->{'show_links'};
}
@@ -493,6 +441,100 @@
return $Str;
}
+##
+## Data selector stuff
+##
+my @OutputDataOptions =
+ ( { name =>'Tries',
+ base =>'tries',
+ value => 'tries',
+ 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',
+ shortdesc => 'Number of Problem Parts completed successfully.',
+ longdesc => 'The Number of Problem Parts completed successfully.',
+ },
+ { name =>'Parts Correct & Maximums',
+ base =>'tries',
+ value => 'parts correct total',
+ shortdesc => 'Number of Problem Parts completed successfully.',
+ longdesc => 'The Number of Problem Parts completed successfully and '.
+ 'the maximum possible for each student',
+ },
+ { name => 'Scores',
+ base => 'scores',
+ value => 'scores',
+ 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 Sum & Maximums',
+ base => 'scores',
+ value => 'sum and total',
+ shortdesc => 'Total Score and Maximum Possible for each '.
+ 'Sequence or Folder',
+ longdesc => 'The total of the scores of the student on each problem'.
+ ' and the maximum possible for that student on each Sequence or '.
+ ' Folder.',
+ },
+ { name => 'Summary Table (Scores)',
+ base => 'scores',
+ value => 'final table scores',
+ shortdesc => 'Summary of Scores',
+ longdesc => '',
+ },
+ { name => 'Summary Table (Parts)',
+ base => 'tries',
+ value => 'final table parts',
+ shortdesc => 'Summary of Parts Correct',
+ longdesc => '',
+ }
+ );
+
+sub CreateAndParseOutputDataSelector {
+ my $Str = '';
+ my $elementname = 'chartoutputdata';
+ #
+ my $selected = 'scores';
+ if (exists($ENV{'form.'.$elementname})) {
+ if (ref($ENV{'form.'.$elementname} eq 'ARRAY')) {
+ $selected = $ENV{'form.'.$elementname}->[0];
+ } else {
+ $selected = $ENV{'form.'.$elementname};
+ }
+ }
+ #
+ $data = 'scores';
+ foreach my $option (@OutputDataOptions) {
+ if ($option->{'value'} eq $selected) {
+ $data = $option->{'value'};
+ $base = $option->{'base'};
+ $datadescription = $option->{'shortdesc'};
+ }
+ }
+ #
+ # Build the form element
+ $Str = qq/<select size="5" name="$elementname">/;
+ foreach my $option (@OutputDataOptions) {
+ $Str .= "\n".' <option value="'.$option->{'value'}.'"';
+ $Str .= " selected " if ($option->{'value'} eq $data);
+ $Str .= ">".$option->{'name'}."<\/option>";
+ }
+ $Str .= "\n</select>";
+ return $Str;
+
+}
+
#######################################################
#######################################################
@@ -531,9 +573,10 @@
$r->print("<h3>".$ENV{'course.'.$ENV{'request.course.id'}.'.description'}.
" ".localtime(time)."</h3>");
+ $r->print("<h3>".$datadescription."</h3>");
#
# Set up progress window for 'final table' display only
- if ($show eq 'final table') {
+ if ($data =~ /^final table/) {
my $studentcount = scalar(@Apache::lonstatistics::Students);
%prog_state=&Apache::lonhtmlcommon::Create_PrgWin
($r,'Summary Table Status',
@@ -555,11 +598,11 @@
my $width = $sequence->{'width'};
$Str .= $title.' 'x($width-$base).$padding;
}
- $Str .= "total (of shown problems)</pre>\n";
+ $Str .= "total</pre>\n";
$Str .= "<pre>";
#
# Check for suppression of output
- if ($show eq 'final table') {
+ if ($data =~ /^final table/) {
$Str = '';
}
$r->print($Str);
@@ -592,7 +635,7 @@
}
if (scalar(@tmp) < 1) {
$nodata_count++;
- return if ($show eq 'final table');
+ return if ($data =~ /^final table/);
$Str .= '<font color="blue">No Course Data</font>'."\n";
$r->print($Str);
$r->rflush();
@@ -603,17 +646,24 @@
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 @@
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 @@
$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 @@
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("</pre>\n");
@@ -685,7 +737,7 @@
$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 @@
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<br />");
$r->print("Number of students: ".$num_students."<br />");
@@ -833,10 +885,62 @@
my $cols_output;
my %prog_state; # progress window state
+my $request_aborted;
sub excel_initialize {
my ($r) = @_;
#
+ $request_aborted = undef;
+ my $total_columns = scalar(&get_student_fields_to_show());
+ foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+ # Add 2 because we need a 'sum' and 'total' column for each
+ $total_columns += $seq->{'num_assess_parts'}+2;
+ }
+ if ($data 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;
+ }
+ if ($data 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
+summary data (<b>Scores Sum</b> or <b>Scores Sum & Totals</b>).
+</p>
+END
+ $request_aborted = 1;
+ }
+ if ($data =~ /^final table/) {
+ $r->print(<<END);
+<h2>Unable to Complete Request</h2>
+<p>
+The <b>Summary Table (Scores)</b> option is not available for non-HTML output.
+</p>
+END
+ $request_aborted = 1;
+ }
+ return if ($request_aborted);
+ #
$filename = '/prtspool/'.
$ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
time.'_'.rand(1000000000).'.xls';
@@ -898,21 +1002,48 @@
$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 @@
}
#
# 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_outputstudent {
my ($r,$student) = @_;
+ return if ($request_aborted);
return if (! defined($excel_sheet));
$cols_output=0;
#
@@ -987,13 +1141,27 @@
#
# 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_finish {
my ($r) = @_;
+ return if ($request_aborted);
return if (! defined($excel_sheet));
#
# Write the excel file
@@ -1049,7 +1218,7 @@
my $outputfile;
my $filename;
-
+my $request_aborted;
my %prog_state; # progress window state
sub csv_initialize{
@@ -1060,6 +1229,20 @@
$outputfile = undef;
undef(%prog_state);
#
+ # Deal with unimplemented requests
+ $request_aborted = undef;
+ if ($data =~ /final table/) {
+ $r->print(<<END);
+<h2>Unable to Complete Request</h2>
+<p>
+The <b>Summary Table (Scores)</b> option is not available for non-HTML output.
+</p>
+END
+ $request_aborted = 1;
+ }
+ return if ($request_aborted);
+
+ #
# Open a file
$filename = '/prtspool/'.
$ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
@@ -1077,35 +1260,36 @@
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_outputstudent {
my ($r,$student) = @_;
+ return if ($request_aborted);
return if (! defined($outputfile));
my $Str = '';
#
@@ -1153,16 +1338,22 @@
#
# 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_finish {
my ($r) = @_;
+ return if ($request_aborted);
return if (! defined($outputfile));
close($outputfile);
#
@@ -1200,7 +1392,7 @@
=pod
-=item &StudentPerformanceOnSequence()
+=item &StudentTriesOnSequence()
Inputs:
@@ -1220,17 +1412,20 @@
#######################################################
#######################################################
-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 @@
$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 @@
$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 @@
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 = '<a href="/adm/grades'.
+ '?symb='.&Apache::lonnet::escape($resource->{'symb'}).
+ '&student='.$student->{'username'}.
+ '&domain='.$student->{'domain'}.
+ '&command=submission">'.$symbol.'</a>';
+ }
+ if (! defined($partscore)) {
+ $partscore = $symbol;
+ }
+ push (@ScoreData,$partscore);
+ }
+ $Str .= $symbol;
+ }
+ return ($Str,$performance_length,$score,$max,\@ScoreData);
}
#######################################################
--matthew1055259771--