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

albertel lon-capa-cvs@mail.lon-capa.org
Wed, 16 Oct 2002 20:42:22 -0000


albertel		Wed Oct 16 16:42:22 2002 EDT

  Modified files:              
    /loncom/homework	outputtags.pm 
  Log:
  - convert to use the lonnavmaps human time string function
  
  - fix stupid error I just did, it seems like I woke up on the stupid side of the bed this morning
  
  
  
Index: loncom/homework/outputtags.pm
diff -u loncom/homework/outputtags.pm:1.20 loncom/homework/outputtags.pm:1.21
--- loncom/homework/outputtags.pm:1.20	Wed Oct 16 15:21:32 2002
+++ loncom/homework/outputtags.pm	Wed Oct 16 16:42:22 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # tags that create controlled output
 #
-# $Id: outputtags.pm,v 1.20 2002/10/16 19:21:32 albertel Exp $
+# $Id: outputtags.pm,v 1.21 2002/10/16 20:42:22 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,21 +51,20 @@
     my $status=$Apache::inputtags::status['-1'];
     &Apache::lonxml::debug("got a $status in duedatebox");
     if (($status =~ /CAN.*_ANSWER/) && ($target eq 'web')) {
-	my $format = &Apache::lonxml::get_param('format',$parstack,$safeeval);
-	if ($format eq '') {
-	    &Apache::lonxml::debug("using default format");
-	    $format="%c";
-	}
+#	my $format = &Apache::lonxml::get_param('format',$parstack,$safeeval);
+#	if ($format eq '') {
+#	    &Apache::lonxml::debug("using default format");
+#	    $format="%c";
+#	}
 	my $id = $Apache::inputtags::part;
 	my $date = &Apache::lonnet::EXT("resource.$id.duedate");
 	&Apache::lonxml::debug("duedatebox found $date for $id");
-	if ($date) {
-	    $result ='<table border="on"><tr><td>Due at '.
-		POSIX::strftime($format,localtime($date)).
-			'</td></tr></table>';
-	} else {
-	    $result ='<table border="on"><tr><td>No due date set.</td></tr></table>';
-	}
+	$result ='<table border="on"><tr><td>Due '.
+	    &Apache::lonnavmaps::timeToHumanString($date).
+		'</td></tr></table>';
+#        } else {
+#	    $result ='<table border="on"><tr><td>No due date set.</td></tr></table>';
+#	}
     } elsif ( $target eq 'edit' ) {
 	$result=&Apache::edit::tag_start($target,$token);
 	$result.='</td></tr>';
@@ -84,10 +83,10 @@
 sub start_displaytitle {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
-    if (exists($Apache::outputtags::showonce{'displayduedate'})) {
+    if (exists($Apache::outputtags::showonce{'displayduetitle'})) {
 	return '';
     } else {
-	$Apache::outputtags::showonce{'displayduedate'}=1;
+	$Apache::outputtags::showonce{'displayduetitle'}=1;
     }
     if ($target eq 'web') {
 	$result="<h1>$Apache::lonhomework::name</h1>";