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

Diff for /loncom/homework/outputtags.pm between versions 1.41 and 1.48

version 1.41, 2005/11/03 11:12:37 version 1.48, 2006/05/12 03:46:54
Line 57  sub start_displayduedate { Line 57  sub start_displayduedate {
     return ''; # Already shown the duedate for this part.      return ''; # Already shown the duedate for this part.
  }   }
     }      }
     # since we will show the duedate for this part, remeber it.      # 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 85  sub start_displayduedate { Line 91  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();
     } elsif {$target eq 'tex'} {  
  # print target.  
  $result =''; # Stubbed off for now.  
     }      }
     return $result;      return $result;
 }  }
Line 149  sub end_displaytitle { Line 169  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::lonxml::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;
Removed from v.1.41  
changed lines
  Added in v.1.48

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