version 1.107, 2004/04/23 17:57:18
|
version 1.111, 2004/07/02 08:21:39
|
Line 56 sub start_optionresponse {
|
Line 56 sub start_optionresponse {
|
$token,'4'). |
$token,'4'). |
&Apache::edit::select_arg('Randomize Foil Order','randomize', |
&Apache::edit::select_arg('Randomize Foil Order','randomize', |
['yes','no'],$token). |
['yes','no'],$token). |
|
&Apache::edit::select_arg(&mt('Display of options when printed'),'TeXlayout', |
|
[['horizontal',&mt('Normal list')], |
|
['vertical',&mt('Listed in a vertical column')]],$token). |
&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
$safeeval,'max','randomize'); |
$safeeval,'max','randomize', |
|
'TeXlayout'); |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
} elsif ($target eq 'meta') { |
} elsif ($target eq 'meta') { |
$result=&Apache::response::meta_package_write('optionresponse'); |
$result=&Apache::response::meta_package_write('optionresponse'); |
Line 88 sub start_foilgroup {
|
Line 92 sub start_foilgroup {
|
my $result=''; |
my $result=''; |
%Apache::response::foilgroup=(); |
%Apache::response::foilgroup=(); |
$Apache::optionresponse::conceptgroup=0; |
$Apache::optionresponse::conceptgroup=0; |
&Apache::response::setrandomnumber(); |
&Apache::response::pushrandomnumber(); |
if ($target eq 'edit') { |
if ($target eq 'edit') { |
my $optionlist="<option></option>\n"; |
my $optionlist="<option></option>\n"; |
my $option; |
my $option; |
Line 144 ENDTABLE
|
Line 148 ENDTABLE
|
} # else nothing changed so just use the default mechanism |
} # else nothing changed so just use the default mechanism |
} |
} |
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { |
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { |
$result .= ' \begin{enumerate} '; |
$result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.} |
|
\begin{enumerate} '; |
} |
} |
return $result; |
return $result; |
} |
} |
Line 159 sub end_foilgroup {
|
Line 164 sub end_foilgroup {
|
my $name; |
my $name; |
my @opt; |
my @opt; |
eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval); |
eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval); |
my $TeXlayout=&Apache::lonxml::get_param('TeXlayout',$parstack,$safeeval,undef,0); |
my $TeXlayout=&Apache::lonxml::get_param('TeXlayout',$parstack,$safeeval, |
&Apache::lonnet::logthis("PARAMETER U>$TeXlayout<U"); |
-2,0); |
if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();} |
if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();} |
&Apache::lonxml::debug("Options are $#opt"); |
&Apache::lonxml::debug("Options are $#opt"); |
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
Line 252 sub end_foilgroup {
|
Line 257 sub end_foilgroup {
|
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { |
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { |
$result .= '\end{enumerate}'; |
$result .= '\end{enumerate}'; |
} |
} |
|
&Apache::response::poprandomnumber(); |
return $result; |
return $result; |
} |
} |
|
|
Line 309 sub check_for_invalid {
|
Line 315 sub check_for_invalid {
|
|
|
sub displayfoils { |
sub displayfoils { |
my ($target,$max,$randomize,$TeXlayout,@opt)=@_; |
my ($target,$max,$randomize,$TeXlayout,@opt)=@_; |
&Apache::lonnet::logthis("PARAMETER >>$TeXlayout<<"); |
|
if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;} |
if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;} |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @truelist; |
my @truelist; |
Line 438 sub displayfoils {
|
Line 443 sub displayfoils {
|
|
|
sub optionlist_correction { |
sub optionlist_correction { |
my ($TeXlayout,@options) = @_; |
my ($TeXlayout,@options) = @_; |
&Apache::lonnet::logthis("PARAMETER >$TeXlayout<"); |
|
my $texoptionlist='\\item [] Choices: '; |
my $texoptionlist='\\item [] Choices: '; |
if ($TeXlayout eq 'vertical') {$texoptionlist='\\item []';} |
if ($TeXlayout eq 'vertical') {$texoptionlist='\\item []';} |
if (scalar(@options) > 0) { |
if (scalar(@options) > 0) { |
Line 475 sub webbubbles {
|
Line 479 sub webbubbles {
|
} |
} |
$result.='<td><input type="radio" name="HWVAL_'. |
$result.='<td><input type="radio" name="HWVAL_'. |
$Apache::inputtags::response['-1'].':'.$temp. |
$Apache::inputtags::response['-1'].':'.$temp. |
'" value="'.$opt[$ind].'" '.$checked.' />'.$alphabet[$ind].': '. |
'" value="'.$opt[$ind].'" '.$checked.' />'; |
$opt[$ind].'</td>'; |
if ($alphabet[$ind]) { |
|
$result.=$alphabet[$ind].': '; |
|
} |
|
$result.=$opt[$ind].'</td>'; |
} |
} |
$result.='</tr></table>'; |
$result.='</tr></table>'; |
return $result; |
return $result; |
Line 597 sub end_foil {
|
Line 604 sub end_foil {
|
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
$text=&Apache::lonxml::endredirection; |
$text=&Apache::lonxml::endredirection; |
$text=~/(\w)/; |
$text=~/(\w)/; |
&Apache::lonnet::logthis("TTTEXT IS HERE NOW >>$text<< >>>$1<<<"); |
|
if (($target eq 'tex') and ($Apache::lonhomework::type ne 'exam') and ($text=~/\S/)) {$text = '\vspace*{-2 mm}\item '.$text;} |
if (($target eq 'tex') and ($Apache::lonhomework::type ne 'exam') and ($text=~/\S/)) {$text = '\vspace*{-2 mm}\item '.$text;} |
} |
} |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' |