--- loncom/homework/matchresponse.pm 2009/04/16 15:04:58 1.76 +++ loncom/homework/matchresponse.pm 2009/12/09 11:30:45 1.78 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Full matching style response # -# $Id: matchresponse.pm,v 1.76 2009/04/16 15:04:58 onken Exp $ +# $Id: matchresponse.pm,v 1.78 2009/12/09 11:30:45 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -180,7 +180,7 @@ sub end_itemgroup { $i++; } $table.=' \end{description} \strut '; - if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';} + if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';} $Apache::matchresponse::itemtable{'display'}=$table; $Apache::lonxml::post_evaluate=0; } @@ -518,6 +518,7 @@ sub displayfoils { my $fieldname = $env{'request.symb'} . '&part_'. $Apache::inputtags::part .'&matchresponse'. '&HWVAL_' . $Apache::inputtags::response['-1'] . ':' . $temp . '&submit_' . $Apache::inputtags::part . '&'; $optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname); } else { + $optionlist='\framebox[10 mm][s]{\tiny\strut}'; } } @@ -587,10 +588,10 @@ sub displayfoils { $question.='\vskip -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}' .'\item \hskip -3mm \textbf{'.$internal_counter.'}'; if (&itemdisplay('left') || &itemdisplay('right')) { - $question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize); + $question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize); } else { - $question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems); + $question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems); } $question .= '\end{list} \vskip -8 mm \strut '; $internal_counter++; @@ -758,11 +759,13 @@ sub end_foil { $safeeval); if ( $Apache::matchresponse::conceptgroup && !&Apache::response::showallfoils() ) { + push @{ $Apache::response::conceptgroup{'names'} }, $name; $Apache::response::conceptgroup{"$name.value"} = $value; $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;