--- loncom/homework/radiobuttonresponse.pm 2001/01/12 15:32:29 1.6
+++ loncom/homework/radiobuttonresponse.pm 2001/02/05 18:19:28 1.11
@@ -1,8 +1,6 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
-# 11/23,11/24,11/28 Gerd Kortemeyer
-
package Apache::radiobuttonresponse;
use strict;
@@ -39,31 +37,33 @@ sub setrandomnumber {
return '';
}
-#FIXME needs to stablely do random picks
sub end_foilgroup {
my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
- my $name;
+
my $result;
- &setrandomnumber();
- 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.submit'}) {
- 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';
+ 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
+ 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';
+ }
}
}
}
@@ -121,11 +121,23 @@ 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.="
".$Apache::response::foilgroup{$name.'.text'}."\n";
- $temp++;
+ if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
+ foreach $name (@whichfalse) {
+ $result.="
";
+ if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+ $result.='Correct';
+ } else {
+ $result.='Incorrect';
+ }
+ $result.=":".$Apache::response::foilgroup{$name.'.text'}."\n";
+ }
+ } else {
+ my $temp=0;
+ foreach $name (@whichfalse) {
+ $result.="
".$Apache::response::foilgroup{$name.'.text'}."\n";
+ $temp++;
+ }
}
return $result."
";
}