--- loncom/homework/outputtags.pm 2005/11/02 20:31:55 1.40
+++ loncom/homework/outputtags.pm 2006/04/20 19:09:48 1.47
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# tags that create controlled output
#
-# $Id: outputtags.pm,v 1.40 2005/11/02 20:31:55 albertel Exp $
+# $Id: outputtags.pm,v 1.47 2006/04/20 19:09:48 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,7 +36,9 @@ 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=();
}
@@ -52,18 +54,34 @@ sub start_displayduedate {
if (exists($Apache::outputtags::showonce{'displayduedate'})) {
if (grep(/^\Q$Apache::inputtags::part\E$/,
@{$Apache::outputtags::showonce{'displayduedate'}})) {
- return '';
+ 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) {
+ $format = undef;
+ }
+ if (($status =~ /CAN.*_ANSWER/)) {
my $id = $Apache::inputtags::part;
- my $date = &Apache::lonnet::EXT("resource.$id.duedate");
+ my $date;
+ my $interval= &Apache::lonnet::EXT("resource.$id.interval");
+ if ($interval) {
+ my $first_access=&Apache::lonnet::get_first_access('map');
+ if ($first_access) { $date = $first_access+$interval; }
+ }
+ if (!defined($date)) {
+ $date = &Apache::lonnet::EXT("resource.$id.duedate");
+ }
&Apache::lonxml::debug("duedatebox found $date for $id");
# Only show the due date if the current date is
@@ -81,18 +99,35 @@ sub start_displayduedate {
}
if ($showduedate) {
- if (lc($style) !~ 'plain') {
- $result ='
Due '.
- &Apache::lonnavmaps::timeToHumanString($date).
- ' |
';
- } else {
- $result=&mt('Due').' '.&Apache::lonnavmaps::timeToHumanString($date);
+ 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;
+ }
}
}
- } elsif ( $target eq 'edit' ) {
+
+ }
+ if ( $target eq 'edit' ) {
$result=&Apache::edit::tag_start($target,$token);
$result.='';
$result.=&Apache::edit::end_table();
+
}
return $result;
}
@@ -142,12 +177,18 @@ sub end_displaytitle {
sub multipart {
my ($uri)=@_;
if (!defined($uri)) { $uri=$env{'request.uri'}; }
+ my ($symb)=&Apache::lonxml::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;