--- loncom/homework/radiobuttonresponse.pm 2001/01/12 01:07:13 1.5 +++ loncom/homework/radiobuttonresponse.pm 2001/04/23 17:15:13 1.15 @@ -1,7 +1,6 @@ # The LearningOnline Network with CAPA # mutliple choice style responses - -# 11/23,11/24,11/28 Gerd Kortemeyer +# 2/21 Guy package Apache::radiobuttonresponse; use strict; @@ -26,6 +25,9 @@ sub end_radiobuttonresponse { %Apache::response::foilgroup={}; sub start_foilgroup { %Apache::response::foilgroup={}; + $Apache::optionresponse::conceptgroup=0; + &setrandomnumber(); + return ''; } sub setrandomnumber { @@ -38,31 +40,98 @@ sub setrandomnumber { return ''; } -#FIXME needs to stablely do random picks +sub storesurvey { + if ( defined $ENV{'form.submitted'}) { + my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']}; + &Apache::lonxml::debug("Here I am!:$response:"); + if ( $response =~ /[^\s]/) { + my $id = $Apache::inputtags::response['-1']; + $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response; + $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='SUBMITTED'; + &Apache::lonxml::debug("submitted a $response
\n"); + } + } + return ''; +} + sub end_foilgroup { my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; - my $name; + my $result; - &setrandomnumber(); + if ($target ne 'meta') { + my $rrargs =''; + if ( $#$parstack > 0 ) { $rrargs=$$parstack['-2']; } + my $style = &Apache::run::run("{$rrargs;".'return $style}',$safeeval); + if ( $style eq 'survey' ) { + if ($target eq 'web') { + $result=&displayallfoils(); + } elsif ( $target eq 'grade' ) { + $result=&storesurvey(); + } + } else { + my $name; + my ($truecnt,$falsecnt,$max) = &getfoilcounts($parstack,$safeeval); + my $count=0; + # we will add in 1 of the true statements + if (($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; } + my $answer = int(rand ($count)); + &Apache::lonxml::debug("Answer is $answer, $count from $max, $falsecnt"); + if ($target eq 'web') { + $result=&displayfoils($max,$answer); + } elsif ( $target eq 'grade') { + if ( defined $ENV{'form.submitted'}) { + my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']}; + if ( $response =~ /[^\s]/) { + my $id = $Apache::inputtags::response['-1']; + $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response; + &Apache::lonxml::debug("submitted a $response
\n"); + if ($response == $answer) { + $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS'; + } else { + $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='INCORRECT'; + } + } + } + } + } + } + return $result; +} + +sub getfoilcounts { + my ($parstack,$safeeval)=@_; my $rrargs =''; if ( $#$parstack > 0 ) { $rrargs=$$parstack['-2']; } my $max = &Apache::run::run("{$rrargs;".'return $max}',$safeeval); - my $answer = int(rand $max); - if ($target eq 'web') { - $result=&displayfoils($max,$answer); - } elsif ( $target eq 'grade') { - if ( defined $ENV{'form.submit'}) { - my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']}; - if ( $response =~ /[^\s]/) { - my $id = $Apache::inputtags::response['-1']; - $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response; - &Apache::lonxml::debug("submitted a $response
\n"); - if ($response == $answer) { - $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS'; - } else { - $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='INCORRECT'; - } - } + my @names = @{ $Apache::response::foilgroup{'names'} }; + my $truecnt=0; + my $falsecnt=0; + my $name; + + foreach $name (@names) { + if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { + $truecnt++; + } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') { + $falsecnt++; + } + } + return ($truecnt,$falsecnt,$max); +} + +sub displayallfoils { + my $result; + &Apache::lonxml::debug("survey style display"); + my @names = @{ $Apache::response::foilgroup{'names'} }; + my $temp=0; + my $id=$Apache::inputtags::response['-1']; + my $part=$Apache::inputtags::part; + my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; + foreach my $name (@names) { + if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') { + $result.="
\n"; + $temp++; } } return $result; @@ -77,7 +146,7 @@ sub displayfoils { my $name; foreach $name (@names) { - #result.="
$name is $Apache::response::foilgroup{$name.'.value'} "; + #result.="
$name is $Apache::response::foilgroup{$name.'.value'} "; if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { push (@truelist,$name); } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') { @@ -90,7 +159,7 @@ sub displayfoils { my $whichtrue = rand $#truelist; &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue"); my @whichfalse =(); - while ((($#whichfalse+2) < $max) && ($#falselist > -1)) { + while ((($#whichfalse+1) < $max) && ($#falselist > -1)) { my $afalse=rand $#falselist; &Apache::lonxml::debug("From $#falselist elms, picking $afalse"); $afalse=splice(@falselist,$afalse,1); @@ -98,22 +167,65 @@ sub displayfoils { push (@whichfalse,$afalse); } splice(@whichfalse,$answer,0,$truelist[$whichtrue]); - my $temp=0; &Apache::lonxml::debug("the true statement is $answer"); - foreach $name (@whichfalse) { - $result.="
".$Apache::response::foilgroup{$name.'.text'}."\n"; - $temp++; + if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) { + foreach $name (@whichfalse) { + $result.="
"; + if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { + $result.='Correct'; + } else { + $result.='Incorrect'; + } + $result.=":".$Apache::response::foilgroup{$name.'.text'}."\n"; + } + } else { + my $temp=0; + my $id=$Apache::inputtags::response['-1']; + my $part=$Apache::inputtags::part; + my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; + foreach $name (@whichfalse) { + $result.="
\n"; + $temp++; + } } return $result."
"; } +sub start_conceptgroup { + $Apache::optionresponse::conceptgroup=1; + %Apache::response::conceptgroup={}; + return ''; +} + +sub end_conceptgroup { + my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + $Apache::optionresponse::conceptgroup=0; + if ($target eq 'web' || $target eq 'grade') { + my @names = @{ $Apache::response::conceptgroup{'names'} }; + my $pick=int rand $#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"}; + my $args; + if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } + my $concept = &Apache::run::run("{$args;".'return $concept}',$safeeval); + $Apache::response::foilgroup{"$name.concept"} = $concept; + &Apache::lonxml::debug("Selecting $name in $concept"); + } + return ''; +} + sub start_foil { - $Apache::lonxml::redirection--; + &Apache::lonxml::startredirection; return ''; } sub end_foil { my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + my $foil=&Apache::lonxml::endredirection; if ($target eq 'web' || $target eq 'grade') { my $args =''; if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } @@ -121,12 +233,7 @@ sub end_foil { push @{ $Apache::response::foilgroup{'names'} }, $name; my $value = &Apache::run::run("{$args;".'return $value}',$safeeval); $Apache::response::foilgroup{"$name.value"} = $value; - $Apache::response::foilgroup{"$name.text"} = $Apache::lonxml::outputstack; - } - - $Apache::lonxml::redirection++; - if ($Apache::lonxml::redirection == 1) { - $Apache::lonxml::outputstack=''; + $Apache::response::foilgroup{"$name.text"} = $foil; } return ''; }