version 1.105, 2004/03/25 16:55:16
|
version 1.123, 2005/01/10 19:21:57
|
Line 38 sub start_optionresponse {
|
Line 38 sub start_optionresponse {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
#when in a option response use these |
#when in a option response use these |
&Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup')); |
&Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup','drawoptionlist')); |
push (@Apache::lonxml::namespace,'optionresponse'); |
push (@Apache::lonxml::namespace,'optionresponse'); |
my $id = &Apache::response::start_response($parstack,$safeeval); |
my $id = &Apache::response::start_response($parstack,$safeeval); |
%Apache::hint::option=(); |
%Apache::hint::option=(); |
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 74 sub end_optionresponse {
|
Line 78 sub end_optionresponse {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
&Apache::response::end_response; |
&Apache::response::end_response; |
pop @Apache::lonxml::namespace; |
pop @Apache::lonxml::namespace; |
&Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup')); |
&Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup','drawoptionlist')); |
my $result; |
my $result; |
if ($target eq 'edit') { $result=&Apache::edit::end_table(); } |
if ($target eq 'edit') { $result=&Apache::edit::end_table(); } |
undef(%Apache::response::foilnames); |
undef(%Apache::response::foilnames); |
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, |
|
-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'); |
my $randomize = &Apache::lonxml::get_param('randomize',$parstack, |
my $randomize = &Apache::lonxml::get_param('randomize',$parstack, |
$safeeval,'-2'); |
$safeeval,'-2'); |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex') { |
$result.=&displayfoils($target,$max,$randomize,@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') { |
Line 185 sub end_foilgroup {
|
Line 192 sub end_foilgroup {
|
my $ignored=0; |
my $ignored=0; |
foreach $name (@whichopt) { |
foreach $name (@whichopt) { |
my $response=&Apache::response::getresponse($temp); |
my $response=&Apache::response::getresponse($temp); |
if ($ENV{'form.submitted'} eq 'scantron') { |
if ($ENV{'form.submitted'} eq 'scantron' && $response=~/\S/) { |
$response = $opt[$response]; |
$response = $opt[$response]; |
} |
} |
if ( $response =~ /[^\s]/) { |
if ( $response =~ /[^\s]/) { |
Line 213 sub end_foilgroup {
|
Line 220 sub end_foilgroup {
|
$responsestr; |
$responsestr; |
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr; |
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr; |
|
|
if (!$Apache::lonhomework::scantronmode) { |
if ($Apache::lonhomework::type eq 'survey') { |
|
if ($ignored == 0) { |
|
my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED'; |
|
&Apache::response::handle_previous(\%previous,$ad); |
|
} elsif ($wrong==0 && $right==0) { |
|
} else { |
|
my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='MISSING_ANSWER'; |
|
&Apache::response::handle_previous(\%previous,$ad); |
|
} |
|
} elsif (!$Apache::lonhomework::scantronmode) { |
my $ad; |
my $ad; |
if ($wrong==0 && $ignored==0) { |
if ($wrong==0 && $ignored==0) { |
$ad='EXACT_ANS'; |
$ad='EXACT_ANS'; |
Line 231 sub end_foilgroup {
|
Line 247 sub end_foilgroup {
|
} else { |
} else { |
my $ad; |
my $ad; |
if ($wrong==0 && $right==0) { |
if ($wrong==0 && $right==0) { |
#nothing submitted |
#nothing submitted only assign a score if we |
|
#need to override a previous grade |
|
if (defined($Apache::lonhomework::history{"resource.$part.$id.awarddetail"})) { |
|
$ad='ASSIGNED_SCORE'; |
|
} |
} else { |
} else { |
$ad='ASSIGNED_SCORE'; |
$ad='ASSIGNED_SCORE'; |
} |
} |
Line 250 sub end_foilgroup {
|
Line 270 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 284 sub displayanswers {
|
Line 305 sub displayanswers {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub check_for_invalid { |
|
my ($names,$options) = @_; |
|
my %bad_names; |
|
foreach my $name (@{ $names }) { |
|
my $value=$Apache::response::foilgroup{$name.'.value'}; |
|
my $found=0; |
|
foreach my $option (@{ $options }) { |
|
if ($value eq $option) { $found=1; } |
|
} |
|
if (!$found) { $bad_names{$name}=$value; } |
|
} |
|
if (%bad_names) { |
|
my $error=&mt('The question can not be gotten correct, '. |
|
'the following foils in the <optionresponse> '. |
|
'have invalid correct options').' <br /><tt>'. |
|
join('<br />',(map { $_=&mt("[_1] with value [_2]",$_,$bad_names{$_}) } (keys(%bad_names)))). |
|
"</tt>"; |
|
&Apache::lonxml::error($error); |
|
} |
|
} |
|
|
sub displayfoils { |
sub displayfoils { |
my ($target,$max,$randomize,@opt)=@_; |
my ($target,$max,$randomize,$TeXlayout,@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 @truelist; |
my @truelist; |
Line 295 sub displayfoils {
|
Line 337 sub displayfoils {
|
my $displayoptionintex=1; |
my $displayoptionintex=1; |
my @alphabet = ('A'..'Z'); |
my @alphabet = ('A'..'Z'); |
my @whichopt = &whichfoils($max,$randomize); |
my @whichopt = &whichfoils($max,$randomize); |
|
&check_for_invalid(\@whichopt,\@opt); |
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::part; |
my $id=$Apache::inputtags::response[-1]; |
my $id=$Apache::inputtags::response[-1]; |
my $break; |
my $break; |
Line 320 sub displayfoils {
|
Line 363 sub displayfoils {
|
$text='•'.$text; |
$text='•'.$text; |
} |
} |
$result.=$text."\n"; |
$result.=$text."\n"; |
} |
} |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt); |
$result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt); |
} |
} |
Line 375 sub displayfoils {
|
Line 418 sub displayfoils {
|
my $texoptionlist=''; |
my $texoptionlist=''; |
if ($displayoptionintex && |
if ($displayoptionintex && |
$Apache::lonhomework::type ne 'exam') { |
$Apache::lonhomework::type ne 'exam') { |
$texoptionlist = &optionlist_correction(@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\} |; |
Line 390 sub displayfoils {
|
Line 433 sub displayfoils {
|
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$result.= $texoptionlist.' '.$text; |
$result.= $texoptionlist.' '.$text; |
} else { |
} else { |
$result.= $texoptionlist.'\vspace*{-2 mm}\item '.$text; |
if ($text=~/\S/) {$result.= $texoptionlist.'\vspace*{-2 mm}\item '.$text;} else {$result.= $texoptionlist;} |
} |
} |
} |
} |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
Line 412 sub displayfoils {
|
Line 455 sub displayfoils {
|
|
|
|
|
sub optionlist_correction { |
sub optionlist_correction { |
my @options = @_; |
my ($TeXlayout,@options) = @_; |
my $texoptionlist='\\item [] Choices: '; |
my $texoptionlist='\\item [] Choices: '; |
|
if ($TeXlayout eq 'vertical') {$texoptionlist='\\item []';} |
if (scalar(@options) > 0) { |
if (scalar(@options) > 0) { |
foreach my $option (@options) { |
foreach my $option (@options) { |
$texoptionlist.='{\bf '. |
$texoptionlist.='{\bf '. |
&Apache::lonxml::latex_special_symbols($option). |
&Apache::lonxml::latex_special_symbols($option). |
'},'; |
'}'; |
|
if ($TeXlayout eq 'vertical') { |
|
$texoptionlist.=' \vskip 0 mm ', |
|
} else { |
|
$texoptionlist.=', '; |
|
} |
} |
} |
chop($texoptionlist); |
$texoptionlist=~s/, $//; |
$texoptionlist.='.'; |
if ($TeXlayout ne 'vertical') {$texoptionlist.='.';} |
} else { |
} else { |
$texoptionlist='\\item [] \\vskip -5 mm'; |
if ($TeXlayout ne 'vertical') {$texoptionlist='\\item [] \\vskip -5 mm';} |
} |
} |
return $texoptionlist; |
return $texoptionlist; |
} |
} |
Line 443 sub webbubbles {
|
Line 492 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 452 sub webbubbles {
|
Line 504 sub webbubbles {
|
|
|
|
|
sub bubbles { |
sub bubbles { |
my ($ralphabit,$ropt) = @_; |
my ($ralphabet,$ropt,$response) = @_; |
my @alphabet = @$ralphabit; |
my @alphabet = @$ralphabet; |
my @opt = @$ropt; |
my @opt = @$ropt; |
my ($result,$head,$line) =('','',''); |
my ($result,$head,$line) =('','',''); |
my $number_of_bubbles = $#opt + 1; |
my $number_of_bubbles = $#opt + 1; |
Line 469 sub bubbles {
|
Line 521 sub bubbles {
|
for (my $ind=0;$ind<=$number_of_bubbles;$ind++) { |
for (my $ind=0;$ind<=$number_of_bubbles;$ind++) { |
my $leftmargin; |
my $leftmargin; |
$opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]); |
$opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]); |
|
if ($response eq 'rankresponse') {$opt[$ind]='Rank '.$opt[$ind];} |
if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;} |
if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;} |
$current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2; |
$current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2; |
if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) { |
if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) { |
Line 476 sub bubbles {
|
Line 529 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}'; |
$result.='\vskip -2 mm\noindent\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 564 sub end_foil {
|
Line 617 sub end_foil {
|
my $result = ''; |
my $result = ''; |
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; |
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { $text = '\vspace*{-2 mm}\item '.$text; } |
if ($target eq 'tex') {$text=~s/\\strut\s*\\\\\s*\\strut/\\vskip 0 mm/;} |
|
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' |
|| $target eq 'tex' || $target eq 'analyze') { |
|| $target eq 'tex' || $target eq 'analyze') { |
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); |
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); |
|
if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') { |
|
$text='\vskip 5mm $\triangleright$ '.$text; |
|
} |
if ($value ne 'unused') { |
if ($value ne 'unused') { |
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) { $name=$Apache::lonxml::curdepth; } |
if (!$name) { |
|
&Apache::lonxml::error("Foils without names exist. This can cause problems to malfunction."); |
|
$name=$Apache::lonxml::curdepth; |
|
} |
&Apache::lonxml::debug("Using a name of :$name:"); |
&Apache::lonxml::debug("Using a name of :$name:"); |
if (defined($Apache::response::foilnames{$name})) { |
if (defined($Apache::response::foilnames{$name})) { |
&Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name)); |
&Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name)); |
Line 583 sub end_foil {
|
Line 643 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; |
if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { |
$Apache::response::conceptgroup{"$name.text"} = $text; |
$Apache::response::conceptgroup{"$name.text"} = '\vskip 4 mm $\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; |
if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { |
$Apache::response::foilgroup{"$name.text"} = $text; |
$Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text; |
|
} else { |
|
$Apache::response::foilgroup{"$name.text"} = $text; |
|
} |
|
$Apache::response::foilgroup{"$name.location"} = $location; |
$Apache::response::foilgroup{"$name.location"} = $location; |
} |
} |
} |
} |
Line 607 sub end_foil {
|
Line 659 sub end_foil {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub start_drawoptionlist { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
if ($target ne 'meta') { |
|
return $token->[4]; |
|
} |
|
} |
|
|
|
sub end_drawoptionlist { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
if ($target ne 'meta') { |
|
return $token->[2]; |
|
} |
|
} |
|
|
sub insert_foil { |
sub insert_foil { |
return ' |
return ' |
<foil name="" value="unused"> |
<foil name="" value="unused"> |