--- loncom/homework/radiobuttonresponse.pm 2001/11/07 22:28:44 1.27
+++ loncom/homework/radiobuttonresponse.pm 2001/11/09 20:20:45 1.28
@@ -69,7 +69,7 @@ sub end_foilgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
- if ($target eq 'grade' || $target eq 'web') {
+ if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') {
my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval,'-2');
if ( $style eq 'survey' ) {
if ($target eq 'web') {
@@ -87,6 +87,8 @@ sub end_foilgroup {
&Apache::lonxml::debug("Answer is $answer, $count from $max, $falsecnt");
if ($target eq 'web') {
$result=&displayfoils($max,$answer);
+ } 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']};
@@ -144,15 +146,14 @@ sub displayallfoils {
return $result;
}
-sub displayfoils {
+sub whichfoils {
my ($max,$answer)=@_;
- my @names = @{ $Apache::response::foilgroup{'names'} };
+
my @truelist;
my @falselist;
- my $result;
- my $name;
- foreach $name (@names) {
+ my @names = @{ $Apache::response::foilgroup{'names'} };
+ foreach my $name (@names) {
#result.="
$name is $Apache::response::foilgroup{$name.'.value'} ";
if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
push (@truelist,$name);
@@ -176,8 +177,16 @@ sub displayfoils {
}
splice(@whichfalse,$answer,0,$truelist[$whichtrue]);
&Apache::lonxml::debug("the true statement is $answer");
+ return @whichfalse;
+}
+
+sub displayfoils {
+ my ($max,$answer)=@_;
+ my $result;
+
+ my @whichfoils=&whichfoils($max,$answer);
if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
- foreach $name (@whichfalse) {
+ foreach my $name (@whichfoils) {
$result.="
";
if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
$result.='Correct';
@@ -191,7 +200,7 @@ sub displayfoils {
my $id=$Apache::inputtags::response['-1'];
my $part=$Apache::inputtags::part;
my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
- foreach $name (@whichfalse) {
+ foreach my $name (@whichfoils) {
$result.="
\n";
@@ -201,6 +210,19 @@ sub displayfoils {
return $result."
";
}
+sub displayanswers {
+ my ($max,$answer)=@_;
+ my @names = @{ $Apache::response::foilgroup{'names'} };
+ my @whichopt = &whichfoils($max,$answer);
+ my $result=&Apache::response::answer_header('radiobuttonresponse');
+ foreach my $name (@whichopt) {
+ $result.=&Apache::response::answer_part('radiobuttonresponse',
+ $Apache::response::foilgroup{$name.'.value'})
+ }
+ $result.=&Apache::response::answer_footer('radiobuttonresponse');
+ return $result;
+}
+
sub start_conceptgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
$Apache::radiobuttonresponse::conceptgroup=1;
@@ -222,10 +244,10 @@ sub end_conceptgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
$Apache::radiobuttonresponse::conceptgroup=0;
my $result;
- if ($target eq 'web' || $target eq 'grade') {
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) {
if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
my @names = @{ $Apache::response::conceptgroup{'names'} };
- my $pick=int rand $#names+1;
+ my $pick=int(rand($#names+1));
my $name=$names[$pick];
push @{ $Apache::response::foilgroup{'names'} }, $name;
$Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"};
@@ -254,7 +276,7 @@ sub start_foil {
$result=&Apache::edit::tag_start($target,$token);
$result.=&Apache::edit::text_arg('Name:','name',$token);
$result.=&Apache::edit::select_arg('Correct Option:','value',
- ['true','false'],$token,'15');
+ ['unused','true','false'],$token);
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
'value','name');
@@ -267,7 +289,7 @@ sub end_foil {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $text='';
if ($target eq 'web') { $text=&Apache::lonxml::endredirection; }
- if ($target eq 'web' || $target eq 'grade') {
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) {
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
if ($value ne 'unused') {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);