[LON-CAPA-cvs] cvs: loncom /homework outputtags.pm

albertel lon-capa-cvs@mail.lon-capa.org
Thu, 20 Apr 2006 19:09:48 -0000


albertel		Thu Apr 20 15:09:48 2006 EDT

  Modified files:              
    /loncom/homework	outputtags.pm 
  Log:
  - display duesdate needs to check for an interval
  
  
Index: loncom/homework/outputtags.pm
diff -u loncom/homework/outputtags.pm:1.46 loncom/homework/outputtags.pm:1.47
--- loncom/homework/outputtags.pm:1.46	Tue Jan 17 12:47:24 2006
+++ loncom/homework/outputtags.pm	Thu Apr 20 15:09:48 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # tags that create controlled output
 #
-# $Id: outputtags.pm,v 1.46 2006/01/17 17:47:24 albertel Exp $
+# $Id: outputtags.pm,v 1.47 2006/04/20 19:09:48 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -73,7 +73,15 @@
     }
     if (($status =~ /CAN.*_ANSWER/)) {
 	my $id = $Apache::inputtags::part;
-	my $date = &Apache::lonnet::EXT("resource.$id.duedate");
+	my $date;
+	my $interval= &Apache::lonnet::EXT("resource.$id.interval");
+	if ($interval) {
+	    my $first_access=&Apache::lonnet::get_first_access('map');
+	    if ($first_access) { $date = $first_access+$interval; }
+	}
+	if (!defined($date)) {
+	    $date = &Apache::lonnet::EXT("resource.$id.duedate");
+	}
 	&Apache::lonxml::debug("duedatebox found $date for $id");
 
 	# Only show the due date if the current date is