--- loncom/interface/lonnavmaps.pm	2001/01/30 19:31:32	1.10
+++ loncom/interface/lonnavmaps.pm	2001/01/30 20:04:54	1.11
@@ -154,8 +154,26 @@ sub astatus {
     my $symb=&Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'.
 	     &Apache::lonnet::declutter($hash{'src_'.$rid});
     my $duedate=&parmval('0.duedate',$symb);
-    if ($duedate) {
-       $ctext.='Due: '.localtime($duedate);
+    my $opendate=&parmval('0.opendate',$symb);
+    my $answerdate=&parmval('0.answerdate',$symb);
+    my $now=time;
+    my $tcode=0;
+    if ($now<$duedate) {
+        $tcode=2; 
+        $ctext='Due: '.localtime($duedate);
+        if ($now<$opendate) { 
+          $tcode=1; 
+          $ctext='Open: '.localtime($opendate);
+        }
+        if ($duedate-$now<86400) {
+	   $tcode=4;
+           $ctext='Due: '.localtime($duedate);
+        }
+     } else {
+       $tcode=3;
+       if ($now<$answerdate) {  
+          $ctext='Answer: '.localtime($duedate);
+       }
     }
     my $answer=&Apache::lonnet::reply(
               "restore:$ENV{'user.domain'}:$ENV{'user.name'}:".
@@ -191,7 +209,8 @@ sub astatus {
                } elsif ($returnhash{$_} eq 'incorrect_attempted') {
                    $code=2;
                    $ctext.=
-                     $returnhash{'resource.'.$part.'.tries'}.' attempt(s)';
+                     $returnhash{'resource.'.$part.'.tries'}.'/'.
+                     &parmval($part.'.maxtries',$symb).' tries';
                } elsif ($returnhash{$_} eq 'incorrect_by_override') {
                    $code=2;
                    $ctext.='override';
@@ -202,7 +221,7 @@ sub astatus {
            }
        } keys %returnhash;
     }
-    return 'p'.$code.'"'.$ctext.'"';
+    return 'p'.$code.$tcode.'"'.$ctext.'"';
 }
 
 # ------------------------------------------------------------ Build page table
@@ -444,10 +463,26 @@ sub handler {
                                   $add='<th bgcolor="#AAFF55">';
                                   $adde='</th>';
                               }
-                              if ($rid=~/^p(\d)\"([\w\: \(\)\,]*)\"(.+)/) {
+                            if ($rid=~/^p(\d)(\d)\"([\w\: \(\)\/\,]*)\"(.+)/) {
                                   my $code=$1;
-                                  my $ctext=$2;
-                                  $rid=$3;
+                                  my $tcode=$2;
+                                  my $ctext=$3;
+                                  $rid=$4;
+                                  if ($tcode eq '1') {
+                                     $add='<td bgcolor="#AAAAAA">';
+                                  }
+                                  if ($code eq '3') {
+                                     $add='<td bgcolor="#AAFFAA">';
+				  } else {
+                                      $add='<td bgcolor="#FFAAAA">';
+				      if ($tcode eq '2') {
+                                         $add='<td bgcolor="#FFFFAA">';
+                                      }
+                                      if ($tcode eq '4') {
+                                         $add='<td bgcolor="#FFFF33"><blink>';
+                                         $adde='</blink></td>';
+                                      }
+                                  }
                                   $hwk='<font color="#888811"><b>';
                                   $hwke='</b></font>';
                                   if ($code eq '1') {