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

Diff for /loncom/homework/response.pm between versions 1.177 and 1.191

version 1.177, 2007/09/25 20:18:56 version 1.191, 2008/05/30 16:19:49
Line 451  sub end_customresponse { Line 451  sub end_customresponse {
     }      }
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||       if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
  $target eq 'tex' || $target eq 'analyze') {   $target eq 'tex' || $target eq 'analyze') {
  &Apache::lonxml::increment_counter(&Apache::response::repetition());   &Apache::lonxml::increment_counter(&Apache::response::repetition(),
      "$part.$id");
    if ($target eq 'analyze') {
               $Apache::lonhomework::analyze{"$part.$id.type"} = 'customresponse';
       &Apache::lonhomework::set_bubble_lines();
    }
     }      }
     pop(@Apache::lonxml::namespace);      pop(@Apache::lonxml::namespace);
     pop(@Apache::response::custom_answer);      pop(@Apache::response::custom_answer);
Line 481  sub start_mathresponse { Line 486  sub start_mathresponse {
    $safeeval);     $safeeval);
     $Apache::inputtags::answertxt{$id}=[$answer];      $Apache::inputtags::answertxt{$id}=[$answer];
  }   }
           if ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') {
               $result.=&edit_mathresponse_button($id,"HWVAL_$id");
           }
   
     } 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('String to display for answer:',   $result.=&Apache::edit::text_arg('String to display for answer:',
Line 507  sub start_mathresponse { Line 516  sub start_mathresponse {
     return $result;      return $result;
 }  }
   
   sub edit_mathresponse_button {
       my ($id,$field)=@_;
       my $button=&mt('Edit Answer');
       return(<<ENDFORMULABUTTON);
   <script language="JavaScript">
   function edit_${id}_${field} (textarea) {
       thenumber = textarea;
       thedata = document.forms['lonhomework'].elements[textarea].value;
       newwin = window.open("/adm/dragmath/applet/MaximaPopup.html","","width=565,height=400,resizable");
   }
   </script>
   <input type='button' value='$button' onclick="javascript:edit_${id}_${field}('${field}');void(0);" />
   ENDFORMULABUTTON
   }
   
 sub end_mathresponse {  sub end_mathresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
Line 671  sub start_responseparam { Line 695  sub start_responseparam {
  $Apache::lonnet::packagetab{"$tag&$name&display"};   $Apache::lonnet::packagetab{"$tag&$name&display"};
     $token->[2]->{'default'}=      $token->[2]->{'default'}=
  $Apache::lonnet::packagetab{"$tag&$name&default"};   $Apache::lonnet::packagetab{"$tag&$name&default"};
               $token->[3] = ['name','type','description','default'];
     $constructtag=1;      $constructtag=1;
  }   }
  if ($constructtag) {   if ($constructtag) {
Line 795  sub answer_part { Line 820  sub answer_part {
     last;      last;
  }   }
     }      }
     if ($answer ne '') {              my $fullanswer=$answer;
  $answer = '\verb'.$to_use.$answer.$to_use;              $answer='';
     }              foreach my $element (split(/[\;]/,$fullanswer)) {
          if ($element ne '') {
     $answer.= '\verb'.$to_use.$element.$to_use.' \newline';
          }
               }
  }   }
  if ($answer ne '') {   if ($answer ne '') {
     push(@answer_bits,$answer);      push(@answer_bits,$answer);
Line 816  sub answer_footer { Line 845  sub answer_footer {
     my ($type) = @_;      my ($type) = @_;
     my $result;      my $result;
     if ($env{'form.answer_output_mode'} eq 'tex') {      if ($env{'form.answer_output_mode'} eq 'tex') {
  my $columns = scalar(@answer_bits);   $result  = ' \vskip 0 mm \noindent \begin{tabular}{|p{1.5cm}|p{6.8cm}|}\hline ';
  $result  = ' \vskip 0 mm \noindent \begin{tabular}{|'.'c|'x$columns.'}\hline ';   $result .= $answer_bits[0].'&\vspace*{-4mm}\begin{itemize}';
  $result .= join(' & ',@answer_bits);          for (my $i=1;$i<=$#answer_bits;$i++) {
  $result .= ' \\\\ \\hline \end{tabular} \vskip 0 mm ';              $result.='\item '.$answer_bits[$i].'\vspace*{-7mm}';
           }
    $result .= ' \end{itemize} \\\\ \hline \end{tabular} \vskip 0 mm ';
     } else {      } else {
  $result = '</tr></table>';   if (!$need_row_start) {
       $result .= '</tr>';
    }
    $result .= '</table>';
     }      }
     return $result;      return $result;
 }  }
Line 880  sub getresponse { Line 914  sub getresponse {
     if (!defined($lines)) {      if (!defined($lines)) {
  $lines = 1;   $lines = 1;
     }      }
   
     my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,'H'=>7,      my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,'H'=>7,
     'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14,      'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14,
     'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,'V'=>21,      'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,'V'=>21,
Line 891  sub getresponse { Line 924  sub getresponse {
   
  my $line;   my $line;
  for ($line = 0; $line < $lines; $line++) {   for ($line = 0; $line < $lines; $line++) {
     $response = $env{'scantron.'.      my $theline = $Apache::lonxml::counter+$offset-1+$line;
  ($Apache::lonxml::counter+$offset-1+$line).      $response = $env{"scantron.$theline.answer"};
  '.answer'};      if ((defined($response)) && ($response ne "") && ($response ne " ")) {
     if ($response ne "") {  
  last;   last;
     }      }
           
  }   }
   
    # save bubbled letter for later
    $Apache::lonhomework::results{"resource.$part.$id.scantron"}.=
       $response;
  if ($resulttype ne 'letter') {   if ($resulttype ne 'letter') {
     if ($resulttype eq 'A is 1') {      if ($resulttype eq 'A is 1') {
  $response = $let_to_num{$response}+1;   $response = $let_to_num{$response}+1;
Line 913  sub getresponse { Line 949  sub getresponse {
  $response = chr(ord($response) + $line * $bubbles_per_line);   $response = chr(ord($response) + $line * $bubbles_per_line);
     }      }
  }   }
  # save submitted response for later  
  $Apache::lonhomework::results{"resource.$part.$id.scantron"}.=  
     $response;  
   
     } else {      } else {
  $response = $env{$formparm};   $response = $env{$formparm};
Line 1044  sub show_answer { Line 1077  sub show_answer {
     my $award  = $Apache::lonhomework::history{"resource.$part.solved"};      my $award  = $Apache::lonhomework::history{"resource.$part.solved"};
     my $status = $Apache::inputtags::status[-1];      my $status = $Apache::inputtags::status[-1];
     return  ( ($award =~ /^correct/      return  ( ($award =~ /^correct/
        && lc($Apache::lonhomework::problemstatus) ne 'no')         && &Apache::lonhomework::show_problem_status())
       || $status eq "SHOW_ANSWER");        || $status eq "SHOW_ANSWER");
 }  }
   
Removed from v.1.177  
changed lines
  Added in v.1.191

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