--- loncom/interface/statistics/lonstudentassessment.pm 2003/03/26 21:42:20 1.43
+++ loncom/interface/statistics/lonstudentassessment.pm 2013/05/11 21:39:31 1.169.2.4
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentassessment.pm,v 1.43 2003/03/26 21:42:20 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.169.2.4 2013/05/11 21:39:31 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -50,11 +50,20 @@ Presents assessment data about a student
package Apache::lonstudentassessment;
use strict;
-use Apache::lonstatistics;
-use Apache::lonhtmlcommon;
+use Apache::lonstatistics();
+use Apache::lonhtmlcommon();
+use Apache::loncommon();
use Apache::loncoursedata;
use Apache::lonnet; # for logging porpoises
+use Apache::lonlocal;
+use Apache::grades();
+use Apache::lonmsgdisplay();
+use Time::HiRes;
use Spreadsheet::WriteExcel;
+use Spreadsheet::WriteExcel::Utility();
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+
#######################################################
#######################################################
@@ -85,13 +94,17 @@ my $Statistics;
=item $show 'all', 'totals', or 'scores' determines how much data is output
+=item $single_student_mode evaluates to true if we are showing only one
+student.
+
=cut
#######################################################
#######################################################
my $show_links;
my $output_mode;
-my $show;
+my $chosen_output;
+my $single_student_mode;
#######################################################
#######################################################
@@ -126,27 +139,51 @@ Inputs:
#######################################################
sub BuildStudentAssessmentPage {
my ($r,$c)=@_;
+ #
undef($Statistics);
+ undef($show_links);
+ undef($output_mode);
+ undef($chosen_output);
+ undef($single_student_mode);
+ #
+ my %Saveable_Parameters = ('Status' => 'scalar',
+ 'chartoutputmode' => 'scalar',
+ 'chartoutputdata' => 'scalar',
+ 'Section' => 'array',
+ 'Groups' => 'array',
+ 'StudentData' => 'array',
+ 'Maps' => 'array');
+ &Apache::loncommon::store_course_settings('chart',\%Saveable_Parameters);
+ &Apache::loncommon::restore_course_settings('chart',\%Saveable_Parameters);
+ #
+ &Apache::lonstatistics::PrepareClasslist();
+ #
+ $single_student_mode = 0;
+ $single_student_mode = 1 if ($env{'form.SelectedStudent'});
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['selectstudent']);
+ if ($env{'form.selectstudent'}) {
+ &Apache::lonstatistics::DisplayClasslist($r);
+ return;
+ }
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Chart','Chart_Description:Chart_Sections:Chart_Student_Data:Chart_Enrollment_Status:Chart_Sequences:Chart_Output_Formats:Chart_Output_Data'));
+
#
# Print out the HTML headers for the interface
# This also parses the output mode selector
- # This step must always be done.
+ # This step must *always* be done.
$r->print(&CreateInterface());
$r->print('');
+ $r->print('');
$r->rflush();
- if (! exists($ENV{'form.notfirstrun'})) {
- $r->print(<
Sections | '; - $Str .= 'Student Data | '; - $Str .= 'Sequences and Folders | '; - $Str .= 'Output Format | '; + $Str .= ''.&mt('Sections').''. + &Apache::loncommon::help_open_topic("Chart_Sections"). + ' | '; + $Str .= ''.&mt('Groups').''. + ' | '; + $Str .= ''.&mt('Student Data').''. + &Apache::loncommon::help_open_topic("Chart_Student_Data"). + ' | '; + $Str .= ''.&mt('Access Status').''. + &Apache::loncommon::help_open_topic("Chart_Enrollment_Status"). + ' | '; + $Str .= ''.&mt('Sequences and Folders').''. + &Apache::loncommon::help_open_topic("Chart_Sequences"). + ' | '; + $Str .= ''.&mt('Output Format').''. + &Apache::loncommon::help_open_topic("Chart_Output_Formats"). + ' | '; + $Str .= ''.&mt('Output Data').''. + &Apache::loncommon::help_open_topic("Chart_Output_Data"). + ' | '; $Str .= '
'."\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::GroupSelect('Group','multiple',5); + $Str .= ' | '; $Str .= &Apache::lonstatistics::StudentDataSelect('StudentData','multiple', 5,undef); $Str .= ' | '."\n"; - $Str .= &Apache::lonstatistics::MapSelect('Maps','multiple,all',5, - $only_seq_with_assessments); + $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5); + $Str .= ' | '."\n"; + $Str .= &Apache::lonstatistics::map_select('Maps','multiple,all',5); $Str .= ' | '."\n"; $Str .= &CreateAndParseOutputSelector(); + $Str .= ' | '."\n"; + $Str .= &CreateAndParseOutputDataSelector(); $Str .= ' |
' + .'' + .'
'; return $Str; } @@ -268,108 +390,44 @@ my @OutputOptions = description => 'Output HTML with each symbol linked to the problem '. 'which generated it.', mode => 'html', - show => 'all', show_links => 'yes', }, + { name => 'HTML, with all links', + value => 'html, with all links', + description => 'Output HTML with each symbol linked to the problem '. + 'which generated it. '. + 'This includes links for unattempted problems.', + mode => 'html', + show_links => 'all', + }, { name => 'HTML, without links', value => 'html, without links', description => 'Output HTML. By not including links, the size of the'. ' web page is greatly reduced. If your browser crashes on the '. 'full display, try this.', mode => 'html', - show => 'all', show_links => 'no', }, - { name => 'HTML, scores only', - value => 'html, scores only', - description => 'Output HTML, only showing the total number of correct'. - ' problems (or problem parts) and not the maximum possible for '. - 'each student', - mode => 'html', - show => 'scores', - show_links => 'no', - }, - { name => 'HTML, totals', - value => 'html, totals', - description => 'Output HTML, but only the summary statistics for each'. - ' sequence selected for each student.', - mode => 'html', - show => 'totals', - show_links => 'no', - }, - { name => 'HTML, summary table only', - value => 'html summary table only', - description => 'Output HTML, but only the final summary table for '. - 'all students across all sequences.', - mode => 'html', - show => 'final table', - show_links => 'no', - }, - { name => 'Excel, scores only', - value => 'excel, scores only', - description => 'Output an Excel file (compatable with Excel 95), '. - 'with a single column for each sequence showing the students '. - 'score.', - mode => 'excel', - show => 'scores', - show_links => 'no', - }, - { name => 'Excel, totals', - value => 'excel, totals', - description => 'Output an Excel file (compatable with Excel 95), '. - 'with two columns for each sequence, the students score on the '. - 'sequence and the students maximum possible on the sequence', + { name => 'Excel', + value => 'excel', + description => 'Output an Excel file (compatable with Excel 95).', mode => 'excel', - show => 'totals', - show_links => 'no', - }, - { name => 'multi-sheet Excel', - value => 'multi-sheet excel', - description => 'Output an Excel file (compatable with Excel 95), '. - 'with a seperate worksheet for each sequence you have selected '. - 'the data for each problem part '. - '(number of tries, status, points awarded) will be listed.', - mode => 'multi-sheet excel', - show => 'totals', - show_links => 'no', - }, - { name => 'multi-sheet Excel, by section', - value => 'multi-sheet excel, by section', - description => 'Output an Excel file (compatable with Excel 95), '. - 'with a seperate worksheet for each sequence you have selected '. - 'the data for each problem part '. - '(number of tries, status, points awarded) will be listed. '. - 'There will be one Excel workbook for each section selected.', - mode => 'multi-sheet excel', - show => 'by section', - show_links => 'no', - }, - { name => 'CSV, everything', - value => 'csv, everything', - description => '', - mode => 'csv', - show => 'all', show_links => 'no', - }, - { name => 'CSV, scores only', - value => 'csv, scores only', - description => '', + }, + { name => 'CSV', + value => 'csv', + 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.', mode => 'csv', - show => 'scores', - show_links => 'no', - }, - { name => 'CSV, totals', - value => 'csv, totals', - description => '', - mode => 'csv', - show => 'totals', show_links => 'no', }, ); sub OutputDescriptions { my $Str = ''; - $Str .= "' + .&mt('Unable to retrieve course information.') + .'
'); + } + + # If we're showing links, show a checkbox to open in new + # windows. + if ($show_links ne 'no') { + my $labeltext = &mt('Show links in new window'); + $r->print(<\n"; # First, the @StudentData fields need to be listed @@ -471,36 +693,149 @@ 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; + # + # 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 6 digits for the sum + $width{$symb}->{'width_sum'} += 6; + } + # 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 6 digits for the total + $width{$symb}->{'width_sum'}+=6; + } + # + 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; } - $Str .= "total (of shown problems)\n"; + $total_sum_width = length($total_count)+1; + $Str .= " total\n"; $Str .= "
"; + + $r->print(<+// get the left offset of a given widget as an absolute position +function getLeftOffset (element) { + return collect(element, "offsetLeft"); +} + +// get the top offset of a given widget as an absolute position +function getTopOffset (element) { + return collect(element, "offsetTop"); +} + +function collect(element, att) { + var val = 0; + while(element) { + val += element[att]; + element = element.offsetParent; + } + return val; +} + +var currentDiv; +var currentElement; +function popup_score(element, score) { + popdown_score(); + var left = getLeftOffset(element); + var top = getTopOffset(element); + var div = document.createElement("div"); + div.className = "LC_chrt_popup"; + div.appendChild(document.createTextNode(score)); + div.style.position = "absolute"; + div.style.top = (top - 25) + "px"; + div.style.left = (left - 10) + "px"; + currentDiv = div; + document.body.insertBefore(div, document.body.childNodes[0]); + element.className = "LC_chrt_popup_up"; + currentElement = element; +} + +function popdown_score() { + if (currentDiv) { + document.body.removeChild(currentDiv); + } + if (currentElement) { + currentElement.className = 'LC_chrt_popup_exists'; + } + currentDiv = undefined; +} + +JS + # - # Check for suppression of output - if ($show eq 'final table') { - $Str = ''; + # Let the user know what we are doing + my $studentcount = scalar(@Apache::lonstatistics::Students); + if ($env{'form.SelectedStudent'}) { + $studentcount = '1'; } + # + # Initialize progress window + # + %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$studentcount); + &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, + 'Processing first student'); $r->print($Str); $r->rflush(); + return; } sub html_outputstudent { my ($r,$student) = @_; my $Str = ''; + return if (! defined($navmap)); # if($count++ % 5 == 0 && $count > 0) { - $r->print("
"); +# $r->print("
"); + $r->print(''); + &Apache::lonhtmlcommon::Increment_PrgWin( + $r,\%prog_state,'last five students',5); + $r->rflush(); + $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').''; + } + utf8::decode($title); my $base = length($title); my $width=$Apache::lonstatistics::StudentData{$field}->{'width'}; $Str .= $title.' 'x($width-$base).$padding; @@ -509,14 +844,21 @@ sub html_outputstudent { my %StudentsData; my @tmp = &Apache::loncoursedata::get_current_state ($student->{'username'},$student->{'domain'},undef, - $ENV{'request.course.id'}); - if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) { + $env{'request.course.id'}); + if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:(.*)/)) { %StudentsData = @tmp; - } - if (scalar(@tmp) < 1) { + } else { + my $error = $1; + if (scalar(@tmp) < 1) { + $Str .= '' + .&mt('No Course Data') + .''."\n"; + } else { + $Str .= '' + .&mt('Error getting student data ([_1])',$error) + .''."\n"; + } $nodata_count++; - return if ($show eq 'final table'); - $Str .= 'No Course Data'."\n"; $r->print($Str); $r->rflush(); return; @@ -525,181 +867,176 @@ 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 $randompick = $seq->randompick(); + 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,$randompick); } 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, + $chosen_output->{ignore_weight}, + $randompick); + } + my $ratio=''; + if ($chosen_output->{'every_problem'} && + $chosen_output->{'sequence_sum'}) { + $ratio .= ' '; + } + if ($chosen_output->{'sequence_sum'} && $score ne ' ') { + my $score .= sprintf("%3.2f",$score); + $ratio .= (' 'x(6-length($score))).$score; + } elsif($chosen_output->{'sequence_sum'}) { + $ratio .= ' 'x6; + } + if ($chosen_output->{'sequence_max'}) { + if ($chosen_output->{'sequence_sum'}) { + $ratio .= '/'; + } + my $sequence_total=sprintf("%3.2f",$seq_max); + $ratio .= $sequence_total.(' 'x(6-length($sequence_total))); + } + # + 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("%.2f",$score); + $score = (' 'x(6-length($score))).$score; } + $Str .= ' '.' 'x($total_sum_width-length($score)).$score.' / '.$max; + $Str .= " \n"; # $r->print($Str); # - $r->rflush(); +# $r->rflush(); +# &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student'); return; } 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(); + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); + &html_cleanup(); return; } sub StudentAverageTotal { - my $Str = "
Title | Average | Maximum | '.&mt('Title').' | '. + ''.&mt('Average').' | '. + ''.&mt('Maximum').' | '. + &Apache::loncommon::end_data_table_header_row().$/; + 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.' |
Number of Students | Average | '. - "Maximum |
---|---|---|
'.($num_students-$nodata_count).' | '. - ''.$total_ave.' | '.$total_max.' | '; - $Str .= "
'.&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; @@ -741,112 +1137,341 @@ sub excel_initialize { $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'}; - if (length($sheetname) > 31) { - $sheetname = substr($sheetname,0,31); - } + my $sheetname = $env{'course.'.$env{'request.course.id'}.'.description'}; + $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; - 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('localized'), + $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++, + &mt('Compiled on [_1]',&Apache::lonlocal::locallocaltime(time)),$format->{'h3'}); # - $rows_output++; + $cols_output = 0; + $excel_sheet->write($description_row,$cols_output++, + &mt($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++,&mt($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'}; + } + + my $start = $formula_data{$symb}->{'Excel:startcell'}; + my $end = $formula_data{$symb}->{'Excel:endcell'}; + $formula_data{$symb}->{'Excel:sum'}= $excel_sheet->store_formula + ("=IF(COUNT($start\:$end),SUM($start\:$end),\"\")"); + # 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++, + &mt('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++, + &mt('sum'), + $format->{'bold'}); + } else { + $excel_sheet->write($resource_name_row,$cols_output++, + &mt('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, + &mt('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; + if ($chosen_output->{'grand_total'}) { + $excel_sheet->write($resource_name_row,$cols_output++,&mt('Total'), + $format->{'bold'}); + } + if ($chosen_output->{'grand_maximum'}) { + $excel_sheet->write($resource_name_row,$cols_output++,&mt('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($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 ($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, %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++, + &mt('Summary Table'),$format->{'bold'}); + if ($chosen_output->{'maximum_row'}) { + $excel_sheet->write($summary_header_row,$cols_output++, + &mt('Maximum'),$format->{'bold'}); + } + $excel_sheet->write($summary_header_row,$cols_output++, + &mt('Average'),$format->{'bold'}); + $excel_sheet->write($summary_header_row,$cols_output++, + &mt('Median'),$format->{'bold'}); + $excel_sheet->write($summary_header_row,$cols_output++, + &mt('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++; + } } + ############################################## + # Take care of non-excel initialization + ############################################## # # Let the user know what we are doing my $studentcount = scalar(@Apache::lonstatistics::Students); - $r->print("' + .&mt('Compiling Excel spreadsheet for [quant,_1,student]...',$studentcount) + ."
\n" + ); $r->rflush(); # # Initialize progress window - %prog_state=&Apache::lonhtmlcommon::Create_PrgWin - ($r,'Excel File Compilation Status', - 'Excel File Compilation Progress', $studentcount); + %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$studentcount); # + &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::lonmsgdisplay::retrieve_instructor_comments + ($student->{'username'},$student->{'domain'}); + } + $excel_sheet->write($rows_output,$cols_output++,$value); } # # Get student assessment data @@ -854,24 +1479,95 @@ sub excel_outputstudent { my @tmp = &Apache::loncoursedata::get_current_state($student->{'username'}, $student->{'domain'}, undef, - $ENV{'request.course.id'}); + $env{'request.course.id'}); if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) { %StudentsData = @tmp; } # # 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; + my $randompick = $seq->randompick(); + $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',$randompick); + } else { + ($performance,$performance_length,$score,$seq_max,$rawdata) = + &student_performance_on_sequence($student,\%StudentsData, + $navmap,$seq,'no', + $chosen_output->{ignore_weight}, + $randompick); + } + if ($chosen_output->{'every_problem'}) { + if ($chosen_output->{'correct'}) { + # only indiciate if each item is correct or not + foreach my $value (@$rawdata) { + # positive means correct, 0 or negative means + # incorrect + $value = $value > 0 ? 1 : 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, %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; @@ -883,21 +1579,22 @@ sub excel_outputstudent { sub excel_finish { my ($r) = @_; - return if (! defined($excel_sheet)); + if ($request_aborted || ! defined($navmap) || ! defined($excel_sheet)) { + &excel_cleanup(); + return; + } # # Write the excel file $excel_workbook->close(); - my $c = $r->connection(); - # - return if($c->aborted()); # # Close the progress window &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); # # Tell the user where to get their excel file $r->print('' + .&mt('The [_1]Summary Table (Scores)[_2] option' + .' is not available for non-HTML output.','','') + .'
' + ); + $request_aborted = 1; + } + return if ($request_aborted); + # + # Initialize progress window + my $studentcount = scalar(@Apache::lonstatistics::Students); + %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$studentcount); # # 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'}; + my $description = $env{'course.'.$env{'request.course.id'}.'.description'}; print $outputfile '"'.&Apache::loncommon::csv_translate($description).'",'. - '"'.&Apache::loncommon::csv_translate(scalar(localtime(time))).'"'. + '"'.&Apache::loncommon::csv_translate(scalar(&Apache::lonlocal::locallocaltime(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 ($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 .= '"'.&mt('sum').'",'; + } else { + $resource_row .= '"'.&mt('score').'",'; + } + } + if ($chosen_output->{'sequence_max'}) { + $sequence_row.= '"",'; + $resource_row .= '"'.&mt('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.= '"'.&mt('Total').'",'; + } + if ($chosen_output->{'grand_maximum'}) { + $sequence_row.= '"",'; + $resource_row.= '"'.&mt('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::lonmsgdisplay::retrieve_instructor_comments + ($student->{'username'},$student->{'domain'}); + } + $Str .= '"'.&Apache::loncommon::csv_translate($value).'",'; } # # Get student assessment data @@ -1014,24 +1761,57 @@ sub csv_outputstudent { my @tmp = &Apache::loncoursedata::get_current_state($student->{'username'}, $student->{'domain'}, undef, - $ENV{'request.course.id'}); + $env{'request.course.id'}); if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) { %StudentsData = @tmp; } # # 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 $randompick = $seq->randompick(); + 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',$randompick); + } else { + ($performance,$performance_length,$score,$seq_max,$rawdata) = + &student_performance_on_sequence($student,\%StudentsData, + $navmap,$seq,'no', + $chosen_output->{ignore_weight}, + $randompick); + } + 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"; @@ -1044,31 +1824,44 @@ sub csv_outputstudent { sub csv_finish { my ($r) = @_; - return if (! defined($outputfile)); + if ($request_aborted || ! defined($navmap) || ! defined($outputfile)) { + &csv_cleanup(); + return; + } close($outputfile); # - my $c = $r->connection(); - return if ($c->aborted()); - # # Close the progress window &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); # # Tell the user where to get their csv file $r->print('". - " 1 correct by student in 1 try\n". - " 7 correct by student in 7 tries\n". + " digit score or number of tries to get correct ". " * correct by student in more than 9 tries\n". " + correct by hand grading or override\n". " - incorrect by override\n". " . incorrect attempted\n". - " # ungraded attempted\n". + " u ungraded attempted\n". + " d draft answer saved but not submitted\n". " not attempted (blank field)\n". " x excused". "
";