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

Diff for /loncom/homework/optionresponse.pm between versions 1.70 and 1.73

version 1.70, 2003/03/26 22:59:09 version 1.73, 2003/04/02 18:40:37
Line 316  sub displayfoils { Line 316  sub displayfoils {
   my $result;    my $result;
   my $name;    my $name;
   my $displayoptionintex=0;    my $displayoptionintex=0;
   my @alphabet = ('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P',    my @alphabet = ('A'..'Z');
   'Q','R','S','T','U','V','W','X','Y','Z');  
   my @whichopt = &whichfoils($max,$randomize);    my @whichopt = &whichfoils($max,$randomize);
   my $part=$Apache::inputtags::part;    my $part=$Apache::inputtags::part;
   my $id=$Apache::inputtags::response[-1];    my $id=$Apache::inputtags::response[-1];
Line 383  sub displayfoils { Line 382  sub displayfoils {
  }   }
       }        }
       if ($target ne 'tex') {        if ($target ne 'tex') {
   $optionlist='<select name="HWVAL_'.    if ($Apache::lonhomework::type ne 'exam') {
       $optionlist='<select name="HWVAL_'.
       $Apache::inputtags::response['-1'].':'.$temp.'">'.        $Apache::inputtags::response['-1'].':'.$temp.'">'.
   $optionlist."</select>\n";    $optionlist."</select>\n";
     }
   my $text=$Apache::response::foilgroup{$name.'.text'};    my $text=$Apache::response::foilgroup{$name.'.text'};
   if (!($text=~s|<drawoptionlist\s*/>|$optionlist|)) {    if (!($text=~s|<drawoptionlist\s*/>|$optionlist|) && $Apache::lonhomework::type ne 'exam') {
       $text=$optionlist.$text;        $text=$optionlist.$text;
   }    }
   $result.=$break.$text."\n";    $result.=$break.$text."\n";
   if ($Apache::lonhomework::type eq 'exam') {    if ($Apache::lonhomework::type eq 'exam') {
     $result.=&webbubbles(\@opt,\@alphabet);      $result.=&webbubbles(\@opt,\@alphabet,$temp);
   }    }
   $temp++;    $temp++;
       } else {        } else {
Line 467  sub optionlist_correction { Line 468  sub optionlist_correction {
   
 sub webbubbles {  sub webbubbles {
   
     my ($ropt,$ralphabet)=@_;      my ($ropt,$ralphabet,$temp)=@_;
     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>'.$alphabet[$ind].': '.$opt[$ind].'</td>';     $result.='<td><input type="radio" name="HWVAL_'.$Apache::inputtags::response['-1'].':'.$temp.
                       '" value='.$opt[$ind].'>'.$alphabet[$ind].': '.$opt[$ind].'</td>';
  }   }
  $result.='</tr></table>';   $result.='</tr></table>';
  return $result;   return $result;
Line 634  sub end_foil { Line 636  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') {      if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
  $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;   $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
     } else {      } else {
  $Apache::response::conceptgroup{"$name.text"} = $text;   $Apache::response::conceptgroup{"$name.text"} = $text;
Line 647  sub end_foil { Line 649  sub end_foil {
  if ($Apache::lonhomework::type eq 'exam') {   if ($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') {      if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
  $Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;   $Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;
     } else {      } else {
  $Apache::response::foilgroup{"$name.text"} = $text;   $Apache::response::foilgroup{"$name.text"} = $text;
Removed from v.1.70  
changed lines
  Added in v.1.73

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