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

version 1.39, 2005/10/11 10:48:23 version 1.53, 2008/11/18 19:14:28
Line 26 Line 26
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
   
   =head1 NAME
   
   Apache::outputtags;
   
   =head1 SYNOPSIS
   
   Handles tags associated with output. Seems to
   relate to due dates of the assignment.
   
   This is part of the LearningOnline Network with CAPA project
   described at http://www.lon-capa.org.
   
   =head1 SUBROUTINES
   
   =over
   
   =item start_displayduedate()
   
   =item initialize_outputtags()
   
   Empties the hash of tags that have already been displayed that should only be displayed once.
   
   =item end_displayduedate()
   
   =item start_displaytitle()
   
   =item end_displaytitle()
   
   =item multipart()
   
   =item start_displayweight()
   
   =item end_displayweight()
   
   =item start_displaystudentphoto()
   
   =item end_displaystudentphoto()
   
   
   =back
   
   =cut
   
 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);
   
Line 51  sub start_displayduedate { Line 95  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 = undef;
       }
       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 80  sub start_displayduedate { Line 132  sub start_displayduedate {
  }   }
   
  if ($showduedate) {   if ($showduedate) {
     if (lc($style) !~ 'plain') {       my $duetext = &Apache::lonnavmaps::timeToHumanString($date, '', $format);
  $result ='<table border="on"><tr><td>Due '.      if ($target eq 'web') {
     &Apache::lonnavmaps::timeToHumanString($date).   if (lc($style) !~ 'plain') { 
     '</td></tr></table>';      $result ='<table border="on"><tr><td>Due '.$duetext.'</td></tr></table>';
     } else {   } else {
  $result=&mt('Due').' '.&Apache::lonnavmaps::timeToHumanString($date);      $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.
       
       $result = '\framebox{'
             .&mt('Due').' '.$duetext.'}';
    } else {
       $result = &mt('Due') . ' '.$duetext;
    }
     }      }
  }   }
     } 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;
 }  }
Line 141  sub end_displaytitle { Line 210  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 202  sub end_displayweight { Line 277  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.39  
changed lines
  Added in v.1.53


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