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

[foxr]

foxr		Tue Nov  8 07:00:23 2005 EDT

  Modified files:              
    /loncom/homework	outputtags.pm 
  Log:
  Suport format in displayduedate (web target only for now).
  
  
Index: loncom/homework/outputtags.pm
diff -u loncom/homework/outputtags.pm:1.42 loncom/homework/outputtags.pm:1.43
--- loncom/homework/outputtags.pm:1.42	Thu Nov  3 15:29:07 2005
+++ loncom/homework/outputtags.pm	Tue Nov  8 07:00:22 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # tags that create controlled output
 #
-# $Id: outputtags.pm,v 1.42 2005/11/03 20:29:07 albertel Exp $
+# $Id: outputtags.pm,v 1.43 2005/11/08 12:00:22 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -57,15 +57,21 @@
 	    return '';		# Already shown the duedate for this part.
 	}
     }
-    # since we will show the duedate for this part, remeber it.
+    # since we will show the duedate for this part, remember it.
 
     push (@{$Apache::outputtags::showonce{'displayduedate'}},
 	  $Apache::inputtags::part);
 
+    #  Determine the due date format:
+    #
     my $status=$Apache::inputtags::status['-1'];
     &Apache::lonxml::debug("got a $status in duedatebox");
     my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval);
-    if (($status =~ /CAN.*_ANSWER/) && ($target eq 'web')) {
+    my $format = &Apache::lonxml::get_param('format', $parstack, $safeeval);
+    if (!$format) {
+	$format = '%c';
+    }
+    if (($status =~ /CAN.*_ANSWER/)) {
 	my $id = $Apache::inputtags::part;
 	my $date = &Apache::lonnet::EXT("resource.$id.duedate");
 	&Apache::lonxml::debug("duedatebox found $date for $id");
@@ -85,21 +91,24 @@
 	}
 
 	if ($showduedate) {
-	    if (lc($style) !~ 'plain') { 
-		$result ='<table border="on"><tr><td>Due '.
-		    &Apache::lonnavmaps::timeToHumanString($date).
-		    '</td></tr></table>';
-	    } else {
-		$result=&mt('Due').' '.&Apache::lonnavmaps::timeToHumanString($date);
+	    if ($target eq 'web') {
+		if (lc($style) !~ 'plain') { 
+		    $result ='<table border="on"><tr><td>Due '.
+			&Apache::lonnavmaps::timeToHumanString($date,'', $format).
+			'</td></tr></table>';
+		} else {
+		    $result=&mt('Due').' '.&Apache::lonnavmaps::timeToHumanString($date);
+		}
+	    } elsif ($target eq 'tex') {
 	    }
 	}
-    } elsif ( $target eq 'edit' ) {
+     
+    } 
+    if ( $target eq 'edit' ) {
 	$result=&Apache::edit::tag_start($target,$token);
 	$result.='</td></tr>';
 	$result.=&Apache::edit::end_table();
-    } elsif ( $target eq 'tex' ) {
-	# print target.
-	$result ='';		# Stubbed off for now.
+	
     }
     return $result;
 }