--- loncom/homework/radiobuttonresponse.pm 2002/10/17 14:40:23 1.56
+++ loncom/homework/radiobuttonresponse.pm 2003/04/02 15:09:00 1.64
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.56 2002/10/17 14:40:23 sakharuk Exp $
+# $Id: radiobuttonresponse.pm,v 1.64 2003/04/02 15:09:00 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,6 +42,7 @@ sub start_radiobuttonresponse {
&Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
push (@Apache::lonxml::namespace,'radiobuttonresponse');
my $id = &Apache::response::start_response($parstack,$safeeval);
+ %Apache::hint::radiobutton=();
if ($target eq 'meta') {
$result=&Apache::response::meta_package_write('radiobuttonresponse');
} elsif ($target eq 'edit' ) {
@@ -86,10 +87,7 @@ sub start_foilgroup {
&Apache::response::setrandomnumber();
if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
$result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';
- $Apache::lonxml::counter++;
- my %moreenv;
- $moreenv{'form.counter'}=$Apache::lonxml::counter;
- &Apache::lonnet::appenv(%moreenv);
+ &Apache::lonxml::increment_counter();
}
return $result;
}
@@ -280,12 +278,11 @@ sub whichfoils {
#pick a true statement
my $whichtrue = int(&Math::Random::random_uniform() * ($#truelist+1));
&Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
- my $numinserted;
my (@toplist, @bottomlist);
my $topcount=0;
# assign everyone to either toplist/bottomlist or whichfalse
# which false is randomized, toplist bottomlist are in order
- while ((($numinserted) < $max-1) && ($#falselist > -1)) {
+ while ((($#whichfalse) < $max-2) && ($#falselist > -1)) {
&Apache::lonxml::debug("Have $#whichfalse max is $max");
my $afalse=int(&Math::Random::random_uniform() * ($#falselist+1));
&Apache::lonxml::debug("From $#falselist elms, picking $afalse");
@@ -347,15 +344,19 @@ sub displayfoils {
my $result;
my ($answer,@whichfoils)=&whichfoils($max,$randomize);
- if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) {
+ my $part=$Apache::inputtags::part;
+ my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
+ my $status=$Apache::inputtags::status[-1];
+ if ( ($target ne 'tex') &&
+ (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) ) {
foreach my $name (@whichfoils) {
if ($target ne 'tex') {
$result.="
";
} else {
- $result.='\vskip 0 mm \item ';
+ $result.='\item \vskip -2 mm ';
}
if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
- if ($target ne 'tex') { $result.='Correct:'; } else { $result.='Correct: ';}
+ if ($target ne 'tex') { $result.='Correct:'; } else { $result.='Correct: \textbf{';}
} else {
$result.='Incorrect:';
}
@@ -365,11 +366,11 @@ sub displayfoils {
$result.=$Apache::response::foilgroup{$name.'.text'};
}
if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
- if ($target ne 'tex') { $result.='';}
+ if ($target ne 'tex') { $result.='';} else {$result.='}';}
}
}
} else {
- my @alphabet = ('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z');
+ my @alphabet = ('A'..'Z');
my $i = 0;
my $temp=0;
my $id=$Apache::inputtags::response['-1'];
@@ -378,18 +379,17 @@ sub displayfoils {
my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
foreach my $name (@whichfoils) {
if ($target ne 'tex') {
- $result.="
\n";
- if ($Apache::lonhomework::type eq 'exam') {
- $result .= '
A: Correct | B: Incorrect |