--- loncom/homework/optionresponse.pm 2001/12/04 15:17:56 1.27
+++ loncom/homework/optionresponse.pm 2001/12/14 23:00:52 1.29
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.27 2001/12/04 15:17:56 albertel Exp $
+# $Id: optionresponse.pm,v 1.29 2001/12/14 23:00:52 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,7 +37,7 @@ sub BEGIN {
sub start_optionresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- #when in a radiobutton response use these
+ #when in a option response use these
&Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
push (@Apache::lonxml::namespace,'optionresponse');
my $id = &Apache::response::start_response($parstack,$safeeval);
@@ -65,6 +65,7 @@ sub end_optionresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
&Apache::response::end_response;
pop @Apache::lonxml::namespace;
+ &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
my $result;
if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
return $result;
@@ -171,14 +172,25 @@ sub end_foilgroup {
}
$temp++;
}
+ my $part=$Apache::inputtags::part;
my $id = $Apache::inputtags::response['-1'];
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=&Apache::lonnet::hash2str(%responsehash);
+ my $responsestr=&Apache::lonnet::hash2str(%responsehash);
+ my %previous=&Apache::response::check_for_previous($responsestr,
+ $part,$id);
&Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored");
+ my $ad;
if ($wrong==0 && $ignored==0) {
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS';
+ $ad='EXACT_ANS';
+ } elsif ($wrong==0 && $right==0) {
+ #nothing submitted
} else {
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='INCORRECT';
+ $ad='INCORRECT';
}
+ $Apache::lonhomework::results{"resource.$part.$id.submission"}=
+ $responsestr;
+ $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
+ $ad;
+ &Apache::response::handle_previous(\%previous,$ad);
}
}
} elsif ($target eq 'edit') {
@@ -231,19 +243,27 @@ sub displayfoils {
my $result;
my $name;
my @whichopt = &whichfoils($max);
- my $optionlist="\n";
- my $option;
- foreach $option (@opt) {
- $optionlist.="\n";
- }
- if (($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/) || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) {
+ my $part=$Apache::inputtags::part;
+ my $id=$Apache::inputtags::response[-1];
+ if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/) || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) {
foreach $name (@whichopt) {
$result.="
".$Apache::response::foilgroup{$name.'.value'}.
":".$Apache::response::foilgroup{$name.'.text'}."\n";
}
} else {
my $temp=1;
+ my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
foreach $name (@whichopt) {
+ my $lastopt=$lastresponse{$name};
+ my $optionlist="\n";
+ my $option;
+ foreach $option (@opt) {
+ if ($option eq $lastopt) {
+ $optionlist.="\n";
+ } else {
+ $optionlist.="\n";
+ }
+ }
$result.="
\n".$Apache::response::foilgroup{$name.'.text'}."\n";