Diff for /loncom/homework/optionresponse.pm between versions 1.36 and 1.71

version 1.36, 2002/04/01 21:26:57 version 1.71, 2003/03/27 14:58:56
Line 1 Line 1
 # The LearningOnline Network with CAPA  # LearningOnline Network with CAPA
 # option list style responses  # option list style responses
 #  #
 # $Id$  # $Id$
Line 42  sub start_optionresponse { Line 42  sub start_optionresponse {
   &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));    &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
   push (@Apache::lonxml::namespace,'optionresponse');    push (@Apache::lonxml::namespace,'optionresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);    my $id = &Apache::response::start_response($parstack,$safeeval);
     %Apache::hint::option=();
   if ($target eq 'edit') {    if ($target eq 'edit') {
     $result.=&Apache::edit::start_table($token).      $result.=&Apache::edit::start_table($token).
  "<tr><td>Multiple Option Response Question</td><td>Delete:".   "<tr><td>Multiple Option Response Question</td><td>Delete:".
Line 50  sub start_optionresponse { Line 51  sub start_optionresponse {
         &Apache::edit::end_row().          &Apache::edit::end_row().
         &Apache::edit::start_spanning_row().          &Apache::edit::start_spanning_row().
         "\n";          "\n";
     $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').      $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',
         &Apache::edit::end_row().       $token,'4').
  &Apache::edit::start_spanning_row();          &Apache::edit::select_arg('Randomize Foil Order','randomize',
     ['yes','no'],$token).
           &Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,      my $constructtag=&Apache::edit::get_new_args($token,$parstack,
  $safeeval,'max');   $safeeval,'max','randomize');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }      if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   } elsif ($target eq 'meta') {    } elsif ($target eq 'meta') {
     $result=&Apache::response::meta_package_write('optionresponse');      $result=&Apache::response::meta_package_write('optionresponse');
Line 63  sub start_optionresponse { Line 66  sub start_optionresponse {
     my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";      my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
     push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);      push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
   }    }
 #  if ($target eq 'tex') {$result .= '\begin{itemize}';}  
   return $result;    return $result;
 }  }
   
Line 74  sub end_optionresponse { Line 76  sub end_optionresponse {
   &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));    &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
   my $result;    my $result;
   if ($target eq 'edit') { $result=&Apache::edit::end_table(); }    if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
 #  if ($target eq 'tex') {$result .= '\end{itemize}';}  
   return $result;    return $result;
 }  }
   
 %Apache::response::foilgroup={};  %Apache::response::foilgroup=();
 sub start_foilgroup {  sub start_foilgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
   my $result='';    my $result='';
   %Apache::response::foilgroup={};    %Apache::response::foilgroup=();
   $Apache::optionresponse::conceptgroup=0;    $Apache::optionresponse::conceptgroup=0;
   &Apache::response::setrandomnumber();    &Apache::response::setrandomnumber();
   if ($target eq 'edit') {    if ($target eq 'edit') {
Line 132  ENDTABLE Line 133  ENDTABLE
     if ($optchanged) {      if ($optchanged) {
       $result = "<foilgroup options=\"(";        $result = "<foilgroup options=\"(";
       foreach my $option (@options) {        foreach my $option (@options) {
  $option=~s/\'/\\\'/;   $option=~s/\'/\\\'/g;
  &Apache::lonxml::debug("adding option :$option:");   &Apache::lonxml::debug("adding option :$option:");
  $result .="'".$option."',";   $result .="'".$option."',";
       }        }
Line 140  ENDTABLE Line 141  ENDTABLE
       $result.=')">';        $result.=')">';
     } # else nothing changed so just use the default mechanism      } # else nothing changed so just use the default mechanism
   }    }
   if ($target eq 'tex') {$result .= '\begin{itemize}';}    if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
         $result .= ' \begin{enumerate} ';
     }
   return $result;    return $result;
 }  }
   
Line 150  sub end_foilgroup { Line 153  sub end_foilgroup {
   my $result;    my $result;
   if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {    if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {
     my $name;      my $name;
     my ($count,$max) = &getfoilcounts($parstack,$safeeval);  
     if ($count>$max) { $count=$max }   
     &Apache::lonxml::debug("Count is $count from $max");  
     my @opt;      my @opt;
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);      eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
     &Apache::lonxml::debug("Options are $#opt");      &Apache::lonxml::debug("Options are $#opt");
       my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
       my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
          $safeeval,'-2');
     if ($target eq 'web' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'tex') {
       $result.=&displayfoils($target,$count,@opt);        $result.=&displayfoils($target,$max,$randomize,@opt);
     } elsif ( $target eq 'answer') {      } elsif ( $target eq 'answer') {
       $result.=&displayanswers($count,@opt);        $result.=&displayanswers($max,$randomize,@opt);
     } elsif ( $target eq 'analyze') {      } elsif ( $target eq 'analyze') {
       my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";        my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
       foreach my $name (@{ $Apache::response::foilgroup{'names'} }) {        foreach my $name (@{ $Apache::response::foilgroup{'names'} }) {
Line 171  sub end_foilgroup { Line 174  sub end_foilgroup {
   $Apache::response::foilgroup{"$name.text"};    $Apache::response::foilgroup{"$name.text"};
       }        }
       push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);        push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
       push (@{ $Apache::lonhomework::analyze{"$part_id.shown"} },&whichfoils($count));        push (@{ $Apache::lonhomework::analyze{"$part_id.shown"} },&whichfoils($max,$randomize));
     } elsif ( $target eq 'grade') {      } elsif ( $target eq 'grade') {
       if ( defined $ENV{'form.submitted'}) {        if ( defined $ENV{'form.submitted'}) {
  my @whichopt = &whichfoils($count);   my @whichopt = &whichfoils($max,$randomize);
  my $temp=1;my $name;   my $temp=1;my $name;
  my %responsehash;   my %responsehash;
    my %grade;
  my $right=0;   my $right=0;
  my $wrong=0;   my $wrong=0;
  my $ignored=0;   my $ignored=0;
Line 186  sub end_foilgroup { Line 190  sub end_foilgroup {
   if ( $response =~ /[^\s]/) {    if ( $response =~ /[^\s]/) {
     my $value=$Apache::response::foilgroup{$name.'.value'};      my $value=$Apache::response::foilgroup{$name.'.value'};
     &Apache::lonxml::debug("submitted a $response for $value<br />\n");      &Apache::lonxml::debug("submitted a $response for $value<br />\n");
     if ($value eq $response) {$right++;} else {$wrong++;}      if ($value eq $response) {
    $grade{$name}='1'; $right++;
       } else {
    $grade{$name}='0'; $wrong++;
       }
   } else {    } else {
     $ignored++;      $ignored++;
   }    }
Line 195  sub end_foilgroup { Line 203  sub end_foilgroup {
  my $part=$Apache::inputtags::part;   my $part=$Apache::inputtags::part;
  my $id = $Apache::inputtags::response['-1'];   my $id = $Apache::inputtags::response['-1'];
  my $responsestr=&Apache::lonnet::hash2str(%responsehash);   my $responsestr=&Apache::lonnet::hash2str(%responsehash);
    my $gradestr   =&Apache::lonnet::hash2str(%grade);
  my %previous=&Apache::response::check_for_previous($responsestr,   my %previous=&Apache::response::check_for_previous($responsestr,
    $part,$id);     $part,$id);
  &Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored");   &Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored");
Line 212  sub end_foilgroup { Line 221  sub end_foilgroup {
  }   }
  $Apache::lonhomework::results{"resource.$part.$id.submission"}=   $Apache::lonhomework::results{"resource.$part.$id.submission"}=
   $responsestr;    $responsestr;
    $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
  $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=   $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
   $ad;    $ad;
  &Apache::response::handle_previous(\%previous,$ad);   &Apache::response::handle_previous(\%previous,$ad);
Line 220  sub end_foilgroup { Line 230  sub end_foilgroup {
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table();      $result.=&Apache::edit::end_table();
   }      }  
   if ($target eq 'tex') {$result .= '\end{itemize}';}    if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {$result .= '\end{enumerate}';}
   return $result;    return $result;
 }  }
   
 sub getfoilcounts {  sub getfoilcounts {
   my ($parstack,$safeeval)=@_;    my ($max)=@_;
   my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');  
   # +1 since instructors will count from 1    # +1 since instructors will count from 1
   my $count = $#{ $Apache::response::foilgroup{'names'} }+1;    my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
   return ($count,$max);    if (&Apache::response::showallfoils()) { $max=$count; }
     if ($count>$max) { $count=$max } 
     &Apache::lonxml::debug("Count is $count from $max");
     return $count;
 }  }
   
 sub whichfoils {  sub whichfoils {
   my ($max)=@_;    my ($max,$randomize)=@_;
     $max = &getfoilcounts($max);
     &Apache::lonxml::debug("randomize $randomize");
     if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
   my @names = @{ $Apache::response::foilgroup{'names'} };    my @names = @{ $Apache::response::foilgroup{'names'} };
   my @whichopt =();    my @whichopt =();
     my (%top,@toplist,%bottom,@bottomlist);
     if (!(&Apache::response::showallfoils() || ($randomize eq 'no'))) {
         my $current=0;
         foreach my $name (@names) {
     $current++;
     if ($Apache::response::foilgroup{$name.'.location'} eq 'top') {
         $top{$name}=$current;
     } elsif ($Apache::response::foilgroup{$name.'.location'} eq
      'bottom') {
         $bottom{$name}=$current;
     }
         }
     }
   while ((($#whichopt+1) < $max) && ($#names > -1)) {    while ((($#whichopt+1) < $max) && ($#names > -1)) {
     &Apache::lonxml::debug("Have $#whichopt max is $max");      &Apache::lonxml::debug("Have $#whichopt max is $max");
     my $aopt=int(rand($#names+1));      my $aopt;
       if (&Apache::response::showallfoils() || ($randomize eq 'no')) {
         $aopt=0;
       } else {
         $aopt=int(&Math::Random::random_uniform() * ($#names+1));
       }
     &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");      &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
     $aopt=splice(@names,$aopt,1);      $aopt=splice(@names,$aopt,1);
     &Apache::lonxml::debug("Picked $aopt");      &Apache::lonxml::debug("Picked $aopt");
     push (@whichopt,$aopt);      if ($top{$aopt}) {
    $toplist[$top{$aopt}]=$aopt;
       } elsif ($bottom{$aopt}) {
    $bottomlist[$bottom{$aopt}]=$aopt;
       } else {
    push (@whichopt,$aopt);
       }
     }
     for (my $i=0;$i<=$#toplist;$i++) {
         if ($toplist[$i]) { unshift(@whichopt,$toplist[$i]) }
     }
     for (my $i=0;$i<=$#bottomlist;$i++) {
         if ($bottomlist[$i]) { push(@whichopt,$bottomlist[$i]) }
   }    }
   
   return @whichopt;    return @whichopt;
 }  }
   
 sub displayanswers {  sub displayanswers {
   my ($max,@opt)=@_;    my ($max,$randomize,@opt)=@_;
     if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
   my @names = @{ $Apache::response::foilgroup{'names'} };    my @names = @{ $Apache::response::foilgroup{'names'} };
   my @whichopt = &whichfoils($max);    my @whichopt = &whichfoils($max,$randomize);
   my $result=&Apache::response::answer_header('optionresponse');    my $result=&Apache::response::answer_header('optionresponse');
   foreach my $name (@whichopt) {    foreach my $name (@whichopt) {
     $result.=&Apache::response::answer_part('optionresponse',      $result.=&Apache::response::answer_part('optionresponse',
Line 261  sub displayanswers { Line 308  sub displayanswers {
 }  }
   
 sub displayfoils {  sub displayfoils {
   my ($target,$max,@opt)=@_;    my ($target,$max,$randomize,@opt)=@_;
     if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
   my @names = @{ $Apache::response::foilgroup{'names'} };    my @names = @{ $Apache::response::foilgroup{'names'} };
   my @truelist;    my @truelist;
   my @falselist;    my @falselist;
   my $result;    my $result;
   my $name;    my $name;
   $Apache::optionresponse::displayoptionintex=0;    my $displayoptionintex=0;
   my @whichopt = &whichfoils($max);    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');
     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];
   if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/)  || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {    my $break;
     my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
     my $status=$Apache::inputtags::status[-1];
     if (
         ($target ne 'tex') &&
         (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) ) {
     foreach $name (@whichopt) {      foreach $name (@whichopt) {
       if ($target eq 'web') {   my $text=$Apache::response::foilgroup{$name.'.text'};
   $result.="<br />";   if ($text!~/^\s*$/) {
       if ($target eq 'tex') {
    $break='\vskip 0 mm ';
       } elsif ($target eq 'web') {
    $break='<br />';
       }
    }
    $result.=$break;
    if ($target eq 'web') {
       my $value=$Apache::response::foilgroup{$name.'.value'};
       if (!($text=~s|<drawoptionlist\s*/>|$value|)) {
    if ($text=~/^\s*$/) {
       $text=$value.$text;
    } else {
       $text=$value.': '.$text;
    }
       }
       $result.=$text."\n";
       } elsif ($target eq 'tex') {        } elsif ($target eq 'tex') {
  $result.='\newline';    $Apache::response::foilgroup{$name.'.text'}=~s/\\item//;
      $result .='\item \textit{'.$Apache::response::foilgroup{$name.'.value'}.'}'.
         ":".$Apache::response::foilgroup{$name.'.text'}."\n";
         }
         if ($Apache::lonhomework::type eq 'exam') {
    if ($target ne 'tex') {
     $result.=&webbubbles(\@opt,\@alphabet);
           } else {
     $result.=&bubbles(\@alphabet,\@opt);
           }
       }        }
       $result .=$Apache::response::foilgroup{$name.'.value'}.  
   ":".$Apache::response::foilgroup{$name.'.text'}."\n";  
     }      }
   } else {    } else {
     my $temp=1;      my $temp=1;
     my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});      my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
     foreach $name (@whichopt) {      foreach $name (@whichopt) {
         my $text=$Apache::response::foilgroup{$name.'.text'};
         if ($text!~/^\s*$/) {
     if ($target eq 'tex') {
         $break='\vskip 0 mm ';
     } elsif ($target eq 'web') {
         $break='<br />';
     }
         }
       my $lastopt=$lastresponse{$name};        my $lastopt=$lastresponse{$name};
       my $optionlist="<option></option>\n";        my $optionlist="<option></option>\n";
       my $option;        my $option;
Line 296  sub displayfoils { Line 383  sub displayfoils {
  }   }
       }        }
       if ($target ne 'tex') {        if ($target ne 'tex') {
   $result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">"    $optionlist='<select name="HWVAL_'.
       .$optionlist        $Apache::inputtags::response['-1'].':'.$temp.'">'.
   ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";    $optionlist."</select>\n";
     my $text=$Apache::response::foilgroup{$name.'.text'};
     if (!($text=~s|<drawoptionlist\s*/>|$optionlist|)) {
         $text=$optionlist.$text;
     }
     $result.=$break.$text."\n";
     if ($Apache::lonhomework::type eq 'exam') {
       $result.=&webbubbles(\@opt,\@alphabet);
     }
   $temp++;    $temp++;
       } else {        } else {
   if ($Apache::optionresponse::displayoptionintex == 0) {            my $texoptionlist = &optionlist_correction($optionlist);
               my $durtyoptionlist = $optionlist;    if ($displayoptionintex == 0) {
       $durtyoptionlist =~ s/<option><\/option>/\\item \[\] The possible answers are:/;        if ($Apache::lonhomework::type eq 'exam') {$texoptionlist='';} #if exam we do not need to show optionlist
       $durtyoptionlist =~ s/<option>/{\\bf /g;        if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
       $durtyoptionlist =~ s/<\/option>/},/g;   if ($Apache::lonhomework::type eq 'exam') {
       $durtyoptionlist =~ s/,$/\./g;            $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\vskip 2 mm/;
       $result.= $durtyoptionlist.$Apache::response::foilgroup{$name.'.text'};          }
       $Apache::optionresponse::displayoptionintex=1;          if ($Apache::response::foilgroup{$name.'.text'}=~/<drawoptionlist\s*\/>/) {
             $Apache::response::foilgroup{$name.'.text'}=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;
           }
    $result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'};
         } else {
     if ($Apache::lonhomework::type eq 'exam') {
         $result.= $texoptionlist.'  '.$Apache::response::foilgroup{$name.'.text'};
     } else {
         $result.= $texoptionlist.'\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
     }
         }
         if ($Apache::lonhomework::type eq 'exam') {
     $result.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -9 mm \strut ';
         }
         $displayoptionintex=1;
   } else {    } else {
       $result.= $Apache::response::foilgroup{$name.'.text'};        if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
     if ($Apache::lonhomework::type eq 'exam') {
         $Apache::response::foilgroup{$name.'.text'}=~s/\\item//;
     }
           if ($Apache::response::foilgroup{$name.'.text'}=~/<drawoptionlist\s*\/>/) {
             $Apache::response::foilgroup{$name.'.text'}=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;
           }
    $result.= $Apache::response::foilgroup{$name.'.text'};
         } else {
     if ($Apache::lonhomework::type eq 'exam') {
         $result.= '  '.$Apache::response::foilgroup{$name.'.text'};
     } else {
         $result.= '\item '.$Apache::response::foilgroup{$name.'.text'};
     }
         }
         if ($Apache::lonhomework::type eq 'exam') {
     $result.='\vskip -2 mm \parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -9 mm \strut ';
         }
   }    }
       }         }
     }      }
   }   
   if ($target ne 'tex') {  
       return $result."<br />";  
   }    }
   else {    if ($target ne 'tex') {
         return $result.$break;
     } else {
       return $result;        return $result;
   }    }
 }  }
   
   
   sub optionlist_correction {
   
       my $texoptionlist = shift;
       $texoptionlist =~ s/<option><\/option>/\\item \[\] Possible answers are:/;
       $texoptionlist =~ s/<option>/\{\\bf /g;
       $texoptionlist =~ s/<option selected="on">/\{\\bf /g;
       $texoptionlist =~ s/<\/option>/\},/g;
       $texoptionlist =~ s/,$/\./g;
       $texoptionlist =~ s/>/\$>\$/g;
       $texoptionlist =~ s/</\$<\$/g;
       $texoptionlist =~ s/=/\$=\$/g;
       $texoptionlist =~ s/\^(\d+)/<m>\$$1\$<\/m>/g;
       return $texoptionlist;
   }
   
   
   sub webbubbles {
   
       my ($ropt,$ralphabet)=@_;
       my @opt=@$ropt; 
       my @alphabet=@$ralphabet;
       my $result='';
    my $number_of_bubbles = $#opt + 1;
    $result.= '<table border="1"><tr>';
    for (my $ind=0;$ind<$number_of_bubbles;$ind++) {
      $result.='<td>'.$alphabet[$ind].': '.$opt[$ind].'</td>';
    }
    $result.='</tr></table>';
    return $result;
   }
   
   
   sub bubbles {
   
       my ($ralphabit,$ropt) = @_;
       my @alphabet = @$ralphabit;
       my @opt = @$ropt;
       my ($result,$head,$line) =('','','');
       my $number_of_bubbles = $#opt + 1;
       my $current_length = 0;
       for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {
    $current_length += (length($opt[$ind])+length($alphabet[$ind])+2)*2;
    if ($current_length<0.9*$ENV{'form.textwidth'} and $ind!=$number_of_bubbles) {
       $line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';
       $head.='lr';
    } else {
       $line=~s/\&\s*$//;
       $result.='\vskip -5 mm\begin{tabular}{'.$head.'}\\\\'.$line.'\\\\\end{tabular}';
       $line = '\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';;
       $head ='lr';
       $current_length = (length($opt[$ind])+length($alphabet[$ind]))*2;
    }
   
       }
       &Apache::lonxml::increment_counter();
       return $result;
   }
   
   
 sub start_conceptgroup {  sub start_conceptgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::optionresponse::conceptgroup=1;    $Apache::optionresponse::conceptgroup=1;
   %Apache::response::conceptgroup={};    %Apache::response::conceptgroup=();
   my $result;    my $result;
   if ($target eq 'edit') {    if ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils");      $result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils");
Line 350  sub end_conceptgroup { Line 534  sub end_conceptgroup {
     #if not there aren't any foils to display and thus no question      #if not there aren't any foils to display and thus no question
     if (defined(@{ $Apache::response::conceptgroup{'names'} })) {      if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
       my @names = @{ $Apache::response::conceptgroup{'names'} };        my @names = @{ $Apache::response::conceptgroup{'names'} };
       my $pick=int rand $#names+1;        my $pick=int(&Math::Random::random_uniform() * ($#names+1));
       my $name=$names[$pick];        my $name=$names[$pick];
       push @{ $Apache::response::foilgroup{'names'} }, $name;        push @{ $Apache::response::foilgroup{'names'} }, $name;
       $Apache::response::foilgroup{"$name.value"} =        $Apache::response::foilgroup{"$name.value"} =
  $Apache::response::conceptgroup{"$name.value"};   $Apache::response::conceptgroup{"$name.value"};
       $Apache::response::foilgroup{"$name.text"} =        $Apache::response::foilgroup{"$name.text"} =
  $Apache::response::conceptgroup{"$name.text"};   $Apache::response::conceptgroup{"$name.text"};
         $Apache::response::foilgroup{"$name.location"} =
    $Apache::response::conceptgroup{"$name.location"};
       my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);        my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
       $Apache::response::foilgroup{"$name.concept"} = $concept;        $Apache::response::foilgroup{"$name.concept"} = $concept;
       &Apache::lonxml::debug("Selecting $name in $concept");        &Apache::lonxml::debug("Selecting $name in $concept");
Line 373  sub end_conceptgroup { Line 559  sub end_conceptgroup {
     $Apache::response::conceptgroup{"$name.value"};      $Apache::response::conceptgroup{"$name.value"};
   $Apache::lonhomework::analyze{"$part_id.foil.text.$name"} =    $Apache::lonhomework::analyze{"$part_id.foil.text.$name"} =
     $Apache::response::conceptgroup{"$name.text"};      $Apache::response::conceptgroup{"$name.text"};
     $Apache::lonhomework::analyze{"$part_id.foil.location.$name"} =
       $Apache::response::conceptgroup{"$name.location"};
  }   }
         } elsif ($target eq 'web') {
     my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
     push(@{ $Apache::hint::option{"$part_id.concepts"} },
          $concept);
     $Apache::hint::option{"$part_id.concept.$concept"}=
         $Apache::response::conceptgroup{'names'};
       }        }
     }      }
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
Line 399  sub start_foil { Line 593  sub start_foil {
     my @opt;      my @opt;
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level);      eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level);
     $result.=&Apache::edit::text_arg('Name:','name',$token);      $result.=&Apache::edit::text_arg('Name:','name',$token);
     $result.= &Apache::edit::select_or_text_arg('Correct Option:','value',['unused',(@opt)],$token,'15');      $result.= &Apache::edit::select_or_text_arg('Correct Option:','value',
          ['unused',(@opt)],$token,'15');
       my $randomize=&Apache::lonxml::get_param('randomize',$parstack,
        $safeeval,'-3');
       if ($randomize ne 'no') {
    $result.=&Apache::edit::select_arg('Location:','location',
      ['random','top','bottom'],$token);
       }
     $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();      $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
    'value','name','location');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }      if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   }     } 
   if ($target eq 'tex') {$result .= '\item ';}  
   return $result;    return $result;
 }  }
   
Line 414  sub end_foil { Line 615  sub end_foil {
   my $text ='';    my $text ='';
   my $result = '';    my $result = '';
   if ($target eq 'web' || $target eq 'tex') {     if ($target eq 'web' || $target eq 'tex') { 
       $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 'web' || $target eq 'grade' || $target eq 'answer'     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' 
       || $target eq 'tex' || $target eq 'analyze') {        || $target eq 'tex' || $target eq 'analyze') {
     my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);      my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
     if ($value ne 'unused') {      if ($value ne 'unused') {
       my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);        my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
         my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval);
       &Apache::lonxml::debug("Got a name of :$name:");        &Apache::lonxml::debug("Got a name of :$name:");
       if (!$name) { $name=$Apache::lonxml::curdepth; }        if (!$name) { $name=$Apache::lonxml::curdepth; }
       &Apache::lonxml::debug("Using a name of :$name:");        &Apache::lonxml::debug("Using a name of :$name:");
       if ( $Apache::optionresponse::conceptgroup ) {        if ( $Apache::optionresponse::conceptgroup
      && !&Apache::response::showallfoils() ) {
  push @{ $Apache::response::conceptgroup{'names'} }, $name;   push @{ $Apache::response::conceptgroup{'names'} }, $name;
  $Apache::response::conceptgroup{"$name.value"} = $value;   $Apache::response::conceptgroup{"$name.value"} = $value;
  $Apache::response::conceptgroup{"$name.text"} = $text;   if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
       $Apache::response::conceptgroup{"$name.text"} = '\vskip 4 mm $\triangleright$ '.$text;
    } else {
       if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
    $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
       } else {
    $Apache::response::conceptgroup{"$name.text"} = $text;
       }
    }
    $Apache::response::conceptgroup{"$name.location"} = $location;
       } else {        } else {
  push @{ $Apache::response::foilgroup{'names'} }, $name;   push @{ $Apache::response::foilgroup{'names'} }, $name;
  $Apache::response::foilgroup{"$name.value"} = $value;   $Apache::response::foilgroup{"$name.value"} = $value;
  $Apache::response::foilgroup{"$name.text"} = $text;   if ($Apache::lonhomework::type eq 'exam') {
       $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
    } else {
       if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
    $Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;
       } else {
    $Apache::response::foilgroup{"$name.text"} = $text;
       }
    }
    $Apache::response::foilgroup{"$name.location"} = $location;
       }        }
     }      }
   }    }

Removed from v.1.36  
changed lines
  Added in v.1.71


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