--- loncom/homework/optionresponse.pm 2001/12/14 23:00:52 1.29 +++ loncom/homework/optionresponse.pm 2002/10/24 19:51:49 1.54 @@ -1,7 +1,7 @@ -# The LearningOnline Network with CAPA +# LearningOnline Network with CAPA # option list style responses # -# $Id: optionresponse.pm,v 1.29 2001/12/14 23:00:52 albertel Exp $ +# $Id: optionresponse.pm,v 1.54 2002/10/24 19:51:49 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,11 +26,12 @@ # http://www.lon-capa.org/ # # 2/21 Guy +# 01/18 Alex package Apache::optionresponse; use strict; use Apache::response; -sub BEGIN { +BEGIN { &Apache::lonxml::register('Apache::optionresponse',('optionresponse')); } @@ -43,20 +44,26 @@ sub start_optionresponse { my $id = &Apache::response::start_response($parstack,$safeeval); if ($target eq 'edit') { $result.=&Apache::edit::start_table($token). - "Multiple Option Response QuestionDelete:". + "Multiple Option Response QuestionDelete:". &Apache::edit::deletelist($target,$token) - ." \n"; - $result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4'). - ""; - $result.="\n"; - } - if ($target eq 'modified') { + ." ". + &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::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'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } - } - if ($target eq 'meta') { + } 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]"; + push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); } return $result; } @@ -71,12 +78,12 @@ sub end_optionresponse { 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(); if ($target eq 'edit') { @@ -98,10 +105,10 @@ sub start_foilgroup { Delete an Option: - - - $insertlist
ENDTABLE + $result.= &Apache::edit::end_row(); + $result.= &Apache::edit::start_spanning_row(); + $result.= $insertlist.'
'; } if ($target eq 'modified') { my @options; @@ -125,7 +132,7 @@ ENDTABLE if ($optchanged) { $result = "$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 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,@opt); } 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($max,$randomize)); } elsif ( $target eq 'grade') { if ( defined $ENV{'form.submitted'}) { - my @whichopt = &whichfoils($count); + my @whichopt = &whichfoils($max,$randomize); my $temp=1;my $name; my %responsehash; my $right=0; @@ -164,8 +186,8 @@ sub end_foilgroup { my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"}; $responsehash{$name}=$response; if ( $response =~ /[^\s]/) { - &Apache::lonxml::debug("submitted a $response
\n"); my $value=$Apache::response::foilgroup{$name.'.value'}; + &Apache::lonxml::debug("submitted a $response for $value
\n"); if ($value eq $response) {$right++;} else {$wrong++;} } else { $ignored++; @@ -184,7 +206,11 @@ sub end_foilgroup { } elsif ($wrong==0 && $right==0) { #nothing submitted } else { - $ad='INCORRECT'; + if ($ignored==0) { + $ad='INCORRECT'; + } else { + $ad='MISSING_ANSWER'; + } } $Apache::lonhomework::results{"resource.$part.$id.submission"}= $responsestr; @@ -195,37 +221,73 @@ sub end_foilgroup { } } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table(); - } + } + if ($target eq 'tex') {$result .= '\end{enumerate}';} 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 ($max,$randomize)=@_; + $max = &getfoilcounts($max); + &Apache::lonxml::debug("randomize $randomize"); my @names = @{ $Apache::response::foilgroup{'names'} }; my @whichopt =(); + my (%top,@toplist,%bottom,@bottomlist); + if (!(&Apache::response::showallfoils() || ($randomize eq 'no'))) { + my $current=0; + foreach my $name (@names) { + $current++; + if ($Apache::response::foilgroup{$name.'.location'} eq 'top') { + $top{$name}=$current; + } elsif ($Apache::response::foilgroup{$name.'.location'} eq + 'bottom') { + $bottom{$name}=$current; + } + } + } while ((($#whichopt+1) < $max) && ($#names > -1)) { &Apache::lonxml::debug("Have $#whichopt max is $max"); - my $aopt=int(rand($#names+1)); + my $aopt; + if (&Apache::response::showallfoils() || ($randomize eq 'no')) { + $aopt=0; + } else { + $aopt=int(&Math::Random::random_uniform() * ($#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); + if ($top{$aopt}) { + $toplist[$top{$aopt}]=$aopt; + } elsif ($bottom{$aopt}) { + $bottomlist[$bottom{$aopt}]=$aopt; + } else { + push (@whichopt,$aopt); + } + } + for (my $i=0;$i<=$#toplist;$i++) { + if ($toplist[$i]) { unshift(@whichopt,$toplist[$i]) } + } + for (my $i=0;$i<=$#bottomlist;$i++) { + if ($bottomlist[$i]) { push(@whichopt,$bottomlist[$i]) } } + return @whichopt; } sub displayanswers { - my ($max,@opt)=@_; + my ($max,$randomize,@opt)=@_; my @names = @{ $Apache::response::foilgroup{'names'} }; - my @whichopt = &whichfoils($max); + my @whichopt = &whichfoils($max,$randomize); my $result=&Apache::response::answer_header('optionresponse'); foreach my $name (@whichopt) { $result.=&Apache::response::answer_part('optionresponse', @@ -236,19 +298,33 @@ sub displayanswers { } sub displayfoils { - my ($max,@opt)=@_; + my ($target,$max,$randomize,@opt)=@_; my @names = @{ $Apache::response::foilgroup{'names'} }; my @truelist; my @falselist; my $result; my $name; - my @whichopt = &whichfoils($max); + my $displayoptionintex=0; + my @alphabet = ('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P', + 'Q','R','S','T','U','V','W','X','Y','Z'); + my @whichopt = &whichfoils($max,$randomize); 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')) { foreach $name (@whichopt) { - $result.="
".$Apache::response::foilgroup{$name.'.value'}. - ":".$Apache::response::foilgroup{$name.'.text'}."\n"; + if ($target eq 'web') { + $result.="
"; + } elsif ($target eq 'tex') { + $result.='\vskip 0 mm '; + } + if ($target ne 'tex') { + $result .=$Apache::response::foilgroup{$name.'.value'}. + ":".$Apache::response::foilgroup{$name.'.text'}."\n"; + } else { + $Apache::response::foilgroup{$name.'.text'}=~s/\\item//; + $result .='\item '.$Apache::response::foilgroup{$name.'.value'}. + ":".$Apache::response::foilgroup{$name.'.text'}."\n"; + } } } else { my $temp=1; @@ -264,25 +340,119 @@ sub displayfoils { $optionlist.="\n"; } } - $result.="
\n".$Apache::response::foilgroup{$name.'.text'}."\n"; - $temp++; + if ($target ne 'tex') { + $result.="
\n".$Apache::response::foilgroup{$name.'.text'}."\n"; + if ($Apache::lonhomework::type eq 'exam') { + my $number_of_bubbles = $#opt + 1; + $result.= ''; + for (my $ind=0;$ind<$number_of_bubbles;$ind++) { + $result.=''; + } + $result.='
'.$alphabet[$ind].': '.$opt[$ind].'
'; + } + $temp++; + } else { + if ($displayoptionintex == 0) { + my $texoptionlist = &optionlist_correction($optionlist); + if ($Apache::lonhomework::type eq 'exam') {$texoptionlist='';} + if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) { + if ($Apache::lonhomework::type eq 'exam') { + $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\item[\\textbf{$Apache::lonxml::counter}\.]/; + } + $result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'}; + } else { + if ($Apache::lonhomework::type eq 'exam') { + $result.= $texoptionlist.'\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'}; + } else { + $result.= $texoptionlist.'\item '.$Apache::response::foilgroup{$name.'.text'}; + } + } + if ($Apache::lonhomework::type eq 'exam') { + $result.=&bubbles(\@alphabet,\@opt); + } + $displayoptionintex=1; + } else { + if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) { + if ($Apache::lonhomework::type eq 'exam') { + $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\item[\\textbf{$Apache::lonxml::counter}\.]/; + } + $result.= $Apache::response::foilgroup{$name.'.text'}; + } else { + if ($Apache::lonhomework::type eq 'exam') { + $result.= '\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'}; + } else { + $result.= '\item '.$Apache::response::foilgroup{$name.'.text'}; + } + } + if ($Apache::lonhomework::type eq 'exam') { + $result.=&bubbles(\@alphabet,\@opt); + } + } + } } + } + if ($target ne 'tex') { + return $result."
"; } - return $result."
"; + else { + return $result; + } +} + + +sub optionlist_correction { + + my $texoptionlist = shift; + $texoptionlist =~ s/