version 1.129, 2005/06/22 12:03:23
|
version 1.136, 2007/01/17 10:46:13
|
Line 114 sub start_foilgroup {
|
Line 114 sub start_foilgroup {
|
<td>Delete an Option: |
<td>Delete an Option: |
<select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select> |
<select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select> |
ENDTABLE |
ENDTABLE |
|
$result.= &Apache::edit::checked_arg('Print options:','texoptions', |
|
[ ['nochoice','Don\'t show option list'] ] |
|
,$token); |
$result.= &Apache::edit::end_row(); |
$result.= &Apache::edit::end_row(); |
$result.= &Apache::edit::start_spanning_row(); |
$result.= &Apache::edit::start_spanning_row(); |
$result.= $insertlist.'<br />'; |
$result.= $insertlist.'<br />'; |
Line 137 ENDTABLE
|
Line 140 ENDTABLE
|
} |
} |
$optchanged=1; |
$optchanged=1; |
} |
} |
if ($optchanged) { |
my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval, |
|
('texoptions')); |
|
if ($optchanged || $rebuildtag ) { |
$result = "<foilgroup options=\"("; |
$result = "<foilgroup options=\"("; |
foreach my $option (@options) { |
foreach my $option (@options) { |
$option=~s/\'/\\\'/g; |
$option=~s/\'/\\\'/g; |
Line 145 ENDTABLE
|
Line 150 ENDTABLE
|
$result .="'".$option."',"; |
$result .="'".$option."',"; |
} |
} |
chop $result; |
chop $result; |
$result.=')">'; |
$result.=')" '; |
|
$result .= 'texoptions="'.$token->[2]{'texoptions'}.'" '; |
|
$result .= '>'; |
} # 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') { |
Line 178 sub end_foilgroup {
|
Line 185 sub end_foilgroup {
|
$result.=&displayfoils($target,$max,$randomize,$TeXlayout,@opt); |
$result.=&displayfoils($target,$max,$randomize,$TeXlayout,@opt); |
} elsif ( $target eq 'answer') { |
} elsif ( $target eq 'answer') { |
$result.=&displayanswers($max,$randomize,@opt); |
$result.=&displayanswers($max,$randomize,@opt); |
|
|
} elsif ( $target eq 'analyze') { |
} elsif ( $target eq 'analyze') { |
my @shown = &whichfoils($max,$randomize); |
my @shown = &whichfoils($max,$randomize); |
&Apache::response::analyze_store_foilgroup(\@shown, |
&Apache::response::analyze_store_foilgroup(\@shown, |
Line 295 sub whichfoils {
|
Line 303 sub whichfoils {
|
} |
} |
|
|
sub displayanswers { |
sub displayanswers { |
my ($max,$randomize,@opt)=@_; |
my ($max,$randomize,@opt)=@_; |
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 @whichopt = &whichfoils($max,$randomize); |
my @whichopt = &whichfoils($max,$randomize); |
my $result=&Apache::response::answer_header('optionresponse'); |
my $result; |
foreach my $name (@whichopt) { |
if ($Apache::lonhomework::type eq 'exam') { |
$result.=&Apache::response::answer_part('optionresponse', |
my $i = 0; |
$Apache::response::foilgroup{$name.'.value'}) |
my %opt = map { ($_,$i++) } @opt; |
} |
|
$result.=&Apache::response::answer_footer('optionresponse'); |
$i = 0; |
return $result; |
my @alphabet = ('A'..'Z'); |
|
foreach my $name (@whichopt) { |
|
$result.=&Apache::response::answer_header('optionresponse',$i++); |
|
$result.=&Apache::response::answer_part('optionresponse', |
|
$alphabet[$opt{$Apache::response::foilgroup{$name.'.value'}}]); |
|
$result.=&Apache::response::answer_part('optionresponse', |
|
$Apache::response::foilgroup{$name.'.value'}); |
|
$result.=&Apache::response::answer_footer('optionresponse'); |
|
} |
|
} else { |
|
$result=&Apache::response::answer_header('optionresponse'); |
|
foreach my $name (@whichopt) { |
|
$result.=&Apache::response::answer_part('optionresponse', |
|
$Apache::response::foilgroup{$name.'.value'}); |
|
} |
|
$result.=&Apache::response::answer_footer('optionresponse'); |
|
} |
|
return $result; |
} |
} |
|
|
sub check_for_invalid { |
sub check_for_invalid { |
Line 390 sub displayfoils {
|
Line 415 sub displayfoils {
|
foreach my $option (@opt) { |
foreach my $option (@opt) { |
my $escopt=&HTML::Entities::encode($option,'\'"&<>'); |
my $escopt=&HTML::Entities::encode($option,'\'"&<>'); |
if ($option eq $lastopt) { |
if ($option eq $lastopt) { |
$optionlist.="<option value='".$escopt."' selected=\"on\">$option</option>\n"; |
$optionlist.="<option value='".$escopt."' selected=\"selected\">$option</option>\n"; |
} else { |
} else { |
$optionlist.="<option value='".$escopt."'>$option</option>\n"; |
$optionlist.="<option value='".$escopt."'>$option</option>\n"; |
} |
} |
Line 424 sub displayfoils {
|
Line 449 sub displayfoils {
|
$texoptionlist = &optionlist_correction($TeXlayout,@opt); |
$texoptionlist = &optionlist_correction($TeXlayout,@opt); |
} |
} |
if ($text=~/<drawoptionlist\s*\/>/) { |
if ($text=~/<drawoptionlist\s*\/>/) { |
$text=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |; |
$text=~s|<drawoptionlist\s*\/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |g; |
} |
} |
|
|
if ($text=~m/\\item /) { |
if ($text=~m/\\item /) { |
Line 532 sub bubbles {
|
Line 557 sub bubbles {
|
$head.='lr'; |
$head.='lr'; |
} else { |
} else { |
$line=~s/\&\s*$//; |
$line=~s/\&\s*$//; |
$result.='\vskip -2 mm\noindent\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}\vskip 0 mm'; |
$result.='\vskip -2 mm\noindent\setlength{\tabcolsep}{2 mm}\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}\vskip 0 mm'; |
$line = '\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';; |
$line = '\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';; |
$head ='lr'; |
$head ='lr'; |
$current_length = (length($opt[$ind])+length($alphabet[$ind]))*2; |
$current_length = (length($opt[$ind])+length($alphabet[$ind]))*2; |
Line 664 sub end_foil {
|
Line 689 sub end_foil {
|
|
|
sub start_drawoptionlist { |
sub start_drawoptionlist { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
if ($target ne 'meta') { |
if (($target ne 'meta') && ($target ne 'answer')) { |
return $token->[4]; |
return $token->[4]; |
} |
} |
} |
} |
|
|
sub end_drawoptionlist { |
sub end_drawoptionlist { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
if ($target ne 'meta') { |
if (($target ne 'meta') && ($target ne 'answer')) { |
return $token->[2]; |
return $token->[2]; |
} |
} |
} |
} |