--- loncom/homework/outputtags.pm	2005/11/03 20:29:07	1.42
+++ loncom/homework/outputtags.pm	2008/11/14 21:27:17	1.52
@@ -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.52 2008/11/14 21:27:17 jms Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,6 +26,67 @@
 # http://www.lon-capa.org/
 #
 
+=head1 NAME
+
+Apache::outputtags;
+
+=head1 SYNOPSIS
+
+Handles tags associated with output. Seems to
+relate to due dates of the assignment.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 HANDLER SUBROUTINE
+
+start_displayduedate()
+
+=head1 OTHER SUBROUTINES
+
+=over
+
+=item *
+
+initialize_outputtags() : Empties the hash of tags that have already been displayed that should only be displayed once.
+
+=item *
+
+end_displayduedate()
+
+=item *
+
+start_displaytitle()
+
+=item *
+
+end_displaytitle()
+
+=item *
+
+multipart()
+
+=item *
+
+start_displayweight()
+
+=item *
+
+end_displayweight()
+
+=item *
+
+start_displaystudentphoto()
+
+=item *
+
+end_displaystudentphoto()
+
+
+=back
+
+=cut
+
 package Apache::outputtags; 
 
 use strict;
@@ -36,9 +97,7 @@ use POSIX qw(strftime);
 BEGIN {
     &Apache::lonxml::register('Apache::outputtags',('displayduedate','displaytitle','displayweight','displaystudentphoto'));
 }
-#  Empties the hash of tags that have already been displayed
-#  that should only be displayed once.
-#
+
 sub initialize_outputtags {
     %Apache::outputtags::showonce=();
 }
@@ -57,17 +116,23 @@ sub start_displayduedate {
 	    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 = undef;
+    }
+    if (($status =~ /CAN.*_ANSWER/)) {
 	my $id = $Apache::inputtags::part;
-	my $date = &Apache::lonnet::EXT("resource.$id.duedate");
+	my $date = &Apache::lonhomework::due_date($id);
 	&Apache::lonxml::debug("duedatebox found $date for $id");
 
 	# Only show the due date if the current date is 
@@ -85,21 +150,35 @@ sub start_displayduedate {
 	}
 
 	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);
+	    my $duetext = &Apache::lonnavmaps::timeToHumanString($date, '', $format);
+	    if ($target eq 'web') {
+		if (lc($style) !~ 'plain') { 
+		    $result ='<table border="on"><tr><td>Due '.$duetext.'</td></tr></table>';
+		} else {
+		    $result=&mt('Due').' '.$duetext;
+		}
+	    } elsif ($target eq 'tex') {
+		# For TeX we'll make the duedate tag work exactly like the 
+		# duedate tag for web.
+
+		my $duetext = &Apache::lonnavmaps::timeToHumanString($date, '', $format);
+		if (lc($style) !~ 'plain') {
+		    # The due date will be put in a box.
+		    
+		    $result = '\framebox{'
+    			       .&mt('Due').' '.$duetext.'}';
+		} else {
+		    $result = &mt('Due') . ' '.$duetext;
+		}
 	    }
 	}
-    } 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;
 }
@@ -149,12 +228,18 @@ sub end_displaytitle {
 sub multipart {
     my ($uri)=@_;
     if (!defined($uri)) { $uri=$env{'request.uri'}; }
+    my ($symb)=&Apache::lonnet::whichuser();
+
     my @parts;
     my $metadata = &Apache::lonnet::metadata($uri,'packages');
     foreach (split(/\,/,$metadata)) {
 	if ($_ =~ /^part_(.*)$/) {
 	    my $part = $1;
-	    if ($part ne '0') { push(@parts,$part); }
+	    if ($part ne '0' 
+		&& !&Apache::loncommon::check_if_partid_hidden($part, 
+							       $symb)) {
+		push(@parts,$part);
+	    }
 	}
     }
     return @parts;
@@ -210,7 +295,7 @@ sub end_displayweight {
 sub start_displaystudentphoto {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
-    my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
+    my (undef,undef,$domain,$user) = &Apache::lonnet::whichuser();
     if ($target eq 'web' && $user eq $env{'user.name'}) {
 	my $url=&Apache::lonnet::studentphoto($domain,$user,"gif");
 	my $args;