--- loncom/homework/optionresponse.pm	2001/12/04 15:17:56	1.27
+++ loncom/homework/optionresponse.pm	2001/12/07 23:58:35	1.28
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.27 2001/12/04 15:17:56 albertel Exp $
+# $Id: optionresponse.pm,v 1.28 2001/12/07 23:58:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -171,14 +171,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"}=&Apache::lonnet::hash2str(%responsehash);
+	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') {
@@ -231,19 +242,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";