--- loncom/homework/radiobuttonresponse.pm 2002/10/25 19:02:38 1.58 +++ loncom/homework/radiobuttonresponse.pm 2002/12/02 17:06:08 1.62 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # mutliple choice style responses # -# $Id: radiobuttonresponse.pm,v 1.58 2002/10/25 19:02:38 albertel Exp $ +# $Id: radiobuttonresponse.pm,v 1.62 2002/12/02 17:06:08 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -345,15 +345,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:'; } @@ -363,7 +367,7 @@ 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 { @@ -387,7 +391,7 @@ sub displayfoils { $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs $i++; } else { - $result .= '\item '.$Apache::response::foilgroup{$name.'.text'}; + $result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'}; } } $temp++;