--- loncom/homework/optionresponse.pm	2001/06/11 16:13:53	1.13
+++ loncom/homework/optionresponse.pm	2001/06/16 21:23:11	1.17
@@ -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 {
@@ -53,13 +61,14 @@ sub start_foilgroup {
     my $option;
     my @opt;
     eval '@opt ='. &Apache::lonxml::get_param('options',$parstack,$safeeval);
-
+    my $count=1;
     foreach $option (@opt) {
-      $optionlist.="<option>$option</option>\n";
+      $optionlist.="<option value=\"$count\">$option</option>\n";
+      $count++;
     }
     my $insertlist=&Apache::edit::insertlist($target,$token);
+    $result.=&Apache::edit::start_table($token);
     $result.= (<<ENDTABLE);
-    <table width="100%" border="2">
       <tr><td>Select Options</td>
         <td>
 	  Add new Option: <input type="text" name="$Apache::lonxml::curdepth.options" />
@@ -73,23 +82,33 @@ 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"};
-      $newopt =~ s/\'/\\\'/g;
       if ($options[0]) {
-	push(@options,$ENV{"form.$Apache::lonxml::curdepth.options"});
+	push(@options,$newopt);
       } else {
-	$options[0]=$ENV{"form.$Apache::lonxml::curdepth.options"};
+	$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;
 }
@@ -98,7 +117,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 } 
@@ -139,6 +158,9 @@ sub end_foilgroup {
       }
     }
   }
+  if ($target eq 'edit') {
+    $result.=&Apache::edit::end_table();
+  }
   return $result;
 }
 
@@ -197,14 +219,26 @@ 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;
@@ -216,7 +250,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 {
@@ -225,9 +267,17 @@ sub start_foil {
   if ($target eq 'web') { &Apache::lonxml::startredirection; }
   if ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token,"Foil");
-    my $options= &Apache::lonxml::get_param('options',$parstack,$safeeval);
+    my $level='-2';
+    if ($$tagstack['-2'] eq 'conceptgroup') { $level = '-3'; }
     my @opt;
-    eval '@opt ='.$options;
+    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;
 }
@@ -261,9 +311,9 @@ sub end_foil {
 
 sub insert_foil {
   return '
-<foil name="" value="">
-<starttextarea />
-<endtextarea />
+<foil name="" value="unused">
+<startouttext />
+<endouttext />
 </foil>';
 }
 1;