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

[albertel]

albertel		Fri Mar 15 16:56:11 2002 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm 
  Log:
  - doesn't think completely correct problems are partially correct
  - now sets bgcolor to something between yellow and green
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.29 loncom/interface/lonnavmaps.pm:1.30
--- loncom/interface/lonnavmaps.pm:1.29	Fri Mar 15 16:40:27 2002
+++ loncom/interface/lonnavmaps.pm	Fri Mar 15 16:56:11 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.29 2002/03/15 21:40:27 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.30 2002/03/15 21:56:11 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -239,10 +239,10 @@
 	my $status=$returnhash{'resource.'.$_.'.solved'};
 	
 	if ($status eq 'correct_by_student') {
-	    if ($code==0) { $code=3; } else { $code=4; }
+	    if ($code==0||$code==3) { $code=3; } else { $code=4; }
 	    $ctext.=' solved';
 	} elsif ($status eq 'correct_by_override') {
-	    if ($code==0) { $code=3; } else { $code=4; }
+	    if ($code==0||$code==3) { $code=3; } else { $code=4; }
 	    $ctext.=' override';
 	} elsif ($status eq 'incorrect_attempted') {
 	    if ($code!=4 && $code!=3) { $code=2; }
@@ -258,7 +258,7 @@
 	    if ($code==3) { $code=4; }
 	    $ctext.=' override';
 	} elsif ($status eq 'excused') {
-	    if ($code==0) { $code=3; } else { $code=4; }
+	    if ($code==0||$code==3) { $code=3; } else { $code=4; }
 	    $ctext.=' excused';
 	} else {
 	    if ($code==0) { $code=1; }
@@ -283,7 +283,7 @@
 		eq 'sequence') { 
 		$tprefix='h'; 
 	    } else {
-		# it's a page we need to grab out the problems only
+		#if it's a page we need to still pull out the problems
 	    }
 	    if (defined($rows[$sofar])) {
 		$rows[$sofar].='&'.$tprefix.$rid;
@@ -603,6 +603,8 @@
 			    }
 			    if ($code eq '3') {
 				$add='<td bgcolor="#AAFFAA">';
+			    } elsif ($code eq '4') {
+				$add='<td bgcolor="#E0FFAA">';
 			    } else {
 				$add='<td bgcolor="#FFAAAA">';
 				if ($tcode eq '2') {
@@ -618,15 +620,11 @@
 			    if ($code eq '1') {
 				$hwke='</b> ('.$ctext.')</font>';
 			    }
-			    if ($code eq '2') {
+			    if ($code eq '2' || $code eq '4') {
 				$hwk='<font color="#992222"><b>';
 				$hwke='</b> ('.$ctext.')</font>';
 			    }
 			    if ($code eq '3') {
-				$hwk='<font color="#229922"><b>';
-				$hwke='</b> ('.$ctext.')</font>';
-			    }
-			    if ($code eq '4') {
 				$hwk='<font color="#229922"><b>';
 				$hwke='</b> ('.$ctext.')</font>';
 			    }