Diff for /loncom/homework/caparesponse/caparesponse.pm between versions 1.225 and 1.227.2.2

version 1.225, 2008/05/30 16:04:33 version 1.227.2.2, 2008/09/13 02:46:59
Line 311  sub start_numericalresponse { Line 311  sub start_numericalresponse {
     if ($unit =~ /\S/) { $result.=" (in $unit) "; }      if ($unit =~ /\S/) { $result.=" (in $unit) "; }
  }   }
         if (($token->[1] eq 'formularesponse') &&           if (($token->[1] eq 'formularesponse') && 
             ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') &&              ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER')) {
             (!&Apache::lonxml::get_param_var('samples',$parstack,$safeeval))) {  
             $result.=&edit_formula_button($id,"HWVAL_$id");              $result.=&edit_formula_button($id,"HWVAL_$id");
         }          }
  if (  &Apache::response::show_answer() ) {   if (  &Apache::response::show_answer() ) {
Line 326  sub start_numericalresponse { Line 325  sub start_numericalresponse {
 sub edit_formula_button {  sub edit_formula_button {
     my ($id,$field)=@_;      my ($id,$field)=@_;
     my $button=&mt('Edit Answer');      my $button=&mt('Edit Answer');
       my $helplink=&Apache::loncommon::help_open_topic('Formula_Editor');
     return(<<ENDFORMULABUTTON);      return(<<ENDFORMULABUTTON);
 <script language="JavaScript">  <script language="JavaScript">
 function edit_${id}_${field} (textarea) {  function edit_${id}_${field} (textarea) {
Line 334  function edit_${id}_${field} (textarea) Line 334  function edit_${id}_${field} (textarea)
     newwin = window.open("/adm/dragmath/applet/MaximaPopup.html","","width=565,height=400,resizable");      newwin = window.open("/adm/dragmath/applet/MaximaPopup.html","","width=565,height=400,resizable");
 }  }
 </script>  </script>
 <input type='button' value='$button' onclick="javascript:edit_${id}_${field}('${field}');void(0);" />  <input type='button' value='$button' onclick="javascript:edit_${id}_${field}('${field}');void(0);" />$helplink
 ENDFORMULABUTTON  ENDFORMULABUTTON
 }  }
   
Line 447  sub check_submission { Line 447  sub check_submission {
  }   }
     } elsif ($tag eq 'numericalresponse') {      } elsif ($tag eq 'numericalresponse') {
  $$args_ref{'type'}='float';   $$args_ref{'type'}='float';
       } elsif ($tag eq 'stringresponse') {
           if ($$args_ref{'type'} eq '') {
               $$args_ref{'type'} = 'ci';
           }
     }      }
       
     &add_in_tag_answer($parstack,$safeeval);      &add_in_tag_answer($parstack,$safeeval);
   
     if (!%answer) {      if (!%answer) {
Line 1171  sub end_stringresponse { Line 1175  sub end_stringresponse {
     my @args = ('type');      my @args = ('type');
     my $args_ref = &setup_capa_args($safeeval,$parstack,      my $args_ref = &setup_capa_args($safeeval,$parstack,
     \@args,$response);      \@args,$response);
                       if ($$args_ref{'type'} eq '') {
                           $$args_ref{'type'} = 'ci';
                       }
     &add_in_tag_answer($parstack,$safeeval);      &add_in_tag_answer($parstack,$safeeval);
     my (@final_awards,@final_msgs,@names);      my (@final_awards,@final_msgs,@names);
     foreach my $name (keys(%answer)) {      foreach my $name (keys(%answer)) {

Removed from v.1.225  
changed lines
  Added in v.1.227.2.2


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