version 1.12, 2003/03/20 19:38:41
|
version 1.17, 2003/05/06 22:08:28
|
Line 113 sub end_itemgroup {
|
Line 113 sub end_itemgroup {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result; |
my $result; |
|
|
|
if ($target eq 'edit') { $result=&Apache::edit::end_table(); } |
if (!defined(@{ $Apache::response::itemgroup{'names'} })) { return; } |
if (!defined(@{ $Apache::response::itemgroup{'names'} })) { return; } |
my @names=@{ $Apache::response::itemgroup{'names'} }; |
my @names=@{ $Apache::response::itemgroup{'names'} }; |
my $randomize =&Apache::lonxml::get_param('randomize',$parstack,$safeeval); |
my $randomize =&Apache::lonxml::get_param('randomize',$parstack,$safeeval); |
Line 154 sub end_itemgroup {
|
Line 155 sub end_itemgroup {
|
} |
} |
$table.=' \end{tabular} \\\\ '; |
$table.=' \end{tabular} \\\\ '; |
$Apache::matchresponse::itemtable{'display'}=$table; |
$Apache::matchresponse::itemtable{'display'}=$table; |
} elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); } |
} |
return $result; |
return $result; |
} |
} |
|
|
Line 394 sub displayfoils {
|
Line 395 sub displayfoils {
|
} else { |
} else { |
if ($Apache::lonhomework::type ne 'exam') { |
if ($Apache::lonhomework::type ne 'exam') { |
$optionlist='\framebox[5 mm][s]{\tiny\strut}'; |
$optionlist='\framebox[5 mm][s]{\tiny\strut}'; |
} else { |
|
$optionlist='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]'; |
|
} |
} |
} |
} |
my $option; |
my $option; |
Line 410 sub displayfoils {
|
Line 409 sub displayfoils {
|
$optionlist='<select name="HWVAL_'. |
$optionlist='<select name="HWVAL_'. |
$Apache::inputtags::response[-1].':'.$temp.'">'. |
$Apache::inputtags::response[-1].':'.$temp.'">'. |
$optionlist."</select>\n"; |
$optionlist."</select>\n"; |
} else { |
|
$optionlist=$optionlist; |
|
} |
} |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
Line 422 sub displayfoils {
|
Line 419 sub displayfoils {
|
} else { |
} else { |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$question.=' '.$optionlist.$text."\n"; |
$question.=' '.$optionlist.$text."\n"; |
$question.=&Apache::optionresponse::bubbles(\@used_letters,\@used_letters).'\end{enumerate} \vskip -7 mm \strut '; |
my @emptyItems = (); |
|
for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';} |
|
$question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut '; |
} else { |
} else { |
$question.=' \\\\ '.$optionlist.$text."\n"; |
$question.=' \\\\ '.$optionlist.$text."\n"; |
} |
} |
Line 611 sub end_foil {
|
Line 610 sub end_foil {
|
&& !&Apache::response::showallfoils() ) { |
&& !&Apache::response::showallfoils() ) { |
push @{ $Apache::response::conceptgroup{'names'} }, $name; |
push @{ $Apache::response::conceptgroup{'names'} }, $name; |
$Apache::response::conceptgroup{"$name.value"} = $value; |
$Apache::response::conceptgroup{"$name.value"} = $value; |
$Apache::response::conceptgroup{"$name.text"} = $text; |
if ($target eq 'tex') { |
|
$Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text; |
|
} else { |
|
$Apache::response::conceptgroup{"$name.text"} = $text; |
|
} |
$Apache::response::conceptgroup{"$name.location"} = $location; |
$Apache::response::conceptgroup{"$name.location"} = $location; |
} else { |
} else { |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
$Apache::response::foilgroup{"$name.value"} = $value; |
$Apache::response::foilgroup{"$name.value"} = $value; |
$Apache::response::foilgroup{"$name.text"} = $text; |
if ($Apache::lonhomework::type eq 'exam') { |
|
$Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text; |
|
} else { |
|
if ($target eq 'tex') { |
|
$Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text; |
|
} else { |
|
$Apache::response::foilgroup{"$name.text"} = $text; |
|
} |
|
} |
$Apache::response::foilgroup{"$name.location"} = $location; |
$Apache::response::foilgroup{"$name.location"} = $location; |
} |
} |
} |
} |