--- loncom/interface/statistics/lonstudentassessment.pm	2003/06/23 16:06:11	1.62
+++ loncom/interface/statistics/lonstudentassessment.pm	2003/10/21 21:23:53	1.71
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.62 2003/06/23 16:06:11 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.71 2003/10/21 21:23:53 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -138,7 +138,16 @@ 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);
@@ -191,6 +200,9 @@ sub BuildStudentAssessmentPage {
     #       are immediately reflected in the chart.
     &Apache::lonnet::clear_EXT_cache_status();
     #
+    # Clean out loncoursedata's package data, just to be safe.
+    &Apache::loncoursedata::clear_internal_caches();
+    #
     # Call the initialize routine selected above
     $initialize->($r);
     foreach my $student (@Students) {
@@ -446,33 +458,33 @@ my @OutputDataOptions =
     (
      { 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',
+     { name  => 'Scores Per Problem',
        base  => 'scores',
-       value => 'final table scores',
-       shortdesc => 'Summary of Scores',
-       longdesc  => 'The average score on each sequence or folder for the '.
-           'selected students.',
+       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 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',
@@ -481,25 +493,25 @@ my @OutputDataOptions =
        },
      { 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.',
-       },
+#     { name  =>'Parts Correct',
+#       base  =>'tries',
+#       value => 'parts correct',
+#       shortdesc => 'Number of Problem Parts completed successfully.',
+#       longdesc => 'The Number of Problem Parts completed successfully'.
+#           ' on each sequence or folder.',
+#       },
+#     { name  => 'Parts Summary Table Only',
+#       base  => 'tries',
+#       value => 'final table parts',
+#       shortdesc => 'Summary of Parts Correct',
+#       longdesc  => 'A summary table of the average number of problem parts '.
+#           'students were able to get correct on each sequence.',
+#       },
      );
 
 sub HTMLifyOutputDataDescriptions {
@@ -582,6 +594,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>");
@@ -833,7 +846,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
@@ -914,9 +934,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
@@ -1170,8 +1188,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
@@ -1389,7 +1408,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) {
@@ -1428,7 +1448,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;
@@ -1496,11 +1516,15 @@ 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 (abs($symbol - sprintf("%.0f",$symbol)) < 0.001) {
+                $symbol = sprintf("%.0f",$symbol);
+            }
             if (length($symbol) > 1) {
                 $symbol = '*';
             }
@@ -1528,7 +1552,7 @@ sub StudentPerformanceOnSequence {
                 $symbol = '<a href="/adm/grades'.
                     '?symb='.&Apache::lonnet::escape($resource->{'symb'}).
                     '&student='.$student->{'username'}.
-                    '&domain='.$student->{'domain'}.
+                    '&userdom='.$student->{'domain'}.
                     '&command=submission">'.$symbol.'</a>';
             }
             $Str .= $symbol;