--- loncom/interface/lonnavmaps.pm	2009/05/04 16:45:57	1.434
+++ loncom/interface/lonnavmaps.pm	2010/01/26 11:33:48	1.443
@@ -1,7 +1,8 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.434 2009/05/04 16:45:57 bisitz Exp $
+# $Id: lonnavmaps.pm,v 1.443 2010/01/26 11:33:48 foxr Exp $
+
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,7 +32,7 @@
 
 =head1 NAME
 
-Apache::lonnavmaps.pm
+Apache::lonnavmaps - Subroutines to handle and render the navigation
 
 =head1 SYNOPSIS
 
@@ -477,6 +478,7 @@ use Apache::loncommon();
 use Apache::lonenc();
 use Apache::lonlocal;
 use Apache::lonnet;
+
 use POSIX qw (floor strftime);
 use Time::HiRes qw( gettimeofday tv_interval );
 use LONCAPA;
@@ -491,7 +493,7 @@ sub NOTHING { return 3; }
 
 my $resObj = "Apache::lonnavmaps::resource";
 
-# Keep these mappings in sync with lonquickgrades, which uses the colors
+# Keep these mappings in sync with lonquickgrades, which usesthe colors
 # instead of the icons.
 my %statusIconMap = 
     (
@@ -504,10 +506,13 @@ my %statusIconMap =
      $resObj->ERROR        => ''
      );
 
-my %iconAltTags = 
-    ( 'navmap.correct.gif' => 'Correct',
-      'navmap.wrong.gif'   => 'Incorrect',
-      'navmap.open.gif'    => 'Open' );
+my %iconAltTags =   #texthash does not work here
+    ( 'navmap.correct.gif'  => 'Correct',
+      'navmap.wrong.gif'    => 'Incorrect',
+      'navmap.open.gif'     => 'Open',
+      'navmap.partial.gif'  => 'Partially Correct',
+      'navmap.ellipsis.gif' => 'Attempted',
+     );
 
 # Defines a status->color mapping, null string means don't color
 my %colormap = 
@@ -597,7 +602,7 @@ sub getLinkForResource {
 	    my ($map,$id,$src)=&Apache::lonnet::decode_symb($res->symb());
 	    if ($map=~/\.page$/) {
 		my $url=&Apache::lonnet::clutter($map);
-		$anchor=&escape($src->shown_symb());
+		$anchor=&escape($res->shown_symb());
 		return ($url,$res->shown_symb(),$anchor);
 	    }
         }
@@ -880,11 +885,6 @@ sub render_resource {
     my $link = $params->{"resourceLink"};
 
     #  The URL part is not escaped at this point, but the symb is... 
-    #  The stuff to the left of the ? must have ' replaced by \' since
-    #  it will be quoted with ' in the href.
-
-    my ($left,$right) = split(/\?/, $link);
-    $link = $left.'?'.$right;
 
     my $src = $resource->src();
     my $it = $params->{"iterator"};
@@ -1038,7 +1038,7 @@ sub render_communication_status {
     my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
     if ($resource->hasDiscussion()) {
         $discussionHTML = $linkopen .
-            '<img alt="'.&mt('New Discussion').'" src="'.$location.'/chat.gif" />' .
+            '<img alt="'.&mt('New Discussion').'" src="'.$location.'/chat.gif" title="'.&mt('New Discussion').'"/>' .
             $linkclose;
     }
     
@@ -1048,7 +1048,7 @@ sub render_communication_status {
             if ($msgid) {
                 $feedbackHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
                     . &escape($msgid) . '">'
-                    . '<img alt="'.&mt('New E-mail').'" src="'.$location.'/feedback.gif" /></a>';
+                    . '<img alt="'.&mt('New E-mail').'" src="'.$location.'/feedback.gif" title="'.&mt('New E-mail').'"/></a>';
             }
         }
     }
@@ -1062,7 +1062,7 @@ sub render_communication_status {
                 $errorcount++;
                 $errorHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
                     . &escape($msgid) . '">'
-                    . '<img alt="'.&mt('New Error').'" src="'.$location.'/bomb.gif" /></a>';
+                    . '<img alt="'.&mt('New Error').'" src="'.$location.'/bomb.gif" title="'.&mt('New Error').'"/></a>';
             }
         }
     }
@@ -1095,7 +1095,7 @@ sub render_quick_status {
         if ($icon) {
 	    my $location=
 		&Apache::loncommon::lonhttpdurl("/adm/lonIcons/$icon");
-            $result .= "$linkopen<img src='$location' alt='$alt' />$linkclose";
+		$result .= $linkopen.'<img src="'.$location.'" alt="'.&mt($alt).'" title="'.&mt($alt).'" />'.$linkclose;            
         } else {
             $result .= "&nbsp;";
         }
@@ -1529,7 +1529,6 @@ END
         ( $res->NETWORK_FAILURE    => 1,
           $res->NOTHING_SET        => 1,
           $res->CORRECT            => 1 );
-    my @backgroundColors = ("LC_trEven", "LC_trOdd");
 
     # Shared variables
     $args->{'counter'} = 0; # counts the rows
@@ -1764,7 +1763,6 @@ END
         # show them.
         foreach my $part (@parts) {
             $rownum ++;
-            my $backgroundColor = $backgroundColors[$rownum % scalar(@backgroundColors)];
             
             $result .= &Apache::loncommon::start_data_table_row();
 
@@ -3535,7 +3533,11 @@ sub navHash {
     my $self = shift;
     my $param = shift;
     my $id = shift;
-    return $self->{NAV_MAP}->navhash($param . ($id?$self->{ID}:""));
+    my $arg = $param . ($id?$self->{ID}:"");
+    if (defined($arg)) {
+        return $self->{NAV_MAP}->navhash($arg);
+    }
+    return;
 }
 
 =pod
@@ -3778,6 +3780,35 @@ sub is_problem {
     }
     return 0;
 }
+#
+#  The has below is the set of status that are considered 'incomplete'
+#
+my %incomplete_hash = 
+(
+ TRIES_LEFT()     => 1,
+ OPEN()           => 1,
+ ATTEMPTED()      => 1
+
+ );
+#
+#  Return tru if a problem is incomplete... for now incomplete means that
+#  any part of the problem is incomplete. 
+#  Note that if the resources is not a problem, 0 is returned.
+#
+sub is_incomplete {
+    my $self = shift;
+    if ($self->is_problem()) {
+	&Apache::lonnet::logthis('is problem');
+	foreach my $part (@{$self->parts()}) {
+	    &Apache::lonnet::logthis("$part status ".$self->status($part));
+	    if (exists($incomplete_hash{$self->status($part)})) {
+		return 1;
+	    }
+	}
+    }
+    return 0;
+       
+}
 sub is_raw_problem {
     my $self=shift;
     my $src = $self->src();