--- loncom/homework/outputtags.pm 2002/01/17 12:23:31 1.15
+++ loncom/homework/outputtags.pm 2003/05/02 18:56:29 1.26
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# tags that create controlled output
#
-# $Id: outputtags.pm,v 1.15 2002/01/17 12:23:31 harris41 Exp $
+# $Id: outputtags.pm,v 1.26 2003/05/02 18:56:29 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -33,63 +33,113 @@ use Apache::lonnet;
use POSIX qw(strftime);
BEGIN {
- &Apache::lonxml::register('Apache::outputtags',('displayduedate','displaytitle'));
+ &Apache::lonxml::register('Apache::outputtags',('displayduedate','displaytitle','displayweight'));
+}
+
+sub initialize_outputtags {
+ %Apache::outputtags::showonce=();
}
sub start_displayduedate {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $result;
- my $status=$Apache::inputtags::status['-1'];
- &Apache::lonxml::debug("got a $status in duedatebox");
- if (($status =~ /CAN.*_ANSWER/) && ($target eq 'web')) {
- my $format = &Apache::lonxml::get_param('format',$parstack,$safeeval);
- if ($format eq '') {
- &Apache::lonxml::debug("using default format");
- $format="%c";
- }
- my $id = $Apache::inputtags::part;
- my $date = &Apache::lonnet::EXT("resource.$id.duedate");
- &Apache::lonxml::debug("duedatebox found $date for $id");
- if ($date) {
- $result ='
Due at '.
- POSIX::strftime($format,localtime($date)).
- ' |
';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result;
+ if (exists($Apache::outputtags::showonce{'displayduedate'})) {
+ return '';
} else {
- $result ='';
+ $Apache::outputtags::showonce{'displayduedate'}=1;
+ }
+ my $status=$Apache::inputtags::status['-1'];
+ &Apache::lonxml::debug("got a $status in duedatebox");
+ if (($status =~ /CAN.*_ANSWER/) && ($target eq 'web')) {
+# my $format = &Apache::lonxml::get_param('format',$parstack,$safeeval);
+# if ($format eq '') {
+# &Apache::lonxml::debug("using default format");
+# $format="%c";
+# }
+ 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).
+ ' |
';
+# } else {
+# $result ='';
+# }
+ } elsif ( $target eq 'edit' ) {
+ $result=&Apache::edit::tag_start($target,$token);
+ $result.='';
+ $result.=&Apache::edit::end_table();
}
- } elsif ( $target eq 'edit' ) {
- $result=&Apache::edit::tag_start($target,$token);
- $result.='';
- $result.=&Apache::edit::end_table();
- }
- return $result;
+ return $result;
}
sub end_displayduedate {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my @result;
- if ($target eq 'edit') { $result[1]='no'; }
- return @result;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my @result;
+ if ($target eq 'edit') { $result[1]='no'; }
+ return @result;
}
sub start_displaytitle {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $result='';
- if ($target eq 'web') {
- $result="$Apache::lonhomework::name
";
- } elsif ($target eq 'edit') {
- $result=&Apache::edit::tag_start($target,$token);
- $result.='';
- $result.=&Apache::edit::end_table();
- }
- return $result;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result='';
+ if (exists($Apache::outputtags::showonce{'displayduetitle'})) {
+ return '';
+ } else {
+ $Apache::outputtags::showonce{'displayduetitle'}=1;
+ }
+ if ($target eq 'web') {
+ $result="$Apache::lonhomework::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';
+ }
+ return $result;
}
sub end_displaytitle {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my @result;
- if ($target eq 'edit') { $result[1]='no'; }
- return @result;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my @result;
+ if ($target eq 'edit') { $result[1]='no'; }
+ return @result;
+}
+
+sub start_displayweight {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result;
+ if (exists($Apache::outputtags::showonce{'displayweight'})) {
+ if(grep(/^\Q$Apache::inputtags::part\E$/,
+ @{$Apache::outputtags::showonce{'displayweight'}})) {
+ return '';
+ }
+ }
+ push(@{$Apache::outputtags::showonce{'displayweight'}},
+ $Apache::inputtags::part);
+ my $status=$Apache::inputtags::status['-1'];
+ 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;
+ } elsif ( $target eq 'edit' ) {
+ $result=&Apache::edit::tag_start($target,$token);
+ $result.='';
+ $result.=&Apache::edit::end_table();
+ }
+ return $result;
+}
+
+sub end_displayweight {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my @result;
+ if ($target eq 'edit') { $result[1]='no'; }
+ return @result;
}
1;