--- loncom/homework/outputtags.pm 2003/01/13 21:23:06 1.25
+++ loncom/homework/outputtags.pm 2003/10/13 19:32:31 1.34
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# tags that create controlled output
#
-# $Id: outputtags.pm,v 1.25 2003/01/13 21:23:06 sakharuk Exp $
+# $Id: outputtags.pm,v 1.34 2003/10/13 19:32:31 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -50,6 +50,7 @@ sub start_displayduedate {
}
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 eq '') {
@@ -59,9 +60,13 @@ sub start_displayduedate {
my $id = $Apache::inputtags::part;
my $date = &Apache::lonnet::EXT("resource.$id.duedate");
&Apache::lonxml::debug("duedatebox found $date for $id");
- $result ='
Due '.
- &Apache::lonnavmaps::timeToHumanString($date).
+ if (lc($style) !~ 'plain') {
+ $result ='Due '.
+ &Apache::lonnavmaps::timeToHumanString($date).
' | ';
+ } else {
+ $result=&mt('Due').' '.&Apache::lonnavmaps::timeToHumanString($date);
+ }
# } else {
# $result ='';
# }
@@ -88,16 +93,22 @@ sub start_displaytitle {
} else {
$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="$Apache::lonhomework::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') {
- $Apache::lonhomework::name=~s/%/\%/g;
- $Apache::lonhomework::name=~s/&/\&/g;
- $result='\vskip 0 mm\noindent\textbf{'.$Apache::lonhomework::name.'}\vskip 0 mm';
+ $name=&Apache::lonxml::latex_special_symbols($name);
+ if (lc($style) !~ 'plain') {
+ $result='\vskip 0 mm\noindent\textbf{'.$name.'}\vskip 0 mm';
+ } else {
+ $result=$name;
+ }
}
return $result;
}
@@ -109,21 +120,52 @@ sub end_displaytitle {
return @result;
}
+sub multipart {
+ my ($uri)=@_;
+ if (!defined($uri)) { $uri=$ENV{'request.uri'}; }
+ my @parts;
+ my $metadata = &Apache::lonnet::metadata($uri,'packages');
+ foreach (split(/\,/,$metadata)) {
+ if ($_ =~ /^part_(.*)$/) {
+ my $part = $1;
+ if ($part ne '0') { push(@parts,$part); }
+ }
+ }
+ return @parts;
+}
+
sub start_displayweight {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
if (exists($Apache::outputtags::showonce{'displayweight'})) {
- return '';
- } else {
- $Apache::outputtags::showonce{'displayweight'}=1;
+ if(grep(/^\Q$Apache::inputtags::part\E$/,
+ @{$Apache::outputtags::showonce{'displayweight'}})) {
+ return '';
+ }
}
- my $status=$Apache::inputtags::status['-1'];
+ push(@{$Apache::outputtags::showonce{'displayweight'}},
+ $Apache::inputtags::part);
if ($target eq 'web' || $target eq 'tex') {
my $id = $Apache::inputtags::part;
- my $weight = &Apache::lonnet::EXT("resource.$id.weight");
- &Apache::lonxml::debug("duedatebox found $weight for $id");
- if (!defined($weight) || ($weight eq '')) { $weight=1; }
- $result.=$weight;
+ if ($id ne '0') {
+ my $weight = &Apache::lonnet::EXT("resource.$id.weight");
+ if (!defined($weight) || ($weight eq '')) { $weight=1; }
+ $result.=$weight;
+ } else {
+ my @parts=&multipart($ENV{'request.uri'});
+ my $weight;
+ if (@parts) {
+ foreach my $part (@parts) {
+ my $pweight=&Apache::lonnet::EXT("resource.$part.weight");
+ if (!defined($pweight) || ($pweight eq '')) { $pweight=1; }
+ $weight+=$pweight;
+ }
+ } else {
+ $weight = &Apache::lonnet::EXT("resource.$id.weight");
+ if (!defined($weight) || ($weight eq '')) { $weight=1; }
+ }
+ $result=$weight;
+ }
} elsif ( $target eq 'edit' ) {
$result=&Apache::edit::tag_start($target,$token);
$result.='';