--- loncom/homework/outputtags.pm	2004/10/26 15:03:08	1.35
+++ loncom/homework/outputtags.pm	2005/10/11 10:48:23	1.39
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # tags that create controlled output
 #
-# $Id: outputtags.pm,v 1.35 2004/10/26 15:03:08 albertel Exp $
+# $Id: outputtags.pm,v 1.39 2005/10/11 10:48:23 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,36 +40,54 @@ sub initialize_outputtags {
     %Apache::outputtags::showonce=();
 }
 
+
 sub start_displayduedate {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
+
+    # Different parts can have different due dates... so we keep a list
+    # of the parts for which we've displayed the duedate:
+
     if (exists($Apache::outputtags::showonce{'displayduedate'})) {
-	return '';
-    } else {
-	$Apache::outputtags::showonce{'displayduedate'}=1;
+	if (grep(/^\Q$Apache::inputtags::part\E$/,
+		 @{$Apache::outputtags::showonce{'displayduedate'}})) {
+	    return '';
+	}
     }
+    push (@{$Apache::outputtags::showonce{'displayduedate'}},
+	  $Apache::inputtags::part);
+
     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 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 (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);
+
+	# Only show the due date if the current date is 
+	# different from due date of the previous part.  I think
+	# this is probably the best way to avoid due date clutter.
+
+       	my $showduedate = 1;
+	my $part_count  = scalar(@{$Apache::outputtags::showonce{'displayduedate'}});
+	if ($part_count > 1) {
+	    my $prev_part_id = $Apache::outputtags::showonce{'displayduedate'}->[$part_count-2];
+	    my $prev_due_date = &Apache::lonnet::EXT("resource.$prev_part_id.duedate");
+	    if ($prev_due_date == $date) {
+		$showduedate = 0;
+	    }
+	}
+
+	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);
+	    }
 	}
-#        } 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>';
@@ -122,7 +140,7 @@ sub end_displaytitle {
 
 sub multipart {
     my ($uri)=@_;
-    if (!defined($uri)) { $uri=$ENV{'request.uri'}; }
+    if (!defined($uri)) { $uri=$env{'request.uri'}; }
     my @parts;
     my $metadata = &Apache::lonnet::metadata($uri,'packages');
     foreach (split(/\,/,$metadata)) {
@@ -152,7 +170,7 @@ sub start_displayweight {
 	    if (!defined($weight) || ($weight eq '')) { $weight=1; }
 	    $result.=$weight;
 	} else {
-	    my @parts=&multipart($ENV{'request.uri'});
+	    my @parts=&multipart($env{'request.uri'});
 	    my $weight;
 	    if (@parts) {
 	        foreach my $part (@parts) {
@@ -185,23 +203,21 @@ sub start_displaystudentphoto {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
     my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
-    if ($target eq 'web' && $user eq $ENV{'user.name'}) {
-	my $ret=&Apache::lonnet::reply("studentphoto:$domain:$user:gif",&Apache::lonnet::homeserver($user,$domain));
-	my $url="/uploaded/$domain/$user/internal/studentphoto.gif";
-	my $tokenurl=&Apache::lonnet::tokenwrapper($url);
+    if ($target eq 'web' && $user eq $env{'user.name'}) {
+	my $url=&Apache::lonnet::studentphoto($domain,$user,"gif");
 	my $args;
 	my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
 	if ($width) { $args.=" width=\"$width\" "; }
 	my $height=&Apache::lonxml::get_param('heigth',$parstack,$safeeval);
 	if ($height) { $args.=" height=\"$height\" "; }
-	$result.=" <img $args src=\"$tokenurl\" alt=\"$user\@$domain\" />";
+	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval);
+	if ($align) { $args.=" align=\"$align\" "; }
+	$result.=" <img $args src=\"$url\" alt=\"$user\@$domain\" />";
     }
-    if ($target eq 'tex' && $ENV{'request.role'} =~ /^cc/) {
-	my $ret=&Apache::lonnet::reply("studentphoto:$domain:$user:eps",&Apache::lonnet::homeserver($user,$domain));
-	my $url="/uploaded/$domain/$user/internal/studentphoto.eps";
-	my $tokenurl=&Apache::lonnet::tokenwrapper($url);
+    if ($target eq 'tex' && $env{'request.role'} =~ /^cc/) {
+	my $url=&Apache::lonnet::studentphoto($domain,$user,"eps");
 	my $ua=new LWP::UserAgent;
-	my $request=new HTTP::Request('GET',$tokenurl);
+	my $request=new HTTP::Request('GET',$url);
 	my $response=$ua->request($request);
 	if ($response->is_success) {
 	    my $file=$user."_".$domain."_studentphoto.eps";
@@ -211,6 +227,8 @@ sub start_displaystudentphoto {
 	    my $width_param=&Apache::londefdef::image_size($Apache::lonnet::perlvar{'lonPrtDir'}."/$file",'0.3',$parstack,$safeeval);
 	    $result.=' \graphicspath{{'.$Apache::lonnet::perlvar{'lonPrtDir'}.
 		'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
+	} else {
+	    $result="$user\@$domain";
 	}
     }
     return $result;