[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.107.2.2 and 1.109

version 1.107.2.2, 2003/10/15 19:54:45 version 1.109, 2003/09/19 21:48:00
Line 169  sub end_numericalresponse { Line 169  sub end_numericalresponse {
      $safeeval);       $safeeval);
  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 (  &Apache::response::show_answer() ) {   if (   ($award =~ /^correct/
                   && lc($Apache::lonhomework::problemstatus) ne 'no')
                || $status eq "SHOW_ANSWER"
                || $ENV{'form.texaward'} eq 'SHOW_ANSWER') {
     my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,      my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
  $safeeval);   $safeeval);
     my $unit=&Apache::lonxml::get_param_var('unit',$parstack,      my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
Line 191  sub end_numericalresponse { Line 194  sub end_numericalresponse {
  }   }
  my $formatted;   my $formatted;
  if ((defined($format)) && ($format ne '')) {   if ((defined($format)) && ($format ne '')) {
       $format=~s/e/E/g;
     &Apache::lonxml::debug("formatting with :$format: answer :$answer:");      &Apache::lonxml::debug("formatting with :$format: answer :$answer:");
     $formatted=sprintf('%.'.$format,$answer).',';      $formatted=sprintf('%.'.$format,$answer).',';
  } else {   } else {
Line 231  sub end_numericalresponse { Line 235  sub end_numericalresponse {
  if ($$tagstack[-1] eq 'numericalresponse') {   if ($$tagstack[-1] eq 'numericalresponse') {
     if ($unit=~/\S/) {$result.=' (in '.$unit.')<br /><br />';}      if ($unit=~/\S/) {$result.=' (in '.$unit.')<br /><br />';}
     $result.= '<table border="1"><tr>';      $result.= '<table border="1"><tr>';
     my $previous=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.$id.submission"};  
     for (my $ind=0;$ind<$number_of_bubbles;$ind++) {      for (my $ind=0;$ind<$number_of_bubbles;$ind++) {
  my $checked='';  
  if ($previous eq $bubble_values[$ind]) {  
     $checked=" checked='on' ";  
  }  
  $result.='<td><input type="radio" name="HWVAL_'.$id.   $result.='<td><input type="radio" name="HWVAL_'.$id.
     '" value="'.$bubble_values[$ind].'" '.$checked      '" value="'.$bubble_values[$ind].'"><b>'.
     .' /><b>'.$alphabet[$ind].'</b>: '.   $alphabet[$ind].'</b>: '.
     $bubble_values[$ind].'</td>';      $bubble_values[$ind].'</td>';
     }      }
     $result.='</tr></table>';      $result.='</tr></table>';
  } elsif ($$tagstack[-1] eq 'formularesponse') {   } elsif ($$tagstack[-1] eq 'formularesponse') {
Line 368  sub end_numericalresponse { Line 367  sub end_numericalresponse {
     if ($target eq 'answer') {      if ($target eq 'answer') {
  if ($ENV{'form.answer_output_mode'} eq 'tex') {   if ($ENV{'form.answer_output_mode'} eq 'tex') {
     $result.=&Apache::response::answer_part($$tagstack[-1],      $result.=&Apache::response::answer_part($$tagstack[-1],
   "\\textbf{$string}");    "$string");
  } else {   } else {
     $result.=&Apache::response::answer_part($$tagstack[-1],      $result.=&Apache::response::answer_part($$tagstack[-1],
     "<b>$string</b>");      "<b>$string</b>");
Line 418  sub format_number { Line 417  sub format_number {
     my ($number,$format,$target)=@_;      my ($number,$format,$target)=@_;
     my $ans;      my $ans;
     if ($format ne '') {      if ($format ne '') {
    $format=~s/e/E/g;
  $ans = sprintf('%.'.$format,$number);   $ans = sprintf('%.'.$format,$number);
     } else {      } else {
  my $format = '';   my $format = '';
Removed from v.1.107.2.2  
changed lines
  Added in v.1.109

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