--- loncom/homework/outputtags.pm 2005/11/08 12:00:22 1.43
+++ 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.43 2005/11/08 12:00:22 foxr Exp $
+# $Id: outputtags.pm,v 1.47 2006/04/20 19:09:48 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -69,11 +69,19 @@ sub start_displayduedate {
my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval);
my $format = &Apache::lonxml::get_param('format', $parstack, $safeeval);
if (!$format) {
- $format = '%c';
+ $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
@@ -91,15 +99,26 @@ sub start_displayduedate {
}
if ($showduedate) {
+ my $duetext = &Apache::lonnavmaps::timeToHumanString($date, '', $format);
if ($target eq 'web') {
if (lc($style) !~ 'plain') {
- $result ='
Due '.
- &Apache::lonnavmaps::timeToHumanString($date,'', $format).
- ' |
';
+ $result ='';
} else {
- $result=&mt('Due').' '.&Apache::lonnavmaps::timeToHumanString($date);
+ $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;
+ }
}
}
@@ -158,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;