--- loncom/interface/lonannounce.pm	2004/02/17 01:46:34	1.27
+++ loncom/interface/lonannounce.pm	2004/06/12 01:04:10	1.28
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Announce
 #
-# $Id: lonannounce.pm,v 1.27 2004/02/17 01:46:34 www Exp $
+# $Id: lonannounce.pm,v 1.28 2004/06/12 01:04:10 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -92,9 +92,26 @@ sub readcalendar {
 		    $realm=&mt('Resource').': '.&Apache::lonnet::gettitle($middle);
 		}
 		my $datetype='';
-		if ($name eq 'duedate') { $datetype=&mt('Due'); }
+		if ($name eq 'duedate') { 
+		    $datetype=&mt('Due'); 
+# see if accidentally answerdate is before duedate
+		    my $answerkey=$thiskey;
+		    $answerkey=~s/duedate$/answerdate/;
+		    if ($resourcedata{$thiskey}>$resourcedata{$answerkey}) {
+			$datetype='Due and Answer Available';
+		    }
+		}
 		if ($name eq 'opendate') { $datetype=&mt('Opening'); }
-		if ($name eq 'answerdate') { $datetype=&mt('Answer Available'); }
+		if ($name eq 'answerdate') {
+# see if accidentally answerdate is before duedate
+		    my $duekey=$thiskey;
+		    $duekey=~s/answerdate$/duedate/;
+		    if ($resourcedata{$duekey}>$resourcedata{$thiskey}) {
+# forget it
+			next;
+		    } 
+		    $datetype=&mt('Answer Available'); 
+		}
 		$returnhash{$courseid.'@'.$resourcedata{$thiskey}.'_'.
 			    $resourcedata{$thiskey}}=
 			    'INTERNAL:'.$datetype.': '.$realm.' ('.$section.')';