version 1.52, 2005/04/07 06:56:22
|
version 1.61, 2007/03/27 19:20:49
|
Line 149 sub end_itemgroup {
|
Line 149 sub end_itemgroup {
|
$Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map; |
$Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map; |
my $direction=&Apache::lonxml::get_param('direction',$parstack,$safeeval); |
my $direction=&Apache::lonxml::get_param('direction',$parstack,$safeeval); |
if ($target eq 'web') { |
if ($target eq 'web') { |
my $table='<table>'; |
|
|
my $table='<br /><table>'; # extra space to match what latex does. |
my $i=0; |
my $i=0; |
if ($direction eq 'horizontal') { $table .='<tr>';} |
if ($direction eq 'horizontal') { $table .='<tr>';} |
foreach my $name (@names) { |
foreach my $name (@names) { |
Line 162 sub end_itemgroup {
|
Line 163 sub end_itemgroup {
|
if ($direction eq 'horizontal') { $table .='</tr>';} |
if ($direction eq 'horizontal') { $table .='</tr>';} |
$table.='</table>'; |
$table.='</table>'; |
$Apache::matchresponse::itemtable{'display'}=$table; |
$Apache::matchresponse::itemtable{'display'}=$table; |
|
$Apache::lonxml::post_evaluate=0; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $table=' \begin{description}\setlength{\leftmargin}{2em}\setlength{\labelwidth}{1em}\setlength{\itemsep}{0.5pt plus1pt minus2pt}\setlength{\listparindent}{0em} '; |
my $table=' \begin{description}\setlength{\leftmargin}{2em}\setlength{\labelwidth}{1em}\setlength{\itemsep}{0.5pt plus1pt minus2pt}\setlength{\listparindent}{0em} '; |
my $i=0; |
my $i=0; |
foreach my $name (@names) { |
foreach my $name (@names) { |
$Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g; |
# $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g; |
$table.='\item['.$alphabet[$i].'] '. |
$table.='\item['.$alphabet[$i].'] '. |
$Apache::response::itemgroup{$name.'.text'}; |
$Apache::response::itemgroup{$name.'.text'}; |
$i++; |
$i++; |
Line 174 sub end_itemgroup {
|
Line 176 sub end_itemgroup {
|
$table.=' \end{description} \strut '; |
$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::matchresponse::itemtable{'display'}=$table; |
|
$Apache::lonxml::post_evaluate=0; |
} |
} |
return $result; |
return $result; |
} |
} |
Line 216 sub end_item {
|
Line 219 sub end_item {
|
my $location=&Apache::lonxml::get_param('location',$parstack, |
my $location=&Apache::lonxml::get_param('location',$parstack, |
$safeeval); |
$safeeval); |
&Apache::lonxml::debug("Got a name of :$name:"); |
&Apache::lonxml::debug("Got a name of :$name:"); |
if (!$name) { $name=$Apache::lonxml::curdepth; } |
if ($name eq "") { $name=$Apache::lonxml::curdepth; } |
&Apache::lonxml::debug("Using a name of :$name:"); |
&Apache::lonxml::debug("Using a name of :$name:"); |
push @{ $Apache::response::itemgroup{'names'} }, $name; |
push @{ $Apache::response::itemgroup{'names'} }, $name; |
$Apache::response::itemgroup{"$name.text"} = $text; |
$Apache::response::itemgroup{"$name.text"} = $text; |
Line 262 sub end_foilgroup {
|
Line 265 sub end_foilgroup {
|
$safeeval,'-2'); |
$safeeval,'-2'); |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex') { |
$result=&displayfoils($target,$max,$randomize); |
$result=&displayfoils($target,$max,$randomize); |
|
$Apache::lonxml::post_evaluate=0; |
} elsif ($target eq 'answer' ) { |
} elsif ($target eq 'answer' ) { |
$result=&displayanswers($max,$randomize); |
$result=&displayanswers($max,$randomize); |
} elsif ( $target eq 'grade') { |
} elsif ( $target eq 'grade') { |
Line 296 sub displayanswers {
|
Line 300 sub displayanswers {
|
$randomize, |
$randomize, |
&Apache::response::showallfoils(), |
&Apache::response::showallfoils(), |
\%Apache::response::foilgroup); |
\%Apache::response::foilgroup); |
my $result=&Apache::response::answer_header('matchresponse'); |
|
my %name_letter_map; |
my %name_letter_map; |
if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) { |
if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) { |
%name_letter_map= |
%name_letter_map= |
%{ $Apache::response::itemgroup{'name_letter_map'} }; |
%{ $Apache::response::itemgroup{'name_letter_map'} }; |
} |
} |
foreach my $name (@whichfoils) { |
my $result; |
my $value_name=$Apache::response::foilgroup{$name.'.value'}; |
if ($Apache::lonhomework::type eq 'exam') { |
my $letter=$name_letter_map{$value_name}; |
my $i=0; |
$result.=&Apache::response::answer_part('matchresponse',$letter); |
foreach my $name (@whichfoils) { |
|
$result.=&Apache::response::answer_header('matchresponse',$i++); |
|
my $value_name=$Apache::response::foilgroup{$name.'.value'}; |
|
my $letter=$name_letter_map{$value_name}; |
|
$result.=&Apache::response::answer_part('matchresponse',$letter); |
|
$result.=&Apache::response::answer_footer('matchresponse'); |
|
} |
|
} else { |
|
$result=&Apache::response::answer_header('matchresponse'); |
|
foreach my $name (@whichfoils) { |
|
my $value_name=$Apache::response::foilgroup{$name.'.value'}; |
|
my $letter=$name_letter_map{$value_name}; |
|
$result.=&Apache::response::answer_part('matchresponse',$letter); |
|
} |
|
$result.=&Apache::response::answer_footer('matchresponse'); |
} |
} |
$result.=&Apache::response::answer_footer('matchresponse'); |
|
return $result; |
return $result; |
} |
} |
|
|
Line 438 sub displayfoils {
|
Line 454 sub displayfoils {
|
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$question.=' \\\\ '.$letter.':'.$text; |
$question.=' \\\\ '.$letter.':'.$text; |
} else { |
} else { |
$question.='<br />'.$letter.':'.$text; |
$question.='<br /><b>'.$letter.':</b> '.$text; |
} |
} |
} |
} |
} else { |
} else { |
Line 471 sub displayfoils {
|
Line 487 sub displayfoils {
|
} |
} |
} |
} |
if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { |
if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { |
$optionlist='<select name="HWVAL_'. |
$optionlist='<select onchange="javascript:setSubmittedPart(\''. |
|
$part.'\');" name="HWVAL_'. |
$Apache::inputtags::response[-1].':'.$temp.'">'. |
$Apache::inputtags::response[-1].':'.$temp.'">'. |
$optionlist."</select>\n"; |
$optionlist."</select>\n"; |
} |
} |
Line 656 sub end_foil {
|
Line 673 sub end_foil {
|
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
&Apache::lonxml::debug("Got a name of :$name:"); |
&Apache::lonxml::debug("Got a name of :$name:"); |
if (!$name) { |
if (!$name) { |
&Apache::lonxml::error("Foils without names exist. This can cause problems to malfunction."); |
&Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction."); |
$name=$Apache::lonxml::curdepth; |
$name=$Apache::lonxml::curdepth; |
} |
} |
&Apache::lonxml::debug("Using a name of :$name:"); |
&Apache::lonxml::debug("Using a name of :$name:"); |