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

Diff for /loncom/homework/caparesponse/caparesponse.pm between versions 1.66 and 1.73

version 1.66, 2002/10/17 14:40:58 version 1.73, 2002/11/25 21:36:42
Line 89  sub start_numericalresponse { Line 89  sub start_numericalresponse {
       $result.=&Apache::edit::text_arg('Format:','format',$token,4);        $result.=&Apache::edit::text_arg('Format:','format',$token,4);
     } elsif ($token->[1] eq 'stringresponse') {      } elsif ($token->[1] eq 'stringresponse') {
       $result.=&Apache::edit::select_arg('Type:','type',        $result.=&Apache::edit::select_arg('Type:','type',
  ['cs','ci','mc'],$token);   [['cs','Case Sensitive'],['ci','Case Insensitive'],
     ['mc','Case Insensitive, Any Order']],$token);
     } elsif ($token->[1] eq 'formularesponse') {      } elsif ($token->[1] eq 'formularesponse') {
       $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);        $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);
     }      }
Line 112  sub start_numericalresponse { Line 113  sub start_numericalresponse {
     }      }
   } elsif ($target eq 'meta') {    } elsif ($target eq 'meta') {
     $result=&Apache::response::meta_package_write('numericalresponse');      $result=&Apache::response::meta_package_write('numericalresponse');
     } elsif ($target eq 'answer' || $target eq 'grade') {
         &Apache::response::reset_params();
   }    }
   return $result;    return $result;
 }  }
Line 127  sub end_numericalresponse { Line 130  sub end_numericalresponse {
       my $id = $Apache::inputtags::response['-1'];        my $id = $Apache::inputtags::response['-1'];
       my $response = $ENV{'form.HWVAL'.$id};        my $response = $ENV{'form.HWVAL'.$id};
       if ( $response =~ /[^\s]/) {        if ( $response =~ /[^\s]/) {
    if (!$Apache::lonxml::default_homework_loaded) {
       &Apache::lonxml::default_homework_load($safeeval);
    }
  my %previous = &Apache::response::check_for_previous($response,$partid,$id);   my %previous = &Apache::response::check_for_previous($response,$partid,$id);
  $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;   $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
  &Apache::lonxml::debug("submitted a $response<br>\n");   &Apache::lonxml::debug("submitted a $response<br>\n");
Line 157  sub end_numericalresponse { Line 163  sub end_numericalresponse {
       }        }
     }      }
   } elsif ($target eq 'web' || $target eq 'tex') {    } elsif ($target eq 'web' || $target eq 'tex') {
     if ($Apache::lonhomework::type ne 'exam') {  
       my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};        my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
       my $status = $Apache::inputtags::status['-1'];        my $status = $Apache::inputtags::status['-1'];
       if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) {        if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) {
Line 199  sub end_numericalresponse { Line 204  sub end_numericalresponse {
      $result.="}. \\vskip 0 mm ";       $result.="}. \\vskip 0 mm ";
    }     }
        }         }
     } else {        if ($Apache::lonhomework::type eq 'exam') {
       my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);        my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
  my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);   my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
  my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);   my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
Line 223  sub end_numericalresponse { Line 228  sub end_numericalresponse {
  my @alphabet = ('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P',   my @alphabet = ('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P',
  'Q','R','S','T','U','V','W','X','Y','Z');   'Q','R','S','T','U','V','W','X','Y','Z');
         if ($target eq 'web') {          if ($target eq 'web') {
       my $id=$Apache::inputtags::response[-1];
     $result.= '<table border="1"><tr>';      $result.= '<table border="1"><tr>';
     for ($ind=0;$ind<$number_of_bubbles;$ind++) {      for ($ind=0;$ind<$number_of_bubbles;$ind++) {
  my $ans;   my $ans;
Line 241  sub end_numericalresponse { Line 247  sub end_numericalresponse {
     }      }
     $ans = sprintf('%.'.$format,$bubbles_values[$ind]);      $ans = sprintf('%.'.$format,$bubbles_values[$ind]);
  }   }
     $result.='<td>'.$alphabet[$ind].': '.$ans.'</td>';      $result.='<td><input type="radio" name="HWVAL'.$id.'" value="'.$ans.'"><b>'.$alphabet[$ind].'</b>: '.$ans.'</td>';
     }      }
     $result.='</tr></table>';      $result.='</tr></table>';
  } elsif ($target eq 'tex') {   } elsif ($target eq 'tex') {
Line 278  sub end_numericalresponse { Line 284  sub end_numericalresponse {
     my $power = $2;      my $power = $2;
     $power=~s/^\+//;      $power=~s/^\+//;
     $power=~s/^(-?)0+(\d+)//;      $power=~s/^(-?)0+(\d+)//;
     $ans=$number.'$\times 10^{'.$1.$2.'}$';      $ans=$number.'$\times 10^{'.$1.$2.'}$'; #'stupidemacs
  }    } 
     } else {      } else {
  my $badans = $bubbles_values[$ind];   my $badans = $bubbles_values[$ind];
Line 297  sub end_numericalresponse { Line 303  sub end_numericalresponse {
     my $power = $2;      my $power = $2;
     $power=~s/^\+//;      $power=~s/^\+//;
     $power=~s/^(-?)0+(\d+)//;      $power=~s/^(-?)0+(\d+)//;
     $ans=$number.'$\times 10^{'.$1.$2.'}$';      $ans=$number.'$\times 10^{'.$1.$2.'}$'; #'stupidemacs
  }    } 
     }      }
     $result.='\hskip -3 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -2 mm & {\small '.$ans.'} ';      $result.='\hskip -3 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -2 mm & {\small '.$ans.'} ';
Line 308  sub end_numericalresponse { Line 314  sub end_numericalresponse {
  $result.='\\\\\end{tabular}\vskip 0 mm ';       $result.='\\\\\end{tabular}\vskip 0 mm ';    
     }      }
     $result.='\end{enumerate}';      $result.='\end{enumerate}';
     $Apache::lonxml::counter++;          &Apache::lonxml::increment_counter();
     my %moreenv;  
     $moreenv{'form.counter'}=$Apache::lonxml::counter;  
     &Apache::lonnet::appenv(%moreenv);     
  }   }
     }      }
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
Line 357  sub end_numericalresponse { Line 360  sub end_numericalresponse {
       }        }
   }    }
   if ($target eq 'answer') {    if ($target eq 'answer') {
       if ($high) { $ans.=' ['.$low.','.$high.'] '; }        if ($high) { $ans.=' ['.$low.','.$high.']'; }
       if ($sighigh) { $ans.= "Sig <i>$siglow - $sighigh</i>"; }        if ($sighigh) { $ans.= " Sig <i>$siglow - $sighigh</i>"; }
       $result.=&Apache::response::answer_part($$tagstack[-1],$ans);        $result.=&Apache::response::answer_part($$tagstack[-1],$ans);
   } elsif ($target eq 'analyze') {    } elsif ($target eq 'analyze') {
       push (@{ $Apache::lonhomework::analyze{"$part_id.answer"} },        push (@{ $Apache::lonhomework::analyze{"$part_id.answer"} },
Removed from v.1.66  
changed lines
  Added in v.1.73

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