--- loncom/interface/statistics/lonstudentassessment.pm 2004/02/11 17:42:34 1.86 +++ loncom/interface/statistics/lonstudentassessment.pm 2005/02/11 21:25:53 1.111 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentassessment.pm,v 1.86 2004/02/11 17:42:34 matthew Exp $ +# $Id: lonstudentassessment.pm,v 1.111 2005/02/11 21:25:53 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -88,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. @@ -103,9 +97,7 @@ student. ####################################################### my $show_links; my $output_mode; -my $data; -my $base; -my $datadescription; +my $chosen_output; my $single_student_mode; ####################################################### @@ -145,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', @@ -163,6 +153,8 @@ sub BuildStudentAssessmentPage { # $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; @@ -316,6 +308,7 @@ the chart page. ####################################################### sub CreateInterface { my $Str = ''; + $Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Chart'); # $Str .= &CreateLegend(); $Str .= ''."\n"; $Str .= ''; @@ -364,6 +357,9 @@ sub CreateInterface { $Str .= ''; $Str .= ' 'x5; + $Str .= + &mt('Status[_1]', + ''); $Str .= '
'; return $Str; } @@ -411,7 +407,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 +473,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 +490,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 +565,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 +576,7 @@ sub CreateAndParseOutputDataSelector { $Str = qq/"; @@ -605,6 +611,7 @@ 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; sub html_initialize { my ($r) = @_; @@ -617,16 +624,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
@@ -637,20 +636,52 @@ 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
+    my $total_count;
     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'}) {
+            if ($chosen_output->{'every_problem'}) {
+                # Use 1 digit for a space
+                $sequence->{'width_sum'} += 1;            
+            }
+	    $total_count += $sequence->{'num_assess_parts'};
+            # 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(&HTML::Entities::decode($sequence->{'title'}))) {
+            $sequence->{'width_total'} = length(&HTML::Entities::decode($sequence->{'title'}));
+        }
+        #
+        # Output the sequence titles
+        $Str .= 
+            $sequence->{'title'}.' 'x($sequence->{'width_total'}-
+                                      length($sequence->{'title'})
+                                      ).$padding;
     }
-    $Str .= "total
\n"; + $total_sum_width = length($total_count)+1; + $Str .= " total\n"; $Str .= "
";
-    #
-    # Check for suppression of output
-    if ($data =~ /^final table/) {
-        $Str = '';
-    }
     $r->print($Str);
     $r->rflush();
     return;
@@ -660,13 +691,17 @@ 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
     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 +716,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();
@@ -693,7 +727,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);
@@ -702,20 +736,28 @@ sub html_outputstudent {
                 &StudentPerformanceOnSequence($student,\%StudentsData,
                                               $seq,$show_links);
         }
-        my $ratio = sprintf("%3d",$score).'/'.sprintf("%3d",$seq_max);
+        my $ratio='';
+        if ($chosen_output->{'every_problem'}) {
+            $ratio .= ' ';
+        }
+        if ($chosen_output->{'sequence_sum'} && $score ne ' ') {
+            $ratio .= sprintf("%3.0f",$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 ($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_length=0;
         }
+        $performance .= ' 'x($seq->{'width_total'}-$performance_length-$seq->{'width_sum'}).
+            $ratio;
         #
         $Str .= $performance.$padding;
         #
@@ -724,24 +766,25 @@ sub html_outputstudent {
     }
     #
     # 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);
     }
+    $Str .= ' '.' 'x($total_sum_width-length($score)).$score.' / '.$max;
+    $Str .= " \n";
     #
     $r->print($Str);
     #
@@ -753,63 +796,62 @@ 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"); - } - 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(); return; } sub StudentAverageTotal { - my $Str = "

Summary Tables

\n"; - my $num_students = scalar(@Apache::lonstatistics::Students); - my $total_ave = 0; - my $total_max = 0; + my $Str = '

'.&mt('Summary Tables').'

'.$/; $Str .= '
'."\n"; - $Str .= "\n"; + $Str .= ''. + ''. + ''. + ''. + ''.$/; foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { my $ave; - if ($num_students > $nodata_count) { - $ave = int(100*($Statistics->{$seq->{'symb'}}->{'score'}/ - ($num_students-$nodata_count)))/100; + my $num_students = $Statistics->{$seq->{'symb'}}->{'num_students'}; + if ($num_students > 0) { + $ave = int(100* + ($Statistics->{$seq->{'symb'}}->{'score'}/$num_students) + )/100; } else { $ave = 0; } - $total_ave += $ave; my $max = $Statistics->{$seq->{'symb'}}->{'max'}; - $total_max += $max; $ave = sprintf("%.2f",$ave); $Str .= ''. ''. ''."\n"; } - $total_ave = sprintf('%.2f',$total_ave); # only two digit - $Str .= "
TitleAverageMaximum
'.&mt('Title').''.&mt('Average').''.&mt('Maximum').'
'.$seq->{'title'}.''.$ave.' '.$max.' '.'
\n"; - $Str .= ''."\n"; - $Str .= ''. - "\n"; - $Str .= ''. - ''. - ''. - ''; $Str .= "
Number of StudentsAverageMaximum
'.($num_students-$nodata_count).''.$total_ave.' '.''.$total_max.' '.'
\n"; return $Str; } sub SingleStudentTotal { my $student = &Apache::lonstatistics::current_student(); - my $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 .= ''."\n"; $Str .= - "\n"; + ''. + ''; + if ($chosen_output->{'base'} eq 'tries') { + $Str .= ''; + } else { + $Str .= ''; + } + $Str .= ''."\n"; my $total = 0; my $total_max = 0; foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { @@ -821,7 +863,7 @@ sub SingleStudentTotal { $total += $value; $total_max +=$max; } - $Str .= ''. + $Str .= ''. ''. '\n"; $Str .= "
Sequence or FolderScoreMaximum
'.&mt('Sequence or Folder').''.&mt('Parts Correct').''.&mt('Score').''.&mt('Maximum').'
Total
'.&mt('Total').''.$total.''.$total_max."
\n"; @@ -860,6 +902,7 @@ my %prog_state; # progress window state my $request_aborted; my $total_formula; +my $maximum_formula; sub excel_initialize { my ($r) = @_; @@ -872,54 +915,30 @@ sub excel_initialize { undef (%prog_state); undef ($request_aborted); undef ($total_formula); + undef ($maximum_formula); # my $total_columns = scalar(&get_student_fields_to_show()); + my $num_students = scalar(@Apache::lonstatistics::Students); + # 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 ($data eq 'tries' && $total_columns > 255) { - $r->print(<Unable to Complete Request -

-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 ($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 'scores' && $total_columns > 255) { - $r->print(<Unable to Complete Request -

-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; - } - if ($data =~ /^final table/) { - $r->print(<Unable to Complete Request -

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

-END - $request_aborted = 1; + 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); # @@ -933,6 +952,25 @@ END $rows_output = 0; $cols_output = 0; # + # 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(&Apache::lonstatistics::Sequences_with_Assess()); + $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++; + # # Create sheet $excel_workbook = Spreadsheet::WriteExcel->new('/home/httpd'.$filename); # @@ -951,25 +989,15 @@ END # File::Temp is used to determine the temporary directory. $excel_workbook->set_tempdir($Apache::lonnet::tmpdir); # + my $format = &Apache::loncommon::define_excel_formats($excel_workbook); + # # Add a worksheet my $sheetname = $ENV{'course.'.$ENV{'request.course.id'}.'.description'}; $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++, + $excel_sheet->write($header_row,$cols_output++, $ENV{'course.'.$ENV{'request.course.id'}.'.description'}, $format->{'h1'}); $cols_output += 3; @@ -991,27 +1019,27 @@ END $sectionstring = "Section ".$Sections[0]; } } - $excel_sheet->write($rows_output,$cols_output++,$sectionstring, + $excel_sheet->write($header_row,$cols_output++,$sectionstring, $format->{'h3'}); $cols_output += scalar(@Sections); # # Put the date in there too - $excel_sheet->write($rows_output++,$cols_output++, + $excel_sheet->write($header_row,$cols_output++, 'Compiled on '.localtime(time),$format->{'h3'}); # $cols_output = 0; - $excel_sheet->write($rows_output++,$cols_output++,$datadescription, - $format->{'h3'}); + $excel_sheet->write($description_row,$cols_output++, + $chosen_output->{'shortdesc'}, + $format->{'b'}); # - 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; + $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; @@ -1022,17 +1050,18 @@ END # # Add the remaining column headers my $total_formula_string = '=0'; + my $maximum_formula_string = '=0'; foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { $excel_sheet->write($sequence_name_row,, - $cols_output,$seq->{'title'},$format->{'h3'}); + $cols_output,$seq->{'title'},$format->{'bold'}); # Determine starting cell $seq->{'Excel:startcell'}= &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($maximum_data_row,$cols_output); + ($first_data_row,$cols_output); $seq->{'Excel:startcol'}=$cols_output; - if ($data eq 'tries' || $data eq 'scores') { + 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'}}) { if ($res->{'type'} ne 'assessment' || ! exists($res->{'parts'}) || @@ -1046,129 +1075,213 @@ END $cols_output++, $res->{'title'}.' part '.$part, $format->{'bold'}); + $count++; } } else { $excel_sheet->write($resource_name_row, $cols_output++, $res->{'title'},$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 - ($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 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 + ($first_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); + ($first_data_row,$cols_output); $seq->{'Excel:scorecol'}=$cols_output; - if ($data eq 'parts correct total') { + if ($chosen_output->{'base'} eq 'parts correct total') { $excel_sheet->write($resource_name_row,$cols_output++, 'parts correct', $format->{'bold'}); - } else { - $excel_sheet->write($resource_name_row,$cols_output++, - 'score', - $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); - $excel_sheet->write($resource_name_row,$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'}); + $seq->{'Excel:maxcell'} = + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($first_data_row,$cols_output); + $seq->{'Excel:maxcol'}=$cols_output; + $maximum_formula_string.='+'. + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($first_data_row,$cols_output); + $cols_output++; + + } + } + if ($chosen_output->{'grand_total'}) { + $excel_sheet->write($resource_name_row,$cols_output++,'Total', + $format->{'bold'}); + } + if ($chosen_output->{'grand_maximum'}) { + $excel_sheet->write($resource_name_row,$cols_output++,'Max. Total', $format->{'bold'}); } - $excel_sheet->write($resource_name_row,$cols_output++,'Grand 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($maximum_data_row,$cols_output++,'Maximum', - $format->{'bold'}); - } else { - $excel_sheet->write($maximum_data_row,$cols_output++,''); + $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 $grand_total = 0; - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - $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 ($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; + my %maximum_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'}); + $maximum_cell_translation{$seq->{'Excel:maxcell'}} = + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($maximum_data_row,$seq->{'Excel:maxcol'}); + 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($maximum_data_row,$cols_output++,$weight); - } elsif ($data eq 'tries') { - $excel_sheet->write($maximum_data_row,$cols_output++,''); - } - $max += $weight; + } + # + if ($chosen_output->{'sequence_sum'} && + $chosen_output->{'every_problem'}) { + my %replaceCells= + ('^'.$seq->{'Excel:startcell'}.':'. + $seq->{'Excel:endcell'}.'$' => + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell($maximum_data_row,$seq->{'Excel:startcol'}).':'. + &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($maximum_data_row,$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 (&Apache::lonstatistics::Sequences_with_Assess()) { + $cols_output = 0; + $excel_sheet->write($row,$cols_output++, + $seq->{'title'}, + $format->{'bold'}); + if ($chosen_output->{'maximum_row'}) { + $excel_sheet->write + ($row,$cols_output++, + '='. + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($maximum_data_row,$seq->{'Excel:scorecol'}) + ); + } + my $range = &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($maximum_data_row,$seq->{'Excel:startcol'}); - $replaceCells{$seq->{'Excel:endcell'}} = + ($first_data_row,$seq->{'Excel:scorecol'}). + ':'. &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); - } else { - $excel_sheet->write($maximum_data_row,$cols_output++, - $max); + ($first_data_row+$num_students-1,$seq->{'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($maximum_data_row,$cols_output++, - $total_formula,undef, - %total_cell_translation); - } else { - $excel_sheet->write($maximum_data_row,$cols_output++,$grand_total); - } - $rows_output = $first_data_row; + ############################################## + # Take care of non-excel initialization + ############################################## # # Let the user know what we are doing my $studentcount = scalar(@Apache::lonstatistics::Students); @@ -1188,7 +1301,8 @@ END # 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'); @@ -1204,7 +1318,12 @@ sub excel_outputstudent { # 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 @@ -1219,15 +1338,20 @@ sub excel_outputstudent { # # Write out sequence scores and totals data my %total_cell_translation; + my %maximum_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'}); + # and maximum cell + $maximum_cell_translation{$seq->{'Excel:maxcell'}} = + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($rows_output,$seq->{'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'); @@ -1235,43 +1359,61 @@ 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) { + 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= + ('^'.$seq->{'Excel:startcell'}.':'.$seq->{'Excel:endcell'}.'$' + => + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell($rows_output,$seq->{'Excel:startcol'}).':'. + &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); + } 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++; @@ -1339,7 +1481,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

@@ -1349,7 +1491,13 @@ 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/'. @@ -1368,57 +1516,66 @@ END print $outputfile '"'.&Apache::loncommon::csv_translate($description).'",'. '"'.&Apache::loncommon::csv_translate(scalar(localtime(time))).'"'. "\n"; + foreach my $item ('shortdesc','non_html_notes') { + next if (! exists($chosen_output->{$item})); + print $outputfile + '"'.&Apache::loncommon::csv_translate($chosen_output->{$item}).'"'. + "\n"; + } # # Print out the headings - my $Str = ''; - my $Str2 = undef; + my $sequence_row = ''; + my $resource_row = undef; foreach my $field (&get_student_fields_to_show()) { - if ($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",'; } - } - 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; } @@ -1431,7 +1588,12 @@ sub csv_outputstudent { # 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 @@ -1445,9 +1607,11 @@ sub csv_outputstudent { } # # Output performance data + my $total = 0; + my $maximum = 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'); @@ -1456,13 +1620,35 @@ 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; + $maximum += $seq_max; + } + if ($chosen_output->{'grand_total'}) { + $Str .= '"'.$total.'",'; + } + if ($chosen_output->{'grand_maximum'}) { + $Str .= '"'.$maximum.'",'; } chop($Str); $Str .= "\n"; @@ -1487,7 +1673,7 @@ sub csv_finish { # # Tell the user where to get their csv file $r->print('
'. - 'Your csv file.'."\n"); + ''.&mt('Your csv file.').''."\n"); $r->rflush(); return; @@ -1528,6 +1714,7 @@ sub StudentTriesOnSequence { my $performance_length = 0; my @TriesData = (); my $tries; + my $hasdata = 0; # flag - true if the student has any data on the sequence foreach my $resource (@{$seq->{'contents'}}) { next if ($resource->{'type'} ne 'assessment'); my $resource_data = $studentdata->{$resource->{'symb'}}; @@ -1552,6 +1739,7 @@ sub StudentTriesOnSequence { my $tries = 0; if(exists($resource_data->{'resource.'.$partnum.'.tries'})) { $tries = $resource_data->{'resource.'.$partnum.'.tries'}; + $hasdata =1; } # if ($awarded > 0) { @@ -1592,9 +1780,15 @@ sub StudentTriesOnSequence { } # if (! defined($tries)) { - $tries = $symbol; + $tries = 0; + } + if ($status =~ /^(incorrect|ungraded)/) { + # Bug 3390: show '-' for tries on incorrect problems + # (csv & excel only) + push(@TriesData,-$tries); + } else { + push (@TriesData,$tries); } - push (@TriesData,$tries); # if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) { @@ -1614,6 +1808,9 @@ sub StudentTriesOnSequence { if ($seq->{'randompick'}) { $max = $seq->{'randompick'}; } + if (! $hasdata && $sum == 0) { + $sum = ' '; + } return ($Str,$performance_length,$sum,$max,\@TriesData); } @@ -1651,6 +1848,7 @@ sub StudentPerformanceOnSequence { my $symbol; my @ScoreData = (); my $partscore; + my $hasdata = 0; # flag, 0 if there were no submissions on the sequence foreach my $resource (@{$seq->{'contents'}}) { next if ($resource->{'type'} ne 'assessment'); my $resource_data = $studentdata->{$resource->{'symb'}}; @@ -1669,13 +1867,17 @@ sub StudentPerformanceOnSequence { $performance_length++; # one character per part $symbol = ' '; # default to space # - my $awarded = 0; + my $awarded; if (exists($resource_data->{'resource.'.$part.'.awarded'})) { $awarded = $resource_data->{'resource.'.$part.'.awarded'}; $awarded = 0 if (! $awarded); + $hasdata = 1; } # $partscore = $weight*$awarded; + if (! defined($awarded)) { + $partscore = undef; + } $score += $partscore; $symbol = $partscore; if (abs($symbol - sprintf("%.0f",$symbol)) < 0.001) { @@ -1690,10 +1892,12 @@ sub StudentPerformanceOnSequence { $symbol = 'x'; $max -= $weight; # Do not count 'excused' problems. } - } else { + $hasdata = 1; + } elsif (!exists($resource_data->{'resource.'.$part.'.awarded'})){ # Unsolved. Did they try? if (exists($resource_data->{'resource.'.$part.'.tries'})){ $symbol = '.'; + $hasdata = 1; } else { $symbol = ' '; } @@ -1714,6 +1918,9 @@ sub StudentPerformanceOnSequence { $Str .= $symbol; } } + if (! $hasdata && $score == 0) { + $score = ' '; + } return ($Str,$performance_length,$score,$max,\@ScoreData); }