Diff for /loncom/homework/outputtags.pm between versions 1.29 and 1.37

version 1.29, 2003/05/03 21:09:03 version 1.37, 2005/03/28 21:49:31
Line 33  use Apache::lonnet; Line 33  use Apache::lonnet;
 use POSIX qw(strftime);  use POSIX qw(strftime);
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::outputtags',('displayduedate','displaytitle','displayweight'));      &Apache::lonxml::register('Apache::outputtags',('displayduedate','displaytitle','displayweight','displaystudentphoto'));
 }  }
   
 sub initialize_outputtags {  sub initialize_outputtags {
Line 50  sub start_displayduedate { Line 50  sub start_displayduedate {
     }      }
     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);
     if (($status =~ /CAN.*_ANSWER/) && ($target eq 'web')) {      if (($status =~ /CAN.*_ANSWER/) && ($target eq 'web')) {
 # my $format = &Apache::lonxml::get_param('format',$parstack,$safeeval);  # my $format = &Apache::lonxml::get_param('format',$parstack,$safeeval);
 # if ($format eq '') {  # if ($format eq '') {
Line 59  sub start_displayduedate { Line 60  sub start_displayduedate {
  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");
  $result ='<table border="on"><tr><td>Due '.   if (lc($style) !~ 'plain') { 
     &Apache::lonnavmaps::timeToHumanString($date).      $result ='<table border="on"><tr><td>Due '.
    &Apache::lonnavmaps::timeToHumanString($date).
  '</td></tr></table>';   '</td></tr></table>';
    } else {
       $result=&mt('Due').' '.&Apache::lonnavmaps::timeToHumanString($date);
    }
 #        } else {  #        } else {
 #    $result ='<table border="on"><tr><td>No due date set.</td></tr></table>';  #    $result ='<table border="on"><tr><td>No due date set.</td></tr></table>';
 # }  # }
Line 88  sub start_displaytitle { Line 93  sub start_displaytitle {
     } else {      } else {
  $Apache::outputtags::showonce{'displayduetitle'}=1;   $Apache::outputtags::showonce{'displayduetitle'}=1;
     }      }
       my $name=&Apache::structuretags::get_resource_name();
       my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval);
     if ($target eq 'web') {      if ($target eq 'web') {
  $result="<h1>$Apache::lonhomework::name</h1>";   $result=$name;
    if (lc($style) !~ 'plain') { $result="<h1>$name</h1>"; }
     } elsif ($target eq 'edit') {      } elsif ($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' and $Apache::lonhomework::type ne 'exam') {      } elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
  $Apache::lonhomework::name=~s/%/\%/g;   $name=&Apache::lonxml::latex_special_symbols($name);
  $Apache::lonhomework::name=~s/&/\&/g;   if (lc($style) !~ 'plain') { 
  $result='\vskip 0 mm\noindent\textbf{'.$Apache::lonhomework::name.'}\vskip 0 mm';      $result='\vskip 0 mm\noindent\textbf{'.$name.'}\vskip 0 mm';
    } else {
       $result=$name;
    }
     }      }
     return $result;      return $result;
 }  }
Line 134  sub start_displayweight { Line 145  sub start_displayweight {
     }      }
     push(@{$Apache::outputtags::showonce{'displayweight'}},      push(@{$Apache::outputtags::showonce{'displayweight'}},
  $Apache::inputtags::part);   $Apache::inputtags::part);
     my $status=$Apache::inputtags::status['-1'];  
     if ($target eq 'web' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'tex') {
  my $id = $Apache::inputtags::part;   my $id = $Apache::inputtags::part;
  if ($id ne '0') {   if ($id ne '0') {
Line 144  sub start_displayweight { Line 154  sub start_displayweight {
  } else {   } else {
     my @parts=&multipart($ENV{'request.uri'});      my @parts=&multipart($ENV{'request.uri'});
     my $weight;      my $weight;
     foreach my $part (@parts) {      if (@parts) {
  my $pweight=&Apache::lonnet::EXT("resource.$part.weight");          foreach my $part (@parts) {
  if (!defined($pweight) || ($pweight eq '')) { $pweight=1; }      my $pweight=&Apache::lonnet::EXT("resource.$part.weight");
  $weight+=$pweight;      if (!defined($pweight) || ($pweight eq '')) { $pweight=1; }
       $weight+=$pweight;
           }
       } else {
    $weight = &Apache::lonnet::EXT("resource.$id.weight");
                   if (!defined($weight) || ($weight eq '')) { $weight=1; }
     }      }
     $result=$weight;      $result=$weight;
  }   }
Line 163  sub end_displayweight { Line 178  sub end_displayweight {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my @result;      my @result;
     if ($target eq 'edit') { $result[1]='no'; }      if ($target eq 'edit') { $result[1]='no'; }
       return @result;
   }
   
   sub start_displaystudentphoto {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
       if ($target eq 'web' && $user eq $ENV{'user.name'}) {
    my $url=&Apache::lonnet::studentphoto($domain,$user,"gif");
    my $args;
    my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
    if ($width) { $args.=" width=\"$width\" "; }
    my $height=&Apache::lonxml::get_param('heigth',$parstack,$safeeval);
    if ($height) { $args.=" height=\"$height\" "; }
    my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval);
    if ($align) { $args.=" align=\"$align\" "; }
    $result.=" <img $args src=\"$url\" alt=\"$user\@$domain\" />";
       }
       if ($target eq 'tex' && $ENV{'request.role'} =~ /^cc/) {
    my $url=&Apache::lonnet::studentphoto($domain,$user,"eps");
    my $ua=new LWP::UserAgent;
    my $request=new HTTP::Request('GET',$url);
    my $response=$ua->request($request);
    if ($response->is_success) {
       my $file=$user."_".$domain."_studentphoto.eps";
       open(FILE,">".$Apache::lonnet::perlvar{'lonPrtDir'}."/$file");
       print FILE $response->content;
       close(FILE);
       my $width_param=&Apache::londefdef::image_size($Apache::lonnet::perlvar{'lonPrtDir'}."/$file",'0.3',$parstack,$safeeval);
       $result.=' \graphicspath{{'.$Apache::lonnet::perlvar{'lonPrtDir'}.
    '}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
    } else {
       $result="$user\@$domain";
    }
       }
       return $result;
   }
   
   sub end_displaystudentphoto {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my @result;
       if ($target eq 'edit') { $result[1]='no'; }
     return @result;      return @result;
 }  }
   

Removed from v.1.29  
changed lines
  Added in v.1.37


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