--- loncom/homework/radiobuttonresponse.pm	2001/01/15 21:44:21	1.8
+++ loncom/homework/radiobuttonresponse.pm	2001/03/01 01:20:04	1.14
@@ -1,7 +1,6 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
-
-# 11/23,11/24,11/28 Gerd Kortemeyer
+# 2/21 Guy
 
 package Apache::radiobuttonresponse;
 use strict;
@@ -26,6 +25,8 @@ sub end_radiobuttonresponse {
 %Apache::response::foilgroup={};
 sub start_foilgroup {
   %Apache::response::foilgroup={};
+  $Apache::optionresponse::conceptgroup=0;
+  &setrandomnumber();
   return '';
 }
 
@@ -39,14 +40,12 @@ sub setrandomnumber {
   return '';
 }
 
-#FIXME needs to stablely do random picks
 sub end_foilgroup {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   
   my $result;
   if ($target ne 'meta') {
     my $name;
-    &setrandomnumber();
     my ($truecnt,$falsecnt,$max) = &getfoilcounts($parstack,$safeeval);
     my $count=0;
     # we will add in 1 of the true statements
@@ -61,7 +60,7 @@ sub end_foilgroup {
 	if ( $response =~ /[^\s]/) {
 	  my $id = $Apache::inputtags::response['-1'];
 	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
-	  &Apache::lonxml::debug("submitted a $response<br>\n");
+	  &Apache::lonxml::debug("submitted a $response<br />\n");
 	  if ($response == $answer) {
 	    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS';
 	  } else {
@@ -103,7 +102,7 @@ sub displayfoils {
   my $name;
 
   foreach $name (@names) {
-    #result.="<br><b>$name</b> is <i> $Apache::response::foilgroup{$name.'.value'} </i>";
+    #result.="<br /><b>$name</b> is <i> $Apache::response::foilgroup{$name.'.value'} </i>";
     if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
       push (@truelist,$name);
     } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
@@ -124,22 +123,60 @@ sub displayfoils {
     push (@whichfalse,$afalse);
   }
   splice(@whichfalse,$answer,0,$truelist[$whichtrue]);
-  my $temp=0;
   &Apache::lonxml::debug("the true statement is $answer");
-  foreach $name (@whichfalse) {
-    $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\">".$Apache::response::foilgroup{$name.'.text'}."</input>\n";
-    $temp++;
+  if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
+    foreach $name (@whichfalse) {
+      $result.="<br />";
+      if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { 
+	$result.='Correct';
+      } else {
+	$result.='Incorrect';
+      }
+      $result.=":".$Apache::response::foilgroup{$name.'.text'}."</input>\n";
+    }
+  } else {
+    my $temp=0;
+    foreach $name (@whichfalse) {
+      $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\">".$Apache::response::foilgroup{$name.'.text'}."</input>\n";
+      $temp++;
+    }
   }
   return $result."<br />";
 }
 
+sub start_conceptgroup {
+  $Apache::optionresponse::conceptgroup=1;  
+  %Apache::response::conceptgroup={};
+  return '';
+}
+
+sub end_conceptgroup {
+  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  $Apache::optionresponse::conceptgroup=0;  
+  if ($target eq 'web' || $target eq 'grade') {
+    my @names = @{ $Apache::response::conceptgroup{'names'} };
+    my $pick=int rand $#names+1;
+    my $name=$names[$pick];
+    push @{ $Apache::response::foilgroup{'names'} }, $name;
+    $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};
+    $Apache::response::foilgroup{"$name.value"} = $Apache::response::conceptgroup{"$name.value"};
+    my $args;
+    if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
+    my $concept = &Apache::run::run("{$args;".'return $concept}',$safeeval);
+    $Apache::response::foilgroup{"$name.concept"} = $concept;
+    &Apache::lonxml::debug("Selecting $name in $concept");
+  }
+  return '';
+}
+
 sub start_foil {
-  $Apache::lonxml::redirection--;
+  &Apache::lonxml::startredirection;
   return '';
 }
 
 sub end_foil {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my $foil=&Apache::lonxml::endredirection;
   if ($target eq 'web' || $target eq 'grade') {
     my $args ='';
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
@@ -147,12 +184,7 @@ sub end_foil {
     push @{ $Apache::response::foilgroup{'names'} }, $name;
     my $value = &Apache::run::run("{$args;".'return $value}',$safeeval);
     $Apache::response::foilgroup{"$name.value"} = $value;
-    $Apache::response::foilgroup{"$name.text"} = $Apache::lonxml::outputstack;
-  }
-  
-  $Apache::lonxml::redirection++;
-  if ($Apache::lonxml::redirection == 1) { 
-    $Apache::lonxml::outputstack=''; 
+    $Apache::response::foilgroup{"$name.text"} = $foil;
   }
   return '';
 }