--- loncom/homework/radiobuttonresponse.pm 2001/01/15 21:44:21 1.8
+++ loncom/homework/radiobuttonresponse.pm 2001/02/22 00:49:03 1.13
@@ -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;
@@ -39,7 +38,6 @@ sub setrandomnumber {
return '';
}
-#FIXME needs to stablely do random picks
sub end_foilgroup {
my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
@@ -61,7 +59,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
\n");
+ &Apache::lonxml::debug("submitted a $response
\n");
if ($response == $answer) {
$Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS';
} else {
@@ -103,7 +101,7 @@ sub displayfoils {
my $name;
foreach $name (@names) {
- #result.="
$name is $Apache::response::foilgroup{$name.'.value'} ";
+ #result.="
$name is $Apache::response::foilgroup{$name.'.value'} ";
if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
push (@truelist,$name);
} elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
@@ -124,22 +122,35 @@ 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."
";
}
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 +158,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 '';
}