--- loncom/homework/radiobuttonresponse.pm	2001/03/01 01:20:04	1.14
+++ loncom/homework/radiobuttonresponse.pm	2001/06/01 16:00:42	1.19
@@ -12,7 +12,7 @@ sub BEGIN {
 sub start_radiobuttonresponse {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   #when in a radiobutton response use these
-  &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil'));
+  &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
   my $id = &Apache::response::start_response($parstack,$safeeval);
   return '';
 }
@@ -25,18 +25,22 @@ sub end_radiobuttonresponse {
 %Apache::response::foilgroup={};
 sub start_foilgroup {
   %Apache::response::foilgroup={};
-  $Apache::optionresponse::conceptgroup=0;
-  &setrandomnumber();
+  $Apache::radiobuttonresponse::conceptgroup=0;
+  &Apache::response::setrandomnumber();
   return '';
 }
 
-sub setrandomnumber {
-  my $rndseed=&Apache::lonnet::rndseed();
-  $rndseed=unpack("%32i",$rndseed);
-  $rndseed=$rndseed
-    +&Apache::lonnet::numval($Apache::inputtags::part)
-      +&Apache::lonnet::numval($Apache::inputtags::response['-1']);
-  srand($rndseed);
+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]/) {
+      my $id = $Apache::inputtags::response['-1'];
+      $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
+      $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='SUBMITTED';
+      &Apache::lonxml::debug("submitted a $response<br />\n");
+    }
+  }
   return '';
 }
 
@@ -45,26 +49,35 @@ sub end_foilgroup {
   
   my $result;
   if ($target ne 'meta') {
-    my $name;
-    my ($truecnt,$falsecnt,$max) = &getfoilcounts($parstack,$safeeval);
-    my $count=0;
-    # we will add in 1 of the true statements
-    if (($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; }
-    my $answer = int(rand ($count));
-    &Apache::lonxml::debug("Answer is $answer, $count from $max, $falsecnt");
-    if ($target eq 'web') {
-      $result=&displayfoils($max,$answer);
-    } elsif ( $target eq 'grade') {
-      if ( defined $ENV{'form.submitted'}) {
-	my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
-	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");
-	  if ($response == $answer) {
-	    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS';
-	  } else {
-	    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='INCORRECT';
+    my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval,'-2');
+    if ( $style eq 'survey' ) {
+      if ($target eq 'web') {
+	$result=&displayallfoils();
+      } elsif ( $target eq 'grade' ) {
+	$result=&storesurvey();
+      }
+    } else {
+      my $name;
+      my ($truecnt,$falsecnt,$max) = &getfoilcounts($parstack,$safeeval);
+      my $count=0;
+      # we will add in 1 of the true statements
+      if (($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; }
+      my $answer = int(rand ($count));
+      &Apache::lonxml::debug("Answer is $answer, $count from $max, $falsecnt");
+      if ($target eq 'web') {
+	$result=&displayfoils($max,$answer);
+      } elsif ( $target eq 'grade') {
+	if ( defined $ENV{'form.submitted'}) {
+	  my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
+	  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");
+	    if ($response == $answer) {
+	      $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS';
+	    } else {
+	      $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='INCORRECT';
+	    }
 	  }
 	}
       }
@@ -75,9 +88,7 @@ sub end_foilgroup {
 
 sub getfoilcounts {
   my ($parstack,$safeeval)=@_;
-  my $rrargs ='';
-  if ( $#$parstack > 0 ) { $rrargs=$$parstack['-2']; }
-  my $max = &Apache::run::run("{$rrargs;".'return $max}',$safeeval);
+  my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
   my @names = @{ $Apache::response::foilgroup{'names'} };
   my $truecnt=0;
   my $falsecnt=0;
@@ -93,6 +104,25 @@ sub getfoilcounts {
   return ($truecnt,$falsecnt,$max);
 }
 
+sub displayallfoils {
+  my $result;
+  &Apache::lonxml::debug("survey style display");
+  my @names = @{ $Apache::response::foilgroup{'names'} };
+  my $temp=0;
+  my $id=$Apache::inputtags::response['-1'];
+  my $part=$Apache::inputtags::part;
+  my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
+  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 ($lastresponse eq $temp) { $result .= 'checked="on"'; }
+      $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
+      $temp++;
+    }
+  }
+  return $result;
+}
+
 sub displayfoils {
   my ($max,$answer)=@_;
   my @names = @{ $Apache::response::foilgroup{'names'} };
@@ -112,11 +142,12 @@ sub displayfoils {
       &Apache::lonxml::error("Unknown state $Apache::response::foilgroup{$name.'.value'} for $name in <foilgroup>");
     }
   }
-  my $whichtrue = rand $#truelist;
+  my $whichtrue = int(rand($#truelist+1));
   &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
   my @whichfalse =();
-  while ((($#whichfalse+2) < $max) && ($#falselist > -1)) {
-    my $afalse=rand $#falselist;
+  while ((($#whichfalse+1) < $max) && ($#falselist > -1)) {
+    &Apache::lonxml::debug("Have $#whichfalse max is $max");
+    my $afalse=int(rand($#falselist+1));
     &Apache::lonxml::debug("From $#falselist elms, picking $afalse");
     $afalse=splice(@falselist,$afalse,1);
     &Apache::lonxml::debug("Picked $afalse");
@@ -136,8 +167,13 @@ sub displayfoils {
     }
   } else {
     my $temp=0;
+    my $id=$Apache::inputtags::response['-1'];
+    my $part=$Apache::inputtags::part;
+    my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
     foreach $name (@whichfalse) {
-      $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\">".$Apache::response::foilgroup{$name.'.text'}."</input>\n";
+       $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";
       $temp++;
     }
   }
@@ -145,14 +181,14 @@ sub displayfoils {
 }
 
 sub start_conceptgroup {
-  $Apache::optionresponse::conceptgroup=1;  
+  $Apache::radiobuttonresponse::conceptgroup=1;
   %Apache::response::conceptgroup={};
   return '';
 }
 
 sub end_conceptgroup {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  $Apache::optionresponse::conceptgroup=0;  
+  $Apache::radiobuttonresponse::conceptgroup=0;
   if ($target eq 'web' || $target eq 'grade') {
     my @names = @{ $Apache::response::conceptgroup{'names'} };
     my $pick=int rand $#names+1;
@@ -160,9 +196,7 @@ sub end_conceptgroup {
     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);
+    my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
     $Apache::response::foilgroup{"$name.concept"} = $concept;
     &Apache::lonxml::debug("Selecting $name in $concept");
   }
@@ -176,15 +210,22 @@ sub start_foil {
 
 sub end_foil {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  my $foil=&Apache::lonxml::endredirection;
+  my $text='';
+  if ($target eq 'web') { $text=&Apache::lonxml::endredirection; }
   if ($target eq 'web' || $target eq 'grade') {
-    my $args ='';
-    if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-    my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
-    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"} = $foil;
+    my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
+    if ($value ne 'unused') {
+      my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+      if ( $Apache::radiobuttonresponse::conceptgroup ) {
+	push @{ $Apache::response::conceptgroup{'names'} }, $name;
+	$Apache::response::conceptgroup{"$name.value"} = $value;
+	$Apache::response::conceptgroup{"$name.text"} = $text;	
+      } else {
+	push @{ $Apache::response::foilgroup{'names'} }, $name;
+	$Apache::response::foilgroup{"$name.value"} = $value;
+	$Apache::response::foilgroup{"$name.text"} = $text;
+      }
+    }
   }
   return '';
 }