--- loncom/homework/optionresponse.pm	2001/06/02 03:59:59	1.11
+++ loncom/homework/optionresponse.pm	2001/06/26 21:41:58	1.18
@@ -17,19 +17,27 @@ sub start_optionresponse {
   push (@Apache::lonxml::namespace,'optionresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);
   if ($target eq 'edit') {
-    $result.="<table width=\"100%\" border=\"2\"><tr><td>Multiple Option Response Question</td>
+    $result.=&Apache::edit::start_table($token)."<tr><td>Multiple Option Response Question</td>
 <td>Delete:".
   &Apache::edit::deletelist($target,$token)
-."</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;
 }
 
 sub end_optionresponse {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   &Apache::response::end_response;
   pop @Apache::lonxml::namespace;
-  return '';
+  my $result;
+  if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
+  return $result;
 }
 
 sub insert_optionresponse {
@@ -42,25 +50,81 @@ sub insert_optionresponse {
 
 %Apache::response::foilgroup={};
 sub start_foilgroup {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+
+  my $result='';
   %Apache::response::foilgroup={};
   $Apache::optionresponse::conceptgroup=0;
   &Apache::response::setrandomnumber();
-  return '';
+  if ($target eq 'edit') {
+    my $optionlist="<option></option>\n";
+    my $option;
+    my @opt;
+    eval '@opt ='. &Apache::lonxml::get_param('options',$parstack,$safeeval);
+    my $count=1;
+    foreach $option (@opt) {
+      $optionlist.="<option value=\"$count\">$option</option>\n";
+      $count++;
+    }
+    my $insertlist=&Apache::edit::insertlist($target,$token);
+    $result.=&Apache::edit::start_table($token);
+    $result.= (<<ENDTABLE);
+      <tr><td>Select Options</td>
+        <td>
+	  Add new Option: <input type="text" name="$Apache::lonxml::curdepth.options" />
+        </td>
+        <td>Delete an Option:
+	  <select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select>
+        </td>
+     </tr>
+     <tr><td colspan="3">$insertlist<br />
+ENDTABLE
+  }
+  if ($target eq 'modified') {
+    my @options;
+    my $optchanged=0;
+    eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
+    if ($ENV{"form.$Apache::lonxml::curdepth.deleteopt"}) {
+      my $delopt=$ENV{"form.$Apache::lonxml::curdepth.deleteopt"};
+      &Apache::lonxml::debug("Deleting :$delopt:");
+      splice(@options,$delopt-1,1);
+      $optchanged=1;
+    }
+    if ($ENV{"form.$Apache::lonxml::curdepth.options"}) {
+      my $newopt = $ENV{"form.$Apache::lonxml::curdepth.options"};
+      if ($options[0]) {
+	push(@options,$newopt);
+      } else {
+	$options[0]=$newopt;
+      }
+      $optchanged=1;
+    }
+    if ($optchanged) {
+      $result = "<foilgroup options=\"(";
+      foreach my $option (@options) {
+	$option=~s/\'/\\\'/;
+	&Apache::lonxml::debug("adding option :$option:");
+	$result .="'".$option."',";
+      }
+      chop $result;
+      $result.=')">';
+    } # else nothing changed so just use the default mechanism
+  }
+  return $result;
 }
 
 sub end_foilgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
   my $result;
-  if ($target ne 'meta') {
+  if ($target eq 'grade' || $target eq 'web') {
     my $name;
     my ($count,$max) = &getfoilcounts($parstack,$safeeval);
     if ($count>$max) { $count=$max } 
     &Apache::lonxml::debug("Count is $count from $max");
-    my $args ='';
-    if ( $#$parstack > 0 ) { $args=$$parstack['-1']; }
     my @opt;
-    eval '@opt ='.&Apache::run::run("{$args;".'return $options}',$safeeval);
+    eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
+    &Apache::lonxml::debug("Options are $#opt");
     if ($target eq 'web') {
       $result=&displayfoils($count,@opt);
     } elsif ( $target eq 'grade') {
@@ -94,6 +158,9 @@ sub end_foilgroup {
       }
     }
   }
+  if ($target eq 'edit') {
+    $result.=&Apache::edit::end_table();
+  }
   return $result;
 }
 
@@ -152,42 +219,84 @@ sub displayfoils {
 
 
 sub start_conceptgroup {
-  $Apache::optionresponse::conceptgroup=1;  
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  $Apache::optionresponse::conceptgroup=1;
   %Apache::response::conceptgroup={};
-  return '';
+  my $result;
+  if ($target eq 'edit') {
+    $result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils");
+    $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50')."</td></tr>";
+    $result.="<tr><td colspan=\"3\">\n";
+  }
+  if ($target eq 'modified') {
+    my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'concept');
+    if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+  }
+  return $result;
 }
 
 sub end_conceptgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-  $Apache::optionresponse::conceptgroup=0;  
+  $Apache::optionresponse::conceptgroup=0;
+  my $result='';
   if ($target eq 'web' || $target eq 'grade') {
-    my @names = @{ $Apache::response::conceptgroup{'names'} };
-    my $pick=int rand $#names+1;
-    my $name=$names[$pick];
-    push @{ $Apache::response::foilgroup{'names'} }, $name;
-    $Apache::response::foilgroup{"$name.value"} =  $Apache::response::conceptgroup{"$name.value"};
-    $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};
-    my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
-    $Apache::response::foilgroup{"$name.concept"} = $concept;
-    &Apache::lonxml::debug("Selecting $name in $concept");
+    #if not there aren't any foils to display and thus no question
+    if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
+      my @names = @{ $Apache::response::conceptgroup{'names'} };
+      my $pick=int rand $#names+1;
+      my $name=$names[$pick];
+      push @{ $Apache::response::foilgroup{'names'} }, $name;
+      $Apache::response::foilgroup{"$name.value"} =  $Apache::response::conceptgroup{"$name.value"};
+      $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};
+      my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
+      $Apache::response::foilgroup{"$name.concept"} = $concept;
+      &Apache::lonxml::debug("Selecting $name in $concept");
+    }
   }
-  return '';
+  if ($target eq 'edit') {
+    $result=&Apache::edit::end_table();
+  }
+  return $result;
+}
+
+sub insert_conceptgroup {
+  my $result="\n\t\t<conceptgroup concept=\"\">".&insert_foil()."\n\t\t</conceptgroup>\n";
+  return $result;
 }
 
 sub start_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result='';
   if ($target eq 'web') { &Apache::lonxml::startredirection; }
-  return '';
+  if ($target eq 'edit') {
+    $result=&Apache::edit::tag_start($target,$token,"Foil");
+    my $level='-2';
+    if ($$tagstack['-2'] eq 'conceptgroup') { $level = '-3'; }
+    my @opt;
+    eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level);
+    $result.=&Apache::edit::text_arg('Name:','name',$token).
+      &Apache::edit::select_arg('Correct Option:','value',['unused',(@opt)],$token).
+      '</td></tr><tr><td colspan="3">';
+  }
+  if ($target eq 'modified') {
+    my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');
+    if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+  }
+  return $result;
 }
 
 sub end_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $text ='';
+  my $result = '';
   if ($target eq 'web') { $text=&Apache::lonxml::endredirection; }
   if ($target eq 'web' || $target eq 'grade') {
     my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
     if ($value ne 'unused') {
       my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+      &Apache::lonxml::debug("Got a name of :$name:");
+      if (!$name) { $name=$Apache::lonxml::curdepth; }
+      &Apache::lonxml::debug("Using a name of :$name:");
       if ( $Apache::optionresponse::conceptgroup ) {
 	push @{ $Apache::response::conceptgroup{'names'} }, $name;
 	$Apache::response::conceptgroup{"$name.value"} = $value;
@@ -200,17 +309,16 @@ sub end_foil {
     }
   }
   if ($target eq 'edit') {
-    my $options= &Apache::lonxml::get_param('options',$parstack,$safeeval);
-    if (!$options && $#$parstack > 2 ) { $args=$$parstack['-2']; }
-    my @opt;
-    #eval '@opt ='.
+    $result.= &Apache::edit::tag_end($target,$token,'');
   }
-  return '';
+  return $result;
 }
 
 sub insert_foil {
   return '
-<foil name="" value="">
+<foil name="" value="unused">
+<startouttext />
+<endouttext />
 </foil>';
 }
 1;