--- loncom/homework/outputtags.pm 2005/04/07 06:56:22 1.38 +++ loncom/homework/outputtags.pm 2005/10/11 10:48:23 1.39 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # tags that create controlled output # -# $Id: outputtags.pm,v 1.38 2005/04/07 06:56:22 albertel Exp $ +# $Id: outputtags.pm,v 1.39 2005/10/11 10:48:23 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,36 +40,54 @@ sub initialize_outputtags { %Apache::outputtags::showonce=(); } + sub start_displayduedate { 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'})) { - return ''; - } else { - $Apache::outputtags::showonce{'displayduedate'}=1; + if (grep(/^\Q$Apache::inputtags::part\E$/, + @{$Apache::outputtags::showonce{'displayduedate'}})) { + return ''; + } } + push (@{$Apache::outputtags::showonce{'displayduedate'}}, + $Apache::inputtags::part); + 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 '') { -# &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 (lc($style) !~ 'plain') { - $result ='
Due '. - &Apache::lonnavmaps::timeToHumanString($date). - '
'; - } else { - $result=&mt('Due').' '.&Apache::lonnavmaps::timeToHumanString($date); + + # 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) { + if (lc($style) !~ 'plain') { + $result ='
Due '. + &Apache::lonnavmaps::timeToHumanString($date). + '
'; + } else { + $result=&mt('Due').' '.&Apache::lonnavmaps::timeToHumanString($date); + } } -# } else { -# $result ='
No due date set.
'; -# } } elsif ( $target eq 'edit' ) { $result=&Apache::edit::tag_start($target,$token); $result.='';