--- loncom/homework/outputtags.pm 2004/10/26 15:03:08 1.35
+++ loncom/homework/outputtags.pm 2005/11/08 12:00:22 1.43
@@ -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.43 2005/11/08 12:00:22 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,51 +29,86 @@
package Apache::outputtags;
use strict;
+use Apache::lonlocal;
use Apache::lonnet;
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=();
}
+
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 ''; # Already shown the duedate for this part.
+ }
}
+ # 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 eq '') {
-# &Apache::lonxml::debug("using default format");
-# $format="%c";
-# }
+ 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");
- if (lc($style) !~ 'plain') {
- $result ='
Due '.
- &Apache::lonnavmaps::timeToHumanString($date).
- ' |
';
- } 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;
+ }
}
-# } else {
-# $result ='';
-# }
- } elsif ( $target eq 'edit' ) {
+
+ if ($showduedate) {
+ if ($target eq 'web') {
+ if (lc($style) !~ 'plain') {
+ $result ='Due '.
+ &Apache::lonnavmaps::timeToHumanString($date,'', $format).
+ ' |
';
+ } else {
+ $result=&mt('Due').' '.&Apache::lonnavmaps::timeToHumanString($date);
+ }
+ } elsif ($target eq 'tex') {
+ }
+ }
+
+ }
+ if ( $target eq 'edit' ) {
$result=&Apache::edit::tag_start($target,$token);
$result.='';
$result.=&Apache::edit::end_table();
+
}
return $result;
}
@@ -122,7 +157,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 +187,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 +220,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.=" ";
+ my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval);
+ if ($align) { $args.=" align=\"$align\" "; }
+ $result.=" ";
}
- 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 +244,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;