\n";
foreach my $outputmode (@OutputOptions) {
$Str .=" - ".$outputmode->{'name'}."
\n";
@@ -409,6 +419,8 @@ sub OutputDescriptions {
sub CreateAndParseOutputSelector {
my $Str = '';
my $elementname = 'chartoutputmode';
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ [$elementname]);
#
# Format for output options is 'mode, restrictions';
my $selected = 'html, without links';
@@ -445,61 +457,76 @@ sub CreateAndParseOutputSelector {
## 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 => '',
- }
- );
+ (
+ { name => 'Scores Summary',
+ base => 'scores',
+ value => 'sum and total',
+ shortdesc => 'Total Score and Maximum Possible for each '.
+ 'Sequence or Folder',
+ longdesc => 'The score of each student as well as the '.
+ ' maximum possible on each Sequence or Folder.',
+ },
+ { name => 'Scores Per Problem',
+ 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 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',
+ 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',
+ 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 {
+ my $Str = '';
+ $Str .= "Output Data
\n";
+ $Str .= "\n";
+ foreach my $option (@OutputDataOptions) {
+ $Str .= ' - '.$option->{'name'}.'
';
+ $Str .= '- '.$option->{'longdesc'}.'
'."\n";
+ }
+ $Str .= "
\n";
+ return $Str;
+}
sub CreateAndParseOutputDataSelector {
my $Str = '';
@@ -569,11 +596,14 @@ sub html_initialize {
$padding = ' 'x3;
$count = 0;
$nodata_count = 0;
+ undef(%prog_state);
#
$r->print("".$ENV{'course.'.$ENV{'request.course.id'}.'.description'}.
" ".localtime(time)."
");
- $r->print("".$datadescription."
");
+ if ($data !~ /^final table/) {
+ $r->print("".$datadescription."
");
+ }
#
# Set up progress window for 'final table' display only
if ($data =~ /^final table/) {
@@ -614,7 +644,7 @@ sub html_outputstudent {
my ($r,$student) = @_;
my $Str = '';
#
- if($count++ % 5 == 0 && $count > 0) {
+ if($count++ % 5 == 0 && $count > 0 && $data !~ /^final table/) {
$r->print("");
}
# First, the @StudentData fields need to be listed
@@ -791,78 +821,6 @@ sub SingleStudentTotal {
=pod
-=head2 Multi-Sheet EXCEL subroutines
-
-=item &multi_sheet_excel_initialize($r)
-
-=item &multi_sheet_excel_outputstudent($r,$student)
-
-=item &multi_sheet_excel_finish($r)
-
-=cut
-
-#######################################################
-#######################################################
-{
-
-sub multi_sheet_excel_initialize {
- my ($r)=@_;
- $r->print("Not yet implemented
");
- #
- # Estimate the size of the file. We would like to have < 5 megs of data.
- my $max_size = 5000000;
- my $num_students = scalar(@Apache::lonstatistics::Students);
- my $num_sequences = 0;
- my $num_data_per_part = 2; # 'status' and 'numtries'
- my $fields_per_student = scalar(&get_student_fields_to_show());
- my $bytes_per_field = 20; # Back of the envelope calculation
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
- $num_sequences++ if ($seq->{'num_assess'} > 0);
- $fields_per_student += $num_data_per_part * $seq->{'num_assess_parts'};
- }
- my $size_estimate = $fields_per_student*$num_students*$bytes_per_field;
- #
- # Compute number of workbooks
- my $num_workbooks = 1;
- if ($size_estimate > $max_size) { # try to stay under 5 megs
- $num_workbooks += int($size_estimate / $max_size);
- }
-# 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
");
- $r->print("Number of students: ".$num_students."
");
- $r->print("Number of fields per student: ".$fields_per_student."
");
- $r->print("Total number of fields: ".($fields_per_student*$num_students).
- "
");
- $r->print("Bytes per field: ".$bytes_per_field." (estimated)"."
");
- $r->print("Estimated size: ".$size_estimate." bytes
");
- $r->print("Number of workbooks: ".$num_workbooks."
");
- $r->rflush();
- return;
-}
-
-sub multi_sheet_excel_outputstudent {
- my ($r,$student) = @_;
-}
-
-sub multi_sheet_excel_finish {
- my ($r) = @_;
-}
-
-}
-#######################################################
-#######################################################
-
-=pod
-
=head2 EXCEL subroutines
=item &excel_initialize($r)
@@ -890,7 +848,14 @@ my $request_aborted;
sub excel_initialize {
my ($r) = @_;
#
- $request_aborted = undef;
+ undef ($excel_sheet);
+ undef ($excel_workbook);
+ undef ($filename);
+ undef ($rows_output);
+ undef ($cols_output);
+ undef (%prog_state);
+ undef ($request_aborted);
+ #
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
@@ -971,9 +936,7 @@ END
#
# Add a worksheet
my $sheetname = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
- if (length($sheetname) > 31) {
- $sheetname = substr($sheetname,0,31);
- }
+ $sheetname = &Apache::loncommon::clean_excel_name($sheetname);
$excel_sheet = $excel_workbook->addworksheet($sheetname);
#
# Put the course description in the header
@@ -1114,6 +1077,8 @@ END
($r,'Excel File Compilation Status',
'Excel File Compilation Progress', $studentcount);
#
+ &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
+ 'Processing first student');
return;
}
@@ -1225,8 +1190,9 @@ sub csv_initialize{
my ($r) = @_;
#
# Clean up
- $filename = undef;
- $outputfile = undef;
+ undef($outputfile);
+ undef($filename);
+ undef($request_aborted);
undef(%prog_state);
#
# Deal with unimplemented requests
@@ -1444,7 +1410,8 @@ sub StudentTriesOnSequence {
} elsif ($status eq 'excused') {
$symbol = 'x';
$max--;
- } elsif ($status eq 'correct_by_student' &&
+ } elsif (($status eq 'correct_by_scantron' ||
+ $status eq 'correct_by_student') &&
exists($resource_data->{'resource.'.$partnum.'.tries'})){
$tries = $resource_data->{'resource.'.$partnum.'.tries'};
if ($tries > 9) {
@@ -1483,7 +1450,7 @@ sub StudentTriesOnSequence {
$symbol = ''.$symbol.'';
}
$value .= $symbol;
@@ -1551,11 +1518,15 @@ sub StudentPerformanceOnSequence {
my $awarded = 0;
if (exists($resource_data->{'resource.'.$part.'.awarded'})) {
$awarded = $resource_data->{'resource.'.$part.'.awarded'};
+ $awarded = 0 if (! $awarded);
}
#
$partscore = $weight*$awarded;
$score += $partscore;
- $symbol = $weight;
+ $symbol = $partscore;
+ if (abs($symbol - sprintf("%.0f",$symbol)) < 0.001) {
+ $symbol = sprintf("%.0f",$symbol);
+ }
if (length($symbol) > 1) {
$symbol = '*';
}
@@ -1574,19 +1545,20 @@ sub StudentPerformanceOnSequence {
}
}
#
+ if (! defined($partscore)) {
+ $partscore = $symbol;
+ }
+ push (@ScoreData,$partscore);
+ #
if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) {
$symbol = ''.$symbol.'';
}
- if (! defined($partscore)) {
- $partscore = $symbol;
- }
- push (@ScoreData,$partscore);
+ $Str .= $symbol;
}
- $Str .= $symbol;
}
return ($Str,$performance_length,$score,$max,\@ScoreData);
}