{'value'} eq $selected);
- $Str .= ">".$option->{'name'}."<\/option>";
+ $Str .= ">".&mt($option->{'name'})."<\/option>";
}
$Str .= "\n";
return $Str;
}
+##
+## Data selector stuff
+##
+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,
+ grand_maximum => 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 '.
+ ' maximum possible on each Sequence or Folder.',
+ },
+ { 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,
+ grand_maximum => 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 =>'Tries',
+ base =>'tries',
+ value => 'tries',
+ scores => 0,
+ tries => 1,
+ correct => 0,
+ every_problem => 1,
+ 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',
+ longdesc =>'The number of tries before success on each problem part.',
+ non_html_notes => 'negative values indicate an incorrect problem',
+ },
+ { 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,
+ grand_maximum => 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',
+ },
+ );
+
+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 = '';
+ 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};
+ }
+ }
+ #
+ $chosen_output = $OutputDataOptions[0];
+ foreach my $option (@OutputDataOptions) {
+ if ($option->{'value'} eq $selected) {
+ $chosen_output = $option;
+ }
+ }
+ #
+ # Build the form element
+ $Str = qq//;
+ foreach my $option (@OutputDataOptions) {
+ $Str .= "\n".' {'value'} eq $chosen_output->{'value'});
+ $Str .= ">".&mt($option->{'name'})."<\/option>";
+ }
+ $Str .= "\n ";
+ return $Str;
+
+}
+
+#######################################################
+#######################################################
+sub count_parts {
+ my ($navmap,$sequence) = @_;
+ my @resources = &get_resources($navmap,$sequence);
+ my $count = 0;
+ foreach my $res (@resources) {
+ $count += scalar(@{$res->parts});
+ }
+ return $count;
+}
+
+sub get_resources {
+ my ($navmap,$sequence) = @_;
+ my @resources = $navmap->retrieveResources($sequence,
+ sub { shift->is_problem(); },
+ 0,0,0);
+ return @resources;
+}
+
#######################################################
#######################################################
@@ -443,6 +626,11 @@ 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;
+
+ my %width; # Holds sequence width information
+ my @sequences;
+ my $navmap; # Have to keep this around since weakref is a bit zealous
sub html_initialize {
my ($r) = @_;
@@ -450,17 +638,25 @@ sub html_initialize {
$padding = ' 'x3;
$count = 0;
$nodata_count = 0;
+ undef(%prog_state);
+ undef(%width);
+ #
+ undef($navmap);
+ undef(@sequences);
+ ($navmap,@sequences) =
+ &Apache::lonstatistics::selected_sequences_with_assessments();
+ if (! ref($navmap)) {
+ # Unable to get data, so bail out
+ $r->print("".
+ &mt('Unable to retrieve course information.').
+ ' ');
+ }
#
$r->print("".$ENV{'course.'.$ENV{'request.course.id'}.'.description'}.
" ".localtime(time)." ");
-
#
- # Set up progress window for 'final table' display only
- if ($show eq 'final table') {
- my $studentcount = scalar(@Apache::lonstatistics::Students);
- %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
- ($r,'Summary Table Status',
- 'Summary Table Compilation Progress', $studentcount);
+ if ($chosen_output->{'base'} !~ /^final table/) {
+ $r->print("".$chosen_output->{'shortdesc'}." ");
}
my $Str = "\n";
# First, the @StudentData fields need to be listed
@@ -471,20 +667,57 @@ sub html_initialize {
my $width=$Apache::lonstatistics::StudentData{$field}->{'width'};
$Str .= $title.' 'x($width-$base).$padding;
}
- # Now the selected sequences need to be listed
- 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;
- }
- $Str .= "total (of shown problems) \n";
- $Str .= "";
#
- # Check for suppression of output
- if ($show eq 'final table') {
- $Str = '';
+ # Compute the column widths and output the sequence titles
+ my $total_count;
+ #
+ # Compute sequence widths
+ my $starttime = Time::HiRes::time;
+ foreach my $seq (@sequences) {
+ my $symb = $seq->symb;
+ my $title = $seq->compTitle;
+ $width{$symb}->{'width_sum'} = 0;
+ # Compute width of sum
+ if ($chosen_output->{'sequence_sum'}) {
+ if ($chosen_output->{'every_problem'}) {
+ # Use 1 digit for a space
+ $width{$symb}->{'width_sum'} += 1;
+ }
+ $total_count += &count_parts($navmap,$seq);
+ # Use 3 digits for the sum
+ $width{$symb}->{'width_sum'} += 3;
+ }
+ # Compute width of maximum
+ if ($chosen_output->{'sequence_max'}) {
+ if ($width{$symb}->{'width_sum'}>0) {
+ # One digit for the '/'
+ $width{$symb}->{'width_sum'} +=1;
+ }
+ # Use 3 digits for the total
+ $width{$symb}->{'width_sum'}+=3;
+ }
+ #
+ if ($chosen_output->{'every_problem'}) {
+ # one problem per digit
+ $width{$symb}->{'width_parts'}= &count_parts($navmap,$seq);
+ $width{$symb}->{'width_problem'} += $width{$symb}->{'width_parts'};
+ } else {
+ $width{$symb}->{'width_problem'} = 0;
+ }
+ $width{$symb}->{'width_total'} = $width{$symb}->{'width_problem'} +
+ $width{$symb}->{'width_sum'};
+ if ($width{$symb}->{'width_total'} < length(&HTML::Entities::decode($title))) {
+ $width{$symb}->{'width_total'} = length(&HTML::Entities::decode($title));
+ }
+ #
+ # Output the sequence titles
+ $Str .= $title.(' 'x($width{$symb}->{'width_total'}-
+ length($title)
+ )).$padding;
}
+ $total_sum_width = length($total_count)+1;
+ $Str .= " total \n";
+ $Str .= "";
$r->print($Str);
$r->rflush();
return;
@@ -493,6 +726,7 @@ sub html_initialize {
sub html_outputstudent {
my ($r,$student) = @_;
my $Str = '';
+ return if (! defined($navmap));
#
if($count++ % 5 == 0 && $count > 0) {
$r->print(" ");
@@ -501,6 +735,10 @@ sub html_outputstudent {
my @to_show = &get_student_fields_to_show();
foreach my $field (@to_show) {
my $title=$student->{$field};
+ # Deal with 'comments' - how I love special cases
+ if ($field eq 'comments') {
+ $title = ''.&mt('Comments').' ';
+ }
my $base = length($title);
my $width=$Apache::lonstatistics::StudentData{$field}->{'width'};
$Str .= $title.' 'x($width-$base).$padding;
@@ -515,7 +753,6 @@ sub html_outputstudent {
}
if (scalar(@tmp) < 1) {
$nodata_count++;
- return if ($show eq 'final table');
$Str .= 'No Course Data '."\n";
$r->print($Str);
$r->rflush();
@@ -525,48 +762,72 @@ sub html_outputstudent {
# By sequence build up the data
my $studentstats;
my $PerformanceStr = '';
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
- my ($performance,$score,$seq_max) =
- &StudentPerformanceOnSequence($student,\%StudentsData,
- $seq,$show_links);
- my $ratio = $score.'/'.$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));
+ foreach my $seq (@sequences) {
+ my $symb = $seq->symb;
+ my ($performance,$performance_length,$score,$seq_max,$rawdata);
+ if ($chosen_output->{'tries'}) {
+ ($performance,$performance_length,$score,$seq_max,$rawdata) =
+ &student_tries_on_sequence($student,\%StudentsData,
+ $navmap,$seq,$show_links);
} else {
- # Pad with extra spaces
- $performance .= ' 'x($seq->{'width'}-$seq_max-
- length($ratio)
- ).$ratio;
+ ($performance,$performance_length,$score,$seq_max,$rawdata) =
+ &student_performance_on_sequence($student,\%StudentsData,
+ $navmap,$seq,$show_links);
}
+ my $ratio='';
+ if ($chosen_output->{'every_problem'} &&
+ $chosen_output->{'sequence_sum'}) {
+ $ratio .= ' ';
+ }
+ if ($chosen_output->{'sequence_sum'} && $score ne ' ') {
+ my $score .= sprintf("%3.0f",$score);
+ $ratio .= (' 'x(3-length($score))).$score;
+ } elsif($chosen_output->{'sequence_sum'}) {
+ $ratio .= ' 'x3;
+ }
+ if ($chosen_output->{'sequence_max'}) {
+ if ($chosen_output->{'sequence_sum'}) {
+ $ratio .= '/';
+ }
+ $ratio .= sprintf("%3.0f",$seq_max);
+ }
+ #
+ if (! $chosen_output->{'every_problem'}) {
+ $performance = '';
+ $performance_length=0;
+ }
+ $performance .= ' 'x($width{$symb}->{'width_total'} -
+ $performance_length -
+ $width{$symb}->{'width_sum'}).
+ $ratio;
#
$Str .= $performance.$padding;
#
- $studentstats->{$seq->{'symb'}}->{'score'}= $score;
- $studentstats->{$seq->{'symb'}}->{'max'} = $seq_max;
+ $studentstats->{$symb}->{'score'}= $score;
+ $studentstats->{$symb}->{'max'} = $seq_max;
}
#
# 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'};
- $Statistics->{$symb}->{'max'} += $seq_stats->{'max'};
- $score += $seq_stats->{'score'};
+ if ($Statistics->{$symb}->{'max'} < $seq_stats->{'max'}) {
+ $Statistics->{$symb}->{'max'} = $seq_stats->{'max'};
+ }
+ 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;
- $Str .= " \n";
- #
- # Check for suppressed output and update the progress window if so...
- if ($show eq 'final table') {
- $Str = '';
- &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
- 'last student');
+ if (! defined($score)) {
+ $score = ' ' x $total_sum_width;
+ } else {
+ $score = sprintf("%.0f",$score);
+ $score = (' 'x(3-length($score))).$score;
}
+ $Str .= ' '.' 'x($total_sum_width-length($score)).$score.' / '.$max;
+ $Str .= " \n";
#
$r->print($Str);
#
@@ -576,130 +837,88 @@ sub html_outputstudent {
sub html_finish {
my ($r) = @_;
+ return if (! defined($navmap));
#
# Check for suppressed output and close the progress window if so
- if ($show eq 'final table') {
- &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
- } else {
- $r->print(" \n");
+ $r->print("\n");
+ if ($chosen_output->{'summary_table'}) {
+ if ($single_student_mode) {
+ $r->print(&SingleStudentTotal());
+ } else {
+ $r->print(&StudentAverageTotal());
+ }
}
- $r->print(&StudentAverageTotal());
$r->rflush();
+ undef($navmap);
return;
}
sub StudentAverageTotal {
- my $Str = "Summary Tables \n";
- my $num_students = scalar(@Apache::lonstatistics::Students);
- my $total_ave = 0;
- my $total_max = 0;
+ my $Str = ''.&mt('Summary Tables').' '.$/;
$Str .= ''."\n";
- $Str .= "Title Average Maximum '.
+ ''.&mt('Title').' '.
+ ''.&mt('Average').' '.
+ ''.&mt('Maximum').' '.
+ ' '.$/;
+ foreach my $seq (@sequences) {
+ my $symb = $seq->symb;
my $ave;
- if ($num_students > $nodata_count) {
- $ave = int(100*($Statistics->{$seq->{'symb'}}->{'score'}/
- ($num_students-$nodata_count)))/100;
+ my $num_students = $Statistics->{$symb}->{'num_students'};
+ if ($num_students > 0) {
+ $ave = int(100*
+ ($Statistics->{$symb}->{'score'}/$num_students)
+ )/100;
} else {
$ave = 0;
}
- $total_ave += $ave;
- my $max = $seq->{'num_assess_parts'};
- $total_max += $max;
- if ($ave == 0) {
- $ave = "0.00";
- }
- $ave .= ' ';
- $max .= ' ';
- $Str .= ''.$seq->{'title'}.' '.
- ''.$ave.' '.
- ''.$max.' '.$seq->compTitle.' '.
+ ''.$ave.' '.
+ ''.$max.' '.'
\n";
- $Str .= ''."\n";
- $Str .= 'Number of Students Average '.
- "Maximum '.($num_students-$nodata_count).' '.
- ''.$total_ave.' '.$total_max.' ';
$Str .= "
\n";
return $Str;
}
-}
-
-#######################################################
-#######################################################
-
-=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 ($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;
- }
+sub SingleStudentTotal {
+ return if (! defined($navmap));
+ my $student = &Apache::lonstatistics::current_student();
+ my $Str = ''.&mt('Summary table for [_1] ([_2]@[_3])',
+ $student->{'fullname'},
+ $student->{'username'},$student->{'domain'}).' ';
+ $Str .= $/;
+ $Str .= ''."\n";
+ $Str .=
+ ''.
+ ''.&mt('Sequence or Folder').' ';
+ if ($chosen_output->{'base'} eq 'tries') {
+ $Str .= ''.&mt('Parts Correct').' ';
+ } else {
+ $Str .= ''.&mt('Score').' ';
}
-
- $r->print("Maximum allowed size: ".$max_size." bytes'.&mt('Maximum').' '." \n";
+ my $total = 0;
+ my $total_max = 0;
+ foreach my $seq (@sequences) {
+ my $value = $Statistics->{$seq->symb}->{'score'};
+ my $max = $Statistics->{$seq->symb}->{'max'};
+ $Str .= ''.&HTML::Entities::encode($seq->compTitle).' '.
+ ''.$value.' '.
+ ''.$max.' '.&mt('Total').' '.$total.' '.
+ ''.$total_max."
\n";
+ return $Str;
}
-sub multi_sheet_excel_finish {
- my ($r) = @_;
}
-}
#######################################################
#######################################################
@@ -721,19 +940,73 @@ sub multi_sheet_excel_finish {
my $excel_sheet;
my $excel_workbook;
+my $format;
my $filename;
my $rows_output;
my $cols_output;
my %prog_state; # progress window state
+my $request_aborted;
+
+my $total_formula;
+my $maximum_formula;
+my %formula_data;
+
+my $navmap;
+my @sequences;
sub excel_initialize {
my ($r) = @_;
#
- $filename = '/prtspool/'.
- $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
- time.'_'.rand(1000000000).'.xls';
+ undef ($excel_sheet);
+ undef ($excel_workbook);
+ undef ($filename);
+ undef ($rows_output);
+ undef ($cols_output);
+ undef (%prog_state);
+ undef ($request_aborted);
+ undef ($total_formula);
+ undef ($maximum_formula);
+ #
+ undef(%formula_data);
+ #
+ undef($navmap);
+ undef(@sequences);
+ ($navmap,@sequences) =
+ &Apache::lonstatistics::selected_sequences_with_assessments();
+ if (! ref($navmap)) {
+ # Unable to get data, so bail out
+ $r->print("".
+ &mt('Unable to retrieve course information.').
+ ' ');
+ }
+ #
+ my $total_columns = scalar(&get_student_fields_to_show());
+ my $num_students = scalar(@Apache::lonstatistics::Students);
+ #
+ foreach my $seq (@sequences) {
+ if ($chosen_output->{'every_problem'}) {
+ $total_columns+=&count_parts($navmap,$seq);
+ }
+ # Add 2 because we need a 'sequence_sum' and 'total' column for each
+ $total_columns += 2;
+ }
+ my $too_many_cols_error_message =
+ ''.&mt('Unable to Complete Request').' '.$/.
+ ''.&mt('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.').'
'.$/.
+ ''.&mt('You may consider reducing the number of Sequences or Folders you have selected.').'
'.$/.
+ ''.&mt('LON-CAPA can produce CSV files of this data or Excel files of the Scores Summary data.').'
'.$/;
+ if ($chosen_output->{'base'} eq 'tries' && $total_columns > 255) {
+ $r->print($too_many_cols_error_message);
+ $request_aborted = 1;
+ }
+ if ($chosen_output->{'base'} eq 'scores' && $total_columns > 255) {
+ $r->print($too_many_cols_error_message);
+ $request_aborted = 1;
+ }
+ return if ($request_aborted);
+ #
#
$excel_workbook = undef;
$excel_sheet = undef;
@@ -741,39 +1014,44 @@ sub excel_initialize {
$rows_output = 0;
$cols_output = 0;
#
- # Create sheet
- $excel_workbook = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);
- #
- # Check for errors
- if (! defined($excel_workbook)) {
- $r->log_error("Error creating excel spreadsheet $filename: $!");
- $r->print("Problems creating new Excel file. ".
- "This error has been logged. ".
- "Please alert your LON-CAPA administrator");
- return ;
+ # Determine rows
+ my $header_row = $rows_output++;
+ my $description_row = $rows_output++;
+ my $notes_row = $rows_output++;
+ $rows_output++; # blank row
+ my $summary_header_row;
+ if ($chosen_output->{'summary_table'}) {
+ $summary_header_row = $rows_output++;
+ $rows_output+= scalar(@sequences);
+ $rows_output++;
}
+ my $sequence_name_row = $rows_output++;
+ my $resource_name_row = $rows_output++;
+ my $maximum_data_row = $rows_output++;
+ if (! $chosen_output->{'maximum_row'}) {
+ $rows_output--;
+ }
+ my $first_data_row = $rows_output++;
#
- # The excel spreadsheet stores temporary data in files, then put them
- # together. If needed we should be able to disable this (memory only).
- # The temporary directory must be specified before calling 'addworksheet'.
- # File::Temp is used to determine the temporary directory.
- $excel_workbook->set_tempdir($Apache::lonnet::tmpdir);
+ # Create sheet
+ ($excel_workbook,$filename,$format)=
+ &Apache::loncommon::create_workbook($r);
+ return if (! defined($excel_workbook));
#
# 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
- $excel_sheet->write($rows_output,$cols_output++,
- $ENV{'course.'.$ENV{'request.course.id'}.'.description'});
+ $excel_sheet->write($header_row,$cols_output++,
+ $ENV{'course.'.$ENV{'request.course.id'}.'.description'},
+ $format->{'h1'});
$cols_output += 3;
#
# Put a description of the sections listed
my $sectionstring = '';
- my @Sections = @Apache::lonstatistics::SelectedSections;
+ my @Sections = &Apache::lonstatistics::get_selected_sections();
if (scalar(@Sections) > 1) {
if (scalar(@Sections) > 2) {
my $last = pop(@Sections);
@@ -788,85 +1066,308 @@ sub excel_initialize {
$sectionstring = "Section ".$Sections[0];
}
}
- $excel_sheet->write($rows_output,$cols_output++,$sectionstring);
+ $excel_sheet->write($header_row,$cols_output++,$sectionstring,
+ $format->{'h3'});
$cols_output += scalar(@Sections);
#
# Put the date in there too
- $excel_sheet->write($rows_output,$cols_output++,
- 'Compiled on '.localtime(time));
+ $excel_sheet->write($header_row,$cols_output++,
+ 'Compiled on '.localtime(time),$format->{'h3'});
#
- $rows_output++;
+ $cols_output = 0;
+ $excel_sheet->write($description_row,$cols_output++,
+ $chosen_output->{'shortdesc'},
+ $format->{'b'});
+ #
+ $cols_output = 0;
+ $excel_sheet->write($notes_row,$cols_output++,
+ $chosen_output->{'non_html_notes'},
+ $format->{'i'});
+
+ ##############################################
+ # Output headings for the raw data
+ ##############################################
#
# Add the student headers
$cols_output = 0;
foreach my $field (&get_student_fields_to_show()) {
- $excel_sheet->write($rows_output,$cols_output++,$field);
+ $excel_sheet->write($resource_name_row,$cols_output++,$field,
+ $format->{'bold'});
}
#
- # Add the Sequence 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+1,$cols_output,'score');
- $excel_sheet->write($rows_output+1,$cols_output+1,'maximum');
- $cols_output += 2;
+ # Add the remaining column headers
+ my $total_formula_string = '=0';
+ my $maximum_formula_string = '=0';
+ foreach my $seq (@sequences) {
+ my $symb = $seq->symb;
+ $excel_sheet->write($sequence_name_row,,
+ $cols_output,$seq->compTitle,$format->{'bold'});
+ # Determine starting cell
+ $formula_data{$symb}->{'Excel:startcell'}=
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+ ($first_data_row,$cols_output);
+ $formula_data{$symb}->{'Excel:startcol'}=$cols_output;
+ my $count = 0;
+ if ($chosen_output->{'every_problem'}) {
+ # Put the names of the problems and parts into the sheet
+ foreach my $res (&get_resources($navmap,$seq)) {
+ if (scalar(@{$res->parts}) > 1) {
+ foreach my $part (@{$res->parts}) {
+ $excel_sheet->write($resource_name_row,
+ $cols_output++,
+ $res->compTitle.' part '.$res->part_display($part),
+ $format->{'bold'});
+ $count++;
+ }
+ } else {
+ $excel_sheet->write($resource_name_row,
+ $cols_output++,
+ $res->compTitle,$format->{'bold'});
+ $count++;
+ }
+ }
+ }
+ # Determine ending cell
+ if ($count <= 1) {
+ $formula_data{$symb}->{'Excel:endcell'} = $formula_data{$symb}->{'Excel:startcell'};
+ $formula_data{$symb}->{'Excel:endcol'} = $formula_data{$symb}->{'Excel:startcol'};
} else {
+ $formula_data{$symb}->{'Excel:endcell'} =
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+ ($first_data_row,$cols_output-1);
+ $formula_data{$symb}->{'Excel:endcol'} = $cols_output-1;
+ }
+ # Create the formula for summing up this sequence
+ if (! exists($formula_data{$symb}->{'Excel:endcell'}) ||
+ ! defined($formula_data{$symb}->{'Excel:endcell'})) {
+ $formula_data{$symb}->{'Excel:endcell'} = $formula_data{$symb}->{'Excel:startcell'};
+ }
+ $formula_data{$symb}->{'Excel:sum'}= $excel_sheet->store_formula
+ ('=SUM('.$formula_data{$symb}->{'Excel:startcell'}.
+ ':'.$formula_data{$symb}->{'Excel:endcell'}.')');
+ # Determine cell the score is held in
+ $formula_data{$symb}->{'Excel:scorecell'} =
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+ ($first_data_row,$cols_output);
+ $formula_data{$symb}->{'Excel:scorecol'}=$cols_output;
+ if ($chosen_output->{'base'} eq 'parts correct total') {
+ $excel_sheet->write($resource_name_row,$cols_output++,
+ 'parts correct',
+ $format->{'bold'});
+ } elsif ($chosen_output->{'sequence_sum'}) {
+ if ($chosen_output->{'correct'}) {
+ # Only reporting the number correct, so do not call it score
+ $excel_sheet->write($resource_name_row,$cols_output++,
+ 'sum',
+ $format->{'bold'});
+ } else {
+ $excel_sheet->write($resource_name_row,$cols_output++,
+ 'score',
+ $format->{'bold'});
+ }
+ }
+ #
+ $total_formula_string.='+'.
+ &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,
+ 'maximum',
+ $format->{'bold'});
+ $formula_data{$symb}->{'Excel:maxcell'} =
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+ ($first_data_row,$cols_output);
+ $formula_data{$symb}->{'Excel:maxcol'}=$cols_output;
+ $maximum_formula_string.='+'.
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+ ($first_data_row,$cols_output);
$cols_output++;
+
}
}
- #
- # Bookkeeping
- if ($show eq 'totals') {
- $rows_output += 2;
- } else {
- $rows_output += 1;
- }
- #
- # Output a row for MAX
- if ($show ne 'totals') {
+ 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
+ ##############################################
+ if ($chosen_output->{'maximum_row'}) {
$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');
+ $excel_sheet->write($maximum_data_row,$cols_output++,'Maximum',
+ $format->{'bold'});
} else {
- $excel_sheet->write($rows_output,$cols_output++,'');
+ $excel_sheet->write($maximum_data_row,$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
+ my %total_cell_translation;
+ my %maximum_cell_translation;
+ foreach my $seq (@sequences) {
+ my $symb = $seq->symb;
+ $cols_output=$formula_data{$symb}->{'Excel:startcol'};
+ $total_cell_translation{$formula_data{$symb}->{'Excel:scorecell'}}=
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+ ($maximum_data_row,$formula_data{$symb}->{'Excel:scorecol'});
+ $maximum_cell_translation{$formula_data{$symb}->{'Excel:maxcell'}}=
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+ ($maximum_data_row,$formula_data{$symb}->{'Excel:maxcol'});
+ my $weight;
+ my $max = 0;
+ foreach my $resource (&get_resources($navmap,$seq)) {
+ foreach my $part (@{$resource->parts}){
+ $weight = 1;
+ if ($chosen_output->{'scores'}) {
+ $weight = &Apache::lonnet::EXT
+ ('resource.'.$part.'.weight',$resource->{'symb'},
+ undef,undef,undef);
+ if (!defined($weight) || ($weight eq '')) {
+ $weight=1;
+ }
+ }
+ if ($chosen_output->{'scores'} &&
+ $chosen_output->{'every_problem'}) {
+ $excel_sheet->write($maximum_data_row,$cols_output++,
+ $weight);
+ }
+ $max += $weight;
+ }
+ }
+ #
+ if ($chosen_output->{'sequence_sum'} &&
+ $chosen_output->{'every_problem'}) {
+ my %replaceCells=
+ ('^'.$formula_data{$symb}->{'Excel:startcell'}.':'.
+ $formula_data{$symb}->{'Excel:endcell'}.'$' =>
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell($maximum_data_row,$formula_data{$symb}->{'Excel:startcol'}).':'.
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell($maximum_data_row,$formula_data{$symb}->{'Excel:endcol'}));
+ $excel_sheet->repeat_formula($maximum_data_row,$cols_output++,
+ $formula_data{$symb}->{'Excel:sum'},undef,
+ %replaceCells);
+
+ } elsif ($chosen_output->{'sequence_sum'}) {
+ $excel_sheet->write($maximum_data_row,$cols_output++,$max);
+ }
+ if ($chosen_output->{'sequence_max'}) {
+ $excel_sheet->write($maximum_data_row,$cols_output++,$max);
+ }
+ #
+ }
+ if ($chosen_output->{'grand_total'}) {
+ $excel_sheet->repeat_formula($maximum_data_row,$cols_output++,
+ $total_formula,undef,
+ %total_cell_translation);
+ }
+ if ($chosen_output->{'grand_maximum'}) {
+ $excel_sheet->repeat_formula($maximum_data_row,$cols_output++,
+ $maximum_formula,undef,
+ %maximum_cell_translation);
+ }
+ } # End of MAXIMUM row output if ($chosen_output->{'maximum_row'}) {
+ $rows_output = $first_data_row;
+ ##############################################
+ # Output summary table, which actually is above the sequence name row.
+ ##############################################
+ if ($chosen_output->{'summary_table'}) {
+ $cols_output = 0;
+ $excel_sheet->write($summary_header_row,$cols_output++,
+ 'Summary Table',$format->{'bold'});
+ if ($chosen_output->{'maximum_row'}) {
+ $excel_sheet->write($summary_header_row,$cols_output++,
+ 'Maximum',$format->{'bold'});
+ }
+ $excel_sheet->write($summary_header_row,$cols_output++,
+ 'Average',$format->{'bold'});
+ $excel_sheet->write($summary_header_row,$cols_output++,
+ 'Median',$format->{'bold'});
+ $excel_sheet->write($summary_header_row,$cols_output++,
+ 'Std Dev',$format->{'bold'});
+ my $row = $summary_header_row+1;
+ foreach my $seq (@sequences) {
+ my $symb = $seq->symb;
+ $cols_output = 0;
+ $excel_sheet->write($row,$cols_output++,
+ $seq->compTitle,
+ $format->{'bold'});
+ if ($chosen_output->{'maximum_row'}) {
+ $excel_sheet->write
+ ($row,$cols_output++,
+ '='.
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+ ($maximum_data_row,$formula_data{$symb}->{'Excel:scorecol'})
+ );
+ }
+ my $range =
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+ ($first_data_row,$formula_data{$symb}->{'Excel:scorecol'}).
+ ':'.
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+ ($first_data_row+$num_students-1,$formula_data{$symb}->{'Excel:scorecol'});
+ $excel_sheet->write($row,$cols_output++,
+ '=AVERAGE('.$range.')');
+ $excel_sheet->write($row,$cols_output++,
+ '=MEDIAN('.$range.')');
+ $excel_sheet->write($row,$cols_output++,
+ '=STDEV('.$range.')');
+ $row++;
}
- $rows_output++;
}
+ ##############################################
+ # Take care of non-excel initialization
+ ##############################################
#
# Let the user know what we are doing
my $studentcount = scalar(@Apache::lonstatistics::Students);
- $r->print("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
%prog_state=&Apache::lonhtmlcommon::Create_PrgWin
($r,'Excel File Compilation Status',
- 'Excel File Compilation Progress', $studentcount);
+ 'Excel File Compilation Progress', $studentcount,
+ 'inline',undef,'Statistics','stats_status');
#
+ &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
+ 'Processing first student');
return;
}
sub excel_outputstudent {
my ($r,$student) = @_;
- return if (! defined($excel_sheet));
+ if ($request_aborted || ! defined($navmap) || ! defined($excel_sheet)) {
+ return;
+ }
$cols_output=0;
#
# Write out student data
my @to_show = &get_student_fields_to_show();
foreach my $field (@to_show) {
- $excel_sheet->write($rows_output,$cols_output++,$student->{$field});
+ my $value = $student->{$field};
+ if ($field eq 'comments') {
+ $value = &Apache::lonmsg::retrieve_instructor_comments
+ ($student->{'username'},$student->{'domain'});
+ }
+ $excel_sheet->write($rows_output,$cols_output++,$value);
}
#
# Get student assessment data
@@ -880,18 +1381,85 @@ sub excel_outputstudent {
}
#
# Write out sequence scores and totals data
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
- my ($performance,$score,$seq_max) =
- &StudentPerformanceOnSequence($student,\%StudentsData,
- $seq,'no');
- if ($show eq 'totals' || $show eq 'scores') {
- $excel_sheet->write($rows_output,$cols_output++,$score);
+ my %total_cell_translation;
+ my %maximum_cell_translation;
+ foreach my $seq (@sequences) {
+ my $symb = $seq->symb;
+ $cols_output = $formula_data{$symb}->{'Excel:startcol'};
+ # Keep track of cells to translate in total cell
+ $total_cell_translation{$formula_data{$symb}->{'Excel:scorecell'}} =
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+ ($rows_output,$formula_data{$symb}->{'Excel:scorecol'});
+ # and maximum cell
+ $maximum_cell_translation{$formula_data{$symb}->{'Excel:maxcell'}} =
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
+ ($rows_output,$formula_data{$symb}->{'Excel:maxcol'});
+ #
+ my ($performance,$performance_length,$score,$seq_max,$rawdata);
+ if ($chosen_output->{'tries'} || $chosen_output->{'correct'}){
+ ($performance,$performance_length,$score,$seq_max,$rawdata) =
+ &student_tries_on_sequence($student,\%StudentsData,
+ $navmap,$seq,'no');
+ } else {
+ ($performance,$performance_length,$score,$seq_max,$rawdata) =
+ &student_performance_on_sequence($student,\%StudentsData,
+ $navmap,$seq,'no');
+ }
+ 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) {
+ if ($score eq ' ' || !defined($value)) {
+ $cols_output++;
+ } else {
+ $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=
+ ('^'.$formula_data{$symb}->{'Excel:startcell'}.':'.$formula_data{$symb}->{'Excel:endcell'}.'$'
+ =>
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell($rows_output,$formula_data{$symb}->{'Excel:startcol'}).':'.
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell($rows_output,$formula_data{$symb}->{'Excel:endcol'})
+ );
+ # The undef is for the format
+ $excel_sheet->repeat_formula($rows_output,$cols_output++,
+ $formula_data{$symb}->{'Excel:sum'},undef,
+ %replaceCells);
+ } elsif ($chosen_output->{'sequence_sum'}) {
+ if ($score eq ' ') {
+ $cols_output++;
+ } else {
+ $excel_sheet->write($rows_output,$cols_output++,$score);
+ }
}
- if ($show eq 'totals') {
+ if ($chosen_output->{'sequence_max'}) {
$excel_sheet->write($rows_output,$cols_output++,$seq_max);
}
}
#
+ if ($chosen_output->{'grand_total'}) {
+ $excel_sheet->repeat_formula($rows_output,$cols_output++,
+ $total_formula,undef,
+ %total_cell_translation);
+ }
+ if ($chosen_output->{'grand_maximum'}) {
+ $excel_sheet->repeat_formula($rows_output,$cols_output++,
+ $maximum_formula,undef,
+ %maximum_cell_translation);
+ }
+ #
# Bookkeeping
$rows_output++;
$cols_output=0;
@@ -903,7 +1471,9 @@ sub excel_outputstudent {
sub excel_finish {
my ($r) = @_;
- return if (! defined($excel_sheet));
+ if ($request_aborted || ! defined($navmap) || ! defined($excel_sheet)) {
+ return;
+ }
#
# Write the excel file
$excel_workbook->close();
@@ -943,17 +1513,51 @@ sub excel_finish {
my $outputfile;
my $filename;
-
+my $request_aborted;
my %prog_state; # progress window state
+my $navmap;
+my @sequences;
sub csv_initialize{
my ($r) = @_;
#
# Clean up
- $filename = undef;
- $outputfile = undef;
+ undef($outputfile);
+ undef($filename);
+ undef($request_aborted);
undef(%prog_state);
#
+ undef($navmap);
+ undef(@sequences);
+ ($navmap,@sequences) =
+ &Apache::lonstatistics::selected_sequences_with_assessments();
+ if (! ref($navmap)) {
+ # Unable to get data, so bail out
+ $r->print("".
+ &mt('Unable to retrieve course information.').
+ ' ');
+ }
+ #
+ # Deal with unimplemented requests
+ $request_aborted = undef;
+ if ($chosen_output->{'base'} =~ /final table/) {
+ $r->print(<Unable to Complete Request
+
+The Summary Table (Scores) option is not available for non-HTML output.
+
+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,
+ 'inline',undef,'Statistics','stats_status');
+ #
# Open a file
$filename = '/prtspool/'.
$ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
@@ -971,62 +1575,81 @@ sub csv_initialize{
print $outputfile '"'.&Apache::loncommon::csv_translate($description).'",'.
'"'.&Apache::loncommon::csv_translate(scalar(localtime(time))).'"'.
"\n";
-
+ foreach my $item ('shortdesc','non_html_notes') {
+ next if (! exists($chosen_output->{$item}));
+ print $outputfile
+ '"'.&Apache::loncommon::csv_translate($chosen_output->{$item}).'"'.
+ "\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 ($show eq 'scores') {
- $Str .= '"'.&Apache::loncommon::csv_translate($field).'",';
- } elsif ($show eq 'totals') {
- $Str .= '"",'; # first row empty on the student fields
- $Str2 .= '"'.&Apache::loncommon::csv_translate($field).'",';
- } elsif ($show eq 'all') {
- $Str .= '"'.&Apache::loncommon::csv_translate($field).'",';
- }
- }
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
- if ($show eq 'scores') {
- $Str .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}).
- '",';
- } elsif ($show eq 'totals') {
- $Str .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}).
- '","",';
- $Str2 .= '"score","total possible",';
- } elsif ($show eq 'all') {
- $Str .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}).
- '",';
- $Str .= '"",'x($seq->{'num_assess_parts'}-1);
- $Str .= '"score","total possible",';
- }
+ $sequence_row .='"",';
+ $resource_row .= '"'.&Apache::loncommon::csv_translate($field).'",';
}
- chop($Str);
- $Str .= "\n";
- print $outputfile $Str;
- if (defined($Str2)) {
- chop($Str2);
- $Str2 .= "\n";
- print $outputfile $Str2;
+ foreach my $seq (@sequences) {
+ $sequence_row .= '"'.
+ &Apache::loncommon::csv_translate($seq->compTitle).'",';
+ my $count = 0;
+ if ($chosen_output->{'every_problem'}) {
+ foreach my $res (&get_resources($navmap,$seq)) {
+ if (scalar(@{$res->parts}) < 1) {
+ next;
+ }
+ foreach my $part (@{$res->parts}) {
+ $resource_row .= '"'.
+ &Apache::loncommon::csv_translate
+ ($res->compTitle.', Part '.$res->part_display($part)).'",';
+ $count++;
+ }
+ }
+ }
+ $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",';
+ }
}
- #
- # 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",';
+ }
+ if ($chosen_output->{'grand_maximum'}) {
+ $sequence_row.= '"",';
+ $resource_row.= '"Maximum",';
+ }
+ chomp($sequence_row);
+ chomp($resource_row);
+ print $outputfile $sequence_row."\n";
+ print $outputfile $resource_row."\n";
return;
}
sub csv_outputstudent {
my ($r,$student) = @_;
- return if (! defined($outputfile));
+ if ($request_aborted || ! defined($navmap) || ! defined($outputfile)) {
+ return;
+ }
my $Str = '';
#
# Output student fields
my @to_show = &get_student_fields_to_show();
foreach my $field (@to_show) {
- $Str .= '"'.&Apache::loncommon::csv_translate($student->{$field}).'",';
+ my $value = $student->{$field};
+ if ($field eq 'comments') {
+ $value = &Apache::lonmsg::retrieve_instructor_comments
+ ($student->{'username'},$student->{'domain'});
+ }
+ $Str .= '"'.&Apache::loncommon::csv_translate($value).'",';
}
#
# Get student assessment data
@@ -1040,18 +1663,48 @@ sub csv_outputstudent {
}
#
# Output performance data
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
- my ($performance,$score,$seq_max) =
- &StudentPerformanceOnSequence($student,\%StudentsData,
- $seq,'no');
- if ($show eq 'scores') {
+ my $total = 0;
+ my $maximum = 0;
+ foreach my $seq (@sequences) {
+ my ($performance,$performance_length,$score,$seq_max,$rawdata);
+ if ($chosen_output->{'tries'}){
+ ($performance,$performance_length,$score,$seq_max,$rawdata) =
+ &student_tries_on_sequence($student,\%StudentsData,
+ $navmap,$seq,'no');
+ } else {
+ ($performance,$performance_length,$score,$seq_max,$rawdata) =
+ &student_performance_on_sequence($student,\%StudentsData,
+ $navmap,$seq,'no');
+ }
+ 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 ($show eq 'totals') {
- $Str .= '"'.$score.'","'.$seq_max.'",';
- } elsif ($show eq 'all') {
- $Str .= '"'.join('","',(split(//,$performance),$score,$seq_max)).
- '",';
+ }
+ if ($chosen_output->{'sequence_max'}) {
+ $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";
@@ -1064,7 +1717,9 @@ sub csv_outputstudent {
sub csv_finish {
my ($r) = @_;
- return if (! defined($outputfile));
+ if ($request_aborted || ! defined($navmap) || ! defined($outputfile)) {
+ return;
+ }
close($outputfile);
#
my $c = $r->connection();
@@ -1075,7 +1730,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;
@@ -1088,7 +1743,7 @@ sub csv_finish {
=pod
-=item &StudentPerformanceOnSequence()
+=item &StudentTriesOnSequence()
Inputs:
@@ -1108,71 +1763,221 @@ Inputs:
#######################################################
#######################################################
-sub StudentPerformanceOnSequence {
- my ($student,$studentdata,$seq,$links) = @_;
+sub student_tries_on_sequence {
+ my ($student,$studentdata,$navmap,$seq,$links) = @_;
$links = 'no' if (! defined($links));
my $Str = '';
my ($sum,$max) = (0,0);
- foreach my $resource (@{$seq->{'contents'}}) {
- next if ($resource->{'type'} ne 'assessment');
- my $resource_data = $studentdata->{$resource->{'symb'}};
+ 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 (&get_resources($navmap,$seq)) {
+ my $resource_data = $studentdata->{$resource->symb};
my $value = '';
- foreach my $partnum (@{$resource->{'parts'}}) {
+ foreach my $partnum (@{$resource->parts()}) {
+ $tries = undef;
$max++;
+ $performance_length++;
my $symbol = ' '; # default to space
#
+ my $awarded = 0;
+ if (exists($resource_data->{'resource.'.$partnum.'.awarded'})) {
+ $awarded = $resource_data->{'resource.'.$partnum.'.awarded'};
+ $awarded = 0 if (! $awarded);
+ }
+ #
+ my $status = '';
if (exists($resource_data->{'resource.'.$partnum.'.solved'})) {
- my $status = $resource_data->{'resource.'.$partnum.'.solved'};
- if ($status eq 'correct_by_override') {
- $symbol = '+';
- $sum++;
- } elsif ($status eq 'incorrect_by_override') {
- $symbol = '-';
- } elsif ($status eq 'ungraded_attempted') {
- $symbol = '#';
- } elsif ($status eq 'incorrect_attempted') {
- $symbol = '.';
- } elsif ($status eq 'excused') {
+ $status = $resource_data->{'resource.'.$partnum.'.solved'};
+ }
+ #
+ my $tries = 0;
+ if(exists($resource_data->{'resource.'.$partnum.'.tries'})) {
+ $tries = $resource_data->{'resource.'.$partnum.'.tries'};
+ $hasdata =1;
+ }
+ #
+ if ($awarded > 0) {
+ # The student has gotten the problem correct to some degree
+ if ($status eq 'excused') {
$symbol = 'x';
$max--;
- } elsif ($status eq 'correct_by_student' &&
- exists($resource_data->{'resource.'.$partnum.'.tries'})){
- my $num = $resource_data->{'resource.'.$partnum.'.tries'};
- if ($num > 9) {
+ } elsif ($status eq 'correct_by_override') {
+ $symbol = '+';
+ $sum++;
+ } elsif ($tries > 0) {
+ if ($tries > 9) {
$symbol = '*';
- } elsif ($num > 0) {
- $symbol = $num;
} else {
- $symbol = ' ';
+ $symbol = $tries;
}
$sum++;
- } elsif (exists($resource_data->{'resource.'.
- $partnum.'.tries'})){
- $symbol = '.';
} else {
- $symbol = ' ';
+ $symbol = '+';
+ $sum++;
}
} else {
- # Unsolved. Did they try?
- if (exists($resource_data->{'resource.'.$partnum.'.tries'})){
+ # The student has the problem incorrect or it is ungraded
+ if ($status eq 'excused') {
+ $symbol = 'x';
+ $max--;
+ } elsif ($status eq 'incorrect_by_override') {
+ $symbol = '-';
+ } elsif ($status eq 'ungraded_attempted') {
+ $symbol = '#';
+ } elsif ($status eq 'incorrect_attempted' ||
+ $tries > 0) {
$symbol = '.';
} else {
- $symbol = ' ';
+ # Problem is wrong and has not been attempted.
+ $symbol=' ';
}
}
#
- if ($links eq 'yes' && $symbol ne ' ') {
+ if (! defined($tries)) {
+ $tries = 0;
+ }
+ if ($status =~ /^(incorrect|ungraded)/) {
+ # Bug 3390: show '-' for tries on incorrect problems
+ # (csv & excel only)
+ push(@TriesData,-$tries);
+ } else {
+ push (@TriesData,$tries);
+ }
+ #
+ if ( ($links eq 'yes' && $symbol ne ' ') ||
+ ($links eq 'all')) {
+ if (length($symbol) > 1) {
+ &Apache::lonnet::logthis('length of symbol "'.$symbol.'" > 1');
+ }
$symbol = ''.$symbol.' ';
}
$value .= $symbol;
}
$Str .= $value;
}
- return ($Str,$sum,$max);
+ if ($seq->randompick()) {
+ $max = $seq->randompick();
+ }
+ if (! $hasdata && $sum == 0) {
+ $sum = ' ';
+ }
+ return ($Str,$performance_length,$sum,$max,\@TriesData);
+}
+
+#######################################################
+#######################################################
+
+=pod
+
+=item &student_performance_on_sequence
+
+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 student_performance_on_sequence {
+ my ($student,$studentdata,$navmap,$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;
+ my $hasdata = 0; # flag, 0 if there were no submissions on the sequence
+ foreach my $resource (&get_resources($navmap,$seq)) {
+ my $symb = $resource->symb;
+ my $resource_data = $studentdata->{$symb};
+ foreach my $part (@{$resource->parts()}) {
+ $partscore = undef;
+ my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight',
+ $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;
+ 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) {
+ $symbol = sprintf("%.0f",$symbol);
+ }
+ 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.
+ }
+ $hasdata = 1;
+ } elsif (!exists($resource_data->{'resource.'.$part.'.awarded'})){
+ # Unsolved. Did they try?
+ if (exists($resource_data->{'resource.'.$part.'.tries'})){
+ $symbol = '.';
+ $hasdata = 1;
+ } else {
+ $symbol = ' ';
+ }
+ }
+ #
+ if (! defined($partscore)) {
+ $partscore = $symbol;
+ }
+ push (@ScoreData,$partscore);
+ #
+ if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) {
+ $symbol = ''.$symbol.' ';
+ }
+ $Str .= $symbol;
+ }
+ }
+ if (! $hasdata && $score == 0) {
+ $score = ' ';
+ }
+ return ($Str,$performance_length,$score,$max,\@ScoreData);
}
#######################################################