--- loncom/homework/radiobuttonresponse.pm 2001/11/09 20:20:45 1.28
+++ loncom/homework/radiobuttonresponse.pm 2001/12/04 14:57:31 1.30
@@ -55,9 +55,12 @@ 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]/) {
+ if ( $response =~ /[0-9]+/) {
my $id = $Apache::inputtags::response['-1'];
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
+ 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::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='SUBMITTED';
&Apache::lonxml::debug("submitted a $response
\n");
}
@@ -67,12 +70,12 @@ sub storesurvey {
sub end_foilgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-
+
my $result;
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') {
- my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval,'-2');
+ my $style = $Apache::lonhomework::type;
if ( $style eq 'survey' ) {
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'answer') {
$result=&displayallfoils();
} elsif ( $target eq 'grade' ) {
$result=&storesurvey();
@@ -92,9 +95,12 @@ sub end_foilgroup {
} elsif ( $target eq 'grade') {
if ( defined $ENV{'form.submitted'}) {
my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
- if ( $response =~ /[^\s]/) {
+ if ( $response =~ /[0-9]+/) {
my $id = $Apache::inputtags::response['-1'];
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
+ 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';