--- loncom/interface/statistics/lonstudentassessment.pm 2004/02/11 21:15:01 1.87 +++ loncom/interface/statistics/lonstudentassessment.pm 2005/03/14 20:28:22 1.119 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentassessment.pm,v 1.87 2004/02/11 21:15:01 matthew Exp $ +# $Id: lonstudentassessment.pm,v 1.119 2005/03/14 20:28:22 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -56,6 +56,7 @@ use Apache::loncommon(); use Apache::loncoursedata; use Apache::lonnet; # for logging porpoises use Apache::lonlocal; +use Time::HiRes; use Spreadsheet::WriteExcel; use Spreadsheet::WriteExcel::Utility(); @@ -153,6 +154,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; @@ -170,6 +173,9 @@ sub BuildStudentAssessmentPage { if (! exists($ENV{'form.notfirstrun'}) && ! $single_student_mode) { return; } + $r->print('

'. + &Apache::lonstatistics::section_and_enrollment_description(). + '

'); # my $initialize = \&html_initialize; my $output_student = \&html_outputstudent; @@ -306,6 +312,7 @@ the chart page. ####################################################### sub CreateInterface { my $Str = ''; + $Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Chart'); # $Str .= &CreateLegend(); $Str .= ''."\n"; $Str .= ''; @@ -324,21 +331,12 @@ sub CreateInterface { $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::StudentDataSelect('StudentData','multiple', 5,undef); $Str .= ''."\n"; $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5); $Str .= ''."\n"; - $Str .= &Apache::lonstatistics::MapSelect('Maps','multiple,all',5, - $only_seq_with_assessments); + $Str .= &Apache::lonstatistics::map_select('Maps','multiple,all',5); $Str .= ''."\n"; $Str .= &CreateAndParseOutputSelector(); $Str .= ''."\n"; @@ -354,6 +352,9 @@ sub CreateInterface { $Str .= ''; $Str .= ' 'x5; + $Str .= + &mt('Status[_1]', + ''); $Str .= '
'; return $Str; } @@ -401,7 +402,7 @@ my @OutputOptions = }, { name => 'CSV', value => 'csv', - description => 'Output a comma seperated values file suitable for '. + description => 'Output a comma separated values file suitable for '. 'import into a spreadsheet program. Using this method as opposed '. 'to Excel output allows you to organize your data before importing'. ' it into a spreadsheet program.', @@ -473,6 +474,9 @@ my @OutputDataOptions = 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 '. @@ -488,6 +492,9 @@ my @OutputDataOptions = 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', @@ -502,8 +509,12 @@ my @OutputDataOptions = 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', @@ -515,6 +526,9 @@ my @OutputDataOptions = 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', @@ -567,6 +581,26 @@ sub CreateAndParseOutputDataSelector { ####################################################### ####################################################### +sub count_parts { + my ($navmap,$sequence) = @_; + my @resources = &get_resources($navmap,$sequence); + my $count = 0; + foreach my $res (@resources) { + $count += scalar(@{$res->parts}); + } + return $count; +} + +sub get_resources { + my ($navmap,$sequence) = @_; + my @resources = $navmap->retrieveResources($sequence, + sub { shift->is_problem(); }, + 0,0,0); + return @resources; +} + +####################################################### +####################################################### =pod @@ -592,6 +626,11 @@ Return a line of the chart for a student my $nodata_count; # The number of students for which there is no data my %prog_state; # progress state used by loncommon PrgWin routines + my $total_sum_width; + + my %width; # Holds sequence width information + my @sequences; + my $navmap; # Have to keep this around since weakref is a bit zealous sub html_initialize { my ($r) = @_; @@ -600,10 +639,22 @@ sub html_initialize { $count = 0; $nodata_count = 0; undef(%prog_state); + undef(%width); + # + undef($navmap); + undef(@sequences); + ($navmap,@sequences) = + &Apache::lonstatistics::selected_sequences_with_assessments(); + if (! ref($navmap)) { + # Unable to get data, so bail out + $r->print("

". + &mt('Unable to retrieve course information.'). + '

'); + } # $r->print("

".$ENV{'course.'.$ENV{'request.course.id'}.'.description'}. "  ".localtime(time)."

"); - + # if ($chosen_output->{'base'} !~ /^final table/) { $r->print("

".$chosen_output->{'shortdesc'}."

"); } @@ -616,14 +667,56 @@ 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 3 digits for the sum + $width{$symb}->{'width_sum'} += 3; + } + # Compute width of maximum + if ($chosen_output->{'sequence_max'}) { + if ($width{$symb}->{'width_sum'}>0) { + # One digit for the '/' + $width{$symb}->{'width_sum'} +=1; + } + # Use 3 digits for the total + $width{$symb}->{'width_sum'}+=3; + } + # + if ($chosen_output->{'every_problem'}) { + # one problem per digit + $width{$symb}->{'width_parts'}= &count_parts($navmap,$seq); + $width{$symb}->{'width_problem'} += $width{$symb}->{'width_parts'}; + } else { + $width{$symb}->{'width_problem'} = 0; + } + $width{$symb}->{'width_total'} = $width{$symb}->{'width_problem'} + + $width{$symb}->{'width_sum'}; + if ($width{$symb}->{'width_total'} < length(&HTML::Entities::decode($title))) { + $width{$symb}->{'width_total'} = length(&HTML::Entities::decode($title)); + } + # + # Output the sequence titles + $Str .= $title.(' 'x($width{$symb}->{'width_total'}- + length($title) + )).$padding; } - $Str .= "total\n"; + $total_sum_width = length($total_count)+1; + $Str .= " total\n"; $Str .= "
";
     $r->print($Str);
     $r->rflush();
@@ -633,6 +726,7 @@ sub html_initialize {
 sub html_outputstudent {
     my ($r,$student) = @_;
     my $Str = '';
+    return if (! defined($navmap));
     #
     if($count++ % 5 == 0 && $count > 0) {
         $r->print("
");
@@ -641,6 +735,10 @@ sub html_outputstudent {
     my @to_show = &get_student_fields_to_show();
     foreach my $field (@to_show) {
         my $title=$student->{$field};
+        # Deal with 'comments' - how I love special cases
+        if ($field eq 'comments') {
+            $title = ''.&mt('Comments').'';
+        }
         my $base = length($title);
         my $width=$Apache::lonstatistics::StudentData{$field}->{'width'};
         $Str .= $title.' 'x($width-$base).$padding;
@@ -664,46 +762,71 @@ sub html_outputstudent {
     # By sequence build up the data
     my $studentstats;
     my $PerformanceStr = '';
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+    foreach my $seq (@sequences) {
+        my $symb = $seq->symb;
         my ($performance,$performance_length,$score,$seq_max,$rawdata);
         if ($chosen_output->{'tries'}) {
             ($performance,$performance_length,$score,$seq_max,$rawdata) =
-                &StudentTriesOnSequence($student,\%StudentsData,
-                                        $seq,$show_links);
+                &student_tries_on_sequence($student,\%StudentsData,
+                                           $navmap,$seq,$show_links);
         } else {
             ($performance,$performance_length,$score,$seq_max,$rawdata) =
-                &StudentPerformanceOnSequence($student,\%StudentsData,
-                                              $seq,$show_links);
+                &student_performance_on_sequence($student,\%StudentsData,
+                                                 $navmap,$seq,$show_links);
         }
-        my $ratio = sprintf("%3d",$score).'/'.sprintf("%3d",$seq_max);
-        #
-        if ($chosen_output->{'sequence_sum'}) {
-            $performance  = $ratio;
-            $performance .= ' 'x($seq->{'width'}-length($ratio));
-        } else {
-            # Pad with extra spaces
-            $performance .= ' 'x($seq->{'width'}-$performance_length-
-                                 length($ratio)
-                                 ).$ratio;
+        my $ratio='';
+        if ($chosen_output->{'every_problem'} && 
+            $chosen_output->{'sequence_sum'}) {
+            $ratio .= ' ';
+        }
+        if ($chosen_output->{'sequence_sum'} && $score ne ' ') {
+            my $score .= sprintf("%3.0f",$score);
+            $ratio .= (' 'x(3-length($score))).$score;
+        } elsif($chosen_output->{'sequence_sum'}) {
+            $ratio .= ' 'x3;
+        }
+        if ($chosen_output->{'sequence_max'}) {
+            if ($chosen_output->{'sequence_sum'}) {
+                $ratio .= '/';
+            }
+            $ratio .= sprintf("%3.0f",$seq_max);
         }
         #
+        if (! $chosen_output->{'every_problem'}) {
+            $performance = '';
+	    $performance_length=0;
+        }
+        $performance .= ' 'x($width{$symb}->{'width_total'} -
+                             $performance_length -
+                             $width{$symb}->{'width_sum'}).
+            $ratio;
+        #
         $Str .= $performance.$padding;
         #
-        $studentstats->{$seq->{'symb'}}->{'score'}= $score;
-        $studentstats->{$seq->{'symb'}}->{'max'}  = $seq_max;
+        $studentstats->{$symb}->{'score'}= $score;
+        $studentstats->{$symb}->{'max'}  = $seq_max;
     }
     #
     # Total it up and store the statistics info.
-    my ($score,$max) = (0,0);
+    my ($score,$max);
     while (my ($symb,$seq_stats) = each (%{$studentstats})) {
         $Statistics->{$symb}->{'score'} += $seq_stats->{'score'};
         if ($Statistics->{$symb}->{'max'} < $seq_stats->{'max'}) {
             $Statistics->{$symb}->{'max'} = $seq_stats->{'max'};
         }
-        $score += $seq_stats->{'score'};
+        if ($seq_stats->{'score'} ne ' ') {
+            $score += $seq_stats->{'score'};
+            $Statistics->{$symb}->{'num_students'}++;
+        }
         $max   += $seq_stats->{'max'};
     }
-    $Str .= ' '.' 'x(length($max)-length($score)).$score.'/'.$max;
+    if (! defined($score)) {
+        $score = ' ' x $total_sum_width;
+    } else {
+        $score = sprintf("%.0f",$score);
+        $score = (' 'x(3-length($score))).$score;
+    }
+    $Str .= ' '.' 'x($total_sum_width-length($score)).$score.' / '.$max;
     $Str .= " \n";
     #
     $r->print($Str);
@@ -714,73 +837,80 @@ sub html_outputstudent {
 
 sub html_finish {
     my ($r) = @_;
+    return if (! defined($navmap));
     #
     # Check for suppressed output and close the progress window if so
     $r->print("
\n"); - if ($single_student_mode) { - $r->print(&SingleStudentTotal()); - } else { - $r->print(&StudentAverageTotal()); + if ($chosen_output->{'summary_table'}) { + if ($single_student_mode) { + $r->print(&SingleStudentTotal()); + } else { + $r->print(&StudentAverageTotal()); + } } $r->rflush(); + undef($navmap); return; } sub StudentAverageTotal { - my $Str = "

Summary Tables

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

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

'.$/; $Str .= ''."\n"; - $Str .= "\n"; - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { + $Str .= ''. + ''. + ''. + ''. + ''.$/; + 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 = $Statistics->{$seq->{'symb'}}->{'max'}; - $total_max += $max; + my $max = $Statistics->{$symb}->{'max'}; $ave = sprintf("%.2f",$ave); - $Str .= ''. + $Str .= ''. ''. ''."\n"; } - $total_ave = sprintf('%.2f',$total_ave); # only two digit - $Str .= "
TitleAverageMaximum
'.&mt('Title').''.&mt('Average').''.&mt('Maximum').'
'.$seq->{'title'}.'
'.$seq->compTitle.''.$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 { + return if (! defined($navmap)); 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()) { - my $value = $Statistics->{$seq->{'symb'}}->{'score'}; - my $max = $Statistics->{$seq->{'symb'}}->{'max'}; - $Str .= ''. + foreach my $seq (@sequences) { + my $value = $Statistics->{$seq->symb}->{'score'}; + my $max = $Statistics->{$seq->symb}->{'max'}; + $Str .= ''. ''. ''."\n"; $total += $value; $total_max +=$max; } - $Str .= ''. + $Str .= ''. ''. '\n"; $Str .= "
Sequence or FolderScoreMaximum
'.&mt('Sequence or Folder').''.&mt('Parts Correct').''.&mt('Score').''.&mt('Maximum').'
'.$seq->{'title'}.'
'.&HTML::Entities::encode($seq->compTitle).''.$value.''.$max.'
Total
'.&mt('Total').''.$total.''.$total_max."
\n"; @@ -810,6 +940,7 @@ sub SingleStudentTotal { my $excel_sheet; my $excel_workbook; +my $format; my $filename; my $rows_output; @@ -819,6 +950,11 @@ my %prog_state; # progress window state my $request_aborted; my $total_formula; +my $maximum_formula; +my %formula_data; + +my $navmap; +my @sequences; sub excel_initialize { my ($r) = @_; @@ -831,51 +967,46 @@ sub excel_initialize { undef (%prog_state); undef ($request_aborted); undef ($total_formula); + undef ($maximum_formula); + # + undef(%formula_data); + # + undef($navmap); + undef(@sequences); + ($navmap,@sequences) = + &Apache::lonstatistics::selected_sequences_with_assessments(); + if (! ref($navmap)) { + # Unable to get data, so bail out + $r->print("

". + &mt('Unable to retrieve course information.'). + '

'); + } # my $total_columns = scalar(&get_student_fields_to_show()); - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { + my $num_students = scalar(@Apache::lonstatistics::Students); + # + foreach my $seq (@sequences) { + if ($chosen_output->{'every_problem'}) { + $total_columns+=&count_parts($navmap,$seq); + } # Add 2 because we need a 'sequence_sum' and 'total' column for each - $total_columns += $seq->{'num_assess_parts'}+2; + $total_columns += 2; } + my $too_many_cols_error_message = + '

'.&mt('Unable to Complete Request').'

'.$/. + '

'.&mt('LON-CAPA is unable to produce your Excel spreadsheet because your selections will result in more than 255 columns. Excel allows only 255 columns in a spreadsheet.').'

'.$/. + '

'.&mt('You may consider reducing the number of Sequences or Folders you have selected.').'

'.$/. + '

'.&mt('LON-CAPA can produce CSV files of this data or Excel files of the Scores Summary data.').'

'.$/; if ($chosen_output->{'base'} eq 'tries' && $total_columns > 255) { - $r->print(<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; + $r->print($too_many_cols_error_message); + $request_aborted = 1; } if ($chosen_output->{'base'} 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; + $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; @@ -883,50 +1014,44 @@ END $rows_output = 0; $cols_output = 0; # - # Create sheet - $excel_workbook = Spreadsheet::WriteExcel->new('/home/httpd'.$filename); - # - # Check for errors - if (! defined($excel_workbook)) { - $r->log_error("Error creating excel spreadsheet $filename: $!"); - $r->print("Problems creating new Excel file. ". - "This error has been logged. ". - "Please alert your LON-CAPA administrator"); - return ; + # Determine rows + my $header_row = $rows_output++; + my $description_row = $rows_output++; + my $notes_row = $rows_output++; + $rows_output++; # blank row + my $summary_header_row; + if ($chosen_output->{'summary_table'}) { + $summary_header_row = $rows_output++; + $rows_output+= scalar(@sequences); + $rows_output++; + } + my $sequence_name_row = $rows_output++; + my $resource_name_row = $rows_output++; + my $maximum_data_row = $rows_output++; + if (! $chosen_output->{'maximum_row'}) { + $rows_output--; } + my $first_data_row = $rows_output++; # - # The excel spreadsheet stores temporary data in files, then put them - # together. If needed we should be able to disable this (memory only). - # The temporary directory must be specified before calling 'addworksheet'. - # File::Temp is used to determine the temporary directory. - $excel_workbook->set_tempdir($Apache::lonnet::tmpdir); + # Create sheet + ($excel_workbook,$filename,$format)= + &Apache::loncommon::create_workbook($r); + return if (! defined($excel_workbook)); # # Add a worksheet my $sheetname = $ENV{'course.'.$ENV{'request.course.id'}.'.description'}; $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; # # Put a description of the sections listed my $sectionstring = ''; - my @Sections = @Apache::lonstatistics::SelectedSections; + my @Sections = &Apache::lonstatistics::get_selected_sections(); if (scalar(@Sections) > 1) { if (scalar(@Sections) > 2) { my $last = pop(@Sections); @@ -941,24 +1066,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++, + $excel_sheet->write($description_row,$cols_output++, $chosen_output->{'shortdesc'}, - $format->{'h3'}); + $format->{'b'}); # - # 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; @@ -969,62 +1097,59 @@ END # # Add the remaining column headers my $total_formula_string = '=0'; - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { + my $maximum_formula_string = '=0'; + foreach my $seq (@sequences) { + my $symb = $seq->symb; $excel_sheet->write($sequence_name_row,, - $cols_output,$seq->{'title'},$format->{'h3'}); + $cols_output,$seq->compTitle,$format->{'bold'}); # Determine starting cell - $seq->{'Excel:startcell'}= + $formula_data{$symb}->{'Excel:startcell'}= &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($maximum_data_row,$cols_output); - $seq->{'Excel:startcol'}=$cols_output; + ($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 (@{$seq->{'contents'}}) { - 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'}}) { + foreach my $res (&get_resources($navmap,$seq)) { + if (scalar(@{$res->parts}) > 1) { + foreach my $part (@{$res->parts}) { $excel_sheet->write($resource_name_row, $cols_output++, - $res->{'title'}.' part '.$part, + $res->compTitle.' part '.$res->part_display($part), $format->{'bold'}); + $count++; } } else { $excel_sheet->write($resource_name_row, $cols_output++, - $res->{'title'},$format->{'bold'}); + $res->compTitle,$format->{'bold'}); + $count++; } - $count++; } } # Determine ending cell if ($count <= 1) { - $seq->{'Excel:endcell'} = $seq->{'Excel:startcell'}; - $seq->{'Excel:endcol'} = $seq->{'Excel:startcol'}; + $formula_data{$symb}->{'Excel:endcell'} = $formula_data{$symb}->{'Excel:startcell'}; + $formula_data{$symb}->{'Excel:endcol'} = $formula_data{$symb}->{'Excel:startcol'}; } else { - $seq->{'Excel:endcell'} = + $formula_data{$symb}->{'Excel:endcell'} = &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($maximum_data_row,$cols_output-1); - $seq->{'Excel:endcol'} = $cols_output-1; + ($first_data_row,$cols_output-1); + $formula_data{$symb}->{'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'}.')'); + if (! exists($formula_data{$symb}->{'Excel:endcell'}) || + ! defined($formula_data{$symb}->{'Excel:endcell'})) { + $formula_data{$symb}->{'Excel:endcell'} = $formula_data{$symb}->{'Excel:startcell'}; + } + $formula_data{$symb}->{'Excel:sum'}= $excel_sheet->store_formula + ('=SUM('.$formula_data{$symb}->{'Excel:startcell'}. + ':'.$formula_data{$symb}->{'Excel:endcell'}.')'); # Determine cell the score is held in - $seq->{'Excel:scorecell'} = + $formula_data{$symb}->{'Excel:scorecell'} = &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($maximum_data_row,$cols_output); - $seq->{'Excel:scorecol'}=$cols_output; + ($first_data_row,$cols_output); + $formula_data{$symb}->{'Excel:scorecol'}=$cols_output; if ($chosen_output->{'base'} eq 'parts correct total') { $excel_sheet->write($resource_name_row,$cols_output++, 'parts correct', @@ -1044,21 +1169,36 @@ END # $total_formula_string.='+'. &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($maximum_data_row,$cols_output-1); + ($first_data_row,$cols_output-1); if ($chosen_output->{'sequence_max'}) { - $excel_sheet->write($resource_name_row,$cols_output++, + $excel_sheet->write($resource_name_row,$cols_output, 'maximum', $format->{'bold'}); + $formula_data{$symb}->{'Excel:maxcell'} = + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($first_data_row,$cols_output); + $formula_data{$symb}->{'Excel:maxcol'}=$cols_output; + $maximum_formula_string.='+'. + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($first_data_row,$cols_output); + $cols_output++; + } } if ($chosen_output->{'grand_total'}) { $excel_sheet->write($resource_name_row,$cols_output++,'Total', $format->{'bold'}); } + if ($chosen_output->{'grand_maximum'}) { + $excel_sheet->write($resource_name_row,$cols_output++,'Max. Total', + $format->{'bold'}); + } $total_formula = $excel_sheet->store_formula($total_formula_string); - # + $maximum_formula = $excel_sheet->store_formula($maximum_formula_string); + ############################################## # Output a row for MAX, if appropriate - if ($chosen_output->{'scores'}) { + ############################################## + if ($chosen_output->{'maximum_row'}) { $cols_output = 0; foreach my $field (&get_student_fields_to_show()) { if ($field eq 'username' || $field eq 'fullname' || @@ -1072,16 +1212,20 @@ END # # 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'}} = + 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,$seq->{'Excel:scorecol'}); + ($maximum_data_row,$formula_data{$symb}->{'Excel:maxcol'}); my $weight; my $max = 0; - foreach my $resource (@{$seq->{'contents'}}) { - next if ($resource->{'type'} ne 'assessment'); - foreach my $part (@{$resource->{'parts'}}) { + foreach my $resource (&get_resources($navmap,$seq)) { + foreach my $part (@{$resource->parts}){ $weight = 1; if ($chosen_output->{'scores'}) { $weight = &Apache::lonnet::EXT @@ -1102,16 +1246,15 @@ END # 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'}); + 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++, - $seq->{'Excel:sum'},undef, - %replaceCells); + $formula_data{$symb}->{'Excel:sum'},undef, + %replaceCells); + } elsif ($chosen_output->{'sequence_sum'}) { $excel_sheet->write($maximum_data_row,$cols_output++,$max); } @@ -1125,8 +1268,63 @@ END $total_formula,undef, %total_cell_translation); } - } # End of MAXIMUM row output if ($chosen_output->{'scores'}) { + if ($chosen_output->{'grand_maximum'}) { + $excel_sheet->repeat_formula($maximum_data_row,$cols_output++, + $maximum_formula,undef, + %maximum_cell_translation); + } + } # End of MAXIMUM row output if ($chosen_output->{'maximum_row'}) { $rows_output = $first_data_row; + ############################################## + # Output summary table, which actually is above the sequence name row. + ############################################## + if ($chosen_output->{'summary_table'}) { + $cols_output = 0; + $excel_sheet->write($summary_header_row,$cols_output++, + 'Summary Table',$format->{'bold'}); + if ($chosen_output->{'maximum_row'}) { + $excel_sheet->write($summary_header_row,$cols_output++, + 'Maximum',$format->{'bold'}); + } + $excel_sheet->write($summary_header_row,$cols_output++, + 'Average',$format->{'bold'}); + $excel_sheet->write($summary_header_row,$cols_output++, + 'Median',$format->{'bold'}); + $excel_sheet->write($summary_header_row,$cols_output++, + 'Std Dev',$format->{'bold'}); + my $row = $summary_header_row+1; + foreach my $seq (@sequences) { + my $symb = $seq->symb; + $cols_output = 0; + $excel_sheet->write($row,$cols_output++, + $seq->compTitle, + $format->{'bold'}); + if ($chosen_output->{'maximum_row'}) { + $excel_sheet->write + ($row,$cols_output++, + '='. + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($maximum_data_row,$formula_data{$symb}->{'Excel:scorecol'}) + ); + } + my $range = + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($first_data_row,$formula_data{$symb}->{'Excel:scorecol'}). + ':'. + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($first_data_row+$num_students-1,$formula_data{$symb}->{'Excel:scorecol'}); + $excel_sheet->write($row,$cols_output++, + '=AVERAGE('.$range.')'); + $excel_sheet->write($row,$cols_output++, + '=MEDIAN('.$range.')'); + $excel_sheet->write($row,$cols_output++, + '=STDEV('.$range.')'); + $row++; + } + } + ############################################## + # Take care of non-excel initialization + ############################################## # # Let the user know what we are doing my $studentcount = scalar(@Apache::lonstatistics::Students); @@ -1146,7 +1344,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'); @@ -1155,14 +1354,20 @@ END sub excel_outputstudent { my ($r,$student) = @_; - return if ($request_aborted); - return if (! defined($excel_sheet)); + if ($request_aborted || ! defined($navmap) || ! defined($excel_sheet)) { + return; + } $cols_output=0; # # Write out student data my @to_show = &get_student_fields_to_show(); foreach my $field (@to_show) { - $excel_sheet->write($rows_output,$cols_output++,$student->{$field}); + my $value = $student->{$field}; + if ($field eq 'comments') { + $value = &Apache::lonmsg::retrieve_instructor_comments + ($student->{'username'},$student->{'domain'}); + } + $excel_sheet->write($rows_output,$cols_output++,$value); } # # Get student assessment data @@ -1177,22 +1382,28 @@ 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'}; + my %maximum_cell_translation; + foreach my $seq (@sequences) { + my $symb = $seq->symb; + $cols_output = $formula_data{$symb}->{'Excel:startcol'}; # Keep track of cells to translate in total cell - $total_cell_translation{$seq->{'Excel:scorecell'}} = + $total_cell_translation{$formula_data{$symb}->{'Excel:scorecell'}} = + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($rows_output,$formula_data{$symb}->{'Excel:scorecol'}); + # and maximum cell + $maximum_cell_translation{$formula_data{$symb}->{'Excel:maxcell'}} = &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$seq->{'Excel:scorecol'}); + ($rows_output,$formula_data{$symb}->{'Excel:maxcol'}); # my ($performance,$performance_length,$score,$seq_max,$rawdata); if ($chosen_output->{'tries'} || $chosen_output->{'correct'}){ ($performance,$performance_length,$score,$seq_max,$rawdata) = - &StudentTriesOnSequence($student,\%StudentsData, - $seq,'no'); + &student_tries_on_sequence($student,\%StudentsData, + $navmap,$seq,'no'); } else { ($performance,$performance_length,$score,$seq_max,$rawdata) = - &StudentPerformanceOnSequence($student,\%StudentsData, - $seq,'no'); + &student_performance_on_sequence($student,\%StudentsData, + $navmap,$seq,'no'); } if ($chosen_output->{'every_problem'}) { if ($chosen_output->{'correct'}) { @@ -1204,32 +1415,34 @@ sub excel_outputstudent { } } else { foreach my $value (@$rawdata) { - $excel_sheet->write($rows_output,$cols_output++,$value); + if ($score eq ' ' || !defined($value)) { + $cols_output++; + } else { + $excel_sheet->write($rows_output,$cols_output++, + $value); + } } } } if ($chosen_output->{'sequence_sum'} && $chosen_output->{'every_problem'}) { # Write a formula for the sum of this sequence - my %replaceCells; - $replaceCells{$seq->{'Excel:startcell'}} = - &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$seq->{'Excel:startcol'}); - $replaceCells{$seq->{'Excel:endcell'}} = - &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$seq->{'Excel:endcol'}); - # The undef is for the format - if (scalar(keys(%replaceCells)) == 1) { - $excel_sheet->repeat_formula($rows_output,$cols_output++, - $seq->{'Excel:sum'},undef, - %replaceCells,%replaceCells); + my %replaceCells= + ('^'.$formula_data{$symb}->{'Excel:startcell'}.':'.$formula_data{$symb}->{'Excel:endcell'}.'$' + => + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell($rows_output,$formula_data{$symb}->{'Excel:startcol'}).':'. + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell($rows_output,$formula_data{$symb}->{'Excel:endcol'}) + ); + # The undef is for the format + $excel_sheet->repeat_formula($rows_output,$cols_output++, + $formula_data{$symb}->{'Excel:sum'},undef, + %replaceCells); + } elsif ($chosen_output->{'sequence_sum'}) { + if ($score eq ' ') { + $cols_output++; } else { - $excel_sheet->repeat_formula($rows_output,$cols_output++, - $seq->{'Excel:sum'},undef, - %replaceCells); + $excel_sheet->write($rows_output,$cols_output++,$score); } - } elsif ($chosen_output->{'sequence_sum'}) { - $excel_sheet->write($rows_output,$cols_output++,$score); } if ($chosen_output->{'sequence_max'}) { $excel_sheet->write($rows_output,$cols_output++,$seq_max); @@ -1241,6 +1454,11 @@ sub excel_outputstudent { $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++; @@ -1253,8 +1471,9 @@ sub excel_outputstudent { sub excel_finish { my ($r) = @_; - return if ($request_aborted); - return if (! defined($excel_sheet)); + if ($request_aborted || ! defined($navmap) || ! defined($excel_sheet)) { + return; + } # # Write the excel file $excel_workbook->close(); @@ -1296,6 +1515,8 @@ my $outputfile; my $filename; my $request_aborted; my %prog_state; # progress window state +my $navmap; +my @sequences; sub csv_initialize{ my ($r) = @_; @@ -1306,6 +1527,17 @@ sub csv_initialize{ undef($request_aborted); undef(%prog_state); # + undef($navmap); + undef(@sequences); + ($navmap,@sequences) = + &Apache::lonstatistics::selected_sequences_with_assessments(); + if (! ref($navmap)) { + # Unable to get data, so bail out + $r->print("

". + &mt('Unable to retrieve course information.'). + '

'); + } + # # Deal with unimplemented requests $request_aborted = undef; if ($chosen_output->{'base'} =~ /final table/) { @@ -1323,7 +1555,8 @@ END my $studentcount = scalar(@Apache::lonstatistics::Students); %prog_state=&Apache::lonhtmlcommon::Create_PrgWin ($r,'CSV File Compilation Status', - 'CSV File Compilation Progress', $studentcount); + 'CSV File Compilation Progress', $studentcount, + 'inline',undef,'Statistics','stats_status'); # # Open a file $filename = '/prtspool/'. @@ -1342,6 +1575,12 @@ 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 $sequence_row = ''; @@ -1350,23 +1589,19 @@ END $sequence_row .='"",'; $resource_row .= '"'.&Apache::loncommon::csv_translate($field).'",'; } - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { + foreach my $seq (@sequences) { $sequence_row .= '"'. - &Apache::loncommon::csv_translate($seq->{'title'}).'",'; + &Apache::loncommon::csv_translate($seq->compTitle).'",'; my $count = 0; if ($chosen_output->{'every_problem'}) { - foreach my $res (@{$seq->{'contents'}}) { - if ($res->{'type'} ne 'assessment' || - ! exists($res->{'parts'}) || - ref($res->{'parts'}) ne 'ARRAY' || - scalar(@{$res->{'parts'}}) < 1) { + foreach my $res (&get_resources($navmap,$seq)) { + if (scalar(@{$res->parts}) < 1) { next; } - foreach my $part (@{$res->{'parts'}}) { + foreach my $part (@{$res->parts}) { $resource_row .= '"'. - &Apache::loncommon::csv_translate($res->{'title'}. - ', Part '.$part - ).'",'; + &Apache::loncommon::csv_translate + ($res->compTitle.', Part '.$res->part_display($part)).'",'; $count++; } } @@ -1388,6 +1623,10 @@ END $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"; @@ -1397,14 +1636,20 @@ END sub csv_outputstudent { my ($r,$student) = @_; - return if ($request_aborted); - return if (! defined($outputfile)); + if ($request_aborted || ! defined($navmap) || ! defined($outputfile)) { + return; + } my $Str = ''; # # Output student fields my @to_show = &get_student_fields_to_show(); foreach my $field (@to_show) { - $Str .= '"'.&Apache::loncommon::csv_translate($student->{$field}).'",'; + my $value = $student->{$field}; + if ($field eq 'comments') { + $value = &Apache::lonmsg::retrieve_instructor_comments + ($student->{'username'},$student->{'domain'}); + } + $Str .= '"'.&Apache::loncommon::csv_translate($value).'",'; } # # Get student assessment data @@ -1419,16 +1664,17 @@ sub csv_outputstudent { # # Output performance data my $total = 0; - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { + my $maximum = 0; + foreach my $seq (@sequences) { my ($performance,$performance_length,$score,$seq_max,$rawdata); if ($chosen_output->{'tries'}){ ($performance,$performance_length,$score,$seq_max,$rawdata) = - &StudentTriesOnSequence($student,\%StudentsData, - $seq,'no'); + &student_tries_on_sequence($student,\%StudentsData, + $navmap,$seq,'no'); } else { ($performance,$performance_length,$score,$seq_max,$rawdata) = - &StudentPerformanceOnSequence($student,\%StudentsData, - $seq,'no'); + &student_performance_on_sequence($student,\%StudentsData, + $navmap,$seq,'no'); } if ($chosen_output->{'every_problem'}) { if ($chosen_output->{'correct'}) { @@ -1452,10 +1698,14 @@ sub csv_outputstudent { $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"; print $outputfile $Str; @@ -1467,8 +1717,9 @@ sub csv_outputstudent { sub csv_finish { my ($r) = @_; - return if ($request_aborted); - return if (! defined($outputfile)); + if ($request_aborted || ! defined($navmap) || ! defined($outputfile)) { + return; + } close($outputfile); # my $c = $r->connection(); @@ -1479,7 +1730,7 @@ sub csv_finish { # # Tell the user where to get their csv file $r->print('
'. - 'Your csv file.'."\n"); + ''.&mt('Your csv file.').''."\n"); $r->rflush(); return; @@ -1512,19 +1763,19 @@ Inputs: ####################################################### ####################################################### -sub StudentTriesOnSequence { - my ($student,$studentdata,$seq,$links) = @_; +sub student_tries_on_sequence { + my ($student,$studentdata,$navmap,$seq,$links) = @_; $links = 'no' if (! defined($links)); my $Str = ''; my ($sum,$max) = (0,0); my $performance_length = 0; my @TriesData = (); my $tries; - foreach my $resource (@{$seq->{'contents'}}) { - next if ($resource->{'type'} ne 'assessment'); - my $resource_data = $studentdata->{$resource->{'symb'}}; + my $hasdata = 0; # flag - true if the student has any data on the sequence + foreach my $resource (&get_resources($navmap,$seq)) { + my $resource_data = $studentdata->{$resource->symb}; my $value = ''; - foreach my $partnum (@{$resource->{'parts'}}) { + foreach my $partnum (@{$resource->parts()}) { $tries = undef; $max++; $performance_length++; @@ -1544,6 +1795,7 @@ sub StudentTriesOnSequence { my $tries = 0; if(exists($resource_data->{'resource.'.$partnum.'.tries'})) { $tries = $resource_data->{'resource.'.$partnum.'.tries'}; + $hasdata =1; } # if ($awarded > 0) { @@ -1584,9 +1836,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')) { @@ -1594,7 +1852,7 @@ sub StudentTriesOnSequence { &Apache::lonnet::logthis('length of symbol "'.$symbol.'" > 1'); } $symbol = ''.$symbol.''; @@ -1603,8 +1861,11 @@ sub StudentTriesOnSequence { } $Str .= $value; } - if ($seq->{'randompick'}) { - $max = $seq->{'randompick'}; + if ($seq->randompick()) { + $max = $seq->randompick(); + } + if (! $hasdata && $sum == 0) { + $sum = ' '; } return ($Str,$performance_length,$sum,$max,\@TriesData); } @@ -1614,7 +1875,7 @@ sub StudentTriesOnSequence { =pod -=item &StudentPerformanceOnSequence() +=item &student_performance_on_sequence Inputs: @@ -1634,8 +1895,8 @@ Inputs: ####################################################### ####################################################### -sub StudentPerformanceOnSequence { - my ($student,$studentdata,$seq,$links) = @_; +sub student_performance_on_sequence { + my ($student,$studentdata,$navmap,$seq,$links) = @_; $links = 'no' if (! defined($links)); my $Str = ''; # final result string my ($score,$max) = (0,0); @@ -1643,13 +1904,14 @@ sub StudentPerformanceOnSequence { my $symbol; my @ScoreData = (); my $partscore; - foreach my $resource (@{$seq->{'contents'}}) { - next if ($resource->{'type'} ne 'assessment'); - my $resource_data = $studentdata->{$resource->{'symb'}}; - foreach my $part (@{$resource->{'parts'}}) { + my $hasdata = 0; # flag, 0 if there were no submissions on the sequence + foreach my $resource (&get_resources($navmap,$seq)) { + my $symb = $resource->symb; + my $resource_data = $studentdata->{$symb}; + foreach my $part (@{$resource->parts()}) { $partscore = undef; my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight', - $resource->{'symb'}, + $symb, $student->{'domain'}, $student->{'username'}, $student->{'section'}); @@ -1661,13 +1923,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) { @@ -1682,10 +1948,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 = ' '; } @@ -1698,7 +1966,7 @@ sub StudentPerformanceOnSequence { # if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) { $symbol = ''.$symbol.''; @@ -1706,6 +1974,9 @@ sub StudentPerformanceOnSequence { $Str .= $symbol; } } + if (! $hasdata && $score == 0) { + $score = ' '; + } return ($Str,$performance_length,$score,$max,\@ScoreData); }