Diff for /loncom/homework/outputtags.pm between versions 1.39 and 1.43

version 1.39, 2005/10/11 10:48:23 version 1.43, 2005/11/08 12:00:22
Line 29 Line 29
 package Apache::outputtags;   package Apache::outputtags; 
   
 use strict;  use strict;
   use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
 use POSIX qw(strftime);  use POSIX qw(strftime);
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::outputtags',('displayduedate','displaytitle','displayweight','displaystudentphoto'));      &Apache::lonxml::register('Apache::outputtags',('displayduedate','displaytitle','displayweight','displaystudentphoto'));
 }  }
   #  Empties the hash of tags that have already been displayed
   #  that should only be displayed once.
   #
 sub initialize_outputtags {  sub initialize_outputtags {
     %Apache::outputtags::showonce=();      %Apache::outputtags::showonce=();
 }  }
Line 51  sub start_displayduedate { Line 54  sub start_displayduedate {
     if (exists($Apache::outputtags::showonce{'displayduedate'})) {      if (exists($Apache::outputtags::showonce{'displayduedate'})) {
  if (grep(/^\Q$Apache::inputtags::part\E$/,   if (grep(/^\Q$Apache::inputtags::part\E$/,
  @{$Apache::outputtags::showonce{'displayduedate'}})) {   @{$Apache::outputtags::showonce{'displayduedate'}})) {
     return '';      return ''; # Already shown the duedate for this part.
  }   }
     }      }
       # since we will show the duedate for this part, remember it.
   
     push (@{$Apache::outputtags::showonce{'displayduedate'}},      push (@{$Apache::outputtags::showonce{'displayduedate'}},
   $Apache::inputtags::part);    $Apache::inputtags::part);
   
       #  Determine the due date format:
       #
     my $status=$Apache::inputtags::status['-1'];      my $status=$Apache::inputtags::status['-1'];
     &Apache::lonxml::debug("got a $status in duedatebox");      &Apache::lonxml::debug("got a $status in duedatebox");
     my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval);      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) {
    $format = '%c';
       }
       if (($status =~ /CAN.*_ANSWER/)) {
  my $id = $Apache::inputtags::part;   my $id = $Apache::inputtags::part;
  my $date = &Apache::lonnet::EXT("resource.$id.duedate");   my $date = &Apache::lonnet::EXT("resource.$id.duedate");
  &Apache::lonxml::debug("duedatebox found $date for $id");   &Apache::lonxml::debug("duedatebox found $date for $id");
Line 80  sub start_displayduedate { Line 91  sub start_displayduedate {
  }   }
   
  if ($showduedate) {   if ($showduedate) {
     if (lc($style) !~ 'plain') {       if ($target eq 'web') {
  $result ='<table border="on"><tr><td>Due '.   if (lc($style) !~ 'plain') { 
     &Apache::lonnavmaps::timeToHumanString($date).      $result ='<table border="on"><tr><td>Due '.
     '</td></tr></table>';   &Apache::lonnavmaps::timeToHumanString($date,'', $format).
     } else {   '</td></tr></table>';
  $result=&mt('Due').' '.&Apache::lonnavmaps::timeToHumanString($date);   } else {
       $result=&mt('Due').' '.&Apache::lonnavmaps::timeToHumanString($date);
    }
       } elsif ($target eq 'tex') {
     }      }
  }   }
     } elsif ( $target eq 'edit' ) {       
       } 
       if ( $target eq 'edit' ) {
  $result=&Apache::edit::tag_start($target,$token);   $result=&Apache::edit::tag_start($target,$token);
  $result.='</td></tr>';   $result.='</td></tr>';
  $result.=&Apache::edit::end_table();   $result.=&Apache::edit::end_table();
   
     }      }
     return $result;      return $result;
 }  }

Removed from v.1.39  
changed lines
  Added in v.1.43


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>