--- loncom/homework/outputtags.pm 2005/11/09 12:05:56 1.44 +++ 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.44 2005/11/09 12:05:56 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 @@ -169,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;