--- loncom/homework/optionresponse.pm 2001/06/27 18:51:59 1.19 +++ loncom/homework/optionresponse.pm 2007/06/26 20:51:53 1.144 @@ -1,32 +1,76 @@ -# The LearningOnline Network with CAPA +# LearningOnline Network with CAPA # option list style responses -# 2/21 Guy +# +# $Id: optionresponse.pm,v 1.144 2007/06/26 20:51:53 albertel Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# package Apache::optionresponse; use strict; -use Apache::response; +use Apache::response(); +use Apache::lonlocal; +use Apache::lonnet; -sub BEGIN { +BEGIN { &Apache::lonxml::register('Apache::optionresponse',('optionresponse')); } sub start_optionresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - #when in a radiobutton response use these - &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup')); + #when in a option response use these + &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup','drawoptionlist')); push (@Apache::lonxml::namespace,'optionresponse'); my $id = &Apache::response::start_response($parstack,$safeeval); + %Apache::hint::option=(); + undef(%Apache::response::foilnames); if ($target eq 'edit') { - $result.=&Apache::edit::start_table($token)."Multiple Option Response Question -Delete:". - &Apache::edit::deletelist($target,$token) - ." \n"; - $result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4').""; - $result.="\n"; - } - if ($target eq 'modified') { - my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'max'); + $result.=&Apache::edit::start_table($token). + "Multiple Option Response Question ". + &Apache::loncommon::help_open_topic('Option_Response_Problems')."Delete:". + &Apache::edit::deletelist($target,$token) + ." ". + &Apache::edit::end_row(). + &Apache::edit::start_spanning_row(). + "\n"; + $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max', + $token,'4'). + &Apache::edit::select_arg('Randomize Foil Order','randomize', + ['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(); + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'max','randomize', + 'TeXlayout'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } + } elsif ($target eq 'meta') { + $result=&Apache::response::meta_package_write('optionresponse'); + } elsif ($target eq 'analyze') { + my $part_id="$Apache::inputtags::part.$id"; + push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); } return $result; } @@ -35,19 +79,21 @@ sub end_optionresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; &Apache::response::end_response; pop @Apache::lonxml::namespace; + &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup','drawoptionlist')); my $result; if ($target eq 'edit') { $result=&Apache::edit::end_table(); } + undef(%Apache::response::foilnames); return $result; } -%Apache::response::foilgroup={}; +%Apache::response::foilgroup=(); sub start_foilgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - %Apache::response::foilgroup={}; + %Apache::response::foilgroup=(); $Apache::optionresponse::conceptgroup=0; - &Apache::response::setrandomnumber(); + &Apache::response::pushrandomnumber(); if ($target eq 'edit') { my $optionlist="\n"; my $option; @@ -67,23 +113,26 @@ sub start_foilgroup { Delete an Option: - - - $insertlist
ENDTABLE + $result.= &Apache::edit::checked_arg('Print options:','texoptions', + [ ['nochoice','Don\'t show option list'] ] + ,$token); + $result.= &Apache::edit::end_row(); + $result.= &Apache::edit::start_spanning_row(); + $result.= $insertlist.'
'; } if ($target eq 'modified') { my @options; my $optchanged=0; eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval); - if ($ENV{"form.$Apache::lonxml::curdepth.deleteopt"}) { - my $delopt=$ENV{"form.$Apache::lonxml::curdepth.deleteopt"}; + if ($env{"form.$Apache::lonxml::curdepth.deleteopt"}) { + my $delopt=$env{"form.$Apache::lonxml::curdepth.deleteopt"}; &Apache::lonxml::debug("Deleting :$delopt:"); splice(@options,$delopt-1,1); $optchanged=1; } - if ($ENV{"form.$Apache::lonxml::curdepth.options"}) { - my $newopt = $ENV{"form.$Apache::lonxml::curdepth.options"}; + if ($env{"form.$Apache::lonxml::curdepth.options"}) { + my $newopt = $env{"form.$Apache::lonxml::curdepth.options"}; if ($options[0]) { push(@options,$newopt); } else { @@ -91,17 +140,25 @@ ENDTABLE } $optchanged=1; } - if ($optchanged) { + my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval, + ('texoptions')); + if ($optchanged || $rebuildtag ) { $result = "[2]{'texoptions'}.'" '; + $result .= '>'; } # else nothing changed so just use the default mechanism } + if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { + $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.} + \begin{enumerate} '; + } return $result; } @@ -109,116 +166,433 @@ sub end_foilgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; - if ($target eq 'grade' || $target eq 'web') { + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { + my $tex_option_switch=&Apache::lonxml::get_param('texoptions',$parstack,$safeeval); my $name; - my ($count,$max) = &getfoilcounts($parstack,$safeeval); - if ($count>$max) { $count=$max } - &Apache::lonxml::debug("Count is $count from $max"); my @opt; eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval); + &Apache::lonxml::debug("options:".join(':',@opt)); + + my $TeXlayout=&Apache::lonxml::get_param('TeXlayout',$parstack,$safeeval, + -2,0); + if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();} &Apache::lonxml::debug("Options are $#opt"); - if ($target eq 'web') { - $result=&displayfoils($count,@opt); + my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); + my $randomize = &Apache::lonxml::get_param('randomize',$parstack, + $safeeval,'-2'); + if ($target eq 'web' || $target eq 'tex') { + $result.=&displayfoils($target,$max,$randomize,$TeXlayout,@opt); + $Apache::lonxml::post_evaluate=0; + } elsif ( $target eq 'answer') { + $result.=&displayanswers($max,$randomize,@opt); + + } elsif ( $target eq 'analyze') { + my @shown = &whichfoils($max,$randomize); + &Apache::response::analyze_store_foilgroup(\@shown, + ['text','value','location']); + my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; + push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt); } elsif ( $target eq 'grade') { - if ( defined $ENV{'form.submitted'}) { - my @whichopt = &whichfoils($count); + if ( &Apache::response::submitted()) { + my @whichopt = &whichfoils($max,$randomize); my $temp=1;my $name; - my $allresponse; + my %responsehash; + my %grade; my $right=0; my $wrong=0; my $ignored=0; foreach $name (@whichopt) { - my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"}; - $allresponse.="$response:"; + my $response=&Apache::response::getresponse($temp); + if ($env{'form.submitted'} eq 'scantron' && $response=~/\S/) { + $response = $opt[$response]; + } if ( $response =~ /[^\s]/) { - &Apache::lonxml::debug("submitted a $response
\n"); + $responsehash{$name}=$response; my $value=$Apache::response::foilgroup{$name.'.value'}; - if ($value eq $response) {$right++;} else {$wrong++;} + &Apache::lonxml::debug("submitted a $response for $value
\n"); + if ($value eq $response) { + $grade{$name}='1'; $right++; + } else { + $grade{$name}='0'; $wrong++; + } } else { $ignored++; } $temp++; } + my $part=$Apache::inputtags::part; my $id = $Apache::inputtags::response['-1']; - $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$allresponse; + my $responsestr=&Apache::lonnet::hash2str(%responsehash); + my $gradestr =&Apache::lonnet::hash2str(%grade); + my %previous=&Apache::response::check_for_previous($responsestr, + $part,$id); &Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored"); - if ($wrong==0 && $ignored==0) { - $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS'; + $Apache::lonhomework::results{"resource.$part.$id.submission"}= + $responsestr; + $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr; + + 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; + if ($wrong==0 && $ignored==0) { + $ad='EXACT_ANS'; + } elsif ($wrong==0 && $right==0) { + #nothing submitted + } else { + if ($ignored==0) { + $ad='INCORRECT'; + } else { + $ad='MISSING_ANSWER'; + } + } + $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; + &Apache::response::handle_previous(\%previous,$ad); } else { - $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='INCORRECT'; + my $ad; + if ($wrong==0 && $right==0) { + #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 { + $ad='ASSIGNED_SCORE'; + } + $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; + $Apache::lonhomework::results{"resource.$part.$id.awarded"}= + $right/(scalar(@whichopt)); + $Apache::lonhomework::results{"resource.$part.$id.numfoils"}= + scalar(@whichopt); } } } - } - if ($target eq 'edit') { + &Apache::lonxml::increment_counter(&getfoilcounts($max)); + } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table(); } + if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { + $result .= '\end{enumerate}'; + } + &Apache::response::poprandomnumber(); return $result; } sub getfoilcounts { - my ($parstack,$safeeval)=@_; - my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); + my ($max)=@_; # +1 since instructors will count from 1 my $count = $#{ $Apache::response::foilgroup{'names'} }+1; - return ($count,$max); + if (&Apache::response::showallfoils()) { $max=$count; } + if ($count>$max) { $count=$max } + &Apache::lonxml::debug("Count is $count from $max"); + return $count; } sub whichfoils { - my ($max)=@_; - my @names = @{ $Apache::response::foilgroup{'names'} }; - my @whichopt =(); - while ((($#whichopt+1) < $max) && ($#names > -1)) { - &Apache::lonxml::debug("Have $#whichopt max is $max"); - my $aopt=int(rand($#names+1)); - &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt"); - $aopt=splice(@names,$aopt,1); - &Apache::lonxml::debug("Picked $aopt"); - push (@whichopt,$aopt); - } - return @whichopt; + my ($max,$randomize)=@_; + return &Apache::response::whichorder($max,$randomize, + &Apache::response::showallfoils(), + \%Apache::response::foilgroup); +} + +sub displayanswers { + my ($max,$randomize,@opt)=@_; + if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;} + my @names = @{ $Apache::response::foilgroup{'names'} }; + my @whichopt = &whichfoils($max,$randomize); + my $result; + if ($Apache::lonhomework::type eq 'exam') { + my $i = 0; + my %opt = map { ($_,$i++) } @opt; + + $i = 0; + 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 { + 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').'
'. + join('
',(map { $_=&mt("[_1] with value [_2]",$_,$bad_names{$_}) } (keys(%bad_names)))). + ""; + &Apache::lonxml::error($error); + } } sub displayfoils { - my ($max,@opt)=@_; + my ($target,$max,$randomize,$TeXlayout,@opt)=@_; + if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;} my @names = @{ $Apache::response::foilgroup{'names'} }; my @truelist; my @falselist; - my $result; + my $result; my $name; - my @whichopt = &whichfoils($max); - my $optionlist="\n"; - my $option; - foreach $option (@opt) { - $optionlist.="\n"; - } - if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) { + my $displayoptionintex=1; + my @alphabet = ('A'..'Z'); + my @whichopt = &whichfoils($max,$randomize); + &check_for_invalid(\@whichopt,\@opt); + my $part=$Apache::inputtags::part; + my $id=$Apache::inputtags::response[-1]; + my $break; + my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; + if ( ($target ne 'tex') && + &Apache::response::show_answer() ) { + my $temp=1; foreach $name (@whichopt) { - $result.="
".$Apache::response::foilgroup{$name.'.value'}. - ":".$Apache::response::foilgroup{$name.'.text'}."\n"; + my $text=$Apache::response::foilgroup{$name.'.text'}; + my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"}); + my $lastopt=$lastresponse{$name}; + if ($text!~/^\s*$/) { $break='
'; } + $result.=$break; + if ($target eq 'web') { + my $value=$Apache::response::foilgroup{$name.'.value'}; + if (!($text=~s||$value|)) { + if ($text=~/^\s*$/) { + $text=$value.$text; + } else { + $text=''.$value.': '.$text; + } + } else { + $text='•'.$text; + } + $result.=$text."\n"; + } + if ($Apache::lonhomework::type eq 'exam') { + $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt); + } + $temp++; } } else { my $temp=1; + my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"}); + my $internal_counter=$Apache::lonxml::counter; foreach $name (@whichopt) { - $result.="
\n".$Apache::response::foilgroup{$name.'.text'}."\n"; - $temp++; + my $text=$Apache::response::foilgroup{$name.'.text'}; + if ($text!~/^\s*$/) { + if ($target eq 'tex') { + $break='\vskip 0 mm '; + } elsif ($target eq 'web') { + $break='
'; + } + } + my $lastopt=$lastresponse{$name}; + my $optionlist="\n"; + foreach my $option (@opt) { + my $escopt=&HTML::Entities::encode($option,'\'"&<>'); + if ($option eq $lastopt) { + $optionlist.="\n"; + } else { + $optionlist.="\n"; + } + } + if ($target ne 'tex') { + if ($Apache::lonhomework::type ne 'exam') { + $optionlist='\n"; + } else { + $optionlist=''.(' 'x10).''; + } + if ($text=~s||$optionlist|) { + if ($Apache::lonhomework::type ne 'exam') { + $text='•'.$text; + } + } else { + if ($Apache::lonhomework::type ne 'exam') { + $text=$optionlist.$text; + } + } + $result.=$break.$text."\n"; + if ($Apache::lonhomework::type eq 'exam') { + $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt); + } + $temp++; + } else { + my $texoptionlist=''; + if ($displayoptionintex && + $Apache::lonhomework::type ne 'exam') { + $texoptionlist = &optionlist_correction($TeXlayout,@opt); + } + if ($text=~//) { + $text=~s|| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |g; + } + + if ($text=~m/\\item /) { + if ($Apache::lonhomework::type eq 'exam') { + $text=~s/\\item/\\vskip 2 mm/; + } + $result.= $texoptionlist.$text; + } else { + if ($Apache::lonhomework::type eq 'exam') { + $result.= $texoptionlist.' '.$text; + } else { + if ($text=~/\S/) {$result.= $texoptionlist.'\vspace*{-2 mm}\item '.$text;} else {$result.= $texoptionlist;} + } + } + if ($Apache::lonhomework::type eq 'exam') { + $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'. + $internal_counter.'}.]'.&bubbles(\@alphabet,\@opt). + '\end{enumerate} \vskip -8 mm \strut '; + $internal_counter++; + } + $displayoptionintex=0; + } } } - return $result."
"; + + if ($target eq 'web') { + &Apache::response::setup_prior_tries_hash(\&Apache::rankresponse::format_prior_answer, + [\@whichopt, + 'submissiongrading']); + } + + if ($target ne 'tex') { + return $result.$break; + } else { + return $result; + } +} + + +sub optionlist_correction { + my ($TeXlayout,@options) = @_; + my $texoptionlist='\\item [] Choices: '; + if ($TeXlayout eq 'vertical') {$texoptionlist='\\item []';} + if (scalar(@options) > 0) { + foreach my $option (@options) { + $texoptionlist.='{\bf '. + &Apache::lonxml::latex_special_symbols($option). + '}'; + if ($TeXlayout eq 'vertical') { + $texoptionlist.=' \vskip 0 mm ', + } else { + $texoptionlist.=', '; + } + } + $texoptionlist=~s/, $//; + if ($TeXlayout ne 'vertical') {$texoptionlist.='.';} + } else { + if ($TeXlayout ne 'vertical') {$texoptionlist='\\item [] \\vskip -5 mm';} + } + return $texoptionlist; +} + + +sub webbubbles { + my ($ropt,$ralphabet,$temp,$lastopt)=@_; + my @opt=@$ropt; + my @alphabet=@$ralphabet; + my $result=''; + my $number_of_bubbles = $#opt + 1; + $result.= ''; + for (my $ind=0;$ind<$number_of_bubbles;$ind++) { + my $checked=''; + if ($lastopt eq $opt[$ind]) { + $checked=' checked="on" '; + } + $result.=''; + } + $result.='
'; + if ($alphabet[$ind]) { + $result.=$alphabet[$ind].': '; + } + $result.=$opt[$ind].'
'; + return $result; +} + + +sub bubbles { + my ($ralphabet,$ropt,$response, $max_width) = @_; + my @alphabet = @$ralphabet; + my @opt = @$ropt; + my ($result,$head,$line) =('','',''); + my $number_of_bubbles = $#opt + 1; + my $current_length = 0; + my $textwidth; + if (defined($max_width)) { + $textwidth=$max_width; + &Apache::lonxml::debug("Max width passed in: $max_width"); + } elsif ($env{'form.textwidth'} ne '') { + $env{'form.textwidth'}=~/(\d+)/; + $textwidth=$1; + &Apache::lonxml::debug("Max width from form: $textwidth"); + } else { + $env{'form.textwidth'}=~/(\d*)\.?(\d*)/; + $textwidth=$1.'.'.$2; + &Apache::lonxml::debug("Max width defaults? $textwidth"); + } + &Apache::lonxml::debug("Final maxwidth: $textwidth"); + for (my $ind=0;$ind<=$number_of_bubbles;$ind++) { + my $leftmargin; + $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;} + + $current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2; + if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) { + $line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & '; + $head.='lr'; + } else { + $line=~s/\&\s*$//; + $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].'} & ';; + $head ='lr'; + $current_length = (length($opt[$ind])+length($alphabet[$ind]))*2; + } + + } + return $result; } sub start_conceptgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; $Apache::optionresponse::conceptgroup=1; - %Apache::response::conceptgroup={}; + %Apache::response::conceptgroup=(); my $result; if ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils"); - $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50').""; - $result.="\n"; + $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50'). + &Apache::edit::end_row().&Apache::edit::start_spanning_row(); } if ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'concept'); @@ -231,21 +605,14 @@ sub end_conceptgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; $Apache::optionresponse::conceptgroup=0; my $result=''; - if ($target eq 'web' || $target eq 'grade') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { #if not there aren't any foils to display and thus no question - if (defined(@{ $Apache::response::conceptgroup{'names'} })) { - my @names = @{ $Apache::response::conceptgroup{'names'} }; - my $pick=int rand $#names+1; - my $name=$names[$pick]; - push @{ $Apache::response::foilgroup{'names'} }, $name; - $Apache::response::foilgroup{"$name.value"} = $Apache::response::conceptgroup{"$name.value"}; - $Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"}; - my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval); - $Apache::response::foilgroup{"$name.concept"} = $concept; - &Apache::lonxml::debug("Selecting $name in $concept"); - } - } - if ($target eq 'edit') { + &Apache::response::pick_foil_for_concept($target, + ['value','text','location'], + \%Apache::hint::option, + $parstack,$safeeval); + } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); } return $result; @@ -259,21 +626,32 @@ sub insert_conceptgroup { sub start_foil { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web') { &Apache::lonxml::startredirection; } - if ($target eq 'edit') { + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze' ) { + &Apache::lonxml::startredirection; + if ($target eq 'analyze') { + &Apache::response::check_if_computed($token,$parstack,$safeeval,'value'); + } + } elsif ($target eq 'edit') { $result=&Apache::edit::tag_start($target,$token,"Foil"); my $level='-2'; if ($$tagstack['-2'] eq 'conceptgroup') { $level = '-3'; } my @opt; eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level); - $result.=&Apache::edit::text_arg('Name:','name',$token). - &Apache::edit::select_arg('Correct Option:','value',['unused',(@opt)],$token). - ''; - } - if ($target eq 'modified') { - my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name'); + $result.=&Apache::edit::text_arg('Name:','name',$token); + $result.= &Apache::edit::select_or_text_arg('Correct Option:','value', + ['unused',(@opt)],$token,'15'); + my $randomize=&Apache::lonxml::get_param('randomize',$parstack, + $safeeval,'-3'); + if ($randomize ne 'no') { + $result.=&Apache::edit::select_arg('Location:','location', + ['random','top','bottom'],$token); + } + $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, + 'value','name','location'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } - } + } return $result; } @@ -281,22 +659,41 @@ sub end_foil { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $text =''; my $result = ''; - if ($target eq 'web') { $text=&Apache::lonxml::endredirection; } - if ($target eq 'web' || $target eq 'grade') { + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { + $text=&Apache::lonxml::endredirection; + 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' + || $target eq 'tex' || $target eq 'analyze') { 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') { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); &Apache::lonxml::debug("Got a name of :$name:"); - if (!$name) { $name=$Apache::lonxml::curdepth; } + if ($name eq "") { + &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction."); + $name=$Apache::lonxml::curdepth; + } &Apache::lonxml::debug("Using a name of :$name:"); - if ( $Apache::optionresponse::conceptgroup ) { + if (defined($Apache::response::foilnames{$name})) { + &Apache::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique.",$name)); + } + $Apache::response::foilnames{$name}++; + my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval); + if ( $Apache::optionresponse::conceptgroup + && !&Apache::response::showallfoils() ) { push @{ $Apache::response::conceptgroup{'names'} }, $name; $Apache::response::conceptgroup{"$name.value"} = $value; - $Apache::response::conceptgroup{"$name.text"} = $text; + $Apache::response::conceptgroup{"$name.text"} = $text; + $Apache::response::conceptgroup{"$name.location"} = $location; } else { push @{ $Apache::response::foilgroup{'names'} }, $name; $Apache::response::foilgroup{"$name.value"} = $value; $Apache::response::foilgroup{"$name.text"} = $text; + $Apache::response::foilgroup{"$name.location"} = $location; } } } @@ -306,13 +703,31 @@ sub end_foil { return $result; } +sub start_drawoptionlist { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + if ($target !~ /^(?:meta|answer|modified|edit)$/) { + return $token->[4]; + } +} + +sub end_drawoptionlist { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + if ($target !~ /^(?:meta|answer|modified|edit)$/) { + return $token->[2]; + } +} + sub insert_foil { - return ' + return ' '; } + +sub insert_drawoptionlist { + return ''; +} 1; __END__