--- loncom/interface/lonnavmaps.pm	2006/03/23 22:32:10	1.374
+++ loncom/interface/lonnavmaps.pm	2006/05/11 23:51:36	1.381
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.374 2006/03/23 22:32:10 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.381 2006/05/11 23:51:36 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -207,7 +207,8 @@ ENDSUBM
 						 {'only_body' => 1,
 						  'bgcolor'   => '#FFFFFF',
 						  'add_entries' => 
-						      'onLoad="submitthis()"',}).
+						      {'onload' =>
+							   "submitthis()"}}).
 		  &Apache::loncommon::end_page());
 
         return OK;
@@ -245,8 +246,6 @@ MENU
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework','postsymb']);
     
 # ----------------------------------------------------- Force menu registration
-    my $addentries='';
-    my $more_unload;
     my $body_only='';
     my $js;
     if ($env{'environment.remotenavmap'} eq 'on') {
@@ -255,24 +254,13 @@ MENU
                    this.document.location="/adm/navmaps?collapseExternal";
                 }
              </script>';
-# FIXME need to be smarter to only catch window close events
-#	$more_unload="collapse()"
 	$body_only=1;
     }
-    if ($env{'form.register'}) {
-	$addentries=' onLoad="'.&Apache::lonmenu::loadevents().
-	    '" onUnload="'.&Apache::lonmenu::unloadevents().';'.
-	    $more_unload.'"';
-	$r->print(&Apache::lonmenu::registerurl(1));
-    } else {
-	$addentries=' onUnload="'.$more_unload.'"';
-    }
 
     # Header
     $r->print(&Apache::loncommon::start_page('Navigate Course Contents',$js,
-					     {'add_entries'     => $addentries,
-					      'only_body'       => $body_only,
-					      'force_resgister' =>
+					     {'only_body'       => $body_only,
+					      'force_register'  =>
 						  $env{'form.register'},}));
     $r->print('<script type="text/javascript">window.focus();</script>');
      
@@ -330,32 +318,38 @@ MENU
 		      "Close navigation window");
     } 
 
-    my $jumpToFirstHomework = 0;
+
     # Check to see if the student is jumping to next open, do-able problem
     if ($ENV{QUERY_STRING} =~ /^jumpToFirstHomework/) {
-        $jumpToFirstHomework = 1;
         # Find the next homework problem that they can do.
         my $iterator = $navmap->getIterator(undef, undef, undef, 1);
         my $curRes;
         my $foundDoableProblem = 0;
-        my $problemRes;
+        my $minimumduedate;
         
-        while (($curRes = $iterator->next()) && !$foundDoableProblem) {
+        while ($curRes = $iterator->next()) {
             if (ref($curRes) && $curRes->is_problem()) {
                 my $status = $curRes->status();
                 if ($curRes->completable()) {
-                    $problemRes = $curRes;
+                    my $thisduedate=$curRes->duedate();
+                    unless ($foundDoableProblem) {
+                        $minimumduedate=$thisduedate;
+		    }
+                        
                     $foundDoableProblem = 1;
 
-                    # Pop open all previous maps
-                    my $stack = $iterator->getStack();
-                    pop @$stack; # last resource in the stack is the problem
-                                 # itself, which we don't need in the map stack
-                    my @mapPcs = map {$_->map_pc()} @$stack;
-                    $env{'form.filter'} = join(',', @mapPcs);
-
-                    # Mark as both "here" and "jump"
-                    $env{'form.postsymb'} = $curRes->symb();
+                    if ($thisduedate<=$minimumduedate) {
+			# Pop open all previous maps
+			my $stack = $iterator->getStack();
+			pop @$stack; # last resource in the stack is the problem
+			# itself, which we don't need in the map stack
+			my @mapPcs = map {$_->map_pc()} @$stack;
+			$env{'form.filter'} = join(',', @mapPcs);
+			
+			# Mark as both "here" and "jump"
+			$env{'form.postsymb'} = $curRes->symb();
+                        $minimumduedate=$thisduedate;
+		    }
                 }
             }
         }
@@ -367,7 +361,7 @@ MENU
     } else {
 	&add_linkitem(\%toplinkitems,'firsthomework',
 		      'location.href="navmaps?jumpToFirstHomework"',
-		      "Show Me My First Homework Problem");
+		      "Show my first due problem");
     }
 
     my $suppressEmptySequences = 0;
@@ -384,8 +378,8 @@ MENU
                         };
 	&add_linkitem(\%toplinkitems,'everything',
 		     'location.href="navmaps?sort='.$env{'form.sort'}.'"',
-		      "Show Everything");
-        $r->print("<p><font size='+2'>".&mt("Uncompleted Homework")."</font></p>");
+		      "Show everything");
+        $r->print("<p><font size='+2'>".&mt("Uncompleted Problems")."</font></p>");
         $env{'form.filter'} = '';
         $env{'form.condition'} = 1;
 	$resource_no_folder_link = 1;
@@ -393,7 +387,7 @@ MENU
 	&add_linkitem(\%toplinkitems,'uncompleted',
 		      'location.href="navmaps?sort='.$env{'form.sort'}.
 		          '&showOnlyHomework=1"',
-		      "Show Only Uncompleted Homework");
+		      "Show only uncompleted problems");
     }
 
     my %selected=($env{'form.sort'} => 'selected=on');
@@ -685,7 +679,7 @@ sub timeToHumanString {
 
 	if($format ne '') {
 	    my $timeStr = strftime($format, localtime($time));
-	    return $timeStr.&Apache::lonlocal::gettimezone();
+	    return $timeStr.&Apache::lonlocal::gettimezone($time);
 	}
 
         # Less then 5 days away, display day of the week and
@@ -696,7 +690,7 @@ sub timeToHumanString {
             $timeStr =~ s/12:00 am/00:00/;
             $timeStr =~ s/12:00 pm/noon/;
             return ($inPast ? "last " : "this ") .
-                $timeStr.&Apache::lonlocal::gettimezone();
+                $timeStr.&Apache::lonlocal::gettimezone($time);
         }
         
 	my $conjunction='on';
@@ -711,14 +705,14 @@ sub timeToHumanString {
             my $timeStr = strftime("$conjunction %A, %b %e at %I:%M %P", localtime($time));
             $timeStr =~ s/12:00 am/00:00/;
             $timeStr =~ s/12:00 pm/noon/;
-            return $timeStr.&Apache::lonlocal::gettimezone();
+            return $timeStr.&Apache::lonlocal::gettimezone($time);
         }
 
         # Not this year, so show the year
         my $timeStr = strftime("$conjunction %A, %b %e %Y at %I:%M %P", localtime($time));
         $timeStr =~ s/12:00 am/00:00/;
         $timeStr =~ s/12:00 pm/noon/;
-        return $timeStr.&Apache::lonlocal::gettimezone();
+        return $timeStr.&Apache::lonlocal::gettimezone($time);
     }
 }
 
@@ -1615,11 +1609,11 @@ sub render {
         if ($condition) {
 	    $link='"navmaps?condition=0&filter=&'.$queryString.
 		'&here='.&Apache::lonnet::escape($here).'"';
-	    $text='Close All Folders';
+	    $text='Close all folders';
         } else {
 	    $link='"navmaps?condition=1&filter=&'.$queryString.
 		'&here='.&Apache::lonnet::escape($here).'"';
-	    $text='Open All Folders';
+	    $text='Open all folders';
         }
 	if ($args->{'caller'} eq 'navmapsdisplay') {
 	    &add_linkitem($args->{'linkitems'},'changefolder',
@@ -3836,7 +3830,6 @@ sub contains_problem {
 }
 sub is_sequence {
     my $self=shift;
-    my $src = $self->src();
     return $self->navHash("is_map_", 1) && 
 	$self->navHash("map_type_" . $self->map_pc()) eq 'sequence';
 }
@@ -3911,7 +3904,7 @@ Returns a string with the type of the ma
 sub map_finish {
     my $self = shift;
     my $src = $self->src();
-    $src = Apache::lonnet::clutter($src);
+    $src = &Apache::lonnet::clutter($src);
     my $res = $self->navHash("map_finish_$src", 0);
     $res = $self->{NAV_MAP}->getById($res);
     return $res;
@@ -3924,7 +3917,7 @@ sub map_pc {
 sub map_start {
     my $self = shift;
     my $src = $self->src();
-    $src = Apache::lonnet::clutter($src);
+    $src = &Apache::lonnet::clutter($src);
     my $res = $self->navHash("map_start_$src", 0);
     $res = $self->{NAV_MAP}->getById($res);
     return $res;
@@ -4391,9 +4384,9 @@ sub extractParts {
         # So we have to use our knowlege of part names to figure out 
         # where the part names begin and end, and even then, it is possible
         # to construct ambiguous situations.
-        foreach (split /,/, $metadata) {
-            if ($_ =~ /^([a-zA-Z]+)response_(.*)/
-		|| $_ =~ /^(Task)_(.*)/) {
+        foreach my $data (split /,/, $metadata) {
+            if ($data =~ /^([a-zA-Z]+)response_(.*)/
+		|| $data =~ /^(Task)_(.*)/) {
                 my $responseType = $1;
                 my $partStuff = $2;
                 my $partIdSoFar = '';
@@ -4405,8 +4398,15 @@ sub extractParts {
                     if ($parts{$partIdSoFar}) {
                         my @otherChunks = @partChunks[$i+1..$#partChunks];
                         my $responseId = join('_', @otherChunks);
-                        push @{$responseIdHash{$partIdSoFar}}, $responseId;
-                        push @{$responseTypeHash{$partIdSoFar}}, $responseType;
+			if ($self->is_task()) {
+			    push(@{$responseIdHash{$partIdSoFar}},
+				 $partIdSoFar);
+			} else {
+			    push(@{$responseIdHash{$partIdSoFar}},
+				 $responseId);
+			}
+                        push(@{$responseTypeHash{$partIdSoFar}},
+			     $responseType);
                     }
                 }
             }