--- loncom/interface/lonnavmaps.pm	2002/10/14 16:43:58	1.77
+++ loncom/interface/lonnavmaps.pm	2002/10/17 19:25:27	1.84
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.77 2002/10/14 16:43:58 bowersj2 Exp $
+# $Id: lonnavmaps.pm,v 1.84 2002/10/17 19:25:27 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -823,7 +823,7 @@ sub new_handle {
     # Initialize the nav map
     my $navmap = Apache::lonnavmaps::navmap->new(
                         $ENV{"request.course.fn"}.".db",
-                        $ENV{"request.course.fn"}."_parms.db", 1);
+                        $ENV{"request.course.fn"}."_parms.db", 1, 1);
 
 
     if (!defined($navmap)) {
@@ -849,10 +849,6 @@ sub new_handle {
         $r->print('<img src="/adm/lonMisc/chat.gif"> Discussions'.
                   '<br><img src="/adm/lonMisc/feedback.gif"> New message (click to open)<p>'); 
     }
-    #if (($currenturl=~/^\/res/) &&
-    #    ($currenturl!~/^\/res\/adm/)) {
-    #    $r->print('<a href="#curloc">Current Location</a><p>');
-    #}
 
     # Check that it's defined
     if (!($navmap->courseMapDefined())) {
@@ -929,7 +925,7 @@ sub new_handle {
 
     # Begin the HTML table
     # four cols: resource + indent, chat+feedback, icon, text string
-    $r->print('<table cellspacing="3" cellpadding="0" bgcolor="#FFFFFF">' ."\n");
+    $r->print('<table cellspacing="0" cellpadding="3" width="100%" border="0" bgcolor="#FFFFFF">' ."\n");
 
     my $condition = 0;
     if ($ENV{'form.condition'}) {
@@ -944,7 +940,7 @@ sub new_handle {
     if ($currenturl && !$ENV{'form.alreadyHere'}) {
         # Give me every resource...
         my $mapIterator = $navmap->getIterator(undef, undef, {}, 1);
-        my $found != 0;
+        my $found = 0;
         my $depth = 1;
         $mapIterator->next(); # discard the first BEGIN_MAP
         my $curRes = $mapIterator->next();
@@ -977,6 +973,7 @@ sub new_handle {
     my $now = time();
     my $in24Hours = $now + 24 * 60 * 60;
     my $depth = 1;
+    my $displayedHereMarker = 0;
 
     # We know the first thing is a BEGIN_MAP (see "$self->{STARTED}"
     # code in iterator->next), so ignore the first one
@@ -1074,11 +1071,18 @@ sub new_handle {
                 }
 
             } else {
-                @parts[0] = "0"; # this is to get past foreach loop below
+                $parts[0] = "0"; # this is to get past foreach loop below
                  # you can consider a non-problem resource as a resource
                   # with only one part without loss
             }
 
+            # Is it a multipart problem with a single part, now in 
+            # @parts with "0" filtered out? If so, forget it's a multi-part
+            # problem and treat it like a single-part problem.
+            if ( scalar(@parts) == 1 ) {
+                $multipart = 0;
+            }
+
             # Display one part, in event of network error.
             # If this is a single part, we can at least show the correct
             # status, but if it's multipart, we're lost.
@@ -1103,6 +1107,10 @@ sub new_handle {
                     'symb='.&Apache::lonnet::escape($curRes->symb()).
                     '"';
                 my $title = $curRes->title();
+                if (!$title) {
+                    $title = $curRes->src();
+                    $title = substr ($title, rindex($title, "/") + 1);
+                }
                 my $partLabel = "";
                 my $newBranchText = "";
 
@@ -1130,7 +1138,8 @@ sub new_handle {
                 # Display the correct icon, link to open or shut map
                 if ($curRes->is_map()) { 
                     my $mapId = $curRes->map_pc();
-                    my $nowOpen = !defined($filterHash{$mapId});
+                    my $nowOpen = (!defined($filterHash{$mapId}));
+                    if ($condition) {$nowOpen = !$nowOpen;}
                     $icon = $nowOpen ?
                         "navmap.folder.closed.gif" : "navmap.folder.open.gif";
                     $icon = "<img src=\"/adm/lonIcons/$icon\" alt=\"\" border=\"0\" />";
@@ -1155,6 +1164,14 @@ sub new_handle {
                         $curRes->duedate() > time()) {
                         $color = $hurryUpColor;
                     }
+                    # Special case: If this is the last try, and there is
+                    # more then one available, give a bit of urgency
+                    my $tries = $curRes->tries($part);
+                    my $maxtries = $curRes->maxtries($part);
+                    if ($tries && $maxtries && $maxtries > 1 &&
+                        $maxtries - $tries == 1) {
+                        $color = $hurryUpColor;
+                    }
                     if ($color ne "") {
                         $colorizer = "bgcolor=\"$color\"";
                     }
@@ -1165,7 +1182,7 @@ sub new_handle {
                 }
 
                 # FIRST COL: The resource indentation, branch icon, and name
-                $r->print("  <tr><td align=\"left\" valign=\"center\">\n");
+                $r->print("  <tr><td align=\"left\" valign=\"center\" width=\"60%\">\n");
 
                 # print indentation
                 for (my $i = 0; $i < $indentLevel - $deltalevel; $i++) {
@@ -1178,9 +1195,10 @@ sub new_handle {
                 my $curMarkerEnd = "";
 
                 # Is this the current resource?
-                if ($curRes->src() eq $currenturl) {
+                if ($curRes->src() eq $currenturl && !$displayedHereMarker) {
                     $curMarkerBegin = '<a name="curloc" /><font color="red" size="+2">&gt; </font>';
                     $curMarkerEnd = '<font color="red" size="+2"> &lt;</font>';
+                    $displayedHereMarker = 1;
                 }
 
                 if ($curRes->is_problem() && $part ne "0" && !$condensed) { 
@@ -1195,7 +1213,7 @@ sub new_handle {
 
                 if ($curRes->{RESOURCE_ERROR}) {
                     $r->print(&Apache::loncommon::help_open_topic ("Navmap_Host_Down",
-                                                  '<font size="-1">Host down</font>'));
+                                              '<font size="-1">Host down</font>'));
                     }
 
                 my $discussionHTML = ""; my $feedbackHTML = "";
@@ -1219,7 +1237,7 @@ sub new_handle {
                     }
                 }
 
-                $r->print("<td align=\"left\" valign=\"center\">$discussionHTML$feedbackHTML</td>");
+                $r->print("<td width=\"75\" align=\"left\" valign=\"center\">$discussionHTML$feedbackHTML&nbsp;</td>");
 
                 # Is this the first displayed part of a multi-part problem
                 # that has not been condensed, so we should suppress these two
@@ -1232,12 +1250,12 @@ sub new_handle {
                     my $icon = $statusIconMap{$curRes->status($part)};
                     my $alt = $iconAltTags{$icon};
                     if ($icon) {
-                        $r->print("<td valign=\"center\" width=\"50\" align=\"right\">$linkopen<img src=\"/adm/lonIcons/$icon\" border=\"0\" alt=\"$alt\" />$linkclose</td>\n");
+                        $r->print("<td width=\"30\" valign=\"center\" width=\"50\" align=\"right\">$linkopen<img width=\"25\" height=\"25\" src=\"/adm/lonIcons/$icon\" border=\"0\" alt=\"$alt\" />$linkclose</td>\n");
                     } else {
-                        $r->print("<td></td>\n");
+                        $r->print("<td width=\"30\">&nbsp;</td>\n");
                     }
                 } else { # not problem, no icon
-                    $r->print("<td></td>\n");
+                    $r->print("<td width=\"30\">&nbsp;</td>\n");
                 }
 
                 # FOURTH COL: Text description
@@ -1252,7 +1270,7 @@ sub new_handle {
                     $r->print('(randomly select ' . $curRes->randompick() .')');
                 }
 
-                $r->print("</td></tr>\n");
+                $r->print("&nbsp;</td></tr>\n");
             }
         }
         $curRes = $mapIterator->next();
@@ -1330,7 +1348,7 @@ sub getDescription {
         return "Open " . timeToHumanString($res->opendate($part));
     }
     if ($status == $res->OPEN) {
-        if ($res->duedate()) {
+        if ($res->duedate($part)) {
             return "Due " . timeToHumanString($res->duedate($part));
         } else {
             return "Open, no due date";
@@ -1352,9 +1370,15 @@ sub getDescription {
         return "Not yet graded.";
     }
     if ($status == $res->TRIES_LEFT) {
-        my $tries = $res->tries();
-        my $maxtries = $res->maxtries();
-        my $triesString = "($tries of $maxtries tries used)";
+        my $tries = $res->tries($part);
+        my $maxtries = $res->maxtries($part);
+        my $triesString = "";
+        if ($tries && $maxtries) {
+            $triesString = "<font size=\"-1\"><i>($tries of $maxtries tries used)</i></font>";
+            if ($maxtries > 1 && $maxtries - $tries == 1) {
+                $triesString = "<b>$triesString</b>";
+            }
+        }
         if ($res->duedate()) {
             return "Due " . timeToHumanString($res->duedate($part)) .
                 " $triesString";
@@ -1641,6 +1665,8 @@ sub new {
         $self->{EMAIL_STATUS} = \%emailstatus;
         
     }    
+
+    $self->{PARM_CACHE} = {};
     
     bless($self);
         
@@ -1762,6 +1788,21 @@ sub finishResource {
 sub parmval {
     my $self = shift;
     my ($what,$symb)=@_;
+    my $hashkey = $what."|||".$symb;
+
+    if (defined($self->{PARM_CACHE}->{$hashkey})) {
+        return $self->{PARM_CACHE}->{$hashkey};
+    }
+
+    my $result = $self->parmval_real($what, $symb);
+    $self->{PARM_CACHE}->{$hashkey} = $result;
+    return $result;
+}
+
+sub parmval_real {
+    my $self = shift;
+    my ($what,$symb) = @_;
+
     my $cid=$ENV{'request.course.id'};
     my $csec=$ENV{'request.course.sec'};
     my $uname=$ENV{'user.name'};
@@ -2223,8 +2264,6 @@ These are methods that help you retrieve
 
 =item * B<to>: Returns the "to" value from the compiled nav map. (It is likely you want to use B<getNext> instead.)
 
-=item * B<type>: Returns the type of the resource, "start", "normal", or "finish". 
-
 =back
 
 =cut
@@ -2254,7 +2293,6 @@ sub symb {
 }
 sub title { my $self=shift; return $self->navHash("title_", 1); }
 sub to { my $self=shift; return $self->navHash("to_", 1); }
-sub type { my $self=shift; return $self->navHash("type_", 1); }
 
 =pod
 
@@ -2470,7 +2508,7 @@ sub getReturnHash {
     my $self = shift;
     
     if (!defined($self->{RETURN_HASH})) {
-        my %tmpHash = &Apache::lonnet::restore($self->symb());
+        my %tmpHash  = &Apache::lonnet::restore($self->symb());
         $self->{RETURN_HASH} = \%tmpHash;
     }
 }       
@@ -2561,25 +2599,27 @@ sub extractParts {
 
     $self->{PARTS} = [];
 
-    # Retrieve part count
-    my $metadata = &Apache::lonnet::metadata($self->src(), 'allpossiblekeys');
-    if (!$metadata) {
-        $self->{RESOURCE_ERROR} = 1;
-        $self->{PARTS} = [];
-        return;
-    }
-
-    foreach (split(/\,/,$metadata)) {
-        if ($_ =~ /^parameter\_(.*)\_opendate$/) {
-            push @{$self->{PARTS}}, $1;
+    # Retrieve part count, if this is a problem
+    if ($self->is_problem()) {
+        my $metadata = &Apache::lonnet::metadata($self->src(), 'allpossiblekeys');
+        if (!$metadata) {
+            $self->{RESOURCE_ERROR} = 1;
+            $self->{PARTS} = [];
+            return;
         }
+        
+        foreach (split(/\,/,$metadata)) {
+            if ($_ =~ /^parameter\_(.*)\_opendate$/) {
+                push @{$self->{PARTS}}, $1;
+            }
+        }
+        
+        
+        # Is this possible to do in one line? - Jeremy
+        my @sortedParts = sort @{$self->{PARTS}};
+        $self->{PARTS} = \@sortedParts;
     }
 
-    
-    # Is this possible to do in one line? - Jeremy
-    my @sortedParts = sort @{$self->{PARTS}};
-    $self->{PARTS} = \@sortedParts;
-
     return;
 }
 
@@ -2828,7 +2868,7 @@ sub status {
     # If it's WRONG...
     if ($completionStatus == INCORRECT || $completionStatus == INCORRECT_BY_OVERRIDE) {
         # and there are TRIES LEFT:
-        if ($self->tries() < $self->maxtries()) {
+        if ($self->tries($part) < $self->maxtries($part) || !$self->maxtries($part)) {
             return TRIES_LEFT;
         }
         return INCORRECT; # otherwise, return orange; student can't fix this