--- loncom/interface/statistics/lonstudentassessment.pm	2003/06/10 19:19:57	1.55
+++ loncom/interface/statistics/lonstudentassessment.pm	2003/09/30 11:41:06	1.68
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.55 2003/06/10 19:19:57 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.68 2003/09/30 11:41:06 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -138,8 +138,21 @@ Inputs:
 #######################################################
 sub BuildStudentAssessmentPage {
     my ($r,$c)=@_;
+
     undef($Statistics);
+    undef($show_links);
+    undef($output_mode);
+    undef($data);
+    undef($base);
+    undef($datadescription);
+    undef($single_student_mode);
+
+    $single_student_mode = 0;
     $single_student_mode = 1 if ($ENV{'form.SelectedStudent'});
+    if ($ENV{'form.selectstudent'}) {
+        &Apache::lonstatistics::DisplayClasslist($r);
+        return;
+    }
     #
     # Print out the HTML headers for the interface
     #    This also parses the output mode selector
@@ -149,6 +162,7 @@ sub BuildStudentAssessmentPage {
     $r->print('<input type="hidden" name="sort" value="'.
               $ENV{'form.sort'}.'" />');
     $r->rflush();
+    #
     if (! exists($ENV{'form.notfirstrun'}) && ! $single_student_mode) {
         return;
     }
@@ -179,6 +193,13 @@ sub BuildStudentAssessmentPage {
         @Students = @Apache::lonstatistics::Students;
     }
     #
+    # Perform generic initialization tasks
+    #       Since we use lonnet::EXT to retrieve problem weights,
+    #       to ensure current data we must clear the caches out.
+    #       This makes sure that parameter changes at the student level
+    #       are immediately reflected in the chart.
+    &Apache::lonnet::clear_EXT_cache_status();
+    #
     # Call the initialize routine selected above
     $initialize->($r);
     foreach my $student (@Students) {
@@ -285,8 +306,12 @@ sub CreateInterface {
     $Str .= '<td align="center"><b>Student Data</b></td>';
     $Str .= '<td align="center"><b>Enrollment Status</b></td>';
     $Str .= '<td align="center"><b>Sequences and Folders</b></td>';
-    $Str .= '<td align="center"><b>Output Format</b></td>';
-    $Str .= '<td align="center"><b>Output Data</b></td>';
+    $Str .= '<td align="center"><b>Output Format</b>'.
+        &Apache::loncommon::help_open_topic("Chart_Output_Formats").
+        '</td>';
+    $Str .= '<td align="center"><b>Output Data</b>'.
+        &Apache::loncommon::help_open_topic("Chart_Output_Data").
+        '</td>';
     $Str .= '</tr>'."\n";
     #
     $Str .= '<tr><td align="center">'."\n";
@@ -314,7 +339,13 @@ sub CreateInterface {
     $Str .= '</td></tr>'."\n";
     $Str .= '</table>'."\n";
     $Str .= '<input type="submit" value="Generate Chart" />';
-    $Str .= '&nbsp;'x8;
+    $Str .= '&nbsp;'x5;
+    $Str .= '<input type="submit" name="selectstudent" '.
+                                  'value="Select One Student" />';
+    $Str .= '&nbsp;'x5;
+    $Str .= '<input type="submit" name="ClearCache" value="Clear Caches" />';
+    $Str .= '&nbsp;'x5;
+    $Str .= '<br />';
     return $Str;
 }
 
@@ -359,29 +390,12 @@ my @OutputOptions =
        mode => 'excel',
        show_links => 'no',
    },
-#     { name  => 'multi-sheet Excel',
-#       value => 'multi-sheet excel',
-#       description => 'Output an Excel file (compatable with Excel 95), '.
-#	   'with a seperate worksheet for each sequence you have selected '.
-#           'the data for each problem part '.
-#           '(number of tries, status, points awarded) will be listed.',
-#       mode => 'multi-sheet excel',
-#       show_links => 'no',
-#           },
-#     { name  => 'multi-sheet Excel, by section',
-#       value => 'multi-sheet excel, by section',
-#       description => 'Output an Excel file (compatable with Excel 95), '.
-#	   'with a seperate worksheet for each sequence you have selected '.
-#           'the data for each problem part '.
-#           '(number of tries, status, points awarded) will be listed.  '.
-#           'There will be one Excel workbook for each section selected.',
-#       mode => 'multi-sheet excel',
-#       show_links => 'no',
-#           },
      { name  => 'CSV',
        value => 'csv',
        description => 'Output a comma seperated values file suitable for '.
-           'import into a spreadsheet.',
+           'import into a spreadsheet program.  Using this method as opposed '.
+           'to Excel output allows you to organize your data before importing'.
+           ' it into a spreadsheet program.',
        mode => 'csv',
        show_links => 'no',
            },
@@ -389,7 +403,7 @@ my @OutputOptions =
 
 sub OutputDescriptions {
     my $Str = '';
-    $Str .= "<h2>Output Modes</h2>\n";
+    $Str .= "<h2>Output Formats</h2>\n";
     $Str .= "<dl>\n";
     foreach my $outputmode (@OutputOptions) {
 	$Str .="    <dt>".$outputmode->{'name'}."</dt>\n";
@@ -438,61 +452,76 @@ sub CreateAndParseOutputSelector {
 ## 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  => '',
-        }
-      );
+    (
+     { 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 score of each student as well as the '.
+           ' maximum possible on each Sequence or Folder.',
+       },
+     { 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',
+       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'.
+           ' on each sequence or folder.',
+       },
+     { 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  => '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 {
+    my $Str = '';
+    $Str .= "<h2>Output Data</h2>\n";
+    $Str .= "<dl>\n";
+    foreach my $option (@OutputDataOptions) {
+        $Str .= '    <dt>'.$option->{'name'}.'</dt>';
+        $Str .= '<dd>'.$option->{'longdesc'}.'</dd>'."\n";
+    }
+    $Str .= "</dl>\n";
+    return $Str;
+}
 
 sub CreateAndParseOutputDataSelector {
     my $Str = '';
@@ -562,6 +591,7 @@ sub html_initialize {
     $padding = ' 'x3;
     $count = 0;
     $nodata_count = 0;
+    undef(%prog_state);
     #
     $r->print("<h3>".$ENV{'course.'.$ENV{'request.course.id'}.'.description'}.
               "&nbsp;&nbsp;".localtime(time)."</h3>");
@@ -786,78 +816,6 @@ sub SingleStudentTotal {
 
 =pod
 
-=head2 Multi-Sheet EXCEL subroutines
-
-=item &multi_sheet_excel_initialize($r)
-
-=item &multi_sheet_excel_outputstudent($r,$student)
-
-=item &multi_sheet_excel_finish($r)
-
-=cut
-
-#######################################################
-#######################################################
-{
-
-sub multi_sheet_excel_initialize {
-    my ($r)=@_;
-    $r->print("<h1>Not yet implemented</h1>");
-    # 
-    # Estimate the size of the file.  We would like to have < 5 megs of data.
-    my $max_size = 5000000;
-    my $num_students  = scalar(@Apache::lonstatistics::Students);
-    my $num_sequences = 0;
-    my $num_data_per_part  = 2; # 'status' and 'numtries'
-    my $fields_per_student = scalar(&get_student_fields_to_show());
-    my $bytes_per_field    = 20; # Back of the envelope calculation
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        $num_sequences++ if ($seq->{'num_assess'} > 0);
-        $fields_per_student += $num_data_per_part * $seq->{'num_assess_parts'};
-    }
-    my $size_estimate = $fields_per_student*$num_students*$bytes_per_field;
-    #
-    # Compute number of workbooks
-    my $num_workbooks = 1;
-    if ($size_estimate > $max_size) { # try to stay under 5 megs
-        $num_workbooks += int($size_estimate / $max_size);
-    }
-#    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<br />");
-    $r->print("Number of students: ".$num_students."<br />");
-    $r->print("Number of fields per student: ".$fields_per_student."<br />");
-    $r->print("Total number of fields: ".($fields_per_student*$num_students).
-              "<br />");
-    $r->print("Bytes per field: ".$bytes_per_field." (estimated)"."<br />");
-    $r->print("Estimated size: ".$size_estimate." bytes<br />");
-    $r->print("Number of workbooks: ".$num_workbooks."<br />");
-    $r->rflush();
-    return;
-}
-
-sub multi_sheet_excel_outputstudent {
-    my ($r,$student) = @_;
-}
-
-sub multi_sheet_excel_finish {
-    my ($r) = @_;
-}
-
-}
-#######################################################
-#######################################################
-
-=pod
-
 =head2 EXCEL subroutines
 
 =item &excel_initialize($r)
@@ -885,7 +843,14 @@ my $request_aborted;
 sub excel_initialize {
     my ($r) = @_;
     #
-    $request_aborted = undef;
+    undef ($excel_sheet);
+    undef ($excel_workbook);
+    undef ($filename);
+    undef ($rows_output);
+    undef ($cols_output);
+    undef (%prog_state);
+    undef ($request_aborted);
+    #
     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
@@ -966,9 +931,7 @@ END
     #
     # Add a worksheet
     my $sheetname = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
-    if (length($sheetname) > 31) {
-        $sheetname = substr($sheetname,0,31);
-    }
+    $sheetname = &Apache::loncommon::clean_excel_name($sheetname);
     $excel_sheet = $excel_workbook->addworksheet($sheetname);
     #
     # Put the course description in the header
@@ -1109,6 +1072,8 @@ END
         ($r,'Excel File Compilation Status',
          'Excel File Compilation Progress', $studentcount);
     #
+    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
+                                          'Processing first student');
     return;
 }
 
@@ -1220,8 +1185,9 @@ sub csv_initialize{
     my ($r) = @_;
     # 
     # Clean up
-    $filename = undef;
-    $outputfile = undef;
+    undef($outputfile);
+    undef($filename);
+    undef($request_aborted);
     undef(%prog_state);
     #
     # Deal with unimplemented requests
@@ -1439,7 +1405,8 @@ sub StudentTriesOnSequence {
                 } elsif ($status eq 'excused') {
                     $symbol = 'x';
                     $max--;
-                } elsif ($status eq 'correct_by_student' &&
+                } elsif (($status eq 'correct_by_scantron' ||
+                          $status eq 'correct_by_student') &&
                     exists($resource_data->{'resource.'.$partnum.'.tries'})){
                     $tries = $resource_data->{'resource.'.$partnum.'.tries'};
                     if ($tries > 9) {
@@ -1478,7 +1445,7 @@ sub StudentTriesOnSequence {
                 $symbol = '<a href="/adm/grades'.
                     '?symb='.&Apache::lonnet::escape($resource->{'symb'}).
                         '&student='.$student->{'username'}.
-                            '&domain='.$student->{'domain'}.
+                            '&userdom='.$student->{'domain'}.
                                 '&command=submission">'.$symbol.'</a>';
             }
             $value .= $symbol;
@@ -1546,11 +1513,12 @@ sub StudentPerformanceOnSequence {
             my $awarded = 0;
             if (exists($resource_data->{'resource.'.$part.'.awarded'})) {
                 $awarded = $resource_data->{'resource.'.$part.'.awarded'};
+                $awarded = 0 if (! $awarded);
             }
             #
             $partscore = $weight*$awarded;
             $score += $partscore;
-            $symbol = $weight; 
+            $symbol = $partscore; 
             if (length($symbol) > 1) {
                 $symbol = '*';
             }
@@ -1569,19 +1537,20 @@ sub StudentPerformanceOnSequence {
                 }
             }
             #
+            if (! defined($partscore)) {
+                $partscore = $symbol;
+            }
+            push (@ScoreData,$partscore);
+            #
             if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) {
                 $symbol = '<a href="/adm/grades'.
                     '?symb='.&Apache::lonnet::escape($resource->{'symb'}).
                     '&student='.$student->{'username'}.
-                    '&domain='.$student->{'domain'}.
+                    '&userdom='.$student->{'domain'}.
                     '&command=submission">'.$symbol.'</a>';
             }
-            if (! defined($partscore)) {
-                $partscore = $symbol;
-            }
-            push (@ScoreData,$partscore);
+            $Str .= $symbol;
         }
-        $Str .= $symbol;
     }
     return ($Str,$performance_length,$score,$max,\@ScoreData);
 }