--- loncom/homework/optionresponse.pm 2003/05/27 13:56:21 1.78 +++ loncom/homework/optionresponse.pm 2006/03/15 17:10:49 1.135 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # option list style responses # -# $Id: optionresponse.pm,v 1.78 2003/05/27 13:56:21 sakharuk Exp $ +# $Id: optionresponse.pm,v 1.135 2006/03/15 17:10:49 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,11 +25,11 @@ # # 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,13 +39,15 @@ 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:". + "Multiple Option Response Question ". + &Apache::loncommon::help_open_topic('Option_Response_Problems')."Delete:". &Apache::edit::deletelist($target,$token) ." ". &Apache::edit::end_row(). @@ -55,15 +57,19 @@ sub start_optionresponse { $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'); + $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"; push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); } return $result; @@ -73,9 +79,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,7 +93,7 @@ sub start_foilgroup { my $result=''; %Apache::response::foilgroup=(); $Apache::optionresponse::conceptgroup=0; - &Apache::response::setrandomnumber(); + &Apache::response::pushrandomnumber(); if ($target eq 'edit') { my $optionlist="\n"; my $option; @@ -107,6 +114,9 @@ sub start_foilgroup { Delete an Option: 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.'
'; @@ -115,14 +125,14 @@ ENDTABLE 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 { @@ -130,7 +140,9 @@ 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 .= ' \begin{enumerate} '; + $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.} + \begin{enumerate} '; } return $result; } @@ -151,32 +166,33 @@ 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') { + 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); + &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"); 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,@opt); } 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,11 +202,11 @@ sub end_foilgroup { my $ignored=0; foreach $name (@whichopt) { my $response=&Apache::response::getresponse($temp); - if ($ENV{'form.submitted'} eq 'scantron') { + if ($env{'form.submitted'} eq 'scantron' && $response=~/\S/) { $response = $opt[$response]; } - $responsehash{$name}=$response; 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) { @@ -214,7 +230,16 @@ sub end_foilgroup { $responsestr; $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; if ($wrong==0 && $ignored==0) { $ad='EXACT_ANS'; @@ -232,7 +257,11 @@ sub end_foilgroup { } else { 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'; } @@ -251,6 +280,7 @@ sub end_foilgroup { if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { $result .= '\end{enumerate}'; } + &Apache::response::poprandomnumber(); return $result; } @@ -272,47 +302,81 @@ 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)=@_; + 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 ($target,$max,$randomize,@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 $displayoptionintex=0; + 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"}; - 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 %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'}; @@ -320,26 +384,22 @@ sub displayfoils { if ($text=~/^\s*$/) { $text=$value.$text; } else { - $text=$value.': '.$text; + $text=''.$value.': '.$text; } + } else { + $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 $internal_counter=$Apache::lonxml::counter; foreach $name (@whichopt) { my $text=$Apache::response::foilgroup{$name.'.text'}; if ($text!~/^\s*$/) { @@ -351,74 +411,65 @@ sub displayfoils { } my $lastopt=$lastresponse{$name}; my $optionlist="\n"; - my $option; - foreach $option (@opt) { - if ($option eq $lastopt) { - $optionlist.="\n"; - } else { - $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=''. $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') { + $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\} |; + } + + if ($text=~m/\\item /) { if ($Apache::lonhomework::type eq 'exam') { - $result.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -9 mm \strut '; -# $Apache::lonxml::counter++; + $text=~s/\\item/\\vskip 2 mm/; } - $displayoptionintex=1; + $result.= $texoptionlist.$text; } 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'}; - } - } if ($Apache::lonhomework::type eq 'exam') { - $result.='\vskip -2 mm \parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -9 mm \strut '; -# $Apache::lonxml::counter++; + $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; } } } @@ -431,54 +482,81 @@ sub displayfoils { sub optionlist_correction { - - my $texoptionlist = shift; - $texoptionlist =~ s/