--- loncom/interface/statistics/lonstudentassessment.pm 2003/12/05 21:04:34 1.76 +++ loncom/interface/statistics/lonstudentassessment.pm 2004/02/12 16:29:00 1.89 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentassessment.pm,v 1.76 2003/12/05 21:04:34 matthew Exp $ +# $Id: lonstudentassessment.pm,v 1.89 2004/02/12 16:29:00 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -52,6 +52,7 @@ package Apache::lonstudentassessment; use strict; use Apache::lonstatistics; use Apache::lonhtmlcommon; +use Apache::loncommon(); use Apache::loncoursedata; use Apache::lonnet; # for logging porpoises use Apache::lonlocal; @@ -87,12 +88,6 @@ my $Statistics; =item $show 'all', 'totals', or 'scores' determines how much data is output -=item $data determines what performance data is shown - -=item $datadescription A short description of the output data selected. - -=item $base 'tries' or 'scores' determines the base of the performance shown - =item $single_student_mode evaluates to true if we are showing only one student. @@ -102,9 +97,7 @@ student. ####################################################### my $show_links; my $output_mode; -my $data; -my $base; -my $datadescription; +my $chosen_output; my $single_student_mode; ####################################################### @@ -144,9 +137,7 @@ sub BuildStudentAssessmentPage { undef($Statistics); undef($show_links); undef($output_mode); - undef($data); - undef($base); - undef($datadescription); + undef($chosen_output); undef($single_student_mode); # my %Saveable_Parameters = ('Status' => 'scalar', @@ -476,6 +467,13 @@ 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, + summary_table => 1, shortdesc => 'Total Score and Maximum Possible for each '. 'Sequence or Folder', longdesc => 'The score of each student as well as the '. @@ -484,51 +482,47 @@ 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, + summary_table => 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, + summary_table => 1, shortdesc => 'Number of Tries before success on each Problem Part', longdesc =>'The number of tries before success on each problem part.', }, { name =>'Parts Correct', base =>'tries', value => 'parts correct total', + scores => 0, + tries => 0, + correct => 1, + every_problem => 1, + sequence_sum => 1, + sequence_max => 1, + grand_total => 1, + summary_table => 1, 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 { @@ -556,12 +550,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; } } # @@ -569,7 +561,7 @@ sub CreateAndParseOutputDataSelector { $Str = qq/"; @@ -616,16 +608,8 @@ sub html_initialize { $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
@@ -636,20 +620,46 @@ sub html_initialize {
         my $width=$Apache::lonstatistics::StudentData{$field}->{'width'};
         $Str .= $title.' 'x($width-$base).$padding;
     }
-    # Now the selected sequences need to be listed
+    #
+    # Compute the column widths and output the sequence titles
     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;
+        #
+        # Comptue column widths
+        $sequence->{'width_sum'} = 0;
+        if ($chosen_output->{'sequence_sum'}) {
+            # Use 3 digits for the sum
+            $sequence->{'width_sum'} = 3;
+        }
+        if ($chosen_output->{'sequence_max'}) {
+            if ($sequence->{'width_sum'}>0) {
+                # One digit for the '/'
+                $sequence->{'width_sum'} +=1;
+            }
+            # Use 3 digits for the total
+            $sequence->{'width_sum'}+=3;
+        }
+        if ($chosen_output->{'every_problem'}) {
+            # one problem per digit
+            $sequence->{'width_problem'} = $sequence->{'num_assess_parts'};
+        } else {
+            $sequence->{'width_problem'} = 0;
+        }
+        $sequence->{'width_total'} = $sequence->{'width_problem'} + 
+                                     $sequence->{'width_sum'};
+        if ($sequence->{'width_total'} < length($sequence->{'title'})) {
+            $sequence->{'width_total'} = length($sequence->{'title'});
+            $sequence->{'width_problem'} = 
+                $sequence->{'width_total'} - $sequence->{'width_sum'};
+        }
+        #
+        # Output the sequence titles
+        $Str .= 
+            $sequence->{'title'}.' 'x($sequence->{'width_total'}-
+                                      length($sequence->{'title'})
+                                      ).$padding;
     }
     $Str .= "total
\n"; $Str .= "
";
-    #
-    # Check for suppression of output
-    if ($data =~ /^final table/) {
-        $Str = '';
-    }
     $r->print($Str);
     $r->rflush();
     return;
@@ -659,7 +669,7 @@ sub html_outputstudent {
     my ($r,$student) = @_;
     my $Str = '';
     #
-    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
@@ -680,7 +690,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();
@@ -692,7 +701,7 @@ sub html_outputstudent {
     my $PerformanceStr = '';
     foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
         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);
@@ -701,20 +710,22 @@ sub html_outputstudent {
                 &StudentPerformanceOnSequence($student,\%StudentsData,
                                               $seq,$show_links);
         }
-        my $ratio = sprintf("%3d",$score).'/'.sprintf("%3d",$seq_max);
+        my $ratio='';
+        if ($chosen_output->{'sequence_sum'}) {
+            $ratio .= sprintf("%3d",$score);
+        }
+        if ($chosen_output->{'sequence_max'}) {
+            if ($chosen_output->{'sequence_sum'}) {
+                $ratio .= '/';
+            }
+            $ratio .= 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;
+        if (! $chosen_output->{'every_problem'}) {
+            $performance = '';
         }
+        $performance .= ' 'x($seq->{'width_problem'}-$performance_length).
+            $ratio;
         #
         $Str .= $performance.$padding;
         #
@@ -735,13 +746,6 @@ sub html_outputstudent {
     $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');
-    }
-    #
     $r->print($Str);
     #
     $r->rflush();
@@ -752,11 +756,7 @@ sub html_finish {
     my ($r) = @_;
     #
     # 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"); - } + $r->print("\n"); if ($single_student_mode) { $r->print(&SingleStudentTotal()); } else { @@ -784,22 +784,20 @@ sub StudentAverageTotal { $total_ave += $ave; my $max = $Statistics->{$seq->{'symb'}}->{'max'}; $total_max += $max; - if ($ave == 0) { - $ave = "0.00"; - } - $ave .= ' '; - $max .= '   '; + $ave = sprintf("%.2f",$ave); $Str .= ''.$seq->{'title'}.''. - ''.$ave.''. - ''.$max.''."\n"; + ''.$ave.' '. + ''.$max.' '.''."\n"; } - $total_ave = int(100*$total_ave)/100; # only two digit + $total_ave = sprintf('%.2f',$total_ave); # only two digit $Str .= "\n"; $Str .= ''."\n"; $Str .= ''. "\n"; - $Str .= ''. - ''; + $Str .= ''. + ''. + ''. + ''; $Str .= "
Number of StudentsAverageMaximum
'.($num_students-$nodata_count).''.$total_ave.''.$total_max.'
'.($num_students-$nodata_count).''.$total_ave.' '.''.$total_max.' '.'
\n"; return $Str; } @@ -875,11 +873,15 @@ sub excel_initialize { undef ($total_formula); # my $total_columns = scalar(&get_student_fields_to_show()); + foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - # Add 2 because we need a 'sum' and 'total' column for each - $total_columns += $seq->{'num_assess_parts'}+2; + if ($chosen_output->{'every_problem'}) { + $total_columns += $seq->{'num_assess_parts'}; + } + # Add 2 because we need a 'sequence_sum' and 'total' column for each + $total_columns += 2; } - if ($data eq 'tries' && $total_columns > 255) { + if ($chosen_output->{'base'} eq 'tries' && $total_columns > 255) { $r->print(<Unable to Complete Request

@@ -896,7 +898,7 @@ summary data (Parts Correct or 255) { + if ($chosen_output->{'base'} eq 'scores' && $total_columns > 255) { $r->print(<Unable to Complete Request

@@ -908,16 +910,7 @@ You may consider reducing the number of have selected.

LON-CAPA can produce CSV files of this data or Excel files of the -summary data (Scores Sum or Scores Sum & Totals). -

-END - $request_aborted = 1; - } - if ($data =~ /^final table/) { - $r->print(<Unable to Complete Request -

-The Summary Table (Scores) option is not available for non-HTML output. +Scores Summary data.

END $request_aborted = 1; @@ -957,9 +950,22 @@ END $sheetname = &Apache::loncommon::clean_excel_name($sheetname); $excel_sheet = $excel_workbook->addworksheet($sheetname); # + # Define some potentially useful formats + my $format; + $format->{'header'} = $excel_workbook->add_format(bold => 1, + bottom => 1, + align => 'center'); + $format->{'bold'} = $excel_workbook->add_format(bold=>1); + $format->{'h1'} = $excel_workbook->add_format(bold=>1, size=>18); + $format->{'h2'} = $excel_workbook->add_format(bold=>1, size=>16); + $format->{'h3'} = $excel_workbook->add_format(bold=>1, size=>14); + $format->{'date'} = $excel_workbook->add_format(num_format=> + 'mmm d yyyy hh:mm AM/PM'); + # # Put the course description in the header $excel_sheet->write($rows_output,$cols_output++, - $ENV{'course.'.$ENV{'request.course.id'}.'.description'}); + $ENV{'course.'.$ENV{'request.course.id'}.'.description'}, + $format->{'h1'}); $cols_output += 3; # # Put a description of the sections listed @@ -979,168 +985,206 @@ END $sectionstring = "Section ".$Sections[0]; } } - $excel_sheet->write($rows_output,$cols_output++,$sectionstring); + $excel_sheet->write($rows_output,$cols_output++,$sectionstring, + $format->{'h3'}); $cols_output += scalar(@Sections); # # Put the date in there too $excel_sheet->write($rows_output++,$cols_output++, - 'Compiled on '.localtime(time)); + 'Compiled on '.localtime(time),$format->{'h3'}); # $cols_output = 0; - $excel_sheet->write($rows_output++,$cols_output++,$datadescription); + $excel_sheet->write($rows_output++,$cols_output++, + $chosen_output->{'shortdesc'}, + $format->{'h3'}); # - if ($data eq 'tries' || $data eq 'scores') { - $rows_output++; - } + # Figure out the rows we need + my $sequence_name_row = $rows_output+1; + my $resource_name_row = $sequence_name_row+1; + my $maximum_data_row = $sequence_name_row+2; + my $first_data_row = $sequence_name_row+3; # # 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; + $excel_sheet->write($sequence_name_row,, + $cols_output,$seq->{'title'},$format->{'h3'}); + # Determine starting cell + $seq->{'Excel:startcell'}= + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($maximum_data_row,$cols_output); + $seq->{'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 (@{$seq->{'contents'}}) { - next if ($res->{'type'} ne 'assessment'); + if ($res->{'type'} ne 'assessment' || + ! exists($res->{'parts'}) || + ref($res->{'parts'}) ne 'ARRAY' || + scalar(@{$res->{'parts'}}) < 1) { + next; + } if (scalar(@{$res->{'parts'}}) > 1) { foreach my $part (@{$res->{'parts'}}) { - $excel_sheet->write($rows_output, + $excel_sheet->write($resource_name_row, $cols_output++, - $res->{'title'}.' part '.$part); + $res->{'title'}.' part '.$part, + $format->{'bold'}); } } else { - $excel_sheet->write($rows_output, + $excel_sheet->write($resource_name_row, $cols_output++, - $res->{'title'}); + $res->{'title'},$format->{'bold'}); } + $count++; } - # Determine ending cell + } + # 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; - # Determine cell the score is held in - $seq->{'Excel:scorecell'} = - &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$cols_output); - $seq->{'Excel:scorecol'}=$cols_output; - $excel_sheet->write($rows_output,$cols_output++,'score'); - # Create the formula for summing up this sequence - $seq->{'Excel:sum'}= $excel_sheet->store_formula - ('=SUM('.$seq->{'Excel:startcell'}. - ':'.$seq->{'Excel:endcell'}.')'); - # - $total_formula_string.='+'. - &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$cols_output-1); - $excel_sheet->write($rows_output,$cols_output++,'maximum'); - } elsif ($data eq 'sum and total') { - $excel_sheet->write($rows_output+1,$cols_output,'score'); - $total_formula_string.='+'. - &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output+1,$cols_output); - $excel_sheet->write($rows_output+1,$cols_output+1,'maximum'); - $cols_output += 2; - } elsif ($data eq 'parts correct total') { - $excel_sheet->write($rows_output+1,$cols_output,'parts correct'); - $total_formula_string.='+'. - &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output+1,$cols_output); - $excel_sheet->write($rows_output+1,$cols_output+1,'maximum'); - $cols_output += 2; - } else { - $cols_output++; + ($maximum_data_row,$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 cell the score is held in + $seq->{'Excel:scorecell'} = + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($maximum_data_row,$cols_output); + $seq->{'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 + ($maximum_data_row,$cols_output-1); + if ($chosen_output->{'sequence_max'}) { + $excel_sheet->write($resource_name_row,$cols_output++, + 'maximum', + $format->{'bold'}); } } - $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'}); } + $total_formula = $excel_sheet->store_formula($total_formula_string); # - # 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++,''); + # Output a row for MAX, if appropriate + if ($chosen_output->{'scores'}) { + $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; - 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; + # + # Add the maximums for each sequence or assessment + my %total_cell_translation; + foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { + $cols_output=$seq->{'Excel:startcol'}; + $total_cell_translation{$seq->{'Excel:scorecell'}} = + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($maximum_data_row,$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 ($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; + $replaceCells{$seq->{'Excel:startcell'}} = + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($maximum_data_row,$seq->{'Excel:startcol'}); + $replaceCells{$seq->{'Excel:endcell'}} = + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($maximum_data_row,$seq->{'Excel:endcol'}); + $excel_sheet->repeat_formula($maximum_data_row,$cols_output++, + $seq->{'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); + } + # } - 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'}); - $excel_sheet->repeat_formula($rows_output,$cols_output++, - $seq->{'Excel:sum'},undef, - %replaceCells); - } - $excel_sheet->repeat_formula($rows_output,$cols_output++, - $total_formula,undef, - %total_cell_translation); - $rows_output++; + if ($chosen_output->{'grand_total'}) { + $excel_sheet->repeat_formula($maximum_data_row,$cols_output++, + $total_formula,undef, + %total_cell_translation); + } + } # End of MAXIMUM row output if ($chosen_output->{'scores'}) { + $rows_output = $first_data_row; # # 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 @@ -1178,13 +1222,14 @@ sub excel_outputstudent { # Write out sequence scores and totals data my %total_cell_translation; foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { + $cols_output = $seq->{'Excel:startcol'}; # Keep track of cells to translate in total cell $total_cell_translation{$seq->{'Excel:scorecell'}} = &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell ($rows_output,$seq->{'Excel:scorecol'}); # 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'); @@ -1192,11 +1237,23 @@ sub excel_outputstudent { ($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); + } + 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) { + $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'}} = @@ -1206,24 +1263,28 @@ sub excel_outputstudent { &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell ($rows_output,$seq->{'Excel:endcol'}); # The undef is for the format - $excel_sheet->repeat_formula($rows_output,$cols_output++, - $seq->{'Excel:sum'},undef, - %replaceCells); - # - $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') { + if (scalar(keys(%replaceCells)) == 1) { + $excel_sheet->repeat_formula($rows_output,$cols_output++, + $seq->{'Excel:sum'},undef, + %replaceCells,%replaceCells); + } else { + $excel_sheet->repeat_formula($rows_output,$cols_output++, + $seq->{'Excel:sum'},undef, + %replaceCells); + } + } elsif ($chosen_output->{'sequence_sum'}) { $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); + } # # Bookkeeping $rows_output++; @@ -1291,7 +1352,7 @@ sub csv_initialize{ # # Deal with unimplemented requests $request_aborted = undef; - if ($data =~ /final table/) { + if ($chosen_output->{'base'} =~ /final table/) { $r->print(<Unable to Complete Request

@@ -1301,7 +1362,12 @@ 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); # # Open a file $filename = '/prtspool/'. @@ -1322,55 +1388,54 @@ END "\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).'",'; - } + $sequence_row .='"",'; + $resource_row .= '"'.&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); + $sequence_row .= '"'. + &Apache::loncommon::csv_translate($seq->{'title'}).'",'; + my $count = 0; + if ($chosen_output->{'every_problem'}) { foreach my $res (@{$seq->{'contents'}}) { - next if ($res->{'type'} ne 'assessment'); + if ($res->{'type'} ne 'assessment' || + ! exists($res->{'parts'}) || + ref($res->{'parts'}) ne 'ARRAY' || + scalar(@{$res->{'parts'}}) < 1) { + next; + } foreach my $part (@{$res->{'parts'}}) { - $Str2 .= '"'.&Apache::loncommon::csv_translate($res->{'title'}.', Part '.$part).'",'; + $resource_row .= '"'. + &Apache::loncommon::csv_translate($res->{'title'}. + ', Part '.$part + ).'",'; + $count++; } } - $Str2 .= '"score","total possible",'; + } + $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",'; } } - 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); + if ($chosen_output->{'grand_total'}) { + $sequence_row.= '"",'; + $resource_row.= '"Total",'; + } + chomp($sequence_row); + chomp($resource_row); + print $outputfile $sequence_row."\n"; + print $outputfile $resource_row."\n"; return; } @@ -1397,9 +1462,10 @@ sub csv_outputstudent { } # # Output performance data + my $total = 0; foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { 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'); @@ -1408,13 +1474,31 @@ sub csv_outputstudent { &StudentPerformanceOnSequence($student,\%StudentsData, $seq,'no'); } - if ($data eq 'sum only' || $data eq 'parts correct') { + 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 ($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; + } + if ($chosen_output->{'grand_total'}) { + $Str .= '"'.$total.'",'; } chop($Str); $Str .= "\n"; @@ -1490,44 +1574,56 @@ sub StudentTriesOnSequence { $performance_length++; my $symbol = ' '; # default to space # + my $awarded = 0; + if (exists($resource_data->{'resource.'.$partnum.'.awarded'})) { + $awarded = $resource_data->{'resource.'.$partnum.'.awarded'}; + $awarded = 0 if (! $awarded); + } + # + my $status = ''; if (exists($resource_data->{'resource.'.$partnum.'.solved'})) { - my $status = $resource_data->{'resource.'.$partnum.'.solved'}; - if ($status eq 'correct_by_override') { - $symbol = '+'; - $sum++; - } elsif ($status eq 'incorrect_by_override') { - $symbol = '-'; - } elsif ($status eq 'ungraded_attempted') { - $symbol = '#'; - } elsif ($status eq 'incorrect_attempted') { - $symbol = '.'; - } elsif ($status eq 'excused') { + $status = $resource_data->{'resource.'.$partnum.'.solved'}; + } + # + my $tries = 0; + if(exists($resource_data->{'resource.'.$partnum.'.tries'})) { + $tries = $resource_data->{'resource.'.$partnum.'.tries'}; + } + # + if ($awarded > 0) { + # The student has gotten the problem correct to some degree + if ($status eq 'excused') { $symbol = 'x'; $max--; - } elsif (($status eq 'correct_by_scantron' || - $status eq 'correct_by_student') && - exists($resource_data->{'resource.'.$partnum.'.tries'})){ - $tries = $resource_data->{'resource.'.$partnum.'.tries'}; + } elsif ($status eq 'correct_by_override') { + $symbol = '+'; + $sum++; + } elsif ($tries > 0) { if ($tries > 9) { $symbol = '*'; - } elsif ($tries > 0) { - $symbol = $tries; } else { - $symbol = ' '; + $symbol = $tries; } $sum++; - } elsif (exists($resource_data->{'resource.'. - $partnum.'.tries'})){ - $symbol = '.'; } else { - $symbol = ' '; + $symbol = '+'; + $sum++; } } else { - # Unsolved. Did they try? - if (exists($resource_data->{'resource.'.$partnum.'.tries'})){ + # The student has the problem incorrect or it is ungraded + if ($status eq 'excused') { + $symbol = 'x'; + $max--; + } elsif ($status eq 'incorrect_by_override') { + $symbol = '-'; + } elsif ($status eq 'ungraded_attempted') { + $symbol = '#'; + } elsif ($status eq 'incorrect_attempted' || + $tries > 0) { $symbol = '.'; } else { - $symbol = ' '; + # Problem is wrong and has not been attempted. + $symbol=' '; } } #