--- loncom/homework/radiobuttonresponse.pm 2001/12/04 15:17:56 1.31
+++ loncom/homework/radiobuttonresponse.pm 2001/12/13 23:36:39 1.32
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.31 2001/12/04 15:17:56 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.32 2001/12/13 23:36:39 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -82,9 +82,9 @@ sub storesurvey {
&Apache::lonxml::debug("Here I am!:$response:");
if ( $response =~ /[0-9]+/) {
my $id = $Apache::inputtags::response['-1'];
- my @whichfoils=&whichfoils($max,$answer);
+ my @whichfoils=@{ $Apache::response::foilgroup{'names'} };
my %responsehash;
- $responsehash{$whichfoil[$reponse]}=$response;
+ $responsehash{$whichfoils[$response]}=$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
\n");
@@ -93,6 +93,32 @@ sub storesurvey {
return '';
}
+sub grade_response {
+ my ($max,$answer)=@_;
+ if (!defined($ENV{'form.submitted'})) { return; }
+ my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
+ if ( $response !~ /[0-9]+/) { return; }
+ my $part=$Apache::inputtags::part;
+ my $id = $Apache::inputtags::response['-1'];
+ my @whichfoils=&whichfoils($max,$answer);
+ my %responsehash;
+ $responsehash{$whichfoils[$response]}=$response;
+ my $responsestr=&Apache::lonnet::hash2str(%responsehash);
+ my %previous=&Apache::response::check_for_previous($responsestr,
+ $part,$id);
+ $Apache::lonhomework::results{"resource.$part.$id.submission"}=
+ $responsestr;
+ &Apache::lonxml::debug("submitted a $response
\n");
+ my $ad;
+ if ($response == $answer) {
+ $ad='EXACT_ANS';
+ } else {
+ $ad='INCORRECT';
+ }
+ $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
+ &Apache::response::handle_previous(\%previous,$ad);
+}
+
sub end_foilgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
@@ -118,22 +144,7 @@ sub end_foilgroup {
} 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 =~ /[0-9]+/) {
- my $id = $Apache::inputtags::response['-1'];
- 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
\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';
- }
- }
- }
+ &grade_response($max,$answer);
}
}
}
@@ -166,10 +177,12 @@ sub displayallfoils {
my $id=$Apache::inputtags::response['-1'];
my $part=$Apache::inputtags::part;
my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
+ my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
+ &Apache::lonhomework::showhash(%lastresponse);
foreach my $name (@names) {
if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
$result.="
\n";
$temp++;
}
@@ -231,9 +244,10 @@ sub displayfoils {
my $id=$Apache::inputtags::response['-1'];
my $part=$Apache::inputtags::part;
my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
+ my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
foreach my $name (@whichfoils) {
$result.="
\n";
$temp++;
}