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

Diff for /loncom/homework/optionresponse.pm between versions 1.84 and 1.90

version 1.84, 2003/08/01 19:04:06 version 1.90, 2003/10/15 19:40:42
Line 302  sub displayfoils { Line 302  sub displayfoils {
   my $id=$Apache::inputtags::response[-1];    my $id=$Apache::inputtags::response[-1];
   my $break;    my $break;
   my $solved=$Apache::lonhomework::history{"resource.$part.solved"};    my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
   my $status=$Apache::inputtags::status[-1];    if ( ($target ne 'tex') &&
   if (         &Apache::response::show_answer() ) {
       ($target ne 'tex') &&      my $temp=1;
       (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) ) {  
     foreach $name (@whichopt) {      foreach $name (@whichopt) {
  my $text=$Apache::response::foilgroup{$name.'.text'};   my $text=$Apache::response::foilgroup{$name.'.text'};
    my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
    my $lastopt=$lastresponse{$name};
  if ($text!~/^\s*$/) {   if ($text!~/^\s*$/) {
     if ($target eq 'tex') {      if ($target eq 'tex') {
  $break='\vskip 0 mm ';   $break='\vskip 0 mm ';
Line 334  sub displayfoils { Line 335  sub displayfoils {
       }        }
       if ($Apache::lonhomework::type eq 'exam') {        if ($Apache::lonhomework::type eq 'exam') {
  if ($target ne 'tex') {   if ($target ne 'tex') {
   $result.=&webbubbles(\@opt,\@alphabet);    $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt);
         } else {          } else {
   $result.=&bubbles(\@alphabet,\@opt);    $result.=&bubbles(\@alphabet,\@opt);
         }          }
       }        }
         $temp++;
     }      }
   } else {    } else {
     my $temp=1;      my $temp=1;
Line 375  sub displayfoils { Line 377  sub displayfoils {
   }    }
   $result.=$break.$text."\n";    $result.=$break.$text."\n";
   if ($Apache::lonhomework::type eq 'exam') {    if ($Apache::lonhomework::type eq 'exam') {
     $result.=&webbubbles(\@opt,\@alphabet,$temp);      $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt);
   }    }
   $temp++;    $temp++;
       } else {        } else {
Line 438  sub optionlist_correction { Line 440  sub optionlist_correction {
   
     my $texoptionlist = shift;      my $texoptionlist = shift;
     if ($texoptionlist=~/<option selected/ or $texoptionlist=~/<option>[^<]+<\/option>/) {      if ($texoptionlist=~/<option selected/ or $texoptionlist=~/<option>[^<]+<\/option>/) {
  $texoptionlist =~ s/<option><\/option>/\\item \[\] Choose from: /;   $texoptionlist =~ s/<option><\/option>/\\item \[\] Choices: /;
  $texoptionlist =~ s/<option>/\{\\bf /g;   $texoptionlist =~ s/<option>/\{\\bf /g;
  $texoptionlist =~ s/<option selected="on">/\{\\bf /g;   $texoptionlist =~ s/<option selected="on">/\{\\bf /g;
  $texoptionlist =~ s/<\/option>/\},/g;   $texoptionlist =~ s/<\/option>/\},/g;
Line 456  sub optionlist_correction { Line 458  sub optionlist_correction {
   
 sub webbubbles {  sub webbubbles {
   
     my ($ropt,$ralphabet,$temp)=@_;      my ($ropt,$ralphabet,$temp,$lastopt)=@_;
     my @opt=@$ropt;       my @opt=@$ropt; 
     my @alphabet=@$ralphabet;      my @alphabet=@$ralphabet;
     my $result='';      my $result='';
  my $number_of_bubbles = $#opt + 1;      my $number_of_bubbles = $#opt + 1;
  $result.= '<table border="1"><tr>';      $result.= '<table border="1"><tr>';
  for (my $ind=0;$ind<$number_of_bubbles;$ind++) {      for (my $ind=0;$ind<$number_of_bubbles;$ind++) {
    $result.='<td><input type="radio" name="HWVAL_'.$Apache::inputtags::response['-1'].':'.$temp.   my $checked='';
                     '" value='.$opt[$ind].'>'.$alphabet[$ind].': '.$opt[$ind].'</td>';   if ($lastopt eq $opt[$ind]) {
       $checked=' checked="on" ';
  }   }
  $result.='</tr></table>';   $result.='<td><input type="radio" name="HWVAL_'.
  return $result;      $Apache::inputtags::response['-1'].':'.$temp.
       '" value="'.$opt[$ind].'" '.$checked.' />'.$alphabet[$ind].': '.
       $opt[$ind].'</td>';
       }
       $result.='</tr></table>';
       return $result;
 }  }
   
   
Line 603  sub end_foil { Line 611  sub end_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $text ='';    my $text ='';
   my $result = '';    my $result = '';
   if ($target eq 'web' || $target eq 'tex') {     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
       $text=&Apache::lonxml::endredirection;        $text=&Apache::lonxml::endredirection;
       if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { $text = '\vspace*{-2 mm}\item '.$text; }        if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { $text = '\vspace*{-2 mm}\item '.$text; }
   }    }
Line 623  sub end_foil { Line 631  sub end_foil {
  if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {   if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
     $Apache::response::conceptgroup{"$name.text"} = '\vskip 4 mm $\triangleright$ '.$text;      $Apache::response::conceptgroup{"$name.text"} = '\vskip 4 mm $\triangleright$ '.$text;
  } else {   } else {
     if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {      $Apache::response::conceptgroup{"$name.text"} = $text;
  $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;  
     } else {  
  $Apache::response::conceptgroup{"$name.text"} = $text;  
     }  
  }   }
  $Apache::response::conceptgroup{"$name.location"} = $location;   $Apache::response::conceptgroup{"$name.location"} = $location;
       } else {        } else {
Line 636  sub end_foil { Line 640  sub end_foil {
  if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {   if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
     $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;      $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
  } else {   } else {
     if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {      $Apache::response::foilgroup{"$name.text"} = $text;
  $Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;  
     } else {  
  $Apache::response::foilgroup{"$name.text"} = $text;  
     }  
  }   }
  $Apache::response::foilgroup{"$name.location"} = $location;   $Apache::response::foilgroup{"$name.location"} = $location;
       }        }
Removed from v.1.84  
changed lines
  Added in v.1.90

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