Diff for /loncom/homework/optionresponse.pm between versions 1.16 and 1.18

version 1.16, 2001/06/16 20:33:33 version 1.18, 2001/06/26 21:41:58
Line 20  sub start_optionresponse { Line 20  sub start_optionresponse {
     $result.=&Apache::edit::start_table($token)."<tr><td>Multiple Option Response Question</td>      $result.=&Apache::edit::start_table($token)."<tr><td>Multiple Option Response Question</td>
 <td>Delete:".  <td>Delete:".
   &Apache::edit::deletelist($target,$token)    &Apache::edit::deletelist($target,$token)
 ."</td><td>&nbsp;</td></tr><tr><td colspan=\"3\">\n";      ."</td><td>&nbsp;</td></tr><tr><td colspan=\"3\">\n";
       $result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4')."</td></tr>";
       $result.="<tr><td colspan=\"3\">\n";
     }
     if ($target eq 'modified') {
       my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'max');
       if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   }    }
   
   return $result;    return $result;
 }  }
   
Line 56  sub start_foilgroup { Line 61  sub start_foilgroup {
     my $option;      my $option;
     my @opt;      my @opt;
     eval '@opt ='. &Apache::lonxml::get_param('options',$parstack,$safeeval);      eval '@opt ='. &Apache::lonxml::get_param('options',$parstack,$safeeval);
     my $count=0;      my $count=1;
     foreach $option (@opt) {      foreach $option (@opt) {
       $optionlist.="<option value=\"$count\">$option</option>\n";        $optionlist.="<option value=\"$count\">$option</option>\n";
       $count++;        $count++;
Line 82  ENDTABLE Line 87  ENDTABLE
     if ($ENV{"form.$Apache::lonxml::curdepth.deleteopt"}) {      if ($ENV{"form.$Apache::lonxml::curdepth.deleteopt"}) {
       my $delopt=$ENV{"form.$Apache::lonxml::curdepth.deleteopt"};        my $delopt=$ENV{"form.$Apache::lonxml::curdepth.deleteopt"};
       &Apache::lonxml::debug("Deleting :$delopt:");        &Apache::lonxml::debug("Deleting :$delopt:");
       splice(@options,$delopt,1);        splice(@options,$delopt-1,1);
       $optchanged=1;        $optchanged=1;
     }      }
     if ($ENV{"form.$Apache::lonxml::curdepth.options"}) {      if ($ENV{"form.$Apache::lonxml::curdepth.options"}) {
Line 219  sub start_conceptgroup { Line 224  sub start_conceptgroup {
   %Apache::response::conceptgroup={};    %Apache::response::conceptgroup={};
   my $result;    my $result;
   if ($target eq 'edit') {    if ($target eq 'edit') {
     my $insertlist=&Apache::edit::insertlist($target,$token);  
     $result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils");      $result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils");
     my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);      $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50')."</td></tr>";
     $result.="Concept: <input name=\"$Apache::lonxml::curdepth.concept\" type=\"text\" value=\"$concept\" /></td></tr><tr><td colspan=\"3\">";      $result.="<tr><td colspan=\"3\">\n";
   }    }
   if ($target eq 'modified') {    if ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'concept');      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'concept');
Line 236  sub end_conceptgroup { Line 240  sub end_conceptgroup {
   $Apache::optionresponse::conceptgroup=0;    $Apache::optionresponse::conceptgroup=0;
   my $result='';    my $result='';
   if ($target eq 'web' || $target eq 'grade') {    if ($target eq 'web' || $target eq 'grade') {
     my @names = @{ $Apache::response::conceptgroup{'names'} };      #if not there aren't any foils to display and thus no question
     my $pick=int rand $#names+1;      if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
     my $name=$names[$pick];        my @names = @{ $Apache::response::conceptgroup{'names'} };
     push @{ $Apache::response::foilgroup{'names'} }, $name;        my $pick=int rand $#names+1;
     $Apache::response::foilgroup{"$name.value"} =  $Apache::response::conceptgroup{"$name.value"};        my $name=$names[$pick];
     $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};        push @{ $Apache::response::foilgroup{'names'} }, $name;
     my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);        $Apache::response::foilgroup{"$name.value"} =  $Apache::response::conceptgroup{"$name.value"};
     $Apache::response::foilgroup{"$name.concept"} = $concept;        $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};
     &Apache::lonxml::debug("Selecting $name in $concept");        my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
         $Apache::response::foilgroup{"$name.concept"} = $concept;
         &Apache::lonxml::debug("Selecting $name in $concept");
       }
   }    }
   if ($target eq 'edit') {    if ($target eq 'edit') {
     $result=&Apache::edit::end_table();      $result=&Apache::edit::end_table();
Line 253  sub end_conceptgroup { Line 260  sub end_conceptgroup {
 }  }
   
 sub insert_conceptgroup {  sub insert_conceptgroup {
   my $result="\t\t<conceptgroup concept=\"\">\n".&insert_foil()."\t\t</conceptgroup>\n";    my $result="\n\t\t<conceptgroup concept=\"\">".&insert_foil()."\n\t\t</conceptgroup>\n";
   return $result;    return $result;
 }  }
   
Line 267  sub start_foil { Line 274  sub start_foil {
     if ($$tagstack['-2'] eq 'conceptgroup') { $level = '-3'; }      if ($$tagstack['-2'] eq 'conceptgroup') { $level = '-3'; }
     my @opt;      my @opt;
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level);      eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level);
     my $value=&Apache::lonxml::get_param('value',$parstack,$safeeval);      $result.=&Apache::edit::text_arg('Name:','name',$token).
     my $optionlist="<option>unused</option>\n";        &Apache::edit::select_arg('Correct Option:','value',['unused',(@opt)],$token).
     foreach my $option (@opt) {        '</td></tr><tr><td colspan="3">';
       if ( $value eq $option ) {  
  $optionlist.="<option selected=\"on\">$option</option>\n";  
       } else {  
  $optionlist.="<option>$option</option>\n";  
       }  
     }  
     my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval);  
     $result.="Name: <input name=\"$Apache::lonxml::curdepth.name\" type=\"text\" value=\"$name\" />".  
       "Correct Option:  
       <select name=\"$Apache::lonxml::curdepth.value\">  
         $optionlist  
       </select></td></tr><tr><td colspan=\"3\">";  
   }    }
   if ($target eq 'modified') {    if ($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');
Line 299  sub end_foil { Line 294  sub end_foil {
     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);
         &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:");
       if ( $Apache::optionresponse::conceptgroup ) {        if ( $Apache::optionresponse::conceptgroup ) {
  push @{ $Apache::response::conceptgroup{'names'} }, $name;   push @{ $Apache::response::conceptgroup{'names'} }, $name;
  $Apache::response::conceptgroup{"$name.value"} = $value;   $Apache::response::conceptgroup{"$name.value"} = $value;

Removed from v.1.16  
changed lines
  Added in v.1.18


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