Diff for /loncom/homework/hint.pm between versions 1.34 and 1.38

version 1.34, 2003/02/07 22:03:21 version 1.38, 2003/04/07 23:02:06
Line 50  sub start_hintgroup { Line 50  sub start_hintgroup {
     my $hinttries=&Apache::lonnet::EXT("resource.$id.hinttries");      my $hinttries=&Apache::lonnet::EXT("resource.$id.hinttries");
     if ( $hinttries eq '') { $hinttries = 1; }      if ( $hinttries eq '') { $hinttries = 1; }
     &Apache::lonxml::debug("found :$id:$numtries:$hinttries:");      &Apache::lonxml::debug("found :$id:$numtries:$hinttries:");
     if ( $numtries < $hinttries ) {      if ($Apache::lonhomework::type ne 'exam') {
       $skiptoend='1';   if ( $numtries < $hinttries ) {
       $skiptoend='1';
    } else {
       $result='<table bgcolor="#dddddd"><tr><td>';
    }
     } else {      } else {
       if ($target eq 'web') {$result='<table bgcolor="#dddddd"><tr><td>';}   &Apache::lonxml::startredirection;
     }      }
     if ($skiptoend) {      if ($skiptoend) {
       &Apache::lonxml::get_all_text("/hintgroup",$parser);        &Apache::lonxml::get_all_text("/hintgroup",$parser);
Line 76  sub end_hintgroup { Line 80  sub end_hintgroup {
     my $hinttries=&Apache::lonnet::EXT("resource.$id.hinttries");      my $hinttries=&Apache::lonnet::EXT("resource.$id.hinttries");
     if ( $hinttries eq '') { $hinttries = 1; }      if ( $hinttries eq '') { $hinttries = 1; }
     &Apache::lonxml::debug("found :$id:$numtries:$hinttries:");      &Apache::lonxml::debug("found :$id:$numtries:$hinttries:");
     if ( $numtries >= $hinttries ) {      if ($Apache::lonhomework::type ne 'exam') {
       $result='</td></tr></table>';   if ( $numtries >= $hinttries ) {
       $result='</td></tr></table>';
    }
       } else {
    &Apache::lonxml::endredirection;
     }      }
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table();      $result.=&Apache::edit::end_table();
Line 98  sub start_numericalhint { Line 106  sub start_numericalhint {
     $result.=&Apache::edit::text_arg('Name:','name',$token);      $result.=&Apache::edit::text_arg('Name:','name',$token);
     $result.=&Apache::edit::text_arg('Answer:','answer',$token);      $result.=&Apache::edit::text_arg('Answer:','answer',$token);
     if ($token->[1] eq 'numericalhint') {      if ($token->[1] eq 'numericalhint') {
       $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);        $result.=&Apache::edit::text_arg('Unit:','unit',$token,5).
       $result.=&Apache::edit::text_arg('Format:','format',$token,4);                           &Apache::loncommon::help_open_topic('Physical_Units');
         $result.=&Apache::edit::text_arg('Format:','format',$token,4).
                 &Apache::loncommon::help_open_topic('Numerical_Response_Format');
     } elsif ($token->[1] eq 'stringhint') {      } elsif ($token->[1] eq 'stringhint') {
       $result.=&Apache::edit::select_arg('Type:','type',['cs','ci','mc'],$token);        $result.=&Apache::edit::select_arg('Type:','type',['cs','ci','mc'],$token);
     } elsif ($token->[1] eq 'formulahint') {      } elsif ($token->[1] eq 'formulahint') {
Line 162  sub end_numericalhint { Line 172  sub end_numericalhint {
     if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') { push (@Apache::hint::which,$name); }      if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') { push (@Apache::hint::which,$name); }
     $result='';      $result='';
   } elsif ($target eq 'meta') {    } elsif ($target eq 'meta') {
     $result=&Apache::response::meta_package_write('numericalhint');      $result=&Apache::response::meta_package_write($token->[1]);
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result.='</td></tr>'.&Apache::edit::end_table;      $result.='</td></tr>'.&Apache::edit::end_table;
   }    }
Line 171  sub end_numericalhint { Line 181  sub end_numericalhint {
 }  }
   
 sub start_stringhint {  sub start_stringhint {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      return &start_numericalhint(@_);
   my $result;  
   if ($target eq 'meta') {  
     $result=&Apache::response::meta_package_write('stringhint');  
   } else {  
     $result.=&start_numericalhint(@_);  
   }  
   return $result;  
 }  }
   
 sub end_stringhint {  sub end_stringhint {
   return end_numericalhint(@_);      return &end_numericalhint(@_);
 }  }
   
 sub start_formulahint {  sub start_formulahint {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      return &start_numericalhint(@_);
   my $result;  
   if ($target eq 'meta') {  
     $result=&Apache::response::meta_package_write('formulahint');  
   } else {  
     $result.=&start_numericalhint(@_);  
   }  
   return $result;  
 }  }
   
 sub end_formulahint {  sub end_formulahint {
   return end_numericalhint(@_);      return end_numericalhint(@_);
 }  }
   
 # a part shows if it is on, if no specific parts are on, then default shows  # a part shows if it is on, if no specific parts are on, then default shows

Removed from v.1.34  
changed lines
  Added in v.1.38


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