[BACK]Return to outputtags.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

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

version 1.43, 2005/11/08 12:00:22 version 1.50, 2007/10/08 09:22:50
Line 69  sub start_displayduedate { Line 69  sub start_displayduedate {
     my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval);      my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval);
     my $format = &Apache::lonxml::get_param('format', $parstack, $safeeval);      my $format = &Apache::lonxml::get_param('format', $parstack, $safeeval);
     if (!$format) {      if (!$format) {
  $format = '%c';   $format = undef;
     }      }
     if (($status =~ /CAN.*_ANSWER/)) {      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::lonhomework::due_date($id);
  &Apache::lonxml::debug("duedatebox found $date for $id");   &Apache::lonxml::debug("duedatebox found $date for $id");
   
  # Only show the due date if the current date is    # Only show the due date if the current date is 
Line 91  sub start_displayduedate { Line 91  sub start_displayduedate {
  }   }
   
  if ($showduedate) {   if ($showduedate) {
       my $duetext = &Apache::lonnavmaps::timeToHumanString($date, '', $format);
     if ($target eq 'web') {      if ($target eq 'web') {
  if (lc($style) !~ 'plain') {    if (lc($style) !~ 'plain') { 
     $result ='<table border="on"><tr><td>Due '.      $result ='<table border="on"><tr><td>Due '.$duetext.'</td></tr></table>';
  &Apache::lonnavmaps::timeToHumanString($date,'', $format).  
  '</td></tr></table>';  
  } else {   } else {
     $result=&mt('Due').' '.&Apache::lonnavmaps::timeToHumanString($date);      $result=&mt('Due').' '.$duetext;
  }   }
     } elsif ($target eq 'tex') {      } 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.
       
       $result = '\framebox{'
             .&mt('Due').' '.$duetext.'}';
    } else {
       $result = &mt('Due') . ' '.$duetext;
    }
     }      }
  }   }
             
Line 128  sub start_displaytitle { Line 139  sub start_displaytitle {
     } else {      } else {
  $Apache::outputtags::showonce{'displayduetitle'}=1;   $Apache::outputtags::showonce{'displayduetitle'}=1;
     }      }
       &Apache::lonnet::logthis("start_displaytitle, target=$target / $Apache::lonhomework::type");
     my $name=&Apache::structuretags::get_resource_name();      my $name=&Apache::structuretags::get_resource_name();
     my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval);      my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval);
     if ($target eq 'web') {      if ($target eq 'web') {
Line 144  sub start_displaytitle { Line 156  sub start_displaytitle {
  } else {   } else {
     $result=$name;      $result=$name;
  }   }
    &Apache::lonnet::logthis("Printed title: $name");
     }      }
     return $result;      return $result;
 }  }
Line 158  sub end_displaytitle { Line 171  sub end_displaytitle {
 sub multipart {  sub multipart {
     my ($uri)=@_;      my ($uri)=@_;
     if (!defined($uri)) { $uri=$env{'request.uri'}; }      if (!defined($uri)) { $uri=$env{'request.uri'}; }
       my ($symb)=&Apache::lonnet::whichuser();
   
     my @parts;      my @parts;
     my $metadata = &Apache::lonnet::metadata($uri,'packages');      my $metadata = &Apache::lonnet::metadata($uri,'packages');
     foreach (split(/\,/,$metadata)) {      foreach (split(/\,/,$metadata)) {
  if ($_ =~ /^part_(.*)$/) {   if ($_ =~ /^part_(.*)$/) {
     my $part = $1;      my $part = $1;
     if ($part ne '0') { push(@parts,$part); }      if ($part ne '0' 
    && !&Apache::loncommon::check_if_partid_hidden($part, 
          $symb)) {
    push(@parts,$part);
       }
  }   }
     }      }
     return @parts;      return @parts;
Line 219  sub end_displayweight { Line 238  sub end_displayweight {
 sub start_displaystudentphoto {  sub start_displaystudentphoto {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
     my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();      my (undef,undef,$domain,$user) = &Apache::lonnet::whichuser();
     if ($target eq 'web' && $user eq $env{'user.name'}) {      if ($target eq 'web' && $user eq $env{'user.name'}) {
  my $url=&Apache::lonnet::studentphoto($domain,$user,"gif");   my $url=&Apache::lonnet::studentphoto($domain,$user,"gif");
  my $args;   my $args;
Removed from v.1.43  
changed lines
  Added in v.1.50

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