--- loncom/homework/optionresponse.pm 2003/04/02 18:07:10 1.72 +++ loncom/homework/optionresponse.pm 2003/07/25 20:56:08 1.82 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # option list style responses # -# $Id: optionresponse.pm,v 1.72 2003/04/02 18:07:10 sakharuk Exp $ +# $Id: optionresponse.pm,v 1.82 2003/07/25 20:56:08 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -152,9 +152,11 @@ sub end_foilgroup { 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('texoptions',$parstack,$safeeval); my $name; my @opt; eval '@opt ='.&Apache::lonxml::get_param('options',$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, @@ -185,7 +187,10 @@ sub end_foilgroup { my $wrong=0; my $ignored=0; foreach $name (@whichopt) { - my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"}; + my $response=&Apache::response::getresponse($temp); + if ($ENV{'form.submitted'} eq 'scantron') { + $response = $opt[$response]; + } $responsehash{$name}=$response; if ( $response =~ /[^\s]/) { my $value=$Apache::response::foilgroup{$name.'.value'}; @@ -207,30 +212,47 @@ sub end_foilgroup { 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 - } else { - if ($ignored==0) { - $ad='INCORRECT'; - } else { - $ad='MISSING_ANSWER'; - } - } $Apache::lonhomework::results{"resource.$part.$id.submission"}= - $responsestr; + $responsestr; $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr; - $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}= - $ad; - &Apache::response::handle_previous(\%previous,$ad); + + if (!$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 { + my $ad; + if ($wrong==0 && $right==0) { + #nothing submitted + } 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::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}';} + } + if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { + $result .= '\end{enumerate}'; + } return $result; } @@ -245,52 +267,10 @@ sub getfoilcounts { } sub whichfoils { - my ($max,$randomize)=@_; - $max = &getfoilcounts($max); - &Apache::lonxml::debug("randomize $randomize"); - if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;} - 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; - 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"); - 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; + my ($max,$randomize)=@_; + return &Apache::response::whichorder($max,$randomize, + &Apache::response::showallfoils(), + \%Apache::response::foilgroup); } sub displayanswers { @@ -313,7 +293,7 @@ sub displayfoils { my @names = @{ $Apache::response::foilgroup{'names'} }; my @truelist; my @falselist; - my $result; + my $result; my $name; my $displayoptionintex=0; my @alphabet = ('A'..'Z'); @@ -348,7 +328,8 @@ sub displayfoils { $result.=$text."\n"; } elsif ($target eq 'tex') { $Apache::response::foilgroup{$name.'.text'}=~s/\\item//; - $result .='\item \textit{'.$Apache::response::foilgroup{$name.'.value'}.'}'. + if ($max>1) {$result .='\item ';} + $result .=' \textit{'.$Apache::response::foilgroup{$name.'.value'}.'}'. ":".$Apache::response::foilgroup{$name.'.text'}."\n"; } if ($Apache::lonhomework::type eq 'exam') { @@ -362,6 +343,7 @@ sub displayfoils { } 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*$/) { @@ -393,7 +375,7 @@ sub displayfoils { } $result.=$break.$text."\n"; if ($Apache::lonhomework::type eq 'exam') { - $result.=&webbubbles(\@opt,\@alphabet); + $result.=&webbubbles(\@opt,\@alphabet,$temp); } $temp++; } else { @@ -416,7 +398,8 @@ sub displayfoils { } } 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 '; + $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 { @@ -436,7 +419,8 @@ sub displayfoils { } } 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 '; + $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++; } } } @@ -453,29 +437,33 @@ sub displayfoils { sub optionlist_correction { my $texoptionlist = shift; - $texoptionlist =~ s/