--- loncom/interface/statistics/lonstudentassessment.pm 2003/05/29 21:41:10 1.50 +++ loncom/interface/statistics/lonstudentassessment.pm 2003/06/10 19:19:57 1.55 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentassessment.pm,v 1.50 2003/05/29 21:41:10 matthew Exp $ +# $Id: lonstudentassessment.pm,v 1.55 2003/06/10 19:19:57 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -85,6 +85,12 @@ 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. @@ -94,7 +100,9 @@ student. ####################################################### my $show_links; my $output_mode; -my $show; +my $data; +my $base; +my $datadescription; my $single_student_mode; ####################################################### @@ -135,26 +143,16 @@ sub BuildStudentAssessmentPage { # # Print out the HTML headers for the interface # This also parses the output mode selector - # This step must always be done. + # This step must *always* be done. $r->print(&CreateInterface()); $r->print(''); $r->print(''); $r->rflush(); if (! exists($ENV{'form.notfirstrun'}) && ! $single_student_mode) { - $r->print(< - -Please make your selections in the boxes above and hit -the button marked "Update Display". - -

-ENDMSG -# $r->print(&OutputDescriptions()); return; } # - # my $initialize = \&html_initialize; my $output_student = \&html_outputstudent; my $finish = \&html_finish; @@ -163,10 +161,6 @@ ENDMSG $initialize = \&excel_initialize; $output_student = \&excel_outputstudent; $finish = \&excel_finish; -# } elsif ($output_mode eq 'multi-sheet excel') { -# $initialize = \&multi_sheet_excel_initialize; -# $output_student = \&multi_sheet_excel_outputstudent; -# $finish = \&multi_sheet_excel_finish; } elsif ($output_mode eq 'csv') { $initialize = \&csv_initialize; $output_student = \&csv_outputstudent; @@ -292,6 +286,7 @@ sub CreateInterface { $Str .= 'Enrollment Status'; $Str .= 'Sequences and Folders'; $Str .= 'Output Format'; + $Str .= 'Output Data'; $Str .= ''."\n"; # $Str .= ''."\n"; @@ -314,8 +309,12 @@ sub CreateInterface { $only_seq_with_assessments); $Str .= ''."\n"; $Str .= &CreateAndParseOutputSelector(); + $Str .= ''."\n"; + $Str .= &CreateAndParseOutputDataSelector(); $Str .= ''."\n"; $Str .= ''."\n"; + $Str .= ''; + $Str .= ' 'x8; return $Str; } @@ -336,7 +335,6 @@ my @OutputOptions = description => 'Output HTML with each symbol linked to the problem '. 'which generated it.', mode => 'html', - show => 'all', show_links => 'yes', }, { name => 'HTML, with all links', @@ -345,7 +343,6 @@ my @OutputOptions = 'which generated it. '. 'This includes links for unattempted problems.', mode => 'html', - show => 'all', show_links => 'all', }, { name => 'HTML, without links', @@ -354,52 +351,14 @@ my @OutputOptions = ' web page is greatly reduced. If your browser crashes on the '. 'full display, try this.', mode => 'html', - show => 'all', - show_links => 'no', - }, - { name => 'HTML, scores only', - value => 'html, scores only', - description => 'Output HTML, only showing the total number of correct'. - ' problems (or problem parts) and not the maximum possible for '. - 'each student', - mode => 'html', - show => 'scores', show_links => 'no', }, - { name => 'HTML, totals', - value => 'html, totals', - description => 'Output HTML, but only the summary statistics for each'. - ' sequence selected for each student.', - mode => 'html', - show => 'totals', - show_links => 'no', - }, - { name => 'HTML, summary table only', - value => 'html summary table only', - description => 'Output HTML, but only the final summary table for '. - 'all students across all sequences.', - mode => 'html', - show => 'final table', - show_links => 'no', - }, - { name => 'Excel, scores only', - value => 'excel, scores only', - description => 'Output an Excel file (compatable with Excel 95), '. - 'with a single column for each sequence showing the students '. - 'score.', + { name => 'Excel', + value => 'excel', + description => 'Output an Excel file (compatable with Excel 95).', mode => 'excel', - show => 'scores', show_links => 'no', - }, - { name => 'Excel, totals', - value => 'excel, totals', - description => 'Output an Excel file (compatable with Excel 95), '. - 'with two columns for each sequence, the students score on the '. - 'sequence and the students maximum possible on the sequence', - mode => 'excel', - show => 'totals', - show_links => 'no', - }, + }, # { name => 'multi-sheet Excel', # value => 'multi-sheet excel', # description => 'Output an Excel file (compatable with Excel 95), '. @@ -407,7 +366,6 @@ my @OutputOptions = # 'the data for each problem part '. # '(number of tries, status, points awarded) will be listed.', # mode => 'multi-sheet excel', -# show => 'totals', # show_links => 'no', # }, # { name => 'multi-sheet Excel, by section', @@ -418,28 +376,13 @@ my @OutputOptions = # '(number of tries, status, points awarded) will be listed. '. # 'There will be one Excel workbook for each section selected.', # mode => 'multi-sheet excel', -# show => 'by section', # show_links => 'no', # }, - { name => 'CSV, everything', - value => 'csv, everything', - description => '', - mode => 'csv', - show => 'all', - show_links => 'no', - }, - { name => 'CSV, scores only', - value => 'csv, scores only', - description => '', + { name => 'CSV', + value => 'csv', + description => 'Output a comma seperated values file suitable for '. + 'import into a spreadsheet.', mode => 'csv', - show => 'scores', - show_links => 'no', - }, - { name => 'CSV, totals', - value => 'csv, totals', - description => '', - mode => 'csv', - show => 'totals', show_links => 'no', }, ); @@ -473,11 +416,9 @@ sub CreateAndParseOutputSelector { # Set package variables describing output mode $show_links = 'no'; $output_mode = 'html'; - $show = 'all'; foreach my $option (@OutputOptions) { next if ($option->{'value'} ne $selected); $output_mode = $option->{'mode'}; - $show = $option->{'show'}; $show_links = $option->{'show_links'}; } @@ -493,6 +434,100 @@ sub CreateAndParseOutputSelector { return $Str; } +## +## Data selector stuff +## +my @OutputDataOptions = + ( { name =>'Tries', + base =>'tries', + value => 'tries', + shortdesc => 'Number of Tries before success on each Problem Part', + longdesc =>'The number of tries before success on each problem part.', + }, + { name =>'Parts Correct', + base =>'tries', + value => 'parts correct', + shortdesc => 'Number of Problem Parts completed successfully.', + longdesc => 'The Number of Problem Parts completed successfully.', + }, + { name =>'Parts Correct & Maximums', + base =>'tries', + value => 'parts correct total', + shortdesc => 'Number of Problem Parts completed successfully.', + longdesc => 'The Number of Problem Parts completed successfully and '. + 'the maximum possible for each student', + }, + { name => 'Scores', + base => 'scores', + value => 'scores', + 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 Sum & Maximums', + base => 'scores', + value => 'sum and total', + shortdesc => 'Total Score and Maximum Possible for each '. + 'Sequence or Folder', + longdesc => 'The total of the scores of the student on each problem'. + ' and the maximum possible for that student on each Sequence or '. + ' Folder.', + }, + { name => 'Summary Table (Scores)', + base => 'scores', + value => 'final table scores', + shortdesc => 'Summary of Scores', + longdesc => '', + }, + { name => 'Summary Table (Parts)', + base => 'tries', + value => 'final table parts', + shortdesc => 'Summary of Parts Correct', + longdesc => '', + } + ); + +sub CreateAndParseOutputDataSelector { + my $Str = ''; + my $elementname = 'chartoutputdata'; + # + my $selected = 'scores'; + if (exists($ENV{'form.'.$elementname})) { + if (ref($ENV{'form.'.$elementname} eq 'ARRAY')) { + $selected = $ENV{'form.'.$elementname}->[0]; + } else { + $selected = $ENV{'form.'.$elementname}; + } + } + # + $data = 'scores'; + foreach my $option (@OutputDataOptions) { + if ($option->{'value'} eq $selected) { + $data = $option->{'value'}; + $base = $option->{'base'}; + $datadescription = $option->{'shortdesc'}; + } + } + # + # Build the form element + $Str = qq/"; + return $Str; + +} + ####################################################### ####################################################### @@ -531,9 +566,12 @@ 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 ($show eq 'final table') { + if ($data =~ /^final table/) { my $studentcount = scalar(@Apache::lonstatistics::Students); %prog_state=&Apache::lonhtmlcommon::Create_PrgWin ($r,'Summary Table Status', @@ -555,11 +593,11 @@ sub html_initialize { my $width = $sequence->{'width'}; $Str .= $title.' 'x($width-$base).$padding; } - $Str .= "total (of shown problems)\n"; + $Str .= "total\n"; $Str .= "
";
     #
     # Check for suppression of output
-    if ($show eq 'final table') {
+    if ($data =~ /^final table/) {
         $Str = '';
     }
     $r->print($Str);
@@ -571,7 +609,7 @@ sub html_outputstudent {
     my ($r,$student) = @_;
     my $Str = '';
     #
-    if($count++ % 5 == 0 && $count > 0) {
+    if($count++ % 5 == 0 && $count > 0 && $data !~ /^final table/) {
         $r->print("
");
     }
     # First, the @StudentData fields need to be listed
@@ -592,7 +630,7 @@ sub html_outputstudent {
     }
     if (scalar(@tmp) < 1) {
         $nodata_count++;
-        return if ($show eq 'final table');
+        return if ($data =~ /^final table/);
         $Str .= 'No Course Data'."\n";
         $r->print($Str);
         $r->rflush();
@@ -603,20 +641,27 @@ sub html_outputstudent {
     my $studentstats;
     my $PerformanceStr = '';
     foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        my ($performance,$score,$seq_max) =
-            &StudentPerformanceOnSequence($student,\%StudentsData,
-                                          $seq,$show_links);
-        my $ratio = $score.'/'.$seq_max;
+        my ($performance,$performance_length,$score,$seq_max,$rawdata);
+        if ($base eq 'tries') {
+            ($performance,$performance_length,$score,$seq_max,$rawdata) =
+                &StudentTriesOnSequence($student,\%StudentsData,
+                                        $seq,$show_links);
+        } else {
+            ($performance,$performance_length,$score,$seq_max,$rawdata) =
+                &StudentPerformanceOnSequence($student,\%StudentsData,
+                                              $seq,$show_links);
+        }
+        my $ratio = sprintf("%3d",$score).'/'.sprintf("%3d",$seq_max);
         #
-        if ($show eq 'totals') {
-            $performance = ' 'x(length($seq_max)-length($score)).$ratio;
-            $performance .= ' 'x($seq->{'width'}-length($performance));
-        } elsif ($show eq 'scores') {
-            $performance = $score;
-            $performance .= ' 'x($seq->{'width'}-length($performance));
+        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'}-$seq_max-
+            $performance .= ' 'x($seq->{'width'}-$performance_length-
                                  length($ratio)
                                  ).$ratio;
         }
@@ -631,7 +676,9 @@ sub html_outputstudent {
     my ($score,$max) = (0,0);
     while (my ($symb,$seq_stats) = each (%{$studentstats})) {
         $Statistics->{$symb}->{'score'} += $seq_stats->{'score'};
-        $Statistics->{$symb}->{'max'}   += $seq_stats->{'max'};
+        if ($Statistics->{$symb}->{'max'} < $seq_stats->{'max'}) {
+            $Statistics->{$symb}->{'max'} = $seq_stats->{'max'};
+        }
         $score += $seq_stats->{'score'};
         $max   += $seq_stats->{'max'};
     }
@@ -639,7 +686,7 @@ sub html_outputstudent {
     $Str .= " \n";
     #
     # Check for suppressed output and update the progress window if so...
-    if ($show eq 'final table') {
+    if ($data =~ /^final table/) {
         $Str = '';
         &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
                                                  'last student');
@@ -655,7 +702,7 @@ sub html_finish {
     my ($r) = @_;
     #
     # Check for suppressed output and close the progress window if so
-    if ($show eq 'final table') {
+    if ($data =~ /^final table/) {
         &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
     } else {
         $r->print("
\n"); @@ -685,7 +732,7 @@ sub StudentAverageTotal { $ave = 0; } $total_ave += $ave; - my $max = $seq->{'num_assess_parts'}; + my $max = $Statistics->{$seq->{'symb'}}->{'max'}; $total_max += $max; if ($ave == 0) { $ave = "0.00"; @@ -709,8 +756,8 @@ sub StudentAverageTotal { sub SingleStudentTotal { my $student = &Apache::lonstatistics::current_student(); - my $Str = "

Summary Table For ".$student->{'username'}.'@'. - $student->{'domain'}."

\n"; + my $Str = "

Summary table for ".$student->{'fullname'}." ". + $student->{'username'}.'@'.$student->{'domain'}."

\n"; $Str .= ''."\n"; $Str .= "\n"; @@ -775,15 +822,15 @@ sub multi_sheet_excel_initialize { if ($size_estimate > $max_size) { # try to stay under 5 megs $num_workbooks += int($size_estimate / $max_size); } - if ($show eq 'by section') { - if (@Apache::lonstatistics::SelectedSections > 1 && - $Apache::lonstatistics::SelectedSections[0] ne 'all') { - $num_workbooks = scalar(@Apache::lonstatistics::SelectedSections); - } else { - # @Apache::lonstatistics::Sections contains 'all' as well. - $num_workbooks = scalar(@Apache::lonstatistics::Sections) - 1; - } - } +# if ($data eq ) { +# if (@Apache::lonstatistics::SelectedSections > 1 && +# $Apache::lonstatistics::SelectedSections[0] ne 'all') { +# $num_workbooks = scalar(@Apache::lonstatistics::SelectedSections); +# } else { +# # @Apache::lonstatistics::Sections contains 'all' as well. +# $num_workbooks = scalar(@Apache::lonstatistics::Sections) - 1; +# } +# } $r->print("Maximum allowed size: ".$max_size." bytes
"); $r->print("Number of students: ".$num_students."
"); @@ -833,10 +880,62 @@ my $rows_output; my $cols_output; my %prog_state; # progress window state +my $request_aborted; sub excel_initialize { my ($r) = @_; # + $request_aborted = undef; + my $total_columns = scalar(&get_student_fields_to_show()); + foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { + # Add 2 because we need a 'sum' and 'total' column for each + $total_columns += $seq->{'num_assess_parts'}+2; + } + if ($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 ($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 +summary data (Scores Sum or Scores Sum & Totals). +

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

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

+END + $request_aborted = 1; + } + return if ($request_aborted); + # $filename = '/prtspool/'. $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'. time.'_'.rand(1000000000).'.xls'; @@ -898,21 +997,48 @@ sub excel_initialize { $cols_output += scalar(@Sections); # # Put the date in there too - $excel_sheet->write($rows_output,$cols_output++, + $excel_sheet->write($rows_output++,$cols_output++, 'Compiled on '.localtime(time)); # - $rows_output++; + $cols_output = 0; + $excel_sheet->write($rows_output++,$cols_output++,$datadescription); + # + if ($data eq 'tries' || $data eq 'scores') { + $rows_output++; + } # # Add the student headers $cols_output = 0; foreach my $field (&get_student_fields_to_show()) { $excel_sheet->write($rows_output,$cols_output++,$field); } + my $row_offset = 0; + if ($data eq 'tries' || $data eq 'scores') { + $row_offset = -1; + } # - # Add the Sequence Headers + # Add the remaining column headers foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - $excel_sheet->write($rows_output,$cols_output,$seq->{'title'}); - if ($show eq 'totals') { + $excel_sheet->write($rows_output+$row_offset, + $cols_output,$seq->{'title'}); + if ($data eq 'tries' || $data eq 'scores') { + foreach my $res (@{$seq->{'contents'}}) { + next if ($res->{'type'} ne 'assessment'); + if (scalar(@{$res->{'parts'}}) > 1) { + foreach my $part (@{$res->{'parts'}}) { + $excel_sheet->write($rows_output, + $cols_output++, + $res->{'title'}.' part '.$part); + } + } else { + $excel_sheet->write($rows_output, + $cols_output++, + $res->{'title'}); + } + } + $excel_sheet->write($rows_output,$cols_output++,'score'); + $excel_sheet->write($rows_output,$cols_output++,'maximum'); + } elsif ($data eq 'sum and total' || $data eq 'parts correct total') { $excel_sheet->write($rows_output+1,$cols_output,'score'); $excel_sheet->write($rows_output+1,$cols_output+1,'maximum'); $cols_output += 2; @@ -922,31 +1048,53 @@ sub excel_initialize { } # # Bookkeeping - if ($show eq 'totals') { + if ($data eq 'sum and total' || $data eq 'parts correct total') { $rows_output += 2; } else { $rows_output += 1; } # # Output a row for MAX - if ($show ne 'totals') { - $cols_output = 0; - foreach my $field (&get_student_fields_to_show()) { - if ($field eq 'username' || $field eq 'fullname' || - $field eq 'id') { - $excel_sheet->write($rows_output,$cols_output++,'Maximum'); - } else { - $excel_sheet->write($rows_output,$cols_output++,''); - } + $cols_output = 0; + foreach my $field (&get_student_fields_to_show()) { + if ($field eq 'username' || $field eq 'fullname' || + $field eq 'id') { + $excel_sheet->write($rows_output,$cols_output++,'Maximum'); + } else { + $excel_sheet->write($rows_output,$cols_output++,''); } - # - # Add the Sequence Headers - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - $excel_sheet->write($rows_output,$cols_output++, - $seq->{'num_assess_parts'}); + } + # + # Add the maximums for each sequence or assessment + foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { + 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; + } + } + if ($data eq 'scores') { + $excel_sheet->write($rows_output,$cols_output++,$weight); + } elsif ($data eq 'tries') { + $excel_sheet->write($rows_output,$cols_output++,''); + } + $max += $weight; + } + } + if (! ($data eq 'sum only' || $data eq 'parts correct')) { + $excel_sheet->write($rows_output,$cols_output++,''); } - $rows_output++; + $excel_sheet->write($rows_output,$cols_output++,$max); } + $rows_output++; # # Let the user know what we are doing my $studentcount = scalar(@Apache::lonstatistics::Students); @@ -966,6 +1114,7 @@ sub excel_initialize { sub excel_outputstudent { my ($r,$student) = @_; + return if ($request_aborted); return if (! defined($excel_sheet)); $cols_output=0; # @@ -987,13 +1136,27 @@ sub excel_outputstudent { # # Write out sequence scores and totals data foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - my ($performance,$score,$seq_max) = - &StudentPerformanceOnSequence($student,\%StudentsData, - $seq,'no'); - if ($show eq 'totals' || $show eq 'scores') { + my ($performance,$performance_length,$score,$seq_max,$rawdata); + if ($base eq 'tries') { + ($performance,$performance_length,$score,$seq_max,$rawdata) = + &StudentTriesOnSequence($student,\%StudentsData, + $seq,'no'); + } else { + ($performance,$performance_length,$score,$seq_max,$rawdata) = + &StudentPerformanceOnSequence($student,\%StudentsData, + $seq,'no'); + } + if ($data eq 'tries' || $data eq 'scores') { + foreach my $value (@$rawdata) { + $excel_sheet->write($rows_output,$cols_output++,$value); + } + $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 ($show eq 'totals') { + if ($data eq 'sum and total' || $data eq 'parts correct total') { $excel_sheet->write($rows_output,$cols_output++,$seq_max); } } @@ -1009,6 +1172,7 @@ sub excel_outputstudent { sub excel_finish { my ($r) = @_; + return if ($request_aborted); return if (! defined($excel_sheet)); # # Write the excel file @@ -1049,7 +1213,7 @@ sub excel_finish { my $outputfile; my $filename; - +my $request_aborted; my %prog_state; # progress window state sub csv_initialize{ @@ -1060,6 +1224,20 @@ sub csv_initialize{ $outputfile = undef; undef(%prog_state); # + # Deal with unimplemented requests + $request_aborted = undef; + 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; + } + return if ($request_aborted); + + # # Open a file $filename = '/prtspool/'. $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'. @@ -1077,34 +1255,41 @@ sub csv_initialize{ print $outputfile '"'.&Apache::loncommon::csv_translate($description).'",'. '"'.&Apache::loncommon::csv_translate(scalar(localtime(time))).'"'. "\n"; - # # Print out the headings my $Str = ''; my $Str2 = undef; foreach my $field (&get_student_fields_to_show()) { - if ($show eq 'scores') { + if ($data eq 'sum only') { $Str .= '"'.&Apache::loncommon::csv_translate($field).'",'; - } elsif ($show eq 'totals') { + } 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 ($show eq 'all') { - $Str .= '"'.&Apache::loncommon::csv_translate($field).'",'; + } elsif ($data eq 'scores' || $data eq 'tries' || + $data eq 'parts correct') { + $Str .= '"",'; + $Str2 .= '"'.&Apache::loncommon::csv_translate($field).'",'; } } foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - if ($show eq 'scores') { + if ($data eq 'sum only' || $data eq 'parts correct') { $Str .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}). '",'; - } elsif ($show eq 'totals') { + } elsif ($data eq 'sum and total' || $data eq 'parts correct total') { $Str .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}). '","",'; $Str2 .= '"score","total possible",'; - } elsif ($show eq 'all') { + } elsif ($data eq 'scores' || $data eq 'tries') { $Str .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}). '",'; - $Str .= '"",'x($seq->{'num_assess_parts'}-1); - $Str .= '"score","total possible",'; + $Str .= '"",'x($seq->{'num_assess_parts'}-1+2); + foreach my $res (@{$seq->{'contents'}}) { + next if ($res->{'type'} ne 'assessment'); + foreach my $part (@{$res->{'parts'}}) { + $Str2 .= '"'.&Apache::loncommon::csv_translate($res->{'title'}.', Part '.$part).'",'; + } + } + $Str2 .= '"score","total possible",'; } } chop($Str); @@ -1126,6 +1311,7 @@ sub csv_initialize{ sub csv_outputstudent { my ($r,$student) = @_; + return if ($request_aborted); return if (! defined($outputfile)); my $Str = ''; # @@ -1147,16 +1333,22 @@ sub csv_outputstudent { # # Output performance data foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - my ($performance,$score,$seq_max) = - &StudentPerformanceOnSequence($student,\%StudentsData, - $seq,'no'); - if ($show eq 'scores') { + my ($performance,$performance_length,$score,$seq_max,$rawdata); + if ($base eq 'tries') { + ($performance,$performance_length,$score,$seq_max,$rawdata) = + &StudentTriesOnSequence($student,\%StudentsData, + $seq,'no'); + } else { + ($performance,$performance_length,$score,$seq_max,$rawdata) = + &StudentPerformanceOnSequence($student,\%StudentsData, + $seq,'no'); + } + if ($data eq 'sum only' || $data eq 'parts correct') { $Str .= '"'.$score.'",'; - } elsif ($show eq 'totals') { + } elsif ($data eq 'sum and total' || $data eq 'parts correct total') { $Str .= '"'.$score.'","'.$seq_max.'",'; - } elsif ($show eq 'all') { - $Str .= '"'.join('","',(split(//,$performance),$score,$seq_max)). - '",'; + } elsif ($data eq 'scores' || $data eq 'tries') { + $Str .= '"'.join('","',(@$rawdata,$score,$seq_max)).'",'; } } chop($Str); @@ -1170,6 +1362,7 @@ sub csv_outputstudent { sub csv_finish { my ($r) = @_; + return if ($request_aborted); return if (! defined($outputfile)); close($outputfile); # @@ -1194,7 +1387,7 @@ sub csv_finish { =pod -=item &StudentPerformanceOnSequence() +=item &StudentTriesOnSequence() Inputs: @@ -1214,17 +1407,22 @@ Inputs: ####################################################### ####################################################### -sub StudentPerformanceOnSequence { +sub StudentTriesOnSequence { my ($student,$studentdata,$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 $value = ''; foreach my $partnum (@{$resource->{'parts'}}) { + $tries = undef; $max++; + $performance_length++; my $symbol = ' '; # default to space # if (exists($resource_data->{'resource.'.$partnum.'.solved'})) { @@ -1243,11 +1441,11 @@ sub StudentPerformanceOnSequence { $max--; } elsif ($status eq 'correct_by_student' && exists($resource_data->{'resource.'.$partnum.'.tries'})){ - my $num = $resource_data->{'resource.'.$partnum.'.tries'}; - if ($num > 9) { + $tries = $resource_data->{'resource.'.$partnum.'.tries'}; + if ($tries > 9) { $symbol = '*'; - } elsif ($num > 0) { - $symbol = $num; + } elsif ($tries > 0) { + $symbol = $tries; } else { $symbol = ' '; } @@ -1267,6 +1465,11 @@ sub StudentPerformanceOnSequence { } } # + if (! defined($tries)) { + $tries = $symbol; + } + push (@TriesData,$tries); + # if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) { if (length($symbol) > 1) { @@ -1282,7 +1485,105 @@ sub StudentPerformanceOnSequence { } $Str .= $value; } - return ($Str,$sum,$max); + if ($seq->{'randompick'}) { + $max = $seq->{'randompick'}; + } + return ($Str,$performance_length,$sum,$max,\@TriesData); +} + +####################################################### +####################################################### + +=pod + +=item &StudentPerformanceOnSequence() + +Inputs: + +=over 4 + +=item $student + +=item $studentdata Hash ref to all student data + +=item $seq Hash ref, the sequence we are working on + +=item $links if defined we will output links to each resource. + +=back + +=cut + +####################################################### +####################################################### +sub StudentPerformanceOnSequence { + my ($student,$studentdata,$seq,$links) = @_; + $links = 'no' if (! defined($links)); + my $Str = ''; # final result string + my ($score,$max) = (0,0); + my $performance_length = 0; + 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'}}) { + $partscore = undef; + my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight', + $resource->{'symb'}, + $student->{'domain'}, + $student->{'username'}, + $student->{'section'}); + if (!defined($weight) || ($weight eq '')) { + $weight=1; + } + # + $max += $weight; # see the 'excused' branch below... + $performance_length++; # one character per part + $symbol = ' '; # default to space + # + my $awarded = 0; + if (exists($resource_data->{'resource.'.$part.'.awarded'})) { + $awarded = $resource_data->{'resource.'.$part.'.awarded'}; + } + # + $partscore = $weight*$awarded; + $score += $partscore; + $symbol = $weight; + if (length($symbol) > 1) { + $symbol = '*'; + } + if (exists($resource_data->{'resource.'.$part.'.solved'})) { + my $status = $resource_data->{'resource.'.$part.'.solved'}; + if ($status eq 'excused') { + $symbol = 'x'; + $max -= $weight; # Do not count 'excused' problems. + } + } else { + # Unsolved. Did they try? + if (exists($resource_data->{'resource.'.$part.'.tries'})){ + $symbol = '.'; + } else { + $symbol = ' '; + } + } + # + if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) { + $symbol = ''.$symbol.''; + } + if (! defined($partscore)) { + $partscore = $symbol; + } + push (@ScoreData,$partscore); + } + $Str .= $symbol; + } + return ($Str,$performance_length,$score,$max,\@ScoreData); } #######################################################
Sequence or FolderScoreMaximum