--- loncom/homework/outputtags.pm 2003/08/13 18:50:43 1.31
+++ loncom/homework/outputtags.pm 2006/10/17 15:11:12 1.49
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# tags that create controlled output
#
-# $Id: outputtags.pm,v 1.31 2003/08/13 18:50:43 albertel Exp $
+# $Id: outputtags.pm,v 1.49 2006/10/17 15:11:12 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,46 +29,97 @@
package Apache::outputtags;
use strict;
+use Apache::lonlocal;
use Apache::lonnet;
use POSIX qw(strftime);
BEGIN {
- &Apache::lonxml::register('Apache::outputtags',('displayduedate','displaytitle','displayweight'));
+ &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");
- 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 $style = &Apache::lonxml::get_param('style',$parstack,$safeeval);
+ 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");
- $result ='
Due '.
- &Apache::lonnavmaps::timeToHumanString($date).
- ' |
';
-# } else {
-# $result ='';
-# }
- } elsif ( $target eq 'edit' ) {
+
+ # 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) {
+ my $duetext = &Apache::lonnavmaps::timeToHumanString($date, '', $format);
+ if ($target eq 'web') {
+ if (lc($style) !~ 'plain') {
+ $result ='';
+ } 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;
+ }
+ }
+ }
+
+ }
+ if ( $target eq 'edit' ) {
$result=&Apache::edit::tag_start($target,$token);
$result.='';
$result.=&Apache::edit::end_table();
+
}
return $result;
}
@@ -89,15 +140,21 @@ sub start_displaytitle {
$Apache::outputtags::showonce{'displayduetitle'}=1;
}
my $name=&Apache::structuretags::get_resource_name();
+ my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval);
if ($target eq 'web') {
- $result="$name
";
+ $result=$name;
+ if (lc($style) !~ 'plain') { $result="$name
"; }
} elsif ($target eq 'edit') {
$result=&Apache::edit::tag_start($target,$token);
$result.='';
$result.=&Apache::edit::end_table();
} elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
$name=&Apache::lonxml::latex_special_symbols($name);
- $result='\vskip 0 mm\noindent\textbf{'.$name.'}\vskip 0 mm';
+ if (lc($style) !~ 'plain') {
+ $result='\vskip 0 mm\noindent\textbf{'.$name.'}\vskip 0 mm';
+ } else {
+ $result=$name;
+ }
}
return $result;
}
@@ -111,13 +168,19 @@ sub end_displaytitle {
sub multipart {
my ($uri)=@_;
- if (!defined($uri)) { $uri=$ENV{'request.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;
@@ -134,7 +197,6 @@ sub start_displayweight {
}
push(@{$Apache::outputtags::showonce{'displayweight'}},
$Apache::inputtags::part);
- my $status=$Apache::inputtags::status['-1'];
if ($target eq 'web' || $target eq 'tex') {
my $id = $Apache::inputtags::part;
if ($id ne '0') {
@@ -142,7 +204,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) {
@@ -168,6 +230,48 @@ sub end_displayweight {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my @result;
if ($target eq 'edit') { $result[1]='no'; }
+ return @result;
+}
+
+sub start_displaystudentphoto {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result;
+ 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;
+ 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\" "; }
+ my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval);
+ if ($align) { $args.=" align=\"$align\" "; }
+ $result.="
";
+ }
+ 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',$url);
+ my $response=$ua->request($request);
+ if ($response->is_success) {
+ my $file=$user."_".$domain."_studentphoto.eps";
+ open(FILE,">".$Apache::lonnet::perlvar{'lonPrtDir'}."/$file");
+ print FILE $response->content;
+ close(FILE);
+ 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;
+}
+
+sub end_displaystudentphoto {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my @result;
+ if ($target eq 'edit') { $result[1]='no'; }
return @result;
}