--- loncom/homework/outputtags.pm 2002/07/26 19:14:13 1.17
+++ loncom/homework/outputtags.pm 2016/08/09 23:43:42 1.58
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# tags that create controlled output
#
-# $Id: outputtags.pm,v 1.17 2002/07/26 19:14:13 sakharuk Exp $
+# $Id: outputtags.pm,v 1.58 2016/08/09 23:43:42 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,74 +26,364 @@
# http://www.lon-capa.org/
#
+
+
package Apache::outputtags;
use strict;
+use Apache::lonlocal;
use Apache::lonnet;
use POSIX qw(strftime);
BEGIN {
- &Apache::lonxml::register('Apache::outputtags',('displayduedate','displaytitle'));
+ &Apache::lonxml::register('Apache::outputtags',('displayduedate','displaytitle','displayweight','displaystudentphoto'));
+}
+
+################################ utilities ###########################
+
+#
+# Does a simple substitution of a tab when the opening tag can
+# be replaced by a fixed string.. and same for the closing tag.
+# Parameters:
+# $input - String in in which to do the substitutions.
+# $tag - name of tag without the <>'s e.g. sub for
+# $opening - What to replace <$tag> with
+# $closing - What to replace with.
+# Returns:
+# Input string appropriately substituted.
+#
+sub substitute_tag {
+ my ($input,
+ $tag,
+ $opening,
+ $closing) = @_;
+
+ $input =~ s/<$tag>/$opening/gi;
+ $input =~ s/<\/$tag>/$closing/gi;
+
+ return $input;
+}
+
+#
+# Substitutes the simple formatting tags in a string
+# Parameters:
+# $string - input string.
+# Returns
+# Result of string after simple substitutions
+# Tags we handle are:
+# ,
+#
+sub substitute_simple_tags_latex {
+ my ($string) = @_;
+
+ # restore the <>'s:
+
+ $string =~ s/\\ensuremath\{<}/}/>/g;
+
+
+ # Substitute the tags:
+
+ $string = &substitute_tag($string, "sub", '\ensuremath{_', '}');
+ $string = &substitute_tag($string, 'sup', '\ensuremath{^', '}');
+ $string = &substitute_tag($string, 'em', '\em{', '}');
+
+
+ # Escape the remaining <>'s again:
+
+ $string =~ s//\\ensuremath{>}/g;
+
+
+
+ return $string;
+}
+
+################################ The parser ##########################
+
+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)).
- '
';
- } else {
- $result ='
No due date set.
';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result;
+
+ # Different parts can have different due dates... so we keep a list
+ # of the parts for which we've displayed the duedate:
+
+ if (exists($Apache::outputtags::showonce{'displayduedate'})) {
+ if (grep(/^\Q$Apache::inputtags::part\E$/,
+ @{$Apache::outputtags::showonce{'displayduedate'}})) {
+ return ''; # Already shown the duedate for this part.
+ }
}
- } elsif ( $target eq 'edit' ) {
- $result=&Apache::edit::tag_start($target,$token);
- $result.='';
- $result.=&Apache::edit::end_table();
- }
- return $result;
+ # since we will show the duedate for this part, remember it.
+
+ push (@{$Apache::outputtags::showonce{'displayduedate'}},
+ $Apache::inputtags::part);
+
+ # Determine the due date format:
+ #
+ my $status=$Apache::inputtags::status['-1'];
+ &Apache::lonxml::debug("got a $status in duedatebox");
+ my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval);
+ my $format = &Apache::lonxml::get_param('format', $parstack, $safeeval);
+ if (!$format) {
+ $format = undef;
+ }
+ if (($status =~ /CAN.*_ANSWER/)) {
+ my $id = $Apache::inputtags::part;
+ 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
+ # different from due date of the previous part. I think
+ # this is probably the best way to avoid due date clutter.
+
+ my $showduedate = 1;
+ my $part_count = scalar(@{$Apache::outputtags::showonce{'displayduedate'}});
+ if ($part_count > 1) {
+ my $prev_part_id = $Apache::outputtags::showonce{'displayduedate'}->[$part_count-2];
+ my $prev_due_date = &Apache::lonnet::EXT("resource.$prev_part_id.duedate");
+ if ($prev_due_date == $date) {
+ $showduedate = 0;
+ }
+ }
+
+ if ($showduedate) {
+ my $duetext = &Apache::lonnavmaps::timeToHumanString($date, '', $format);
+ if ($target eq 'web') {
+ if (lc($style) !~ 'plain') {
+ $result ='
Due '.$duetext.'
';
+ } else {
+ $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.
+ # at the start of the line to ensure it won't overlap
+ # the 1 col boundary.
+
+ $result = '\vspace{1.0 ex} \framebox{'
+ .&mt('Due').' '.$duetext.'}';
+ } else {
+ $result = &mt('Due') . ' '.$duetext;
+ }
+ }
+ }
+
+ }
+ if ( $target eq 'edit' ) {
+ $result=&Apache::edit::tag_start($target,$token);
+ $result.='';
+ $result.=&Apache::edit::end_table();
+
+ }
+ 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="