[LON-CAPA-cvs] cvs: loncom /interface lonquickgrades.pm

matthew lon-capa-cvs@mail.lon-capa.org
Thu, 17 Jul 2003 14:31:17 -0000


matthew		Thu Jul 17 10:31:17 2003 EDT

  Modified files:              
    /loncom/interface	lonquickgrades.pm 
  Log:
  Excused problems are not longer part of the total possible.
  
  
Index: loncom/interface/lonquickgrades.pm
diff -u loncom/interface/lonquickgrades.pm:1.20 loncom/interface/lonquickgrades.pm:1.21
--- loncom/interface/lonquickgrades.pm:1.20	Wed Jun 25 15:29:43 2003
+++ loncom/interface/lonquickgrades.pm	Thu Jul 17 10:31:17 2003
@@ -63,7 +63,11 @@
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
 
-    my $showPoints = $ENV{'course.'.$ENV{'request.course.id'}.'.grading'} eq 'standard';
+    my $showPoints = 1;
+    if (defined($ENV{'course.'.$ENV{'request.course.id'}.'.grading'}) &&
+        $ENV{'course.'.$ENV{'request.course.id'}.'.grading'} ne 'standard') {
+        $showPoints = 0;
+    }
 
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new(
@@ -135,6 +139,9 @@
             my $stack = $iterator->getStack();
             
             for my $part (@{$parts}) {
+                if ($curRes->getCompletionStatus($part) == $curRes->EXCUSED()) {
+                    next;
+                }
 		if ($showPoints) {
 		    my $score = $curRes->weight($part) * $curRes->awarded($part);
 		    $partsRight += $score;
@@ -151,7 +158,6 @@
 		    $partsCount++;
 		    if ($status == $curRes->CORRECT || 
 			$status == $curRes->CORRECT_BY_OVERRIDE || 
-			$status == $curRes->EXCUSED || 
 			$status == $curRes->ANSWER_SUBMITTED) {
 			$partsRight++;
 			$totalRight++;