--- loncom/homework/rankresponse.pm 2003/03/25 22:15:04 1.8 +++ loncom/homework/rankresponse.pm 2003/04/02 20:23:52 1.12 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # rank style response # -# $Id: rankresponse.pm,v 1.8 2003/03/25 22:15:04 sakharuk Exp $ +# $Id: rankresponse.pm,v 1.12 2003/04/02 20:23:52 sakharuk Exp $ # Copyright Michigan State University Board of Trustees # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). @@ -264,7 +264,7 @@ sub displayfoils { if ($target ne 'tex') {$optionlist.="\n";} } } - if ($target ne 'tex') { + if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { $optionlist='\n"; @@ -273,14 +273,18 @@ sub displayfoils { } my $text=$Apache::response::foilgroup{$name.'.text'}; if ($target ne 'tex') { - $result.='
'.$optionlist.$text."\n"; + if ($Apache::lonhomework::type ne 'exam') { + $result.='
'.$optionlist.$text."\n"; + } else { + $result.='
'.$text."\n"; + } if ($Apache::lonhomework::type eq 'exam') { - $result.=&Apache::optionresponse::webbubbles(\@alp,\@whichopt); + $result.=&Apache::optionresponse::webbubbles(\@alp,\@whichopt,$temp); } } else { if ($Apache::lonhomework::type eq 'exam') { - $result.='\vskip 0 mm '.$text."\n"; - $result.='\vskip -1 mm\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@alp,\@whichopt).'}\end{enumerate} \vskip -5 mm \strut '; + $result.='\vskip 0 mm '.$text.' \vskip -3 mm '."\n"; + $result.='\vskip -5 mm\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@alp,\@whichopt).'}\end{enumerate} \vskip -5 mm \strut '; } else { $result.=' \\\\ \framebox[5 mm][s]{\tiny\strut} '.$text."\n"; } @@ -457,12 +461,24 @@ sub end_foil { && !&Apache::response::showallfoils() ) { push @{ $Apache::response::conceptgroup{'names'} }, $name; $Apache::response::conceptgroup{"$name.value"} = $value; - $Apache::response::conceptgroup{"$name.text"} = $text; + if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { + $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text; + } else { + $Apache::response::conceptgroup{"$name.text"} = $text; + } $Apache::response::conceptgroup{"$name.location"} = $location; } else { push @{ $Apache::response::foilgroup{'names'} }, $name; $Apache::response::foilgroup{"$name.value"} = $value; - $Apache::response::foilgroup{"$name.text"} = $text; + if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { + $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text; + } else { + if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { + $Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text; + } else { + $Apache::response::foilgroup{"$name.text"} = $text; + } + } $Apache::response::foilgroup{"$name.location"} = $location; } }