--- loncom/homework/radiobuttonresponse.pm 2001/11/09 20:20:45 1.28 +++ loncom/homework/radiobuttonresponse.pm 2002/04/03 19:32:36 1.39 @@ -1,11 +1,36 @@ # The LearningOnline Network with CAPA # mutliple choice style responses +# +# $Id: radiobuttonresponse.pm,v 1.39 2002/04/03 19:32:36 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; use strict; -sub BEGIN { +BEGIN { &Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse')); } @@ -20,16 +45,19 @@ sub start_radiobuttonresponse { $result=&Apache::response::meta_package_write('radiobuttonresponse'); } elsif ($target eq 'edit' ) { $result.=&Apache::edit::start_table($token). - ''.&Apache::lonxml::description($token)."Delete:". + ''.&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"; + ." ".&Apache::edit::end_row() + .&Apache::edit::start_spanning_row(); + + $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4'). + &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n"; } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack, $safeeval,'max'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } + } elsif ($target eq 'tex') { + $result .= '\begin{enumerate}'; } return $result; } @@ -38,8 +66,10 @@ sub end_radiobuttonresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; if ($target eq 'edit') { $result=&Apache::edit::end_table(); } + if ($target eq 'tex') { $result .= '\end{enumerate}'; } &Apache::response::end_response; pop @Apache::lonxml::namespace; + &Apache::lonxml::deregister('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup')); return $result; } @@ -52,27 +82,54 @@ sub start_foilgroup { } 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"); - } - } + if ( !defined($ENV{'form.submitted'})) { return ''; } + 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']; + 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"); 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,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - + my $result; - if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') { - my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval,'-2'); + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') { + my $style = $Apache::lonhomework::type; if ( $style eq 'survey' ) { - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'answer' || $target eq 'tex') { $result=&displayallfoils(); } elsif ( $target eq 'grade' ) { $result=&storesurvey(); @@ -85,24 +142,12 @@ sub end_foilgroup { 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); + if ($target eq 'web' || $target eq 'tex') { + $result=&displayfoils($target,$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); } } } @@ -112,11 +157,13 @@ sub end_foilgroup { sub getfoilcounts { my ($parstack,$safeeval)=@_; my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); - my @names = @{ $Apache::response::foilgroup{'names'} }; + my @names; my $truecnt=0; my $falsecnt=0; my $name; - + if ( $Apache::response::foilgroup{'names'} ) { + @names= @{ $Apache::response::foilgroup{'names'} }; + } foreach $name (@names) { if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { $truecnt++; @@ -135,10 +182,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++; } @@ -152,7 +201,10 @@ sub whichfoils { my @truelist; my @falselist; - my @names = @{ $Apache::response::foilgroup{'names'} }; + my @names; + if ( $Apache::response::foilgroup{'names'} ) { + @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') { @@ -181,13 +233,15 @@ sub whichfoils { } sub displayfoils { - my ($max,$answer)=@_; + my ($target,$max,$answer)=@_; my $result; my @whichfoils=&whichfoils($max,$answer); if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) { foreach my $name (@whichfoils) { - $result.="
"; + if ($target ne 'tex') { + $result.="
"; + } if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { $result.='Correct'; } else { @@ -200,19 +254,24 @@ sub displayfoils { 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); foreach my $name (@whichfoils) { - $result.="
\n"; + if ($target ne 'tex') { + $result.="
\n"; + } else { + $result .= $Apache::response::foilgroup{$name.'.text'}; + } $temp++; } } - return $result."
"; + if ($target ne 'tex') { $result.="
"; } + 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) { @@ -231,7 +290,7 @@ sub start_conceptgroup { if ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50'). - "\n"; + &Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack, $safeeval,'concept'); @@ -244,7 +303,7 @@ 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' ) { + 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(rand($#names+1)); @@ -270,26 +329,30 @@ sub insert_conceptgroup { sub start_foil { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { &Apache::lonxml::startredirection; + if ($target eq 'tex') { + $result .= '\item '; + } } 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); + $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } 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,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $text=''; - if ($target eq 'web') { $text=&Apache::lonxml::endredirection; } - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) { + if ($target eq 'web' || $target eq 'tex') { $text=&Apache::lonxml::endredirection; } + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); if ($value ne 'unused') { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);