version 1.57, 2006/03/31 11:10:24
|
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 $table="\\\\ \\makebox[\\textwidth][l]{ \\begin{tabular}{ll}\n"; |
|
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'}; |
my $response = $Apache::response::itemgroup{"$name.text"}; |
|
$table .= "$alphabet[$i] & $response \\\\ \n"; |
|
$i++; |
$i++; |
} |
} |
# $table.=' \end{description} \ \strut '; |
$table.=' \end{description} \strut '; |
$table .= "\\end{tabular}} \\strut \n\n \\vskip \\parskip "; |
|
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 266 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 487 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"; |
} |
} |