--- loncom/homework/radiobuttonresponse.pm 2001/03/01 01:20:04 1.14
+++ loncom/homework/radiobuttonresponse.pm 2001/05/04 21:19:37 1.17
@@ -26,17 +26,21 @@ sub end_radiobuttonresponse {
sub start_foilgroup {
%Apache::response::foilgroup={};
$Apache::optionresponse::conceptgroup=0;
- &setrandomnumber();
+ &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
\n");
+ }
+ }
return '';
}
@@ -45,26 +49,37 @@ 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
\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 $rrargs ='';
+ if ( $#$parstack > 0 ) { $rrargs=$$parstack['-2']; }
+ my $style = &Apache::run::run("{$rrargs;".'return $style}',$safeeval);
+ 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
\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';
+ }
}
}
}
@@ -93,6 +108,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.="
\n";
+ $temp++;
+ }
+ }
+ return $result;
+}
+
sub displayfoils {
my ($max,$answer)=@_;
my @names = @{ $Apache::response::foilgroup{'names'} };
@@ -115,7 +149,7 @@ sub displayfoils {
my $whichtrue = rand $#truelist;
&Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
my @whichfalse =();
- while ((($#whichfalse+2) < $max) && ($#falselist > -1)) {
+ while ((($#whichfalse+1) < $max) && ($#falselist > -1)) {
my $afalse=rand $#falselist;
&Apache::lonxml::debug("From $#falselist elms, picking $afalse");
$afalse=splice(@falselist,$afalse,1);
@@ -136,8 +170,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.="
".$Apache::response::foilgroup{$name.'.text'}."\n";
+ $result.="
\n";
$temp++;
}
}