--- loncom/homework/radiobuttonresponse.pm	2001/11/07 21:23:15	1.26
+++ loncom/homework/radiobuttonresponse.pm	2001/12/04 14:57:31	1.30
@@ -55,9 +55,12 @@ sub storesurvey {
   if ( defined $ENV{'form.submitted'}) {
     my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
     &Apache::lonxml::debug("Here I am!:$response:");
-    if ( $response =~ /[^\s]/) {
+    if ( $response =~ /[0-9]+/) {
       my $id = $Apache::inputtags::response['-1'];
-      $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
+      my @whichfoils=&whichfoils($max,$answer);
+      my %responsehash;
+      $responsehash{$whichfoil[$reponse]}=$response;
+      $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=&Apache::lonnet::hash2str(%responsehash);
       $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='SUBMITTED';
       &Apache::lonxml::debug("submitted a $response<br />\n");
     }
@@ -67,12 +70,12 @@ sub storesurvey {
 
 sub end_foilgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-  
+
   my $result;
-  if ($target eq 'grade' || $target eq 'web') {
-    my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval,'-2');
+  if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') {
+    my $style = $Apache::lonhomework::type;
     if ( $style eq 'survey' ) {
-      if ($target eq 'web') {
+      if ($target eq 'web' || $target eq 'answer') {
 	$result=&displayallfoils();
       } elsif ( $target eq 'grade' ) {
 	$result=&storesurvey();
@@ -87,12 +90,17 @@ sub end_foilgroup {
       &Apache::lonxml::debug("Answer is $answer, $count from $max, $falsecnt");
       if ($target eq 'web') {
 	$result=&displayfoils($max,$answer);
+      } elsif ($target eq 'answer' ) {
+	$result=&displayanswers($max,$answer);
       } elsif ( $target eq 'grade') {
 	if ( defined $ENV{'form.submitted'}) {
 	  my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
-	  if ( $response =~ /[^\s]/) {
+	  if ( $response =~ /[0-9]+/) {
 	    my $id = $Apache::inputtags::response['-1'];
-	    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
+	    my @whichfoils=&whichfoils($max,$answer);
+	    my %responsehash;
+	    $responsehash{$whichfoil[$reponse]}=$response;
+	    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=&Apache::lonnet::hash2str(%responsehash);
 	    &Apache::lonxml::debug("submitted a $response<br />\n");
 	    if ($response == $answer) {
 	      $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS';
@@ -144,15 +152,14 @@ sub displayallfoils {
   return $result;
 }
 
-sub displayfoils {
+sub whichfoils {
   my ($max,$answer)=@_;
-  my @names = @{ $Apache::response::foilgroup{'names'} };
+
   my @truelist;
   my @falselist;
-  my $result;
-  my $name;
 
-  foreach $name (@names) {
+  my @names = @{ $Apache::response::foilgroup{'names'} };
+  foreach my $name (@names) {
     #result.="<br /><b>$name</b> is <i> $Apache::response::foilgroup{$name.'.value'} </i>";
     if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
       push (@truelist,$name);
@@ -176,8 +183,16 @@ sub displayfoils {
   }
   splice(@whichfalse,$answer,0,$truelist[$whichtrue]);
   &Apache::lonxml::debug("the true statement is $answer");
+  return @whichfalse;
+}
+
+sub displayfoils {
+  my ($max,$answer)=@_;
+  my $result;
+
+  my @whichfoils=&whichfoils($max,$answer);
   if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
-    foreach $name (@whichfalse) {
+    foreach my $name (@whichfoils) {
       $result.="<br />";
       if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { 
 	$result.='Correct';
@@ -191,7 +206,7 @@ sub displayfoils {
     my $id=$Apache::inputtags::response['-1'];
     my $part=$Apache::inputtags::part;
     my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
-    foreach $name (@whichfalse) {
+    foreach my $name (@whichfoils) {
        $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
       if ($lastresponse eq $temp) { $result .= 'checked="on"'; }
       $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
@@ -201,7 +216,21 @@ sub displayfoils {
   return $result."<br />";
 }
 
+sub displayanswers {
+  my ($max,$answer)=@_;
+  my @names = @{ $Apache::response::foilgroup{'names'} };
+  my @whichopt = &whichfoils($max,$answer);
+  my $result=&Apache::response::answer_header('radiobuttonresponse');
+  foreach my $name (@whichopt) {
+    $result.=&Apache::response::answer_part('radiobuttonresponse',
+		     $Apache::response::foilgroup{$name.'.value'})
+  }
+  $result.=&Apache::response::answer_footer('radiobuttonresponse');
+  return $result;
+}
+
 sub start_conceptgroup {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::radiobuttonresponse::conceptgroup=1;
   %Apache::response::conceptgroup={};
   my $result;
@@ -221,16 +250,18 @@ sub end_conceptgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::radiobuttonresponse::conceptgroup=0;
   my $result;
-  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 $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
-    $Apache::response::foilgroup{"$name.concept"} = $concept;
-    &Apache::lonxml::debug("Selecting $name in $concept");
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) {
+    if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
+      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 $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
+      $Apache::response::foilgroup{"$name.concept"} = $concept;
+      &Apache::lonxml::debug("Selecting $name in $concept");
+    }
   } elsif ($target eq 'edit') {
     $result=&Apache::edit::end_table();
   }
@@ -245,18 +276,30 @@ sub insert_conceptgroup {
 sub start_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
-  if ($target eq 'web') { &Apache::lonxml::startredirection; }
-  return '';
+  if ($target eq 'web') {
+    &Apache::lonxml::startredirection;
+  } elsif ($target eq 'edit') {
+    $result=&Apache::edit::tag_start($target,$token);
+    $result.=&Apache::edit::text_arg('Name:','name',$token);
+    $result.=&Apache::edit::select_arg('Correct Option:','value',
+				       ['unused','true','false'],$token);
+  } elsif ($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;
 }
 
 sub end_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $text='';
   if ($target eq 'web') { $text=&Apache::lonxml::endredirection; }
-  if ($target eq 'web' || $target eq 'grade') {
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) {
     my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
     if ($value ne 'unused') {
       my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+      if (!$name) { $name=$Apache::lonxml::curdepth; }
       if ( $Apache::radiobuttonresponse::conceptgroup ) {
 	push @{ $Apache::response::conceptgroup{'names'} }, $name;
 	$Apache::response::conceptgroup{"$name.value"} = $value;
@@ -271,6 +314,13 @@ sub end_foil {
   return '';
 }
 
+sub insert_foil {
+  return '
+<foil name="" value="unused">
+<startouttext />
+<endouttext />
+</foil>';
+}
 1;
 __END__