--- loncom/interface/lonnavmaps.pm	2004/03/22 22:17:40	1.255
+++ loncom/interface/lonnavmaps.pm	2004/03/24 22:22:04	1.256
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.255 2004/03/22 22:17:40 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.256 2004/03/24 22:22:04 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1119,35 +1119,53 @@ my @statuses = ($resObj->CORRECT, $resOb
 use Data::Dumper;
 sub render_parts_summary_status {
     my ($resource, $part, $params) = @_;
-    if (!$resource->is_problem()) { return '<td></td>'; }
+    if (!$resource->is_problem() && !$resource->contains_problem) { return '<td></td>'; }
     if ($params->{showParts}) { 
 	return '<td></td>';
     }
 
     my $td = "<td align='right'>\n";
     my $endtd = "</td>\n";
+    my @probs;
 
-    # If there is a single part, just show the simple status
-    if ($resource->singlepart()) {
-	my $status = $resource->simpleStatus(${$resource->parts}[0]);
-	return $td . "<font color='" . $statusColors{$status} . "'>"
-	    . $statusStrings{$status} . "</font>" . $endtd;
-    }
-
-    # Now we can be sure the $part doesn't really matter.
-    my $statusCount = $resource->simpleStatusCount();
-    my @counts;
-    foreach my $status(@statuses) {
-	# decouple display order from the simpleStatusCount order
-	my $slot = Apache::lonnavmaps::resource::statusToSlot($status);
-	if ($statusCount->[$slot]) {
-	    push @counts, "<font color='" . $statusColors{$status} .
-		"'>" . $statusCount->[$slot] . ' '
+    if ($resource->contains_problem) {
+	@probs=$resource->retrieveResources($resource,sub { $_[0]->is_problem() },1,0);
+    } else {
+	@probs=($resource);
+    }
+    my $return;
+    my %overallstatus;
+    my $totalParts;
+    foreach my $resource (@probs) {
+	# If there is a single part, just show the simple status
+	if ($resource->singlepart()) {
+	    my $status = $resource->simpleStatus(${$resource->parts}[0]);
+	    $overallstatus{$status}++;
+	    $totalParts++;
+	    next;
+	}
+	# Now we can be sure the $part doesn't really matter.
+	my $statusCount = $resource->simpleStatusCount();
+	my @counts;
+	foreach my $status (@statuses) {
+	    # decouple display order from the simpleStatusCount order
+	    my $slot = Apache::lonnavmaps::resource::statusToSlot($status);
+	    if ($statusCount->[$slot]) {
+		$overallstatus{$status}+=$statusCount->[$slot];
+		$totalParts+=$statusCount->[$slot];
+	    }
+	}
+    }
+    $return.= $td . $totalParts . ' parts: ';
+    foreach my $status (@statuses) {
+	if ($overallstatus{$status}) {
+	    $return.="<font color='" . $statusColors{$status} .
+		"'>" . $overallstatus{$status} . ' '
 		. $statusStrings{$status} . "</font>";
 	}
     }
-
-    return $td . $resource->countParts() . ' parts: ' . join (', ', @counts) . $endtd;
+    $return.= $endtd;
+    return $return;
 }
 
 my @preparedColumns = (\&render_resource, \&render_communication_status,
@@ -1182,6 +1200,7 @@ sub render {
     my $jump = $args->{'jump'};
     my $here = $args->{'here'};
     my $suppressNavmap = setDefault($args->{'suppressNavmap'}, 0);
+    my $closeAllPages = setDefault($args->{'closeAllPages'}, 0);
     my $currentJumpDelta = 2; # change this to change how many resources are displayed
                              # before the current resource when using #current
 
@@ -1290,7 +1309,7 @@ sub render {
             $args->{'iterator'} = $it = $navmap->getIterator(undef, undef, $filterHash, $condition);
         }
     }
-    
+
     # (re-)Locate the jump point, if any
     # Note this does not take filtering or hidden into account... need
     # to be fixed?
@@ -1427,7 +1446,7 @@ sub render {
     $args->{'here'} = $here;
 
     $args->{'indentLevel'} = -1; # first BEGIN_MAP takes this to 0
-    while ($curRes = $it->next()) {
+    while ($curRes = $it->next($closeAllPages)) {
         # Maintain indentation level.
         if ($curRes == $it->BEGIN_MAP() ||
             $curRes == $it->BEGIN_BRANCH() ) {
@@ -2168,7 +2187,7 @@ want to know is if I<any> resources matc
 parameter will allow you to avoid potentially expensive enumeration of
 all matching resources.
 
-=item * B<hasResources>(map, filterFunc, recursive):
+=item * B<hasResource>(map, filterFunc, recursive):
 
 Convience method for
 
@@ -2547,7 +2566,7 @@ sub new {
 
 sub next {
     my $self = shift;
-
+    my $closeAllPages=shift;
     if ($self->{FINISHED}) {
 	return END_ITERATOR();
     }
@@ -2561,7 +2580,7 @@ sub next {
 
     if ($self->{RECURSIVE_ITERATOR_FLAG}) {
         # grab the next from the recursive iterator 
-        my $next = $self->{RECURSIVE_ITERATOR}->next();
+        my $next = $self->{RECURSIVE_ITERATOR}->next($closeAllPages);
 
         # is it a begin or end map? If so, update the depth
         if ($next == BEGIN_MAP() ) { $self->{RECURSIVE_DEPTH}++; }
@@ -2675,7 +2694,7 @@ sub next {
 
     # That ends the main iterator logic. Now, do we want to recurse
     # down this map (if this resource is a map)?
-    if ($self->{HERE}->is_map() &&
+    if ( ($self->{HERE}->is_sequence() || (!$closeAllPages && $self->{HERE}->is_page())) &&
         (defined($self->{FILTER}->{$self->{HERE}->map_pc()}) xor $self->{CONDITION})) {
         $self->{RECURSIVE_ITERATOR_FLAG} = 1;
         my $firstResource = $self->{HERE}->map_start();
@@ -2693,7 +2712,7 @@ sub next {
     my $browsePriv = $self->{HERE}->browsePriv();
     if (!$self->{HERE}->src() || 
         (!($browsePriv eq 'F') && !($browsePriv eq '2')) ) {
-        return $self->next();
+        return $self->next($closeAllPages);
     }
 
     return $self->{HERE};
@@ -3162,6 +3181,15 @@ Returns true if the resource is a sequen
 
 =cut
 
+sub hasResource {
+   my $self = shift;
+   return $self->{NAV_MAP}->hasResource(@_);
+}
+
+sub retrieveResources {
+   my $self = shift;
+   return $self->{NAV_MAP}->retrieveResources(@_);
+}
 
 sub is_html {
     my $self=shift;
@@ -3178,7 +3206,15 @@ sub is_page {
 sub is_problem {
     my $self=shift;
     my $src = $self->src();
-    return ($src =~ /\.(problem|exam|quiz|assess|survey|form|library)$/);
+    return ($src =~ /\.(problem|exam|quiz|assess|survey|form|library)$/)
+}
+sub contains_problem {
+    my $self=shift;
+    if ($self->is_page()) {
+	my $hasProblem=$self->hasResource($self,sub { $_[0]->is_problem() },1);
+	return $hasProblem;
+    }
+    return 0;
 }
 sub is_sequence {
     my $self=shift;