--- loncom/homework/radiobuttonresponse.pm 2001/02/22 00:49:03 1.13 +++ loncom/homework/radiobuttonresponse.pm 2001/05/31 22:34:33 1.18 @@ -12,7 +12,7 @@ sub BEGIN { sub start_radiobuttonresponse { my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; #when in a radiobutton response use these - &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil')); + &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup')); my $id = &Apache::response::start_response($parstack,$safeeval); return ''; } @@ -25,16 +25,22 @@ sub end_radiobuttonresponse { %Apache::response::foilgroup={}; sub start_foilgroup { %Apache::response::foilgroup={}; + $Apache::radiobuttonresponse::conceptgroup=0; + &Apache::response::setrandomnumber(); return ''; } -sub setrandomnumber { - my $rndseed=&Apache::lonnet::rndseed(); - $rndseed=unpack("%32i",$rndseed); - $rndseed=$rndseed - +&Apache::lonnet::numval($Apache::inputtags::part) - +&Apache::lonnet::numval($Apache::inputtags::response['-1']); - srand($rndseed); +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 ''; } @@ -43,27 +49,37 @@ sub end_foilgroup { my $result; if ($target ne 'meta') { - my $name; - &setrandomnumber(); - 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'; + 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'; + } } } } @@ -92,6 +108,25 @@ sub getfoilcounts { 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; +} + sub displayfoils { my ($max,$answer)=@_; my @names = @{ $Apache::response::foilgroup{'names'} }; @@ -111,11 +146,12 @@ sub displayfoils { &Apache::lonxml::error("Unknown state $Apache::response::foilgroup{$name.'.value'} for $name in "); } } - my $whichtrue = rand $#truelist; + my $whichtrue = int(rand($#truelist+1)); &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue"); my @whichfalse =(); - while ((($#whichfalse+2) < $max) && ($#falselist > -1)) { - my $afalse=rand $#falselist; + while ((($#whichfalse+1) < $max) && ($#falselist > -1)) { + &Apache::lonxml::debug("Have $#whichfalse max is $max"); + my $afalse=int(rand($#falselist+1)); &Apache::lonxml::debug("From $#falselist elms, picking $afalse"); $afalse=splice(@falselist,$afalse,1); &Apache::lonxml::debug("Picked $afalse"); @@ -135,14 +171,44 @@ sub displayfoils { } } 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.="
".$Apache::response::foilgroup{$name.'.text'}."\n"; + $result.="
\n"; $temp++; } } return $result."
"; } +sub start_conceptgroup { + $Apache::radiobuttonresponse::conceptgroup=1; + %Apache::response::conceptgroup={}; + return ''; +} + +sub end_conceptgroup { + my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + $Apache::radiobuttonresponse::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::startredirection; return ''; @@ -150,15 +216,24 @@ sub start_foil { sub end_foil { my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; - my $foil=&Apache::lonxml::endredirection; + my $text=''; + if ($target eq 'web') { $text=&Apache::lonxml::endredirection; } if ($target eq 'web' || $target eq 'grade') { my $args =''; if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } - my $name = &Apache::run::run("{$args;".'return $name}',$safeeval); - 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"} = $foil; + if ($value ne 'unused') { + my $name = &Apache::run::run("{$args;".'return $name}',$safeeval); + if ( $Apache::radiobuttonresponse::conceptgroup ) { + push @{ $Apache::response::conceptgroup{'names'} }, $name; + $Apache::response::conceptgroup{"$name.value"} = $value; + $Apache::response::conceptgroup{"$name.text"} = $text; + } else { + push @{ $Apache::response::foilgroup{'names'} }, $name; + $Apache::response::foilgroup{"$name.value"} = $value; + $Apache::response::foilgroup{"$name.text"} = $text; + } + } } return ''; }