--- loncom/homework/radiobuttonresponse.pm 2002/04/03 16:54:37 1.38
+++ loncom/homework/radiobuttonresponse.pm 2002/08/05 18:24:05 1.46
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.38 2002/04/03 16:54:37 sakharuk Exp $
+# $Id: radiobuttonresponse.pm,v 1.46 2002/08/05 18:24:05 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,6 +29,7 @@
package Apache::radiobuttonresponse;
use strict;
+use HTML::Entities();
BEGIN {
&Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));
@@ -73,9 +74,9 @@ sub end_radiobuttonresponse {
return $result;
}
-%Apache::response::foilgroup={};
+%Apache::response::foilgroup=();
sub start_foilgroup {
- %Apache::response::foilgroup={};
+ %Apache::response::foilgroup=();
$Apache::radiobuttonresponse::conceptgroup=0;
&Apache::response::setrandomnumber();
return '';
@@ -183,13 +184,27 @@ sub displayallfoils {
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.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
- if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
- $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
- $temp++;
+ if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/) || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) {
+ foreach my $name (@names) {
+ if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
+ $result.="<br />".$Apache::response::foilgroup{$name.'.value'};
+ if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+ $result.='<b>';
+ }
+ $result .= $Apache::response::foilgroup{$name.'.text'};
+ if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+ $result.='</b>';
+ }
+ }
+ }
+ } else {
+ foreach my $name (@names) {
+ if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
+ $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
+ if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
+ $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
+ $temp++;
+ }
}
}
return $result;
@@ -200,35 +215,39 @@ sub whichfoils {
my @truelist;
my @falselist;
+ my @whichfalse =();
my @names;
if ( $Apache::response::foilgroup{'names'} ) {
@names= @{ $Apache::response::foilgroup{'names'} };
}
- foreach my $name (@names) {
- #result.="<br /><b>$name</b> is <i> $Apache::response::foilgroup{$name.'.value'} </i>";
- if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
- push (@truelist,$name);
- } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
- push (@falselist,$name);
- } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
- } else {
- &Apache::lonxml::error("Unknown state $Apache::response::foilgroup{$name.'.value'} for $name in <foilgroup>");
+ if (&Apache::response::showallfoils()) {
+ @whichfalse=@names;
+ } else {
+ foreach my $name (@names) {
+ #result.="<br /><b>$name</b> is <i> $Apache::response::foilgroup{$name.'.value'} </i>";
+ if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+ push (@truelist,$name);
+ } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
+ push (@falselist,$name);
+ } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
+ } else {
+ &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>"));
+ }
}
+ my $whichtrue = int(rand($#truelist+1));
+ &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
+ while ((($#whichfalse+1) < $max-1) && ($#falselist > -1)) {
+ &Apache::lonxml::debug("Have $#whichfalse max is $max");
+ my $afalse=int(rand($#falselist+1));
+ &Apache::lonxml::debug("From $#falselist elms, picking $afalse");
+ $afalse=splice(@falselist,$afalse,1);
+ &Apache::lonxml::debug("Picked $afalse");
+ push (@whichfalse,$afalse);
+ }
+ splice(@whichfalse,$answer,0,$truelist[$whichtrue]);
+ &Apache::lonxml::debug("the true statement is $answer");
}
- my $whichtrue = int(rand($#truelist+1));
- &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
- my @whichfalse =();
- while ((($#whichfalse+1) < $max) && ($#falselist > -1)) {
- &Apache::lonxml::debug("Have $#whichfalse max is $max");
- my $afalse=int(rand($#falselist+1));
- &Apache::lonxml::debug("From $#falselist elms, picking $afalse");
- $afalse=splice(@falselist,$afalse,1);
- &Apache::lonxml::debug("Picked $afalse");
- push (@whichfalse,$afalse);
- }
- splice(@whichfalse,$answer,0,$truelist[$whichtrue]);
- &Apache::lonxml::debug("the true statement is $answer");
return @whichfalse;
}
@@ -237,17 +256,26 @@ sub displayfoils {
my $result;
my @whichfoils=&whichfoils($max,$answer);
- if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
+ if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) {
foreach my $name (@whichfoils) {
if ($target ne 'tex') {
$result.="<br />";
+ } else {
+ $result.='\vskip 0 mm \item ';
}
if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
- $result.='Correct';
+ if ($target ne 'tex') { $result.='Correct:<b>'; } else { $result.='Correct: ';}
+ } else {
+ $result.='Incorrect:';
+ }
+ if ($target ne 'tex') {
+ $result.=$Apache::response::foilgroup{$name.'.text'}."</input>\n";
} else {
- $result.='Incorrect';
+ $result.=$Apache::response::foilgroup{$name.'.text'};
+ }
+ if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+ if ($target ne 'tex') { $result.='</b>';}
}
- $result.=":".$Apache::response::foilgroup{$name.'.text'}."</input>\n";
}
} else {
my $temp=0;
@@ -261,16 +289,13 @@ sub displayfoils {
if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
$result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
} else {
- $result .= $Apache::response::foilgroup{$name.'.text'};
+ $result .= '\item '.$Apache::response::foilgroup{$name.'.text'};
}
$temp++;
}
}
- if ($target ne 'tex') {
- return $result."<br />";
- } else {
- return $result;
- }
+ if ($target ne 'tex') { $result.="<br />"; } else { $result.='\vskip 0 mm '; }
+ return $result;
}
sub displayanswers {
@@ -288,7 +313,7 @@ sub displayanswers {
sub start_conceptgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
$Apache::radiobuttonresponse::conceptgroup=1;
- %Apache::response::conceptgroup={};
+ %Apache::response::conceptgroup=();
my $result;
if ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
@@ -334,13 +359,10 @@ sub start_foil {
my $result='';
if ($target eq 'web' || $target eq 'tex') {
&Apache::lonxml::startredirection;
- if ($target eq 'tex') {
- $result .= '\item ';
- }
} elsif ($target eq 'edit') {
$result=&Apache::edit::tag_start($target,$token);
$result.=&Apache::edit::text_arg('Name:','name',$token);
- $result.=&Apache::edit::select_arg('Correct Option:','value',
+ $result.=&Apache::edit::select_or_text_arg('Correct Option:','value',
['unused','true','false'],$token);
$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
@@ -360,7 +382,8 @@ sub end_foil {
if ($value ne 'unused') {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
if (!$name) { $name=$Apache::lonxml::curdepth; }
- if ( $Apache::radiobuttonresponse::conceptgroup ) {
+ if ( $Apache::radiobuttonresponse::conceptgroup
+ && !&Apache::response::showallfoils() ) {
push @{ $Apache::response::conceptgroup{'names'} }, $name;
$Apache::response::conceptgroup{"$name.value"} = $value;
$Apache::response::conceptgroup{"$name.text"} = $text;