--- loncom/homework/outputtags.pm 2005/11/08 12:00:22 1.43 +++ 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.43 2005/11/08 12:00:22 foxr Exp $ +# $Id: outputtags.pm,v 1.49 2006/10/17 15:11:12 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -69,11 +69,11 @@ 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 = &Apache::lonhomework::due_date($id); &Apache::lonxml::debug("duedatebox found $date for $id"); # Only show the due date if the current date is @@ -91,15 +91,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 ='
Due '.$duetext.'
'; } 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 +169,18 @@ sub end_displaytitle { sub multipart { my ($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; @@ -219,7 +236,7 @@ sub end_displayweight { sub start_displaystudentphoto { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; - my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser(); + 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;