--- loncom/interface/lonnavmaps.pm	2001/01/17 17:27:04	1.8
+++ loncom/interface/lonnavmaps.pm	2001/01/30 00:35:24	1.9
@@ -9,7 +9,7 @@
 # 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21,09/23,
 # 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16 Gerd Kortemeyer)
 #
-# 3/1/1,6/1,17/1 Gerd Kortemeyer
+# 3/1/1,6/1,17/1,29/1 Gerd Kortemeyer
 
 package Apache::lonnavmaps;
 
@@ -36,6 +36,59 @@ sub euclid {
     return $b;
 }
 
+# ------------------------------------------------------------- Find out status
+
+sub astatus {
+    my $rid=shift;
+    my $code=1;
+    my $ctext='';
+    $rid=~/(\d+)\.(\d+)/;
+    my $symb=&Apache::lonnet::escape(
+             &Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'.
+	     &Apache::lonnet::declutter($hash{'src_'.$rid}));
+    my $answer=&Apache::lonnet::reply(
+              "restore:$ENV{'user.domain'}:$ENV{'user.name'}:".
+              $ENV{'request.course.id'}.":$symb",
+              "$ENV{'user.home'}");
+    my %returnhash=();
+    map {
+	my ($name,$value)=split(/\=/,$_);
+        $returnhash{&Apache::lonnet::unescape($name)}=
+                    &Apache::lonnet::unescape($value);
+    } split(/\&/,$answer);
+    if ($returnhash{'version'}) {
+       my $version;
+       for ($version=1;$version<=$returnhash{'version'};$version++) {
+          map {
+             $returnhash{$_}=$returnhash{$version.':'.$_};
+          } split(/\:/,$returnhash{$version.':keys'});
+       }
+       map {
+           if (($_=~/\.(\w+)\.solved$/) && ($_!~/^\d+\:/)) {
+               my $part=$1;
+	       if ($returnhash{$_} eq 'correct_by_student') {
+                   unless ($code==2) { $code=3; }
+                   $ctext.='Part '.$part.': solved';
+               } elsif ($returnhash{$_} eq 'correct_by_override') {
+                   unless ($code==2) { $code=3; }
+                   $ctext.='Part '.$part.': override';
+               } elsif ($returnhash{$_} eq 'incorrect_attempted') {
+                   $code=2;
+                   $ctext.='Part '.$part.': '.
+                     $returnhash{'resource.'.$part.'.tries'}.' attempt(s)';
+               } elsif ($returnhash{$_} eq 'incorrect_by_override') {
+                   $code=2;
+                   $ctext.='Part '.$part.': override';
+               } elsif ($returnhash{$_} eq 'excused') {
+                   unless ($code==2) { $code=3; }
+                   $ctext.='Part '.$part.': excused';
+               }
+           }
+       } keys %returnhash;
+    }
+    return 'p'.$code.'"'.$ctext.'"';
+}
+
 # ------------------------------------------------------------ Build page table
 
 sub tracetable {
@@ -68,8 +121,10 @@ sub tracetable {
                my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$frid});
                if (($brepriv eq '2') || ($brepriv eq 'F')) {
 		 my $pprefix='';
-                 if ($hash{'src_'.$frid}=~/\.problem$/) {
-		     $pprefix='p1';
+                 if ($hash{'src_'.$frid}=~
+                                 /\.(problem|exam|quiz|assess|survey|form)$/) {
+		     $pprefix=&astatus($frid);
+
                  }
                  if (defined($rows[$sofar])) {
                    $rows[$sofar].='&'.$pprefix.$frid;
@@ -85,8 +140,9 @@ sub tracetable {
            my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$rid});
            if (($brepriv eq '2') || ($brepriv eq 'F')) {
 	     my $pprefix='';
-             if ($hash{'src_'.$rid}=~/\.problem$/) {
-	         $pprefix='p1';
+             if ($hash{'src_'.$rid}=~
+                                 /\.(problem|exam|quiz|assess|survey|form)$/) {
+	         $pprefix=&astatus($rid);
              }
              if (defined($rows[$sofar])) {
                 $rows[$sofar].='&'.$pprefix.$rid;
@@ -221,18 +277,19 @@ sub handler {
                                   $add='<th bgcolor="#AAFF55">';
                                   $adde='</th>';
                               }
-                              if ($rid=~/^p(\d)(.+)/) {
+                              if ($rid=~/^p(\d)\"([\w\: \(\)]*)\"(.+)/) {
                                   my $code=$1;
-                                  $rid=$2;
-                                  $hwk='<font color="#999911">';
+                                  my $ctext=$2;
+                                  $rid=$3;
+                                  $hwk='<font color="#888811"><b>';
+                                  $hwke='</b></font>';
                                   if ($code eq '2') {
-                                     $hwk='<font color="#999911"><b>';
-                                     $hwke='</b></font>';
+                                     $hwk='<font color="#992222"><b>';
+                                     $hwke='</b> ('.$ctext.')</font>';
                                   }
                                   if ($code eq '3') {
-                                     $hwk='<font color="#229922">';
-                                  } elsif ($code eq '4') {
-                                     $hwk='<font color="#992222">';
+                                     $hwk='<font color="#229922"><b>';
+                                     $hwke='</b> ('.$ctext.')</font>';
                                   }
                               }
                               $r->print($add.'<a href="'.$hash{'src_'.$rid}.