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

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

version 1.32, 2002/11/13 23:37:56 version 1.38, 2003/04/07 23:02:06
Line 7 Line 7
 #  #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).  # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
 #  #
 # LON-CAPA is free software; you can redistribute it and/or modify  # LON-CAPA me&aree software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by  # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or  # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.  # (at your option) any later version.
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[$#$parser]);        &Apache::lonxml::get_all_text("/hintgroup",$parser);
     }      }
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
     $result .= '\keephidden{';       $result .= '\keephidden{'; 
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 123  sub start_numericalhint { Line 133  sub start_numericalhint {
       $result  = &Apache::edit::rebuild_tag($token);        $result  = &Apache::edit::rebuild_tag($token);
       $result .= &Apache::edit::handle_insert();        $result .= &Apache::edit::handle_insert();
     }      }
     } elsif ($target eq 'web') {
         &Apache::response::reset_params();
   }    }
   return $result;    return $result;
 }  }
Line 160  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 169  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
Line 214  sub start_hintpart { Line 212  sub start_hintpart {
       foreach $which (@Apache::hint::which) { if ($which eq $on) { $show = 1; last } }        foreach $which (@Apache::hint::which) { if ($which eq $on) { $show = 1; last } }
     }      }
     if (!$show) {      if (!$show) {
       &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);        &Apache::lonxml::get_all_text("/hintpart",$parser);
     }      }
   } elsif ($target eq 'grade') {    } elsif ($target eq 'grade') {
     &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);      &Apache::lonxml::get_all_text("/hintpart",$parser);
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result.= &Apache::edit::tag_start($target,$token);      $result.= &Apache::edit::tag_start($target,$token);
     $result.= &Apache::edit::text_arg('On:','on',$token);      $result.= &Apache::edit::text_arg('On:','on',$token);
Removed from v.1.32  
changed lines
  Added in v.1.38

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