--- loncom/homework/optionresponse.pm 2003/07/25 18:46:19 1.80 +++ loncom/homework/optionresponse.pm 2013/07/19 18:24:21 1.191 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # option list style responses # -# $Id: optionresponse.pm,v 1.80 2003/07/25 18:46:19 sakharuk Exp $ +# $Id: optionresponse.pm,v 1.191 2013/07/19 18:24:21 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,11 +25,16 @@ # # http://www.lon-capa.org/ # -# 2/21 Guy -# 01/18 Alex + + + + + package Apache::optionresponse; use strict; -use Apache::response; +use Apache::response(); +use Apache::lonlocal; +use Apache::lonnet; BEGIN { &Apache::lonxml::register('Apache::optionresponse',('optionresponse')); @@ -39,32 +44,43 @@ sub start_optionresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; #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'); 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 QuestionDelete:". - &Apache::edit::deletelist($target,$token) - ." ". - &Apache::edit::end_row(). - &Apache::edit::start_spanning_row(). - "\n"; + $result.=&Apache::edit::start_table($token) + .''.&mt('Multiple Option Response Question').' ' + .&Apache::loncommon::help_open_topic('Option_Response_Problems')."" + .''.&mt('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', + &Apache::edit::select_arg('Randomize Foil Order:','randomize', ['yes','no'],$token). + &Apache::edit::select_arg(&mt('Display of options when printed'),'TeXlayout', + [['horizontal','Normal list'], + ['vertical','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'); + $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.$Apache::inputtags::response[-1]"; + my $part_id="$Apache::inputtags::part.$id"; + $Apache::lonhomework::analyze{"$part_id.type"} = 'optionresponse'; push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); + push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, 1); + } return $result; } @@ -73,9 +89,10 @@ 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')); + &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; } @@ -86,12 +103,16 @@ sub start_foilgroup { my $result=''; %Apache::response::foilgroup=(); $Apache::optionresponse::conceptgroup=0; - &Apache::response::setrandomnumber(); + &Apache::response::pushrandomnumber(undef,$target); if ($target eq 'edit') { my $optionlist="\n"; my $option; my @opt; - eval '@opt ='. &Apache::lonxml::get_param('options',$parstack,$safeeval); + my @raw_options = &Apache::lonxml::get_param('options', $parstack, $safeeval, 0, 0, 1); + + + eval '@opt ='. &Apache::lonxml::get_param('options',$parstack,$safeeval, 0, 0, 1); + my $count=1; foreach $option (@opt) { $optionlist.="\n"; @@ -106,7 +127,24 @@ sub start_foilgroup { Delete an Option: + ENDTABLE + $result.= ''.&Apache::edit::checked_arg('Print options:','texoptions', + [ ['nochoice','Don\'t show option list'] ] + ,$token).''; + $result.= ''; + $result.=&Apache::edit::checked_arg('Checkbox options:','checkboxoptions', + [ ['nochoice','Don\'t show option list'] ] + ,$token).''; $result.= &Apache::edit::end_row(); $result.= &Apache::edit::start_spanning_row(); $result.= $insertlist.'
'; @@ -114,23 +152,24 @@ ENDTABLE 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"}; + + + eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval, 0, 0, 1); + + 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 ($options[0]) { - push(@options,$newopt); - } else { - $options[0]=$newopt; - } + if ($env{"form.$Apache::lonxml::curdepth.options"} ne '') { + my $newopt = $env{"form.$Apache::lonxml::curdepth.options"}; + push(@options,$newopt); $optchanged=1; } - if ($optchanged) { + my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval, + 'texoptions','checkboxvalue','checkboxoptions'); + if ($optchanged || $rebuildtag ) { $result = "[2]{'texoptions'}.'" '; + $result .= 'checkboxoptions="'.$token->[2]{'checkboxoptions'}.'" '; + $result .= 'checkboxvalue="'.$token->[2]{'checkboxvalue'}.'"'; + $result .= '>'; } # else nothing changed so just use the default mechanism } if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { - $result .= ' \begin{enumerate} '; + if($env{'form.pdfFormFields'} ne 'yes') { + $result .= ' \begin{itemize} '; + } else { + $result .= "\\\\"; + } } return $result; } @@ -151,34 +198,41 @@ sub end_foilgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; - if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { - my $tex_option_switch=&Apache::lonxml::get_param('texout',$parstack,$safeeval); + 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 @opt; eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval); - if ($target eq 'tex' && $tex_option_switch eq 'nooptions') {@opt=();} + &Apache::lonxml::debug("options:".join(':',@opt)); + + my $TeXlayout=&Apache::lonxml::get_param('TeXlayout',$parstack,$safeeval, + -2,0); + my $checkboxvalue=&Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval); + my $checkboxchoices=(&Apache::lonxml::get_param('checkboxoptions',$parstack,$safeeval) ne 'nochoice'); + my $noprompt =&Apache::lonxml::get_param('noprompt', $parstack, $safeeval); + + if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();} &Apache::lonxml::debug("Options are $#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,@opt); + $result.=&displayfoils($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,$tex_option_switch, $noprompt, @opt); + $Apache::lonxml::post_evaluate=0; } elsif ( $target eq 'answer') { $result.=&displayanswers($max,$randomize,@opt); + } elsif ( $target eq 'analyze') { - my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; - foreach my $name (@{ $Apache::response::foilgroup{'names'} }) { - if (defined($Apache::lonhomework::analyze{"$part_id.foil.value.$name"})) { next; } - push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },$name); - $Apache::lonhomework::analyze{"$part_id.foil.value.$name"} = - $Apache::response::foilgroup{"$name.value"}; - $Apache::lonhomework::analyze{"$part_id.foil.text.$name"} = - $Apache::response::foilgroup{"$name.text"}; - } - push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt); - push (@{ $Apache::lonhomework::analyze{"$part_id.shown"} },&whichfoils($max,$randomize)); + 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'}) { + + if ( &Apache::response::submitted()) { + my @whichopt = &whichfoils($max,$randomize); my $temp=1;my $name; my %responsehash; @@ -186,13 +240,45 @@ sub end_foilgroup { my $right=0; my $wrong=0; my $ignored=0; + my ($numrows,$bubbles_per_row); + if ($Apache::lonhomework::scantronmode) { + my $numitems = scalar(@opt); + ($numrows,$bubbles_per_row) = + &Apache::optionresponse::getnumrows($numitems); + } + if ($numrows < 1) { + $numrows = 1; + } foreach $name (@whichopt) { - my $response=&Apache::response::getresponse($temp); - if ($ENV{'form.submitted'} eq 'scantron') { - $response = $opt[$response]; - } - $responsehash{$name}=$response; + my $response; + if ($env{'form.submitted'} eq 'scantron') { + if ($numrows > 1) { + my $num = $temp; + my $totalnum; + for (my $i=0; $i<$numrows; $i++) { + my $item = &Apache::response::getresponse($num); + if ($item =~ /^\d+$/) { + $totalnum = $i*$bubbles_per_row + $item; + } + $num ++; + } + if ($totalnum =~ /^\d+$/) { + $response = $opt[$totalnum]; + } + $temp += $numrows; + } else { + $response=&Apache::response::getresponse($temp); + if ($response=~/\S/) { + $response = $opt[$response]; + } + $temp ++; + } + } else { + $response=&Apache::response::getresponse($temp); + $temp ++; + } if ( $response =~ /[^\s]/) { + $responsehash{$name}=$response; my $value=$Apache::response::foilgroup{$name.'.value'}; &Apache::lonxml::debug("submitted a $response for $value
\n"); if ($value eq $response) { @@ -203,9 +289,9 @@ sub end_foilgroup { } else { $ignored++; } - $temp++; } my $part=$Apache::inputtags::part; + my $nonlenient=&grading_is_nonlenient($part); my $id = $Apache::inputtags::response['-1']; my $responsestr=&Apache::lonnet::hash2str(%responsehash); my $gradestr =&Apache::lonnet::hash2str(%grade); @@ -215,8 +301,34 @@ sub end_foilgroup { $Apache::lonhomework::results{"resource.$part.$id.submission"}= $responsestr; $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr; - - if (!$Apache::lonhomework::scantronmode) { + if ($Apache::lonhomework::type eq 'randomizetry') { + $Apache::lonhomework::results{"resource.$part.$id.foilorder"} = &Apache::lonnet::array2str(@whichopt); + } + if (($Apache::lonhomework::type eq 'survey') || + ($Apache::lonhomework::type eq 'surveycred') || + ($Apache::lonhomework::type eq 'anonsurvey') || + ($Apache::lonhomework::type eq 'anonsurveycred')) { + if ($ignored == 0) { + my $ad; + if ($Apache::lonhomework::type eq 'anonsurveycred') { + $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS_CREDIT'; + } elsif ($Apache::lonhomework::type eq 'anonsurvey') { + $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS'; + } elsif ($Apache::lonhomework::type eq 'surveycred') { + $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED_CREDIT'; + } else { + $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 ($nonlenient) { +# +# Non-lenient mode. All right or all wrong +# my $ad; if ($wrong==0 && $ignored==0) { $ad='EXACT_ANS'; @@ -232,9 +344,16 @@ sub end_foilgroup { $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; &Apache::response::handle_previous(\%previous,$ad); } else { +# +# This is lenient mode +# my $ad; 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 { $ad='ASSIGNED_SCORE'; } @@ -246,16 +365,56 @@ sub end_foilgroup { } } } - &Apache::lonxml::increment_counter(&getfoilcounts($max)); + my $part_id = $Apache::inputtags::part; + my $response_id = $Apache::inputtags::response[-1]; + my ($numrows,$bubbles_per_row); + if (($target eq 'tex') && ($Apache::lonhomework::type eq 'exam')) { + ($numrows,$bubbles_per_row) = + &Apache::optionresponse::getnumrows(scalar(@opt)); + } + if ($numrows < 1) { + $numrows = 1; + } + my $increment = &getfoilcounts($max) * $numrows; + &Apache::lonxml::increment_counter($increment,"$part_id.$response_id"); + if ($target eq 'analyze') { + &Apache::lonhomework::set_bubble_lines(); + } + } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table(); } if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { - $result .= '\end{enumerate}'; + if($env{'form.pdfFormFields'} ne 'yes') { + $result .= '\end{itemize}'; + } else { + $result .= "\\\\"; + } } + &Apache::response::poprandomnumber(); return $result; } +sub grading_is_nonlenient { + my ($part) = @_; +# Web mode: we are non-lenient unless told otherwise + my $defaultparm = 'off'; + my $nonlenient = 0; +# Grading a bubblesheet exam: we are grading lenient unless told otherwise + if ($Apache::lonhomework::scantronmode) { + $defaultparm = 'on'; + $nonlenient = 1; + } + my $lenientparm = + &Apache::response::get_response_param($part,'lenient',$defaultparm); + if ($lenientparm=~/^0|off|no$/i) { + $nonlenient = 1; + } elsif ($lenientparm=~/^1|on|yes$/i) { + $nonlenient = 0; + } + return $nonlenient; +} + sub getfoilcounts { my ($max)=@_; # +1 since instructors will count from 1 @@ -274,47 +433,109 @@ sub whichfoils { } 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=&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; + my ($max,$randomize,@opt)=@_; + my @names; + if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') { + @names = @{ $Apache::response::foilgroup{'names'} }; + } + return if (!@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_box_opt { + my ($target,$checkboxvalue,@opt)=@_; +# Check if we are in checkbox mode: checkboxvalue specified, on web, only two options. +# If so, return "checked" value + if ($#opt!=1) { return ''; } + if ($target ne 'web') { return ''; } + return $checkboxvalue; +} + +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 ($target,$max,$randomize,@opt)=@_; - if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;} - my @names = @{ $Apache::response::foilgroup{'names'} }; + my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices, + $tex_option_switch, $no_tfprompt, @opt)=@_; + my @names; + if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') { + @names = @{ $Apache::response::foilgroup{'names'} }; + } + unless (@names > 0) { return;} my @truelist; my @falselist; my $result; my $name; - my $displayoptionintex=0; + my $displayoptionintex=1; my @alphabet = ('A'..'Z'); my @whichopt = &whichfoils($max,$randomize); + unless (($target eq 'tex') && ($tex_option_switch eq 'nochoice')) { + &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"}; - my $status=$Apache::inputtags::status[-1]; - if ( - ($target ne 'tex') && - (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) ) { + if ( ($target ne 'tex') && + &Apache::response::show_answer() ) { + my $temp=1; foreach $name (@whichopt) { my $text=$Apache::response::foilgroup{$name.'.text'}; - if ($text!~/^\s*$/) { - if ($target eq 'tex') { - $break='\vskip 0 mm '; - } elsif ($target eq 'web') { - $break='
'; - } - } + my $lastresp; + if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) || + (($env{'form.grade_username'} eq $env{'user.name'}) && + ($env{'form.grade_domain'} eq $env{'user.domain'}))) { + $lastresp = $Apache::lonhomework::history{"resource.$part.$id.submission"}; + } else { + unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || + ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) { + $lastresp = $Apache::lonhomework::history{"resource.$part.$id.submission"}; + } + } + my %lastresponse=&Apache::lonnet::str2hash($lastresp); + my $lastopt=$lastresponse{$name}; + if ($text!~/^\s*$/) { $break='
'; } $result.=$break; if ($target eq 'web') { my $value=$Apache::response::foilgroup{$name.'.value'}; @@ -322,27 +543,53 @@ sub displayfoils { if ($text=~/^\s*$/) { $text=$value.$text; } else { - $text=$value.': '.$text; + $text=''.$value.': '.$text; } + } else { + if (@whichopt > 1) { + $text='•'.$text; + } } $result.=$text."\n"; - } elsif ($target eq 'tex') { - $Apache::response::foilgroup{$name.'.text'}=~s/\\item//; - $result .='\item \textit{'.$Apache::response::foilgroup{$name.'.value'}.'}'. - ":".$Apache::response::foilgroup{$name.'.text'}."\n"; - } + } if ($Apache::lonhomework::type eq 'exam') { - if ($target ne 'tex') { - $result.=&webbubbles(\@opt,\@alphabet); - } else { - $result.=&bubbles(\@alphabet,\@opt); - } + $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt); } + $temp++; } } else { my $temp=1; - my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"}); + my %lastresponse; + my $newvariation; + if ((($Apache::lonhomework::history{"resource.$part.type"} eq 'randomizetry') || + ($Apache::lonhomework::type eq 'randomizetry')) && + ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) { + if ($env{'form.'.$part.'.rndseed'} ne + $Apache::lonhomework::history{"resource.$part.rndseed"}) { + $newvariation = 1; + } + } + unless ($newvariation) { + if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) || + (($env{'form.grade_username'} eq $env{'user.name'}) && + ($env{'form.grade_domain'} eq $env{'user.domain'}))) { + %lastresponse = + &Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"}); + } else { + unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || + ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) { + %lastresponse = + &Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"}); + } + } + } my $internal_counter=$Apache::lonxml::counter; + my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt); + if ($checkboxopt && (!$no_tfprompt)) { + $result.='
'. + ($checkboxchoices?&mt('Choices: ').''.$opt[0].','.$opt[1].'. ':''). + &mt('Select all that are [_1].',''.$checkboxopt.''); + } foreach $name (@whichopt) { my $text=$Apache::response::foilgroup{$name.'.text'}; if ($text!~/^\s*$/) { @@ -354,77 +601,151 @@ sub displayfoils { } my $lastopt=$lastresponse{$name}; my $optionlist="\n"; - my $option; - foreach $option (@opt) { - if ($option eq $lastopt) { - $optionlist.="\n"; - } else { - $optionlist.="\n"; - } + + if($target eq 'tex' and $env{'form.pdfFormFields'} eq 'yes' + && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') { + my $fieldname = $env{'request.symb'}.'&part_'.$Apache::inputtags::part.'&optionresponse'.'&HWVAL_'.$Apache::inputtags::response['-1'].':'.$temp; + $optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname); + } + + foreach my $option (@opt) { + my $escopt=&HTML::Entities::encode($option,'\'"&<>'); + if ($option eq $lastopt) { + if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' + && $Apache::inputtags::status[-1] eq 'CAN_ANSWER' + && $Apache::lonhomework::type ne 'exam') { + $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); + } else { + $optionlist.="\n"; + } + } else { + if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' + && $Apache::inputtags::status[-1] eq 'CAN_ANSWER' + && $Apache::lonhomework::type ne 'exam') { + $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); + } else { + $optionlist.="\n"; + } + } } if ($target ne 'tex') { if ($Apache::lonhomework::type ne 'exam') { - $optionlist=''. + '\n"; + } else { +# classic selection list + $optionlist='\n"; + } + } else { + $optionlist=''.(' 'x10).''; } - my $text=$Apache::response::foilgroup{$name.'.text'}; - if (!($text=~s||$optionlist|) && $Apache::lonhomework::type ne 'exam') { - $text=$optionlist.$text; + if ($text=~s||$optionlist|) { + if ($Apache::lonhomework::type ne 'exam') { + if (@whichopt > 1) { + $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); + $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt); } $temp++; } else { - my $texoptionlist = &optionlist_correction($optionlist); - if ($displayoptionintex == 0) { - if ($Apache::lonhomework::type eq 'exam') {$texoptionlist='';} #if exam we do not need to show optionlist - if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) { - if ($Apache::lonhomework::type eq 'exam') { - $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\vskip 2 mm/; - } - if ($Apache::response::foilgroup{$name.'.text'}=~//) { - $Apache::response::foilgroup{$name.'.text'}=~s|| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |; - } - $result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'}; - } else { - if ($Apache::lonhomework::type eq 'exam') { - $result.= $texoptionlist.' '.$Apache::response::foilgroup{$name.'.text'}; - } else { - $result.= $texoptionlist.'\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'}; - } - } + 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') { - $result.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -9 mm \strut '; - $internal_counter++; - } - $displayoptionintex=1; - } else { - if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) { - if ($Apache::lonhomework::type eq 'exam') { - $Apache::response::foilgroup{$name.'.text'}=~s/\\item//; - } - if ($Apache::response::foilgroup{$name.'.text'}=~//) { - $Apache::response::foilgroup{$name.'.text'}=~s|| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |; - } - $result.= $Apache::response::foilgroup{$name.'.text'}; - } else { - if ($Apache::lonhomework::type eq 'exam') { - $result.= ' '.$Apache::response::foilgroup{$name.'.text'}; - } else { - $result.= '\item '.$Apache::response::foilgroup{$name.'.text'}; - } - } + $text=~s/\\item/\\vskip 2 mm/; + } elsif ($env{'form.pdfFormFields'} ne 'yes') { + $result.= $texoptionlist.$text; + } + } else { if ($Apache::lonhomework::type eq 'exam') { - $result.='\vskip -2 mm \parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -9 mm \strut '; - $internal_counter++; + $result.= $texoptionlist.' '.$text; + } elsif ($env{'form.pdfFormFields'} ne 'yes') { + if ($text=~/\S/) { + $result.= $texoptionlist.'\vspace*{-2 mm}\item '.$text; + } else { + $result.= $texoptionlist; + } } } + if ($Apache::lonhomework::type eq 'exam') { + $result.='\vskip -1 mm\noindent'; + my ($numrows,$bubbles_per_row) = &getnumrows(scalar(@opt)); + if ($numrows == 1) { + $result .= '\textbf{'.$internal_counter.'}. \vskip -3mm'; + } else { + my $linetext; + for (my $i=0; $i<$numrows; $i++) { + $linetext .= $internal_counter+$i.', '; + } + $linetext =~ s/,\s$//; + $result .= '\small {\textbf{'.$linetext.'}} '. + '\hskip 2 mm {\footnotesize '. + &mt('(Bubble once in [_1] lines)',$numrows). + '} \vskip 1 mm'; + } + $result.= &bubbles(\@alphabet,\@opt,undef,undef,$numrows, + $bubbles_per_row,$internal_counter). + ' \strut '; + $internal_counter += $numrows; + } + if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' + && $Apache::inputtags::status[-1] eq 'CAN_ANSWER' + && $Apache::lonhomework::type ne 'exam') { + $text =~ s/\\item//m; + $result .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut \\\\'; + $temp++; + } + $displayoptionintex=0; } } } + + if ($target eq 'web') { + my $data = [\@whichopt,'submissiongrading']; + my $questiontype; + if ($Apache::lonhomework::type eq 'randomizetry') { + $questiontype = $Apache::lonhomework::type, + } + &Apache::response::setup_prior_tries_hash(\&Apache::rankresponse::format_prior_answer,$data,$questiontype); + } + if ($target ne 'tex') { return $result.$break; } else { @@ -434,68 +755,108 @@ sub displayfoils { sub optionlist_correction { - - my $texoptionlist = shift; - if ($texoptionlist=~/