--- loncom/interface/lonnavmaps.pm	2006/05/11 23:51:36	1.381
+++ loncom/interface/lonnavmaps.pm	2006/05/15 19:29:03	1.382
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.381 2006/05/11 23:51:36 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.382 2006/05/15 19:29:03 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4029,14 +4029,24 @@ sub awarded {
     if (!defined($part)) { $part = '0'; }
     return $self->{NAV_MAP}->{STUDENT_DATA}->{$self->symb()}->{'resource.'.$part.'.awarded'};
 }
+# this should work exactly like the copy in lonhomework.pm
 sub duedate {
     (my $self, my $part) = @_;
+    my $date;
     my $interval=$self->parmval("interval", $part);
-    if ($interval) {
+    my $due_date=$self->parmval("duedate", $part);
+    if (defined($interval)) {
 	my $first_access=&Apache::lonnet::get_first_access('map',$self->symb);
-	if ($first_access) { return ($first_access+$interval); }
+	if (defined($first_access)) {
+	    $interval = $first_access+$interval;
+	    $date = ($interval < $due_date)? $interval : $due_date;
+	} else {
+	    $date = $due_date;
+	}
+    } else {
+	$date = $due_date;
     }
-    return $self->parmval("duedate", $part);
+    return $date;
 }
 sub handgrade {
     (my $self, my $part) = @_;