--- loncom/homework/radiobuttonresponse.pm	2004/08/24 23:32:13	1.90
+++ loncom/homework/radiobuttonresponse.pm	2004/10/21 03:34:06	1.96
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.90 2004/08/24 23:32:13 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.96 2004/10/21 03:34:06 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -118,12 +118,17 @@ sub storesurvey {
     my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1']};
     &Apache::lonxml::debug("Here I am!:$response:");
     if ( $response !~ /[0-9]+/) { return ''; }
+    my $part = $Apache::inputtags::part;
     my $id = $Apache::inputtags::response['-1'];
     my @whichfoils=@{ $Apache::response::foilgroup{'names'} };
     my %responsehash;
     $responsehash{$whichfoils[$response]}=$response;
-    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=&Apache::lonnet::hash2str(%responsehash);
-    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='SUBMITTED';
+    my $responsestr=&Apache::lonnet::hash2str(%responsehash);
+    $Apache::lonhomework::results{"resource.$part.$id.submission"}=
+	$responsestr;
+    my %previous=&Apache::response::check_for_previous($responsestr,$part,$id);
+    my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
+    &Apache::response::handle_previous(\%previous,$ad);
     &Apache::lonxml::debug("submitted a $response<br />\n");
     return '';
 }
@@ -167,9 +172,11 @@ sub end_foilgroup {
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
 	$target eq 'tex' || $target eq 'analyze') {
 	my $style = $Apache::lonhomework::type;
+	my $direction = &Apache::lonxml::get_param('direction',$parstack,
+						   $safeeval,'-2');
 	if ( $style eq 'survey'  && $target ne 'analyze') {
 	    if ($target eq 'web' || $target eq 'tex') {
-		$result=&displayallfoils();
+		$result=&displayallfoils($direction);
 	    } elsif ( $target eq 'answer' ) {
 		$result=&displayallanswers();
 	    } elsif ( $target eq 'grade' ) {
@@ -181,9 +188,6 @@ sub end_foilgroup {
 						 '-2');
 	    my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
 						       $safeeval,'-2');
-	    my $direction = &Apache::lonxml::get_param('direction',$parstack,
-						       $safeeval,'-2');
-	    &Apache::lonxml::debug("direction is $direction");
 	    if ($target eq 'web' || $target eq 'tex') {
 		$result=&displayfoils($target,$max,$randomize,$direction);
 	    } elsif ($target eq 'answer' ) {
@@ -224,6 +228,7 @@ sub getfoilcounts {
 }
 
 sub displayallfoils {
+    my ($direction)=@_;
     my $result;
     &Apache::lonxml::debug("survey style display");
     my @names = @{ $Apache::response::foilgroup{'names'} };
@@ -232,11 +237,16 @@ sub displayallfoils {
     my $part=$Apache::inputtags::part;
     my $lastresponse=
 	$Apache::lonhomework::history{"resource.$part.$id.submission"};
+    if ($direction eq 'horizontal') { $result.='<table><tr>'; }
     my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
     if (&Apache::response::show_answer() ) {
 	foreach my $name (@names) {
 	    if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
-		$result.="<br />";
+		if ($direction eq 'horizontal') {
+		    $result.="<td>";
+		} else {
+		    $result.="<br />";
+		}
 		if (defined($lastresponse{$name})) {
 		    $result.='<b>';
 		}
@@ -244,18 +254,28 @@ sub displayallfoils {
 		if (defined($lastresponse{$name})) {
 		    $result.='</b>';
 		}
+		if ($direction eq 'horizontal') { $result.="</td>"; }
 	    }
 	}
     } else {
 	foreach my $name (@names) {
 	    if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
-		$result.="<br /><input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";
+		if ($direction eq 'horizontal') {
+		    $result.="<td>";
+		} else {
+		    $result.="<br />";
+		}
+                $result .= '<label>';
+		$result.="<input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";
 		if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
-		$result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
+		$result .= '>'.$Apache::response::foilgroup{$name.'.text'}.
+                    '</label>';
 		$temp++;
+		if ($direction eq 'horizontal') { $result.="</td>"; }
 	    }
 	}
     }
+    if ($direction eq 'horizontal') { $result.='</tr></table>'; }
     return $result;
 }
 
@@ -420,8 +440,9 @@ sub displayfoils {
 	    } else {
 		$result.='Incorrect:';
 	    }
+	    if ($target eq 'web') { $result.="<label>"; }
 	    $result.=$Apache::response::foilgroup{$name.'.text'};
-	    if ($target eq 'web') { $result.="</input>\n"; }
+	    if ($target eq 'web') { $result.="</label>"; }
 	    if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
 		if ($target ne 'tex') { $result.='</b>';} else {$result.='}';}
 	    }
@@ -454,9 +475,10 @@ sub displayfoils {
 		} 
 	    }
 	    if ($target ne 'tex') { 
+                $result.= '<label>';
 		$result.="<input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";
 		if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
-		$result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
+		$result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</label>";
 	    } else {
 		if ($Apache::lonhomework::type eq 'exam') {
 		    $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';  #' stupid emacs
@@ -474,7 +496,7 @@ sub displayfoils {
 	    $result.="</tr></table>";
 	}
     }
-    if ($target ne 'tex') { $result.="<br />"; } else { $result.='\vskip 0 mm '; }
+    if ($target ne 'tex') { if ($direction ne 'horizontal') { $result.="<br />";} } else { $result.='\vskip 0 mm '; }
     return $result;
 }
 
@@ -545,6 +567,9 @@ sub start_foil {
     my $result='';
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
 	&Apache::lonxml::startredirection;
+	if ($target eq 'analyze') {
+	    &Apache::response::check_if_computed($token,$parstack,$safeeval,'value');
+	}
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::text_arg('Name:','name',$token);