--- loncom/homework/optionresponse.pm	2001/06/12 22:42:55	1.14
+++ loncom/homework/optionresponse.pm	2001/06/16 20:33:33	1.16
@@ -20,16 +20,19 @@ sub start_optionresponse {
     $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";
   }
 
   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 {
@@ -56,6 +59,7 @@ sub start_foilgroup {
     my $count=0;
     foreach $option (@opt) {
       $optionlist.="<option value=\"$count\">$option</option>\n";
+      $count++;
     }
     my $insertlist=&Apache::edit::insertlist($target,$token);
     $result.=&Apache::edit::start_table($token);
@@ -77,6 +81,7 @@ ENDTABLE
     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);
       $optchanged=1;
     }
@@ -107,7 +112,7 @@ 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 } 
@@ -148,6 +153,9 @@ sub end_foilgroup {
       }
     }
   }
+  if ($target eq 'edit') {
+    $result.=&Apache::edit::end_table();
+  }
   return $result;
 }
 
@@ -206,14 +214,27 @@ 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') {
+    my $insertlist=&Apache::edit::insertlist($target,$token);
+    $result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils");
+    my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
+    $result.="Concept: <input name=\"$Apache::lonxml::curdepth.concept\" type=\"text\" value=\"$concept\" /></td></tr><tr><td colspan=\"3\">";
+  }
+  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;
@@ -225,7 +246,15 @@ sub end_conceptgroup {
     $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="\t\t<conceptgroup concept=\"\">\n".&insert_foil()."\t\t</conceptgroup>\n";
+  return $result;
 }
 
 sub start_foil {
@@ -234,14 +263,29 @@ sub start_foil {
   if ($target eq 'web') { &Apache::lonxml::startredirection; }
   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,'-2');
-    my $optionlist="<option></option>\n";
+    eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level);
+    my $value=&Apache::lonxml::get_param('value',$parstack,$safeeval);
+    my $optionlist="<option>unused</option>\n";
     foreach my $option (@opt) {
-      $optionlist.="<option>$option</option>\n";
+      if ( $value eq $option ) {
+	$optionlist.="<option selected=\"on\">$option</option>\n";
+      } else {
+	$optionlist.="<option>$option</option>\n";
+      }
     }
-    $result.="Name: <input name=\"$Apache::lonxml::curdepth.name\" type=\"text\" />".
-      "Correct Option:<select>$optionlist</select></td></tr><tr><td colspan=\"3\">";
+    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') {
+    my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');
+    if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   }
   return $result;
 }
@@ -275,7 +319,7 @@ sub end_foil {
 
 sub insert_foil {
   return '
-<foil name="" value="">
+<foil name="" value="unused">
 <startouttext />
 <endouttext />
 </foil>';