| '."\n"; $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5); $Str .= ' | '; - my $only_seq_with_assessments = sub { - my $s=shift; - if ($s->{'num_assess'} < 1) { - return 0; - } else { - return 1; - } - }; $Str .= &Apache::lonstatistics::StudentDataSelect('StudentData','multiple', 5,undef); $Str .= ' | '."\n"; $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5); $Str .= ' | '."\n"; - $Str .= &Apache::lonstatistics::MapSelect('Maps','multiple,all',5, - $only_seq_with_assessments); + $Str .= &Apache::lonstatistics::map_select('Maps','multiple,all',5); $Str .= ' | '."\n"; $Str .= &CreateAndParseOutputSelector(); $Str .= ' | '."\n";
@@ -364,6 +352,9 @@ sub CreateInterface {
$Str .= '';
$Str .= ' 'x5;
+ $Str .=
+ &mt('Status [_1]',
+ '');
$Str .= ' '; return $Str; } @@ -411,7 +402,7 @@ my @OutputOptions = }, { name => 'CSV', value => 'csv', - description => 'Output a comma seperated values file suitable for '. + description => 'Output a comma separated values file suitable for '. 'import into a spreadsheet program. Using this method as opposed '. 'to Excel output allows you to organize your data before importing'. ' it into a spreadsheet program.', @@ -477,6 +468,15 @@ 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 '. @@ -485,51 +485,54 @@ my @OutputDataOptions = { name => 'Scores Per Problem', base => 'scores', value => 'scores', + scores => 1, + tries => 0, + correct => 0, + every_problem => 1, + sequence_sum => 1, + sequence_max => 1, + grand_total => 1, + 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 => 'Scores Sum', -# base => 'scores', -# value => 'sum only', -# shortdesc => 'Sum of Scores on each Problem Part', -# longdesc =>'The total of the scores of the student on each problem'. -# ' part in the sequences or folders selected.', -# }, -# { name => 'Scores Summary Table Only', -# base => 'scores', -# value => 'final table scores', -# shortdesc => 'Summary of Scores', -# longdesc => 'The average score on each sequence or folder for the '. -# 'selected students.', -# }, { name =>'Tries', base =>'tries', value => 'tries', + scores => 0, + tries => 1, + correct => 0, + every_problem => 1, + sequence_sum => 0, + sequence_max => 0, + grand_total => 0, + 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', }, -# { name =>'Parts Correct', -# base =>'tries', -# value => 'parts correct', -# shortdesc => 'Number of Problem Parts completed successfully.', -# longdesc => 'The Number of Problem Parts completed successfully'. -# ' on each sequence or folder.', -# }, -# { name => 'Parts Summary Table Only', -# base => 'tries', -# value => 'final table parts', -# shortdesc => 'Summary of Parts Correct', -# longdesc => 'A summary table of the average number of problem parts '. -# 'students were able to get correct on each sequence.', -# }, ); sub HTMLifyOutputDataDescriptions { @@ -557,12 +560,10 @@ sub CreateAndParseOutputDataSelector { } } # - $data = 'scores'; + $chosen_output = $OutputDataOptions[0]; foreach my $option (@OutputDataOptions) { if ($option->{'value'} eq $selected) { - $data = $option->{'value'}; - $base = $option->{'base'}; - $datadescription = $option->{'shortdesc'}; + $chosen_output = $option; } } # @@ -570,7 +571,7 @@ sub CreateAndParseOutputDataSelector { $Str = qq/"; @@ -580,6 +581,26 @@ sub CreateAndParseOutputDataSelector { ####################################################### ####################################################### +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; +} + +####################################################### +####################################################### =pod @@ -605,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) = @_; @@ -613,20 +639,24 @@ sub html_initialize { $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).""); - - if ($data !~ /^final table/) { - $r->print("".$datadescription.""); - } # - # Set up progress window for 'final table' display only - if ($data =~ /^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
@@ -637,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\n";
- $Str .= "";
#
- # Check for suppression of output
- if ($data =~ /^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;
@@ -659,14 +726,19 @@ sub html_initialize {
sub html_outputstudent {
my ($r,$student) = @_;
my $Str = '';
+ return if (! defined($navmap));
#
- if($count++ % 5 == 0 && $count > 0 && $data !~ /^final table/) {
+ if($count++ % 5 == 0 && $count > 0) {
$r->print("");
}
# First, the @StudentData fields need to be listed
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;
@@ -681,7 +753,6 @@ sub html_outputstudent {
}
if (scalar(@tmp) < 1) {
$nodata_count++;
- return if ($data =~ /^final table/);
$Str .= 'No Course Data'."\n";
$r->print($Str);
$r->rflush();
@@ -691,57 +762,72 @@ sub html_outputstudent {
# By sequence build up the data
my $studentstats;
my $PerformanceStr = '';
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+ foreach my $seq (@sequences) {
+ my $symb = $seq->symb;
my ($performance,$performance_length,$score,$seq_max,$rawdata);
- if ($base eq 'tries') {
+ if ($chosen_output->{'tries'}) {
($performance,$performance_length,$score,$seq_max,$rawdata) =
- &StudentTriesOnSequence($student,\%StudentsData,
- $seq,$show_links);
+ &student_tries_on_sequence($student,\%StudentsData,
+ $navmap,$seq,$show_links);
} else {
($performance,$performance_length,$score,$seq_max,$rawdata) =
- &StudentPerformanceOnSequence($student,\%StudentsData,
- $seq,$show_links);
+ &student_performance_on_sequence($student,\%StudentsData,
+ $navmap,$seq,$show_links);
}
- my $ratio = sprintf("%3d",$score).'/'.sprintf("%3d",$seq_max);
- #
- if ($data eq 'sum and total' || $data eq 'parts correct total') {
- $performance = $ratio;
- $performance .= ' 'x($seq->{'width'}-length($ratio));
- } elsif ($data eq 'sum only' || $data eq 'parts correct') {
- $performance = $score;
- $performance .= ' 'x($seq->{'width'}-length($score));
- } else {
- # Pad with extra spaces
- $performance .= ' 'x($seq->{'width'}-$performance_length-
- length($ratio)
- ).$ratio;
+ 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'};
if ($Statistics->{$symb}->{'max'} < $seq_stats->{'max'}) {
$Statistics->{$symb}->{'max'} = $seq_stats->{'max'};
}
- $score += $seq_stats->{'score'};
+ 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 ($data =~ /^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);
#
@@ -751,77 +837,80 @@ sub html_outputstudent {
sub html_finish {
my ($r) = @_;
+ return if (! defined($navmap));
#
# Check for suppressed output and close the progress window if so
- if ($data =~ /^final table/) {
- &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
- } else {
- $r->print("\n");
- }
- if ($single_student_mode) {
- $r->print(&SingleStudentTotal());
- } else {
- $r->print(&StudentAverageTotal());
+ $r->print("\n");
+ if ($chosen_output->{'summary_table'}) {
+ if ($single_student_mode) {
+ $r->print(&SingleStudentTotal());
+ } else {
+ $r->print(&StudentAverageTotal());
+ }
}
$r->rflush();
+ 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 .= '
Summary table for ".$student->{'fullname'}." ". - $student->{'username'}.'@'.$student->{'domain'}."\n"; + my $Str = ''.&mt('Summary table for [_1] ([_2]@[_3])', + $student->{'fullname'}, + $student->{'username'},$student->{'domain'}).''; + $Str .= $/; $Str .= '
-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 -Scores Summary data. - -END - $request_aborted = 1; + 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.'). + ''); } - if ($data =~ /^final table/) { - $r->print(<-The Summary Table (Scores) option is not available for non-HTML output. - -END - $request_aborted = 1; + # + 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); # - $filename = '/prtspool/'. - $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'. - time.'_'.rand(1000000000).'.xls'; # $excel_workbook = undef; $excel_sheet = undef; @@ -933,23 +1014,29 @@ END $rows_output = 0; $cols_output = 0; # - # Create sheet - $excel_workbook = Spreadsheet::WriteExcel->new('/home/httpd'.$filename); + # 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++; # - # 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 ; - } - # - # 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'}; @@ -957,206 +1044,294 @@ END $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; - if (scalar(@Sections) > 1) { - if (scalar(@Sections) > 2) { - my $last = pop(@Sections); - $sectionstring = "Sections ".join(', ',@Sections).', and '.$last; - } else { - $sectionstring = "Sections ".join(' and ',@Sections); - } - } else { - if ($Sections[0] eq 'all') { - $sectionstring = "All sections"; - } else { - $sectionstring = "Section ".$Sections[0]; - } - } - $excel_sheet->write($rows_output,$cols_output++,$sectionstring); - $cols_output += scalar(@Sections); + my @Sections = &Apache::lonstatistics::get_selected_sections(); + $excel_sheet->write($header_row,$cols_output++, + &Apache::lonstatistics::section_and_enrollment_description('plain text'), + $format->{'h3'}); # # 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'}); # $cols_output = 0; - $excel_sheet->write($rows_output++,$cols_output++,$datadescription); + $excel_sheet->write($description_row,$cols_output++, + $chosen_output->{'shortdesc'}, + $format->{'b'}); # - if ($data eq 'tries' || $data eq 'scores') { - $rows_output++; - } + $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); - } - my $row_offset = 0; - if ($data eq 'tries' || $data eq 'scores') { - $row_offset = -1; + $excel_sheet->write($resource_name_row,$cols_output++,$field, + $format->{'bold'}); } # # Add the remaining column headers my $total_formula_string = '=0'; - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - $excel_sheet->write($rows_output+$row_offset, - $cols_output,$seq->{'title'}); - if ($data eq 'tries' || $data eq 'scores') { - # Determine starting cell - $seq->{'Excel:startcell'}= - &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$cols_output); - $seq->{'Excel:startcol'}=$cols_output; + 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 - my $count = 0; - 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, + 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->{'title'}.' part '.$part); + $res->compTitle.' part '.$res->part_display($part), + $format->{'bold'}); + $count++; } } else { - $excel_sheet->write($rows_output, + $excel_sheet->write($resource_name_row, $cols_output++, - $res->{'title'}); + $res->compTitle,$format->{'bold'}); + $count++; } - $count++; } - # Determine ending cell - if ($count == 1) { - $seq->{'Excel:endcell'} = $seq->{'Excel:startcell'}; - $seq->{'Excel:endcol'} = $seq->{'Excel:startcol'}; - } else { - $seq->{'Excel:endcell'} = - &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$cols_output-1); - $seq->{'Excel:endcol'} = $cols_output-1; - } - # Create the formula for summing up this sequence - if (! exists($seq->{'Excel:endcell'}) || - ! defined($seq->{'Excel:endcell'})) { - $seq->{'Excel:endcell'} = $seq->{'Excel:startcell'}; - } - $seq->{'Excel:sum'}= $excel_sheet->store_formula - ('=SUM('.$seq->{'Excel:startcell'}. - ':'.$seq->{'Excel:endcell'}.')'); } + # 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 - $seq->{'Excel:scorecell'} = + $formula_data{$symb}->{'Excel:scorecell'} = &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$cols_output); - $seq->{'Excel:scorecol'}=$cols_output; - if ($data eq 'parts correct total') { - $excel_sheet->write($rows_output,$cols_output++,'parts correct'); - } else { - $excel_sheet->write($rows_output,$cols_output++,'score'); + ($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 - ($rows_output,$cols_output-1); - $excel_sheet->write($rows_output,$cols_output++,'maximum'); + ($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++; + + } } - $excel_sheet->write($rows_output,$cols_output++,'Grand Total'); - $total_formula = $excel_sheet->store_formula($total_formula_string); - # - # Bookkeeping - if ($data eq 'sum and total' || $data eq 'parts correct total') { - $rows_output += 2; - } else { - $rows_output += 1; + if ($chosen_output->{'grand_total'}) { + $excel_sheet->write($resource_name_row,$cols_output++,'Total', + $format->{'bold'}); } - # - # Output a row for MAX - $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++,''); - } + if ($chosen_output->{'grand_maximum'}) { + $excel_sheet->write($resource_name_row,$cols_output++,'Max. Total', + $format->{'bold'}); } - # - # Add the maximums for each sequence or assessment - my %total_cell_translation; - my $grand_total = 0; - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - $total_cell_translation{$seq->{'Excel:scorecell'}} = - &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$seq->{'Excel:scorecol'}); - 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; + $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($maximum_data_row,$cols_output++,'Maximum', + $format->{'bold'}); + } else { + $excel_sheet->write($maximum_data_row,$cols_output++,''); + } + } + # + # 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 ($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 ($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 (! ($data eq 'sum only' || $data eq 'parts correct')) { - $excel_sheet->write($rows_output,$cols_output++,''); + if ($chosen_output->{'sequence_max'}) { + $excel_sheet->write($maximum_data_row,$cols_output++,$max); + } + # } - # - if ($data eq 'tries' || $data eq 'scores') { - my %replaceCells; - $replaceCells{$seq->{'Excel:startcell'}} = + 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 - ($rows_output,$seq->{'Excel:startcol'}); - $replaceCells{$seq->{'Excel:endcell'}} = + ($first_data_row,$formula_data{$symb}->{'Excel:scorecol'}). + ':'. &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$seq->{'Excel:endcol'}); - $excel_sheet->repeat_formula($rows_output,$cols_output++, - $seq->{'Excel:sum'},undef, - %replaceCells); - } else { - $excel_sheet->write($rows_output,$cols_output++, - $max); + ($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++; } - $grand_total+=$max; } - if ($data eq 'tries' || $data eq 'scores') { - $excel_sheet->repeat_formula($rows_output,$cols_output++, - $total_formula,undef, - %total_cell_translation); - } else { - $excel_sheet->write($rows_output,$cols_output++,$grand_total); - } - $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'); @@ -1165,14 +1340,20 @@ END sub excel_outputstudent { my ($r,$student) = @_; - return if ($request_aborted); - 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 @@ -1187,59 +1368,83 @@ sub excel_outputstudent { # # Write out sequence scores and totals data my %total_cell_translation; - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { + 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{$seq->{'Excel:scorecell'}} = + $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,$seq->{'Excel:scorecol'}); + ($rows_output,$formula_data{$symb}->{'Excel:maxcol'}); # my ($performance,$performance_length,$score,$seq_max,$rawdata); - if ($base eq 'tries') { + if ($chosen_output->{'tries'} || $chosen_output->{'correct'}){ ($performance,$performance_length,$score,$seq_max,$rawdata) = - &StudentTriesOnSequence($student,\%StudentsData, - $seq,'no'); + &student_tries_on_sequence($student,\%StudentsData, + $navmap,$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); + &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; - $replaceCells{$seq->{'Excel:startcell'}} = - &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$seq->{'Excel:startcol'}); - $replaceCells{$seq->{'Excel:endcell'}} = - &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$seq->{'Excel:endcol'}); - # The undef is for the format - if (scalar(keys(%replaceCells)) == 1) { - $excel_sheet->repeat_formula($rows_output,$cols_output++, - $seq->{'Excel:sum'},undef, - %replaceCells,%replaceCells); + 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->repeat_formula($rows_output,$cols_output++, - $seq->{'Excel:sum'},undef, - %replaceCells); + $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 ($data eq 'sum and total' || $data eq 'parts correct total') { + if ($chosen_output->{'sequence_max'}) { $excel_sheet->write($rows_output,$cols_output++,$seq_max); } } # - $excel_sheet->repeat_formula($rows_output,$cols_output++, - $total_formula,undef, - %total_cell_translation); - + if ($chosen_output->{'grand_total'}) { + $excel_sheet->repeat_formula($rows_output,$cols_output++, + $total_formula,undef, + %total_cell_translation); + } + if ($chosen_output->{'grand_maximum'}) { + $excel_sheet->repeat_formula($rows_output,$cols_output++, + $maximum_formula,undef, + %maximum_cell_translation); + } # # Bookkeeping $rows_output++; @@ -1252,8 +1457,9 @@ sub excel_outputstudent { sub excel_finish { my ($r) = @_; - return if ($request_aborted); - return if (! defined($excel_sheet)); + if ($request_aborted || ! defined($navmap) || ! defined($excel_sheet)) { + return; + } # # Write the excel file $excel_workbook->close(); @@ -1295,6 +1501,8 @@ my $outputfile; my $filename; my $request_aborted; my %prog_state; # progress window state +my $navmap; +my @sequences; sub csv_initialize{ my ($r) = @_; @@ -1305,9 +1513,20 @@ sub csv_initialize{ 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 ($data =~ /final table/) { + if ($chosen_output->{'base'} =~ /final table/) { $r->print(<
@@ -1317,89 +1536,102 @@ 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'}.'_'.
- time.'_'.rand(1000000000).'.csv';
- unless ($outputfile = Apache::File->new('>/home/httpd'.$filename)) {
- $r->log_error("Couldn't open $filename for output $!");
- $r->print("Problems occured in writing the csv file. ".
- "This error has been logged. ".
- "Please alert your LON-CAPA administrator.");
- $outputfile = undef;
- }
+ ($outputfile,$filename) = &Apache::loncommon::create_text_file($r,'csv');
+ if (! defined($outputfile)) { return ''; }
#
# Datestamp
my $description = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
print $outputfile '"'.&Apache::loncommon::csv_translate($description).'",'.
'"'.&Apache::loncommon::csv_translate(scalar(localtime(time))).'"'.
"\n";
+ print $outputfile '"'.
+ &Apache::loncommon::csv_translate
+ (&Apache::lonstatistics::section_and_enrollment_description()).
+ '"'."\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 ($data eq 'sum only') {
- $Str .= '"'.&Apache::loncommon::csv_translate($field).'",';
- } elsif ($data eq 'sum and total' || $data eq 'parts correct total') {
- $Str .= '"",'; # first row empty on the student fields
- $Str2 .= '"'.&Apache::loncommon::csv_translate($field).'",';
- } elsif ($data eq 'scores' || $data eq 'tries' ||
- $data eq 'parts correct') {
- $Str .= '"",';
- $Str2 .= '"'.&Apache::loncommon::csv_translate($field).'",';
- }
- }
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
- if ($data eq 'sum only' || $data eq 'parts correct') {
- $Str .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}).
- '",';
- } elsif ($data eq 'sum and total' || $data eq 'parts correct total') {
- $Str .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}).
- '","",';
- $Str2 .= '"score","total possible",';
- } elsif ($data eq 'scores' || $data eq 'tries') {
- $Str .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}).
- '",';
- $Str .= '"",'x($seq->{'num_assess_parts'}-1+2);
- 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).'",';
+ $sequence_row .='"",';
+ $resource_row .= '"'.&Apache::loncommon::csv_translate($field).'",';
+ }
+ 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++;
}
}
- $Str2 .= '"score","total possible",';
}
- }
- chop($Str);
- $Str .= "\n";
- print $outputfile $Str;
- if (defined($Str2)) {
- chop($Str2);
- $Str2 .= "\n";
- print $outputfile $Str2;
- }
- #
- # Initialize progress window
- my $studentcount = scalar(@Apache::lonstatistics::Students);
- %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
- ($r,'CSV File Compilation Status',
- 'CSV File Compilation Progress', $studentcount);
+ $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",';
+ }
+ }
+ 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 ($request_aborted);
- 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
@@ -1413,24 +1645,48 @@ sub csv_outputstudent {
}
#
# Output performance data
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+ my $total = 0;
+ my $maximum = 0;
+ foreach my $seq (@sequences) {
my ($performance,$performance_length,$score,$seq_max,$rawdata);
- if ($base eq 'tries') {
+ if ($chosen_output->{'tries'}){
($performance,$performance_length,$score,$seq_max,$rawdata) =
- &StudentTriesOnSequence($student,\%StudentsData,
- $seq,'no');
+ &student_tries_on_sequence($student,\%StudentsData,
+ $navmap,$seq,'no');
} else {
($performance,$performance_length,$score,$seq_max,$rawdata) =
- &StudentPerformanceOnSequence($student,\%StudentsData,
- $seq,'no');
+ &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 ($data eq 'sum only' || $data eq 'parts correct') {
+ if ($chosen_output->{'sequence_sum'}) {
$Str .= '"'.$score.'",';
- } elsif ($data eq 'sum and total' || $data eq 'parts correct total') {
- $Str .= '"'.$score.'","'.$seq_max.'",';
- } elsif ($data eq 'scores' || $data eq 'tries') {
- $Str .= '"'.join('","',(@$rawdata,$score,$seq_max)).'",';
+ }
+ if ($chosen_output->{'sequence_max'}) {
+ $Str .= '"'.$seq_max.'",';
}
+ $total+=$score;
+ $maximum += $seq_max;
+ }
+ if ($chosen_output->{'grand_total'}) {
+ $Str .= '"'.$total.'",';
+ }
+ if ($chosen_output->{'grand_maximum'}) {
+ $Str .= '"'.$maximum.'",';
}
chop($Str);
$Str .= "\n";
@@ -1443,8 +1699,9 @@ sub csv_outputstudent {
sub csv_finish {
my ($r) = @_;
- return if ($request_aborted);
- return if (! defined($outputfile));
+ if ($request_aborted || ! defined($navmap) || ! defined($outputfile)) {
+ return;
+ }
close($outputfile);
#
my $c = $r->connection();
@@ -1455,7 +1712,7 @@ sub csv_finish {
#
# Tell the user where to get their csv file
$r->print(' |