--- loncom/homework/optionresponse.pm 2002/04/01 21:26:57 1.36 +++ loncom/homework/optionresponse.pm 2007/03/27 19:20:49 1.139 @@ -1,7 +1,7 @@ -# The LearningOnline Network with CAPA +# LearningOnline Network with CAPA # option list style responses # -# $Id: optionresponse.pm,v 1.36 2002/04/01 21:26:57 albertel Exp $ +# $Id: optionresponse.pm,v 1.139 2007/03/27 19:20: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,31 +39,39 @@ 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(). &Apache::edit::start_spanning_row(). "\n"; - $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4'). - &Apache::edit::end_row(). - &Apache::edit::start_spanning_row(); + $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'); + $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); } -# if ($target eq 'tex') {$result .= '\begin{itemize}';} return $result; } @@ -71,21 +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')); + &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup','drawoptionlist')); my $result; if ($target eq 'edit') { $result=&Apache::edit::end_table(); } -# if ($target eq 'tex') {$result .= '\end{itemize}';} + 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; @@ -106,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.'
'; @@ -114,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 { @@ -129,18 +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') {$result .= '\begin{itemize}';} + if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { + $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.} + \begin{enumerate} '; + } return $result; } @@ -148,45 +166,56 @@ 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 ($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"); + 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,$count,@opt); + $result.=&displayfoils($target,$max,$randomize,$TeXlayout,@opt); + $Apache::lonxml::post_evaluate=0; } elsif ( $target eq 'answer') { - $result.=&displayanswers($count,@opt); + $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($count)); + 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 %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"}; - $responsehash{$name}=$response; + my $response=&Apache::response::getresponse($temp); + if ($env{'form.submitted'} eq 'scantron' && $response=~/\S/) { + $response = $opt[$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) {$right++;} else {$wrong++;} + if ($value eq $response) { + $grade{$name}='1'; $right++; + } else { + $grade{$name}='0'; $wrong++; + } } else { $ignored++; } @@ -195,139 +224,382 @@ sub end_foilgroup { my $part=$Apache::inputtags::part; my $id = $Apache::inputtags::response['-1']; 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"); - my $ad; - if ($wrong==0 && $ignored==0) { - $ad='EXACT_ANS'; - } elsif ($wrong==0 && $right==0) { - #nothing submitted + $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 { - if ($ignored==0) { - $ad='INCORRECT'; - } else { - $ad='MISSING_ANSWER'; - } + 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); } - $Apache::lonhomework::results{"resource.$part.$id.submission"}= - $responsestr; - $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}= - $ad; - &Apache::response::handle_previous(\%previous,$ad); } } + &Apache::lonxml::increment_counter(&getfoilcounts($max)); } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table(); - } - if ($target eq 'tex') {$result .= '\end{itemize}';} + } + 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,@opt)=@_; - my @names = @{ $Apache::response::foilgroup{'names'} }; - my @whichopt = &whichfoils($max); - 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 setup_prior_tries_hash { + my ($whichopt) = @_; + my $part=$Apache::inputtags::part; + my $id=$Apache::inputtags::response[-1]; + foreach my $i (1..$Apache::lonhomework::history{'version'}) { + my $key = "$i:resource.$part.$id.submission"; + next if (!exists($Apache::lonhomework::history{"$key"})); + my %lastresponse= + &Apache::lonnet::str2hash($Apache::lonhomework::history{$key}); + my $output; + foreach my $name (@$whichopt) { + next if (!defined($lastresponse{$name})); + $output .= ''.$lastresponse{$name}.''; + } + next if (!defined($output)); + $output = + ''.$output.'
'; + $Apache::inputtags::submission_display{$key} = $output; + } } sub displayfoils { - my ($target,$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; - $Apache::optionresponse::displayoptionintex=0; - my @whichopt = &whichfoils($max); + 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]; - if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/) || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) { + my $break; + my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; + if ( ($target ne 'tex') && + &Apache::response::show_answer() ) { + my $temp=1; foreach $name (@whichopt) { - if ($target eq 'web') { - $result.="
"; - } elsif ($target eq 'tex') { - $result.='\newline'; + 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); } - $result .=$Apache::response::foilgroup{$name.'.value'}. - ":".$Apache::response::foilgroup{$name.'.text'}."\n"; + $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*$/) { + if ($target eq 'tex') { + $break='\vskip 0 mm '; + } elsif ($target eq 'web') { + $break='
'; + } + } 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') { - $result.="
\n".$Apache::response::foilgroup{$name.'.text'}."\n"; + 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 { - if ($Apache::optionresponse::displayoptionintex == 0) { - my $durtyoptionlist = $optionlist; - $durtyoptionlist =~ s/