--- loncom/homework/lonhomework.pm	2002/08/16 21:30:08	1.86
+++ loncom/homework/lonhomework.pm	2002/09/16 20:39:39	1.88
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.86 2002/08/16 21:30:08 albertel Exp $
+# $Id: lonhomework.pm,v 1.88 2002/09/16 20:39:39 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -79,7 +79,8 @@ sub get_target {
 	return ('web');
       }
     } else {
-      if ( $ENV{'form.problemmode'} eq 'View' ) {
+      if ( $ENV{'form.problemmode'} eq 'View' ||
+	   $ENV{'form.problemmode'} eq 'Discard Edits and View') {
 	if ( defined($ENV{'form.submitted'}) &&
 	     (!defined($ENV{'form.resetdata'})) ) {
 	  return ('grade', 'web','answer');
@@ -148,6 +149,15 @@ sub check_access {
   foreach $temp ("opendate","duedate","answerdate") {
     $lastdate = $date;
     $date = &Apache::lonnet::EXT("resource.$id.$temp");
+    my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type");
+    if ($thistype eq 'date_interval') {
+	if ($temp eq 'opendate') {
+           $date=&Apache::lonnet::EXT("resource.$id.duedate")-$date;
+        }
+        if ($temp eq 'answerdate') {
+           $date=&Apache::lonnet::EXT("resource.$id.duedate")+$date;
+        }
+    }
     &Apache::lonxml::debug("found :$date: for :$temp:");
     if ($date eq '') {
       $date = "an unknown date"; $passed = 0;