--- loncom/interface/lonnavmaps.pm	2007/08/29 00:55:37	1.400
+++ loncom/interface/lonnavmaps.pm	2007/10/05 18:48:20	1.402
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.400 2007/08/29 00:55:37 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.402 2007/10/05 18:48:20 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -170,7 +170,10 @@ sub getLinkForResource {
         if (defined($item)) { $res = $item; }
     }
 
-    return ($res->link(),$res->shown_symb());
+    if ($res) {
+	return ($res->link(),$res->shown_symb());
+    }
+    return;
 }
 
 # Convenience function: This separates the logic of how to create
@@ -195,7 +198,11 @@ sub getDescription {
     }
     if ($status == $res->OPEN) {
         if ($res->duedate($part)) {
-            return &mt("Due")."  " .timeToHumanString($res->duedate($part),'end');
+	    if ($res->is_practice()) {
+		return &mt("Closes ")."  " .timeToHumanString($res->duedate($part),'start');
+	    } else {
+		return &mt("Due")."  " .timeToHumanString($res->duedate($part),'end');
+	    }
         } else {
             return &mt("Open, no due date");
         }
@@ -204,7 +211,11 @@ sub getDescription {
         return &mt("Answer open")." " . timeToHumanString($res->answerdate($part),'start');
     }
     if ($status == $res->PAST_DUE_NO_ANSWER) {
-        return &mt("Was due")." " . timeToHumanString($res->duedate($part),'end');
+	if ($res->is_practice()) {
+	    return &mt("Closed")." " . timeToHumanString($res->duedate($part),'start');
+	} else {
+	    return &mt("Was due")." " . timeToHumanString($res->duedate($part),'end');
+	}
     }
     if (($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT)
 	&& $res->handgrade($part) ne 'yes') {
@@ -604,6 +615,11 @@ instruct the renderer to render only a p
 the source of the map you want to process, like
 '/res/103/jerf/navmap.course.sequence'.
 
+=item * B<include_top_level_map>: default: false
+
+If you need to include the top level map (meaning the course) in the
+rendered output set this to true
+
 =item * B<navmap>: default: constructs one from %env
 
 A reference to a navmap, used only if an iterator is not passed in. If
@@ -974,7 +990,7 @@ sub render_long_status {
         $params->{'multipart'} && $part eq "0";
                 
     my $color;
-    if ($resource->is_problem()) {
+    if ($resource->is_problem() || $resource->is_practice()) {
         $color = $colormap{$resource->status};
         
         if (dueInLessThan24Hours($resource, $part) ||
@@ -984,13 +1000,13 @@ sub render_long_status {
     }
     
     if ($resource->kind() eq "res" &&
-        $resource->is_problem() &&
+        ($resource->is_problem() || $resource->is_practice()) &&
         !$firstDisplayed) {
         if ($color) {$result .= "<font color=\"$color\"><b>"; }
         $result .= getDescription($resource, $part);
         if ($color) {$result .= "</b></font>"; }
     }
-    if ($resource->is_map() && advancedUser() && $resource->randompick()) {
+    if ($resource->is_map() && &advancedUser() && $resource->randompick()) {
         $result .= &mt('(randomly select [_1])', $resource->randompick());
     }
     if ($resource->is_map() && &advancedUser() && $resource->randomorder()) {
@@ -1236,7 +1252,7 @@ sub render {
 
             $args->{'iterator'} = $it = $navmap->getIterator($firstResource, $finishResource, $filterHash, $condition);
         } else {
-            $args->{'iterator'} = $it = $navmap->getIterator(undef, undef, $filterHash, $condition);
+            $args->{'iterator'} = $it = $navmap->getIterator(undef, undef, $filterHash, $condition,undef,$args->{'include_top_level_map'});
         }
     }
 
@@ -2858,6 +2874,10 @@ sub next {
         $self->{HAVE_RETURNED_0} = 1;
         return $self->{NAV_MAP}->getById('0.0');
     }
+    if ($self->{RETURN_0} && !$self->{HAVE_RETURNED_0_BEGIN_MAP}) {
+	$self->{HAVE_RETURNED_0_BEGIN_MAP} = 1;
+	return $self->BEGIN_MAP();
+    }
 
     if ($self->{RECURSIVE_ITERATOR_FLAG}) {
         # grab the next from the recursive iterator 
@@ -3576,6 +3596,15 @@ sub contains_problem {
     }
     return 0;
 }
+sub map_contains_problem {
+    my $self=shift;
+    if ($self->is_map()) {
+	my $has_problem=
+	    $self->hasResource($self,sub { $_[0]->is_problem() },1);
+	return $has_problem;
+    }
+    return 0;
+}
 sub is_sequence {
     my $self=shift;
     return $self->navHash("is_map_", 1) &&