--- loncom/homework/radiobuttonresponse.pm 2001/01/19 21:44:12 1.10
+++ loncom/homework/radiobuttonresponse.pm 2001/12/04 15:17:56 1.31
@@ -1,5 +1,31 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
+#
+# $Id: radiobuttonresponse.pm,v 1.31 2001/12/04 15:17:56 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;
@@ -9,60 +35,103 @@ 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'));
+ &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={};
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 =~ /[0-9]+/) {
+ my $id = $Apache::inputtags::response['-1'];
+ my @whichfoils=&whichfoils($max,$answer);
+ my %responsehash;
+ $responsehash{$whichfoil[$reponse]}=$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 end_foilgroup {
- my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+
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';
+ if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') {
+ my $style = $Apache::lonhomework::type;
+ if ( $style eq 'survey' ) {
+ if ($target eq 'web' || $target eq 'answer') {
+ $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 '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 =~ /[0-9]+/) {
+ my $id = $Apache::inputtags::response['-1'];
+ my @whichfoils=&whichfoils($max,$answer);
+ my %responsehash;
+ $responsehash{$whichfoil[$reponse]}=$response;
+ $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=&Apache::lonnet::hash2str(%responsehash);
+ &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';
+ }
}
}
}
@@ -73,9 +142,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;
@@ -91,16 +158,34 @@ sub getfoilcounts {
return ($truecnt,$falsecnt,$max);
}
-sub displayfoils {
- my ($max,$answer)=@_;
+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 whichfoils {
+ my ($max,$answer)=@_;
+
my @truelist;
my @falselist;
- my $result;
- my $name;
- foreach $name (@names) {
- #result.="$name is $Apache::response::foilgroup{$name.'.value'} ";
+ 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);
} elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
@@ -110,11 +195,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");
@@ -122,45 +208,144 @@ 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) {
- $result.=" ".$Apache::response::foilgroup{$name.'.value'}.
- ":".$Apache::response::foilgroup{$name.'.text'}."\n";
+ foreach my $name (@whichfoils) {
+ $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;
- foreach $name (@whichfalse) {
- $result.=" ".$Apache::response::foilgroup{$name.'.text'}."\n";
+ my $id=$Apache::inputtags::response['-1'];
+ my $part=$Apache::inputtags::part;
+ my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
+ foreach my $name (@whichfoils) {
+ $result.=" \n";
$temp++;
}
}
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={};
+ 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,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ $Apache::radiobuttonresponse::conceptgroup=0;
+ 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 $result;
+}
+
+sub insert_conceptgroup {
+ my $result="\n\t\t".&insert_foil()."\n\t\t \n";
+ return $result;
+}
+
sub start_foil {
- $Apache::lonxml::redirection--;
- 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)=@_;
- 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"} = $Apache::lonxml::outputstack;
- }
-
- $Apache::lonxml::redirection++;
- if ($Apache::lonxml::redirection == 1) {
- $Apache::lonxml::outputstack='';
+ 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' ) {
+ my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
+ if ($value ne 'unused') {
+ 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;
+ $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 '';
}
+sub insert_foil {
+ return '
+
+
+
+ ';
+}
1;
__END__