--- loncom/interface/statistics/lonstudentassessment.pm	2003/09/10 15:06:34	1.67
+++ 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.67 2003/09/10 15:06:34 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.71 2003/10/21 21:23:53 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -200,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) {
@@ -455,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',
@@ -490,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 {
@@ -1405,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) {
@@ -1518,6 +1522,9 @@ sub StudentPerformanceOnSequence {
             $partscore = $weight*$awarded;
             $score += $partscore;
             $symbol = $partscore; 
+            if (abs($symbol - sprintf("%.0f",$symbol)) < 0.001) {
+                $symbol = sprintf("%.0f",$symbol);
+            }
             if (length($symbol) > 1) {
                 $symbol = '*';
             }