--- loncom/interface/lonnavmaps.pm	2004/05/05 21:04:14	1.259
+++ loncom/interface/lonnavmaps.pm	2004/08/24 22:09:27	1.267.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.259 2004/05/05 21:04:14 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.267.2.3 2004/08/24 22:09:27 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -137,8 +137,9 @@ sub real_handler {
     $r->print('</head>'.
               &Apache::loncommon::bodytag('Navigate Course Contents','',
                                     $addentries,'','',$ENV{'form.register'}));
-    $r->print('<script>window.focus();</script>');
-
+    $r->print('<script>window.focus();</script>'.
+	      &Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT'));
+     
     $r->rflush();
 
     # Check that it's defined
@@ -512,7 +513,7 @@ sub timeToHumanString {
         }
 
         # Not this year, so show the year
-        my $timeStr = strftime("on %A, %b %e %G at %I:%M %P", localtime($time));
+        my $timeStr = strftime("on %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;
@@ -970,7 +971,7 @@ sub render_resource {
         $nonLinkedText .= ' (' . $resource->countParts() . ' parts)';
     }
 
-    if (!$params->{'resource_nolink'} && !$resource->is_sequence()) {
+    if (!$params->{'resource_nolink'} && !$resource->is_sequence() && !$resource->is_empty_sequence) {
         $result .= "  $curMarkerBegin<a href='$link'>$title$partLabel</a>$curMarkerEnd $nonLinkedText</td>";
     } else {
         $result .= "  $curMarkerBegin$title$partLabel$curMarkerEnd $nonLinkedText</td>";
@@ -1368,9 +1369,43 @@ sub render {
                 "&here=" . Apache::lonnet::escape($here) . 
                 "\">".&mt('Open All Folders')."</a>";
         }
-        $result .= "<br /><br />\n";
-    }    
+        $result .= "\n";
+    }
 
+    # Check for any unread discussions in all resources.
+    if (!$args->{'resource_no_folder_link'}) {
+	my $totdisc = 0;
+	my $haveDisc = '';
+	my @allres=$navmap->retrieveResources();
+	foreach my $resource (@allres) {
+	    if ($resource->hasDiscussion()) {
+		my $ressymb;
+		if ($resource->symb() =~ m-(___adm/\w+/\w+)/(\d+)/bulletinboard$-) {
+		    $ressymb = 'bulletin___'.$2.$1.'/'.$2.'/bulletinboard';
+		} else {
+		    $ressymb = $resource->symb();
+		}
+		$haveDisc .= $ressymb.':';
+		$totdisc ++;
+	    }
+	}
+	if ($totdisc > 0) {
+	    $haveDisc =~ s/:$//;
+	    my %lt = &Apache::lonlocal::texthash(
+						 'mapr' => 'Mark all posts read',
+						 );
+	    $result .= (<<END);
+	        &nbsp;&nbsp;&nbsp;<a href="javascript:document.clearbubbles.submit()">$lt{'mapr'}</a>&nbsp;<a href="javascript:void(open('/adm/help/NavMaps_MarkPosts_Read.hlp', 'Help_for_NavMaps_MarkPosts', 'menubar=0,toolbar=1,scrollbars=1,width=350,height=400,resizable=yes'))" title="Online Help"><image src="/adm/help/gif/smallHelp.gif" border="0" alt="(Help: NavMaps_MarkPostsLink)" /></a>
+		<form name="clearbubbles" method="post" action="/adm/feedback">
+		<input type="hidden" name="navurl" value="$ENV{'QUERY_STRING'}" />
+		<input type="hidden" name="navmaps" value="$haveDisc" />
+		</form>
+END
+        } else {
+	    $result .= '<br />';
+	}
+    }
+    $result .= "<br />\n";
     if ($r) {
         $r->print($result);
         $r->rflush();
@@ -1941,7 +1976,7 @@ sub hasDiscussion {
 # backward compatibility (bulletin boards used to be 'wrapped')
     my $ressymb = $symb;
     if ($ressymb =~ m|adm/(\w+)/(\w+)/(\d+)/bulletinboard$|) {
-        unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
+        unless ($ressymb =~ m|adm/wrapper/adm|) {
             $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
         }
     }
@@ -1949,7 +1984,8 @@ sub hasDiscussion {
     if ( defined ( $self->{LAST_READ}->{$ressymb} ) ) {
         return $self->{DISCUSSION_TIME}->{$ressymb} > $self->{LAST_READ}->{$ressymb};
     } else {
-        return $self->{DISCUSSION_TIME}->{$ressymb} >  $self->{LAST_CHECK};
+#        return $self->{DISCUSSION_TIME}->{$ressymb} >  $self->{LAST_CHECK}; # v.1.1 behavior 
+        return $self->{DISCUSSION_TIME}->{$ressymb} >  0; # in 1.2 will display speech bubble icons for all items with posts until marked as read (even if read in v 1.1).
     }
 }
 
@@ -3241,6 +3277,23 @@ sub is_sequence {
     return $self->navHash("is_map_", 1) && 
 	$self->navHash("map_type_" . $self->map_pc()) eq 'sequence';
 }
+sub is_survey {
+    my $self = shift();
+    my $part = shift();
+    if ($self->parmval('type',$part) eq 'survey') {
+        return 1;
+    }
+    if ($self->src() =~ /\.(survey)$/) {
+        return 1;
+    }
+    return 0;
+}
+
+sub is_empty_sequence {
+    my $self=shift;
+    my $src = $self->src();
+    return !$self->is_page() && $self->navHash("is_map_", 1) && !$self->navHash("map_type_" . $self->map_pc());
+}
 
 # Private method: Shells out to the parmval in the nav map, handler parts.
 sub parmval {
@@ -3417,6 +3470,11 @@ sub awarded {
 }
 sub duedate {
     (my $self, my $part) = @_;
+    my $interval=$self->parmval("interval", $part);
+    if ($interval) {
+	my $first_access=&Apache::lonnet::get_first_access('map',$self->symb);
+	if ($first_access) { return ($first_access+$interval); }
+    }
     return $self->parmval("duedate", $part);
 }
 sub maxtries {
@@ -3717,6 +3775,20 @@ sub extractParts {
                 }
             }
         }
+	my $resorder = &Apache::lonnet::metadata($self->src(),'responseorder');
+	if ($resorder) {
+	    my @resorder=split(/,/,$resorder);
+	    foreach my $part (keys(%responseIdHash)) {
+		my %resids = map { ($_,1) } @{ $responseIdHash{$part} };
+		my @neworder;
+		foreach my $possibleid (@resorder) {
+		    if (exists($resids{$possibleid})) {
+			push(@neworder,$possibleid);
+		    }
+		}
+		$responseIdHash{$part}=\@neworder;	
+	    }
+	}
         $self->{RESPONSE_IDS} = \%responseIdHash;
         $self->{RESPONSE_TYPES} = \%responseTypeHash;
     }
@@ -4060,7 +4132,7 @@ sub status {
 
     if ($dateStatus == PAST_DUE_ANSWER_LATER ||
         $dateStatus == PAST_DUE_NO_ANSWER ) {
-        return $dateStatus; 
+        return $suppressFeedback ? ANSWER_SUBMITTED : $dateStatus; 
     }
 
     if ($dateStatus == ANSWER_OPEN) {