--- loncom/homework/radiobuttonresponse.pm 2002/11/07 15:34:14 1.60 +++ loncom/homework/radiobuttonresponse.pm 2003/10/27 20:04:34 1.79 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # mutliple choice style responses # -# $Id: radiobuttonresponse.pm,v 1.60 2002/11/07 15:34:14 sakharuk Exp $ +# $Id: radiobuttonresponse.pm,v 1.79 2003/10/27 20:04:34 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,7 +25,6 @@ # # http://www.lon-capa.org/ # -# 2/21 Guy package Apache::radiobuttonresponse; use strict; @@ -62,7 +61,20 @@ sub start_radiobuttonresponse { $safeeval,'max','randomize'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } elsif ($target eq 'tex') { + my $type=&Apache::lonxml::get_param('TeXtype',$parstack,$safeeval,undef,0); + if ($type eq '1') { + $result .= ' \renewcommand{\labelenumi}{\arabic{enumi}.}'; + } elsif ($type eq 'A') { + $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}'; + } elsif ($type eq 'a') { + $result .= ' \renewcommand{\labelenumi}{\alph{enumi}.}'; + } elsif ($type eq 'i') { + $result .= ' \renewcommand{\labelenumi}{\roman{enumi}.}'; + } $result .= '\begin{enumerate}'; + } elsif ($target eq 'analyze') { + my $part_id="$Apache::inputtags::part.$id"; + push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); } return $result; } @@ -87,14 +99,13 @@ sub start_foilgroup { &Apache::response::setrandomnumber(); if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') { $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]'; - &Apache::lonxml::increment_counter(); } return $result; } sub storesurvey { if ( !defined($ENV{'form.submitted'})) { return ''; } - my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']}; + my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1']}; &Apache::lonxml::debug("Here I am!:$response:"); if ( $response !~ /[0-9]+/) { return ''; } my $id = $Apache::inputtags::response['-1']; @@ -112,7 +123,12 @@ sub grade_response { #keep the random numbers the same must always call this my ($answer,@whichfoils)=&whichfoils($max,$randomize); if (!defined($ENV{'form.submitted'})) { return; } - my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']}; + my $response; + if ($ENV{'form.submitted'} eq 'scantron') { + $response=&Apache::response::getresponse(); + } else { + $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1']}; + } if ( $response !~ /[0-9]+/) { return; } my $part=$Apache::inputtags::part; my $id = $Apache::inputtags::response['-1']; @@ -138,9 +154,10 @@ 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') { + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { my $style = $Apache::lonhomework::type; - if ( $style eq 'survey' ) { + if ( $style eq 'survey' && $target ne 'analyze') { if ($target eq 'web' || $target eq 'answer' || $target eq 'tex') { $result=&displayallfoils(); } elsif ( $target eq 'grade' ) { @@ -157,9 +174,17 @@ sub end_foilgroup { $result=&displayanswers($max,$randomize); } elsif ( $target eq 'grade') { &grade_response($max,$randomize); + } elsif ( $target eq 'analyze') { + 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"} }, + ('true','false')); } } } + &Apache::lonxml::increment_counter(); return $result; } @@ -190,7 +215,7 @@ sub displayallfoils { my $part=$Apache::inputtags::part; my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; my %lastresponse=&Apache::lonnet::str2hash($lastresponse); - if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/) || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) { + if (&Apache::response::show_answer() ) { foreach my $name (@names) { if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') { $result.="
".$Apache::response::foilgroup{$name.'.value'}; @@ -206,7 +231,7 @@ sub displayallfoils { } else { foreach my $name (@names) { if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') { - $result.="
\n"; $temp++; @@ -276,14 +301,16 @@ sub whichfoils { } } #pick a true statement + my $notrue=0; + if (scalar(@truelist) == 0) { $notrue=1; } my $whichtrue = int(&Math::Random::random_uniform() * ($#truelist+1)); &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue"); - my $numinserted; my (@toplist, @bottomlist); my $topcount=0; + my $bottomcount=0; # assign everyone to either toplist/bottomlist or whichfalse # which false is randomized, toplist bottomlist are in order - while ((($numinserted) < $max-1) && ($#falselist > -1)) { + while ((($#whichfalse+$topcount+$bottomcount) < $max-2) && ($#falselist > -1)) { &Apache::lonxml::debug("Have $#whichfalse max is $max"); my $afalse=int(&Math::Random::random_uniform() * ($#falselist+1)); &Apache::lonxml::debug("From $#falselist elms, picking $afalse"); @@ -296,14 +323,20 @@ sub whichfoils { $topcount++; } elsif ($bottom{$afalse}) { $bottomlist[$bottom{$afalse}]=$afalse; + $bottomcount++; } else { push (@whichfalse,$afalse); } } + &Apache::lonxml::debug("Answer wants $answer"); my $truename=$truelist[$whichtrue]; my $dosplice=1; + if ($notrue) { + $dosplice=0; + &Apache::lonxml::error("There are no true statements available.
"); + } #insert the true statement, keeping track of where it wants to be - if ($Apache::response::foilgroup{$truename.'.location'} eq 'top' ) { + if ($Apache::response::foilgroup{$truename.'.location'} eq 'top' && $dosplice) { $toplist[$top{$truename}]=$truename; $answer=-1; foreach my $top (reverse(@toplist)) { @@ -311,7 +344,7 @@ sub whichfoils { if ($top eq $truename) { last; } } $dosplice=0; - } elsif ($Apache::response::foilgroup{$truename.'.location'} eq 'bottom') { + } elsif ($Apache::response::foilgroup{$truename.'.location'} eq 'bottom' && $dosplice) { $bottomlist[$bottom{$truename}]=$truename; $answer=-1; foreach my $bot (@bottomlist) { @@ -321,11 +354,12 @@ sub whichfoils { $answer+=$topcount+$#whichfalse+1; $dosplice=0; } else { - if ($topcount>0) { - $answer = int(&Math::Random::random_uniform() * ($#whichfalse+1)) - + $topcount; + if ($topcount>0 || $bottomcount>0) { + $answer = int(&Math::Random::random_uniform() * ($#whichfalse+1)) + + $topcount; } } + &Apache::lonxml::debug("Answer now wants $answer"); #add the top items to the top, bottom items to the bottom for (my $i=0;$i<=$#toplist;$i++) { if ($toplist[$i]) { unshift(@whichfalse,$toplist[$i]) } @@ -345,12 +379,15 @@ sub displayfoils { my $result; my ($answer,@whichfoils)=&whichfoils($max,$randomize); - if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) { + my $part=$Apache::inputtags::part; + my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; + if ( ($target ne 'tex') && + &Apache::response::show_answer() ) { foreach my $name (@whichfoils) { if ($target ne 'tex') { $result.="
"; } else { - $result.='\vskip 0 mm '; + $result.='\item \vskip -2 mm '; } if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { if ($target ne 'tex') { $result.='Correct:'; } else { $result.='Correct: \textbf{';} @@ -367,7 +404,7 @@ sub displayfoils { } } } else { - 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 @alphabet = ('A'..'Z'); my $i = 0; my $temp=0; my $id=$Apache::inputtags::response['-1']; @@ -376,12 +413,9 @@ sub displayfoils { my %lastresponse=&Apache::lonnet::str2hash($lastresponse); foreach my $name (@whichfoils) { if ($target ne 'tex') { - $result.="
\n"; - if ($Apache::lonhomework::type eq 'exam') { - $result .= '
A:   CorrectB:   Incorrect
'; - } } else { if ($Apache::lonhomework::type eq 'exam') { $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs @@ -430,23 +464,12 @@ sub end_conceptgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; $Apache::radiobuttonresponse::conceptgroup=0; my $result; - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { - if (defined(@{ $Apache::response::conceptgroup{'names'} })) { - my @names = @{ $Apache::response::conceptgroup{'names'} }; - my $pick=int(&Math::Random::random_uniform() * ($#names+1)); - my $name=$names[$pick]; - push @{ $Apache::response::foilgroup{'names'} }, $name; - $Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"}; - $Apache::response::foilgroup{"$name.value"} = $Apache::response::conceptgroup{"$name.value"}; - $Apache::response::foilgroup{"$name.location"} = $Apache::response::conceptgroup{"$name.location"}; - my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval); - $Apache::response::foilgroup{"$name.concept"} = $concept; - &Apache::lonxml::debug("Selecting $name in $concept"); - my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; - push(@{ $Apache::hint::radiobutton{"$part_id.concepts"} },$concept); - $Apache::hint::radiobutton{"$part_id.concept.$concept"}= - $Apache::response::conceptgroup{'names'}; - } + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { + &Apache::response::pick_foil_for_concept($target, + ['value','text','location'], + \%Apache::hint::radiobutton, + $parstack,$safeeval); } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); } @@ -461,7 +484,7 @@ sub insert_conceptgroup { sub start_foil { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web' || $target eq 'tex') { + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { &Apache::lonxml::startredirection; } elsif ($target eq 'edit') { $result=&Apache::edit::tag_start($target,$token); @@ -486,8 +509,10 @@ sub start_foil { sub end_foil { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $text=''; - if ($target eq 'web' || $target eq 'tex') { $text=&Apache::lonxml::endredirection; } - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { + $text=&Apache::lonxml::endredirection; + } + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); if ($value ne 'unused') { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);