--- loncom/homework/radiobuttonresponse.pm 2001/05/31 22:34:33 1.18 +++ loncom/homework/radiobuttonresponse.pm 2001/12/13 23:36:39 1.32 @@ -1,5 +1,30 @@ # The LearningOnline Network with CAPA # mutliple choice style responses +# +# $Id: radiobuttonresponse.pm,v 1.32 2001/12/13 23:36:39 albertel Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# # 2/21 Guy package Apache::radiobuttonresponse; @@ -10,16 +35,37 @@ sub BEGIN { } sub start_radiobuttonresponse { - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; #when in a radiobutton response use these &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup')); + push (@Apache::lonxml::namespace,'radiobuttonresponse'); my $id = &Apache::response::start_response($parstack,$safeeval); - return ''; + if ($target eq 'meta') { + $result=&Apache::response::meta_package_write('radiobuttonresponse'); + } elsif ($target eq 'edit' ) { + $result.=&Apache::edit::start_table($token). + ''.&Apache::lonxml::description($token)."Delete:". + &Apache::edit::deletelist($target,$token) + ." \n"; + $result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4'). + ""; + $result.="\n"; + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'max'); + if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } + } + return $result; } sub end_radiobuttonresponse { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; + if ($target eq 'edit') { $result=&Apache::edit::end_table(); } &Apache::response::end_response; - return ''; + pop @Apache::lonxml::namespace; + return $result; } %Apache::response::foilgroup={}; @@ -34,9 +80,12 @@ 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]/) { + if ( $response =~ /[0-9]+/) { my $id = $Apache::inputtags::response['-1']; - $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response; + my @whichfoils=@{ $Apache::response::foilgroup{'names'} }; + my %responsehash; + $responsehash{$whichfoils[$response]}=$response; + $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=&Apache::lonnet::hash2str(%responsehash); $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='SUBMITTED'; &Apache::lonxml::debug("submitted a $response
\n"); } @@ -44,16 +93,40 @@ sub storesurvey { return ''; } +sub grade_response { + my ($max,$answer)=@_; + if (!defined($ENV{'form.submitted'})) { return; } + my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']}; + if ( $response !~ /[0-9]+/) { return; } + my $part=$Apache::inputtags::part; + my $id = $Apache::inputtags::response['-1']; + my @whichfoils=&whichfoils($max,$answer); + my %responsehash; + $responsehash{$whichfoils[$response]}=$response; + my $responsestr=&Apache::lonnet::hash2str(%responsehash); + my %previous=&Apache::response::check_for_previous($responsestr, + $part,$id); + $Apache::lonhomework::results{"resource.$part.$id.submission"}= + $responsestr; + &Apache::lonxml::debug("submitted a $response
\n"); + my $ad; + if ($response == $answer) { + $ad='EXACT_ANS'; + } else { + $ad='INCORRECT'; + } + $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; + &Apache::response::handle_previous(\%previous,$ad); +} + sub end_foilgroup { - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; - + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; - if ($target ne 'meta') { - my $rrargs =''; - if ( $#$parstack > 0 ) { $rrargs=$$parstack['-2']; } - my $style = &Apache::run::run("{$rrargs;".'return $style}',$safeeval); + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') { + my $style = $Apache::lonhomework::type; if ( $style eq 'survey' ) { - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'answer') { $result=&displayallfoils(); } elsif ( $target eq 'grade' ) { $result=&storesurvey(); @@ -68,20 +141,10 @@ sub end_foilgroup { &Apache::lonxml::debug("Answer is $answer, $count from $max, $falsecnt"); if ($target eq 'web') { $result=&displayfoils($max,$answer); + } elsif ($target eq 'answer' ) { + $result=&displayanswers($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'; - } - } - } + &grade_response($max,$answer); } } } @@ -90,9 +153,7 @@ sub end_foilgroup { sub getfoilcounts { my ($parstack,$safeeval)=@_; - my $rrargs =''; - if ( $#$parstack > 0 ) { $rrargs=$$parstack['-2']; } - my $max = &Apache::run::run("{$rrargs;".'return $max}',$safeeval); + my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); my @names = @{ $Apache::response::foilgroup{'names'} }; my $truecnt=0; my $falsecnt=0; @@ -116,10 +177,12 @@ sub displayallfoils { my $id=$Apache::inputtags::response['-1']; my $part=$Apache::inputtags::part; my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; + my %lastresponse=&Apache::lonnet::str2hash($lastresponse); + &Apache::lonhomework::showhash(%lastresponse); foreach my $name (@names) { if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') { $result.="
\n"; $temp++; } @@ -127,15 +190,14 @@ sub displayallfoils { return $result; } -sub displayfoils { +sub whichfoils { my ($max,$answer)=@_; - my @names = @{ $Apache::response::foilgroup{'names'} }; + my @truelist; my @falselist; - my $result; - my $name; - foreach $name (@names) { + my @names = @{ $Apache::response::foilgroup{'names'} }; + foreach my $name (@names) { #result.="
$name is $Apache::response::foilgroup{$name.'.value'} "; if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { push (@truelist,$name); @@ -159,8 +221,16 @@ sub displayfoils { } splice(@whichfalse,$answer,0,$truelist[$whichtrue]); &Apache::lonxml::debug("the true statement is $answer"); + return @whichfalse; +} + +sub displayfoils { + my ($max,$answer)=@_; + my $result; + + my @whichfoils=&whichfoils($max,$answer); if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) { - foreach $name (@whichfalse) { + foreach my $name (@whichfoils) { $result.="
"; if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { $result.='Correct'; @@ -174,9 +244,10 @@ sub displayfoils { my $id=$Apache::inputtags::response['-1']; my $part=$Apache::inputtags::part; my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; - foreach $name (@whichfalse) { + my %lastresponse=&Apache::lonnet::str2hash($lastresponse); + foreach my $name (@whichfoils) { $result.="
\n"; $temp++; } @@ -184,46 +255,90 @@ sub displayfoils { return $result."
"; } +sub displayanswers { + my ($max,$answer)=@_; + my @names = @{ $Apache::response::foilgroup{'names'} }; + my @whichopt = &whichfoils($max,$answer); + my $result=&Apache::response::answer_header('radiobuttonresponse'); + foreach my $name (@whichopt) { + $result.=&Apache::response::answer_part('radiobuttonresponse', + $Apache::response::foilgroup{$name.'.value'}) + } + $result.=&Apache::response::answer_footer('radiobuttonresponse'); + return $result; +} + sub start_conceptgroup { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; $Apache::radiobuttonresponse::conceptgroup=1; %Apache::response::conceptgroup={}; - return ''; + my $result; + if ($target eq 'edit') { + $result.=&Apache::edit::tag_start($target,$token); + $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50'). + "\n"; + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'concept'); + if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } + } + return $result; } sub end_conceptgroup { - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + my ($target,$token,$tagstack,$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"); + my $result; + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) { + if (defined(@{ $Apache::response::conceptgroup{'names'} })) { + 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 $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval); + $Apache::response::foilgroup{"$name.concept"} = $concept; + &Apache::lonxml::debug("Selecting $name in $concept"); + } + } elsif ($target eq 'edit') { + $result=&Apache::edit::end_table(); } - return ''; + return $result; +} + +sub insert_conceptgroup { + my $result="\n\t\t".&insert_foil()."\n\t\t\n"; + return $result; } sub start_foil { - &Apache::lonxml::startredirection; - return ''; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + if ($target eq 'web') { + &Apache::lonxml::startredirection; + } elsif ($target eq 'edit') { + $result=&Apache::edit::tag_start($target,$token); + $result.=&Apache::edit::text_arg('Name:','name',$token); + $result.=&Apache::edit::select_arg('Correct Option:','value', + ['unused','true','false'],$token); + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, + 'value','name'); + if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } + } + return $result; } sub end_foil { - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; 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 $value = &Apache::run::run("{$args;".'return $value}',$safeeval); + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) { + my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); if ($value ne 'unused') { - my $name = &Apache::run::run("{$args;".'return $name}',$safeeval); + my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); + if (!$name) { $name=$Apache::lonxml::curdepth; } if ( $Apache::radiobuttonresponse::conceptgroup ) { push @{ $Apache::response::conceptgroup{'names'} }, $name; $Apache::response::conceptgroup{"$name.value"} = $value; @@ -238,6 +353,13 @@ sub end_foil { return ''; } +sub insert_foil { + return ' + + + +'; +} 1; __END__