--- loncom/interface/lonnavmaps.pm	2002/10/15 20:05:35	1.83
+++ loncom/interface/lonnavmaps.pm	2002/10/24 18:38:26	1.85
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.83 2002/10/15 20:05:35 bowersj2 Exp $
+# $Id: lonnavmaps.pm,v 1.85 2002/10/24 18:38:26 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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())) {
@@ -894,7 +890,7 @@ sub new_handle {
           $res->TRIES_LEFT         => 'navmap.open.gif',
           $res->INCORRECT          => 'navmap.wrong.gif',
           $res->OPEN               => 'navmap.open.gif',
-          $res->ATTEMPTED          => '' );
+          $res->ATTEMPTED          => 'navmap.open.gif' );
 
     my %iconAltTags = 
         ( 'navmap.correct.gif' => 'Correct',
@@ -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" 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();
@@ -1075,7 +1071,7 @@ 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
             }
@@ -1186,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++) {
@@ -1217,12 +1213,12 @@ 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 = "";
 
-                # SECOND COL: Is there text or feedback?
+                # SECOND COL: Is there text, feedback, errors??
                 if ($curRes->hasDiscussion()) {
                     $discussionHTML = $linkopen .
                         '<img border="0" src="/adm/lonMisc/chat.gif" />' .
@@ -1241,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
@@ -1254,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
@@ -1274,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();
@@ -1477,7 +1473,7 @@ sub timeToHumanString {
         # Less then 5 days away, display day of the week and
         # HH:MM
         if ( $delta < $day * 5 ) {
-            my $timeStr = strftime("%A at %I:%M %P", localtime($time));
+            my $timeStr = strftime("%A, %b %e at %I:%M %P", localtime($time));
             $timeStr =~ s/12:00 am/midnight/;
             $timeStr =~ s/12:00 pm/noon/;
             return ($inPast ? "last " : "next ") .
@@ -1669,6 +1665,8 @@ sub new {
         $self->{EMAIL_STATUS} = \%emailstatus;
         
     }    
+
+    $self->{PARM_CACHE} = {};
     
     bless($self);
         
@@ -1790,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'};
@@ -2251,15 +2264,15 @@ 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
 
 # These info functions can be used directly, as they don't return
 # resource information.
+sub comesfrom { my $self=shift; return $self->navHash("comesfrom_", 1); }
 sub ext { my $self=shift; return $self->navHash("ext_", 1) eq 'true:'; }
+sub from { my $self=shift; return $self->navHash("from_", 1); }
 sub goesto { my $self=shift; return $self->navHash("goesto_", 1); }
 sub kind { my $self=shift; return $self->navHash("kind_", 1); }
 sub randomout { my $self=shift; return $self->navHash("randomout_", 1); }
@@ -2282,7 +2295,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
 
@@ -2498,7 +2510,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;
     }
 }       
@@ -2544,7 +2556,7 @@ sub hasDiscussion {
 
 sub getFeedback {
     my $self = shift;
-    return $self->{NAV_MAP}->getFeedback($self->symb());
+    return $self->{NAV_MAP}->getFeedback($self->src());
 }
 
 =pod
@@ -2874,20 +2886,18 @@ sub status {
 
 =over 4
 
-=item * B<getNext>(): Gets the next resource in the navmap after this one.
+=item * B<getNext>($alreadySeenHashRef): Retreive an array of the possible next resources after this one. Always returns an array, even in the one- or zero-element case. The "alreadySeenHashRef" is an optional parameter that can be passed in to the method. If $$alreadySeenHashRef{$res->id()} is true in that hash, getNext will not return it in the list. In other words, you can use it to suppress resources you've already seen in the getNext method directly.
 
-=cut
+=item * B<getPrevious>($alreadySeenHashRef): Retreive an array of the possible previous resources from this one. Always returns an array, even in the one- or zero-element case. $alreadySeenHashRef is the same as in getNext.
 
-# For the simple single-link case, to get from a resource to the next
-# resource, you need to look up the "to_" link in the nav hash, then
-# follow that with the "goesto_" link.
+=cut
 
 sub getNext {
     my $self = shift;
     my $alreadySeenHash = shift;
     my @branches;
     my $to = $self->to();
-    foreach my $branch ( split(/\,/, $to) ) {
+    foreach my $branch ( split(/,/, $to) ) {
         my $choice = $self->{NAV_MAP}->getById($branch);
         my $next = $choice->goesto();
         $next = $self->{NAV_MAP}->getById($next);
@@ -2903,6 +2913,28 @@ sub getNext {
     }
     return \@branches;
 }
+
+sub getPrevious {
+    my $self = shift;
+    my @alreadySeen = shift;
+    my @branches;
+    my $from = $self->from();
+    foreach my $branch ( split /,/, $from) {
+        my $choice = $self->{NAV_MAP}->getById($branch);
+        my $prev = $choice->comesfrom();
+        $prev = $self->{NAV_MAP}->getById($prev);
+
+        # Skip it if we've already seen it or the user doesn't have
+        # browse privs
+        my $browsePriv = &Apache::lonnet::allowed('bre', $self->src);
+        if (!defined($alreadySeenHash) ||
+            !defined($alreadySeenHash->{$next->{ID}}) ||
+            ($browsePriv ne '2' && $browsePriv ne 'F')) {
+            push @branches, $next;
+        }
+    }
+    return \@branches;
+}
 
 =pod