--- loncom/homework/lonhomework.pm	2000/12/12 22:35:52	1.20
+++ loncom/homework/lonhomework.pm	2000/12/15 20:31:30	1.21
@@ -52,30 +52,46 @@ sub send_footer {
   $request->print(&Apache::lontexconvert::footer());
 }
 
+#@Apache::lonhomework::date_status=();
+#@Apache::lonhomework::date_msg=();
 sub check_date {
-  my ($type,$id) = @_;
+  my ($id) = @_;
   my $date ='';
-  my $passed = '';
-  &Apache::lonxml::debug("checking :$type: for part :$id:");
-  if ($type eq 'OPEN_DATE') {
-    $date = &Apache::lonnet::EXT("resource.$id.opendate");
-  } elsif ($type eq 'DUE_DATE') {
-    $date = &Apache::lonnet::EXT("resource.$id.duedate");
-  } elsif ($type eq 'START_DATE') {
-    $date = &Apache::lonnet::EXT("resource.$id.duedate");
-  } else {
-    &Apache::lonxml::error("Unknown date request $type");
-    $date = '';
+  my $status = '';
+  my $datemsg = '';
+  my $lastdate = '';
+  my $temp;
+  my $type;
+  my $passed;
+  &Apache::lonxml::debug("checking for part :$id:");
+  foreach $temp ("opendate","duedate","answerdate") {
+    $lastdate = $date;
+    $date = &Apache::lonnet::EXT("resource.$id.$temp");
+    &Apache::lonxml::debug("found :$date: for :$temp:");
+    if ($date eq '') {
+      $date = "an unknown date"; $passed = 0;
+    } else {
+      if (time < $date) { $passed = 0; } else { $passed = 1; }
+      $date = localtime $date;
+    }
+    if (!$passed) { $type=$temp; last; }
   }
-  &Apache::lonxml::debug("found :$date:");
-  if ($date eq '') {
-    $date = "an unknown date"; $passed = 0;
-  } else {
-    if (time < $date) { $passed = 0; } else { $passed = 1; }
-    $date = localtime $date;
+  &Apache::lonxml::debug("have :$type:$passed:");
+  if ($passed) {
+    $status='SHOW_ANSWER';
+    $datemsg=$date;
+  } elsif ($type eq 'opendate') {
+    $status='CLOSED';
+    $datemsg = "will open on $date";
+  } elsif ($type eq 'duedate') {
+    $status='CAN_ANSWER';
+    $datemsg = "is due at $date";
+  } elsif ($type eq 'answerdate') {
+    $status='CLOSED';
+    $datemsg = "was due as $lastdate, and asnswers will be available at $date";
   }
-  &Apache::lonxml::debug("sending back :$date:$passed:");
-  return ($date,$passed);
+  &Apache::lonxml::debug("sending back :$status:$datemsg:");
+  return ($status,$datemsg);
 }
 
 sub handler {