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

Diff for /loncom/homework/structuretags.pm between versions 1.282 and 1.283

version 1.282, 2005/03/17 13:56:32 version 1.283, 2005/04/01 18:08:14
Line 1066  sub end_randomlist { Line 1066  sub end_randomlist {
     return $result;      return $result;
 }  }
   
   sub ordered_show_check {
       my $last_part=$Apache::inputtags::partlist[-2];
       my $in_order=
    &Apache::lonnet::EXT('resource.'.$Apache::inputtags::part.'.ordered');
       my $in_order_show=1;
       if ($last_part ne '0' && lc($in_order) eq 'yes') {
    $in_order_show=&Apache::response::check_status($last_part);
       }
       return $in_order_show;
   }
   
 sub start_part {  sub start_part {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';      my $result='';
Line 1080  sub start_part { Line 1091  sub start_part {
     my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);      my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
     my $newtype=&Apache::lonnet::EXT("resource.$id.type");      my $newtype=&Apache::lonnet::EXT("resource.$id.type");
     if ($newtype) { $Apache::lonhomework::type=$newtype; }      if ($newtype) { $Apache::lonhomework::type=$newtype; }
       my $in_order_show=&ordered_show_check();
     my $expression='$external::part=\''.$Apache::inputtags::part.'\';';      my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
     $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';      $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';
     &Apache::run::run($expression,$safeeval);      &Apache::run::run($expression,$safeeval);
Line 1091  sub start_part { Line 1102  sub start_part {
        &Apache::response::meta_parameter_write('display','string',$display,'Part Description');         &Apache::response::meta_parameter_write('display','string',$display,'Part Description');
     } elsif ($target eq 'web' || $target eq 'grade' ||      } elsif ($target eq 'web' || $target eq 'grade' ||
      $target eq 'answer' || $target eq 'tex') {       $target eq 'answer' || $target eq 'tex') {
  if ($hidden) {   if ($hidden || !$in_order_show) {
     my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);      my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);
  } else {   } else {
     my ($status,$accessmsg) = &Apache::lonhomework::check_access($id);      my ($status,$accessmsg) = &Apache::lonhomework::check_access($id);
Line 1171  sub end_part { Line 1182  sub end_part {
     &Apache::lonxml::debug("in end_part $target ");      &Apache::lonxml::debug("in end_part $target ");
     my $status=$Apache::inputtags::status['-1'];      my $status=$Apache::inputtags::status['-1'];
     my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);      my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
       my $in_order_show=&ordered_show_check();
     my $result='';      my $result='';
     if ( $target eq 'meta' ) {      if ( $target eq 'meta' ) {
  $result='';   $result='';
     } elsif ($target eq 'grade') {      } elsif ($target eq 'grade') {
  if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&   if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&
     !$hidden) {      !$hidden && $in_order_show) {
     $result=&Apache::inputtags::grade;      $result=&Apache::inputtags::grade;
  } else {   } else {
     # move any submission data to .hidden      # move any submission data to .hidden
     &Apache::inputtags::hidealldata($Apache::inputtags::part);      &Apache::inputtags::hidealldata($Apache::inputtags::part);
  }   }
     } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) {      } elsif (($target eq 'web' || $target eq 'tex') &&
        !$hidden && $in_order_show) {
  my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,   my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,
  $target);   $target);
  if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') {   if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') {
Removed from v.1.282  
changed lines
  Added in v.1.283

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