--- loncom/interface/lonnavmaps.pm	2003/02/04 16:28:50	1.135
+++ loncom/interface/lonnavmaps.pm	2003/02/04 16:37:51	1.136
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.135 2003/02/04 16:28:50 bowersj2 Exp $
+# $Id: lonnavmaps.pm,v 1.136 2003/02/04 16:37:51 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -77,6 +77,23 @@ my %iconAltTags =
       'navmap.wrong.gif'   => 'Incorrect',
       'navmap.open.gif'    => 'Open' );
 
+# Defines a status->color mapping, null string means don't color
+my %colormap = 
+    ( Apache::lonnavmaps::resource->NETWORK_FAILURE        => '',
+      Apache::lonnavmaps::resource->CORRECT                => '',
+      Apache::lonnavmaps::resource->EXCUSED                => '#3333FF',
+      Apache::lonnavmaps::resource->PAST_DUE_ANSWER_LATER  => '',
+      Apache::lonnavmaps::resource->PAST_DUE_NO_ANSWER     => '',
+      Apache::lonnavmaps::resource->ANSWER_OPEN            => '#006600',
+      Apache::lonnavmaps::resource->OPEN_LATER             => '',
+      Apache::lonnavmaps::resource->TRIES_LEFT             => '',
+      Apache::lonnavmaps::resource->INCORRECT              => '',
+      Apache::lonnavmaps::resource->OPEN                   => '',
+      Apache::lonnavmaps::resource->NOTHING_SET            => ''        );
+# And a special case in the nav map; what to do when the assignment
+# is not yet done and due in less then 24 hours
+my $hurryUpColor = "#FF0000";
+
 sub cleanup {
     if (tied(%navmaphash)){
 	&Apache::lonnet::logthis('Cleanup navmaps: navmaphash');
@@ -242,23 +259,6 @@ sub real_handler {
     # These are some data tables, which make it easy to change some of
     # of the specific visualization parameters if desired.
 
-    # Defines a status->color mapping, null string means don't color
-    my %colormap = 
-    ( $res->NETWORK_FAILURE        => '',
-      $res->CORRECT                => '',
-      $res->EXCUSED                => '#3333FF',
-      $res->PAST_DUE_ANSWER_LATER  => '',
-      $res->PAST_DUE_NO_ANSWER     => '',
-      $res->ANSWER_OPEN            => '#006600',
-      $res->OPEN_LATER             => '',
-      $res->TRIES_LEFT             => '',
-      $res->INCORRECT              => '',
-      $res->OPEN                   => '',
-      $res->NOTHING_SET            => ''        );
-    # And a special case in the nav map; what to do when the assignment
-    # is not yet done and due in less then 24 hours
-    my $hurryUpColor = "#FF0000";
-
     my %condenseStatuses =
         ( $res->NETWORK_FAILURE    => 1,
           $res->NOTHING_SET        => 1,
@@ -554,7 +554,6 @@ sub real_handler {
 
                 }
                 
-                my $colorizer = "";
                 my $color;
                 if ($curRes->is_problem()) {
                     $color = $colormap{$curRes->status};
@@ -563,10 +562,6 @@ sub real_handler {
                         lastTry($curRes, $part)) {
                         $color = $hurryUpColor;
                     }
-
-                    if ($color ne "") {
-                        $colorizer = "bgcolor=\"$color\"";
-                    }
                 }
 
                 if ($curRes->randomout()) {
@@ -1060,24 +1055,6 @@ sub long_status { return 3; }
 
 # Data for render_resource
 
-my $resObj = 'Apache::lonnavmaps::resource';
-# Defines a status->color mapping, null string means don't color
-my %colormap = 
-    ( $resObj->NETWORK_FAILURE        => '',
-      $resObj->CORRECT                => '',
-      $resObj->EXCUSED                => '#3333FF',
-      $resObj->PAST_DUE_ANSWER_LATER  => '',
-      $resObj->PAST_DUE_NO_ANSWER     => '',
-      $resObj->ANSWER_OPEN            => '#006600',
-      $resObj->OPEN_LATER             => '',
-      $resObj->TRIES_LEFT             => '',
-      $resObj->INCORRECT              => '',
-      $resObj->OPEN                   => '',
-      $resObj->NOTHING_SET            => ''        );
-# And a special case in the nav map; what to do when the assignment
-# is not yet done and due in less then 24 hours
-my $hurryUpColor = "#FF0000";
-
 sub render_resource {
     my ($resource, $part, $params) = @_;
 
@@ -1251,7 +1228,34 @@ sub render_quick_status {
 }
 sub render_long_status {
     my ($resource, $part, $params) = @_;
-    return "<td align='center'>long_status</td>";
+    my $result = "<td align='right' valign='center'>\n";
+    my $firstDisplayed = !$params->{'condensed'} && 
+        $params->{'multipart'} && $part eq "0";
+                
+    my $color;
+    if ($resource->is_problem()) {
+        $color = $colormap{$resource->status};
+        
+        if (dueInLessThen24Hours($resource, $part) ||
+            lastTry($resource, $part)) {
+            $color = $hurryUpColor;
+        }
+    }
+    
+    if ($resource->kind() eq "res" &&
+        $resource->is_problem() &&
+        !$firstDisplayed) {
+        if ($color) {$result .= "<font color=\"$color\"><b>"; }
+        $result .= getDescription($resource, $part);
+        if ($color) {$result .= "</b></font>"; }
+    }
+    if ($resource->is_map() && advancedUser() && $resource->randompick()) {
+        $result .= '(randomly select ' . $resource->randompick() .')';
+    }
+    
+    $result .= "&nbsp;</td>\n";
+    
+    return $result;
 }
 
 my @preparedColumns = (\&render_resource, \&render_communication_status,