--- loncom/homework/optionresponse.pm	2001/09/14 20:14:46	1.25
+++ loncom/homework/optionresponse.pm	2002/01/11 16:32:29	1.30
@@ -1,5 +1,30 @@
 # The LearningOnline Network with CAPA
 # option list style responses
+#
+# $Id: optionresponse.pm,v 1.30 2002/01/11 16:32:29 matthew Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # 2/21 Guy
 package Apache::optionresponse;
 use strict;
@@ -12,18 +37,21 @@ sub BEGIN {
 sub start_optionresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
-  #when in a radiobutton response use these
+  #when in a option response use these
   &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
   push (@Apache::lonxml::namespace,'optionresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);
   if ($target eq 'edit') {
     $result.=&Apache::edit::start_table($token).
-      "<tr><td>Multiple Option Response Question</td><td>Delete:".
+	"<tr><td>Multiple Option Response Question</td><td>Delete:".
 	&Apache::edit::deletelist($target,$token)
-	  ."</td><td>&nbsp;</td></tr><tr><td colspan=\"3\">\n";
+	."</td><td>&nbsp;".
+        &Apache::edit::end_row().
+        &Apache::edit::start_spanning_row().
+        "\n";
     $result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4').
-      "</td></tr>";
-    $result.="<tr><td colspan=\"3\">\n";
+        &Apache::edit::end_row().
+	&Apache::edit::start_spanning_row();
   }
   if ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,
@@ -40,6 +68,7 @@ sub end_optionresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   &Apache::response::end_response;
   pop @Apache::lonxml::namespace;
+  &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
   my $result;
   if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
   return $result;
@@ -72,10 +101,10 @@ sub start_foilgroup {
         </td>
         <td>Delete an Option:
 	  <select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select>
-        </td>
-     </tr>
-     <tr><td colspan="3">$insertlist<br />
 ENDTABLE
+    $result.= &Apache::edit::end_row();
+    $result.= &Apache::edit::start_spanning_row();
+    $result.= $insertlist.'<br />';
   }
   if ($target eq 'modified') {
     my @options;
@@ -130,13 +159,13 @@ sub end_foilgroup {
       if ( defined $ENV{'form.submitted'}) {
 	my @whichopt = &whichfoils($count);
 	my $temp=1;my $name;
-	my $allresponse;
+	my %responsehash;
 	my $right=0;
 	my $wrong=0;
 	my $ignored=0;
 	foreach $name (@whichopt) {
 	  my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};
-	  $allresponse.="$response:";
+	  $responsehash{$name}=$response;
 	  if ( $response =~ /[^\s]/) {
 	    &Apache::lonxml::debug("submitted a $response<br />\n");
 	    my $value=$Apache::response::foilgroup{$name.'.value'};
@@ -146,14 +175,25 @@ sub end_foilgroup {
 	  }
 	  $temp++;
 	}
+	my $part=$Apache::inputtags::part;
 	my $id = $Apache::inputtags::response['-1'];
-	$Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$allresponse;
+	my $responsestr=&Apache::lonnet::hash2str(%responsehash);
+	my %previous=&Apache::response::check_for_previous($responsestr,
+							   $part,$id);
 	&Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored");
+	my $ad;
 	if ($wrong==0 && $ignored==0) {
-	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS';
+	  $ad='EXACT_ANS';
+	} elsif ($wrong==0 && $right==0) {
+	  #nothing submitted
 	} else {
-	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='INCORRECT';
+	  $ad='INCORRECT';
 	}
+	$Apache::lonhomework::results{"resource.$part.$id.submission"}=
+	  $responsestr;
+	$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
+	  $ad;
+	&Apache::response::handle_previous(\%previous,$ad);
       }
     }
   } elsif ($target eq 'edit') {
@@ -206,19 +246,27 @@ sub displayfoils {
   my $result;
   my $name;
   my @whichopt = &whichfoils($max);
-  my $optionlist="<option></option>\n";
-  my $option;
-  foreach $option (@opt) {
-    $optionlist.="<option>$option</option>\n";
-  }
-  if (($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/)  || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {
+  my $part=$Apache::inputtags::part;
+  my $id=$Apache::inputtags::response[-1];
+  if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/)  || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {
     foreach $name (@whichopt) {
       $result.="<br />".$Apache::response::foilgroup{$name.'.value'}.
 	":".$Apache::response::foilgroup{$name.'.text'}."\n";
     }
   } else {
     my $temp=1;
+    my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
     foreach $name (@whichopt) {
+      my $lastopt=$lastresponse{$name};
+      my $optionlist="<option></option>\n";
+      my $option;
+      foreach $option (@opt) {
+	if ($option eq $lastopt) {
+	  $optionlist.="<option selected=\"on\">$option</option>\n";
+	} else {
+	  $optionlist.="<option>$option</option>\n";
+	}
+      }
       $result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">"
 	.$optionlist
 	  ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";
@@ -236,8 +284,8 @@ sub start_conceptgroup {
   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";
+    $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50').
+        &Apache::edit::end_row().&Apache::edit::start_spanning_row();
   }
   if ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'concept');
@@ -288,7 +336,7 @@ sub start_foil {
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level);
     $result.=&Apache::edit::text_arg('Name:','name',$token);
     $result.= &Apache::edit::select_or_text_arg('Correct Option:','value',['unused',(@opt)],$token,'15');
-    $result .= '</td></tr><tr><td colspan="3">';
+    $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }