--- loncom/homework/radiobuttonresponse.pm 2001/02/05 18:19:28 1.11
+++ loncom/homework/radiobuttonresponse.pm 2003/04/02 15:09:00 1.64
@@ -1,70 +1,162 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
+#
+# $Id: radiobuttonresponse.pm,v 1.64 2003/04/02 15:09:00 sakharuk 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;
+use HTML::Entities();
-sub BEGIN {
+BEGIN {
&Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));
}
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 '';
+ %Apache::hint::radiobutton=();
+ 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)
+ ."  ".&Apache::edit::end_row()
+ .&Apache::edit::start_spanning_row();
+
+ $result.=
+ &Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').
+ &Apache::edit::select_arg('Randomize Foil Order','randomize',
+ ['yes','no'],$token).
+ &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','randomize');
+ if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+ } elsif ($target eq 'tex') {
+ $result .= '\begin{enumerate}';
+ }
+ return $result;
}
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;
- return '';
+ pop @Apache::lonxml::namespace;
+ &Apache::lonxml::deregister('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
+ return $result;
}
-%Apache::response::foilgroup={};
+%Apache::response::foilgroup=();
sub start_foilgroup {
- %Apache::response::foilgroup={};
- return '';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result;
+ %Apache::response::foilgroup=();
+ $Apache::radiobuttonresponse::conceptgroup=0;
+ &Apache::response::setrandomnumber();
+ if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
+ $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';
+ &Apache::lonxml::increment_counter();
+ }
+ return $result;
}
-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'})) { 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,$randomize)=@_;
+ #keep the random numbers the same must always call this
+ my ($answer,@whichfoils)=&whichfoils($max,$randomize);
+ 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 %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 $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' || $target eq 'tex') {
+ my $style = $Apache::lonhomework::type;
+ if ( $style eq 'survey' ) {
+ if ($target eq 'web' || $target eq 'answer' || $target eq 'tex') {
+ $result=&displayallfoils();
+ } elsif ( $target eq 'grade' ) {
+ $result=&storesurvey();
+ }
+ } else {
+ my $name;
+ my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
+ my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
+ $safeeval,'-2');
+ if ($target eq 'web' || $target eq 'tex') {
+ $result=&displayfoils($target,$max,$randomize);
+ } elsif ($target eq 'answer' ) {
+ $result=&displayanswers($max,$randomize);
+ } elsif ( $target eq 'grade') {
+ &grade_response($max,$randomize);
}
}
}
@@ -72,15 +164,13 @@ 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 @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++;
@@ -88,84 +178,347 @@ sub getfoilcounts {
$falsecnt++;
}
}
- return ($truecnt,$falsecnt,$max);
+ return ($truecnt,$falsecnt);
}
-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"};
+ my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
+ if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/) || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) {
+ foreach my $name (@names) {
+ if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
+ $result.=" ".$Apache::response::foilgroup{$name.'.value'};
+ if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+ $result.='';
+ }
+ $result .= $Apache::response::foilgroup{$name.'.text'};
+ if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+ $result.=' ';
+ }
+ }
+ }
+ } else {
+ foreach my $name (@names) {
+ if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
+ $result.=" \n";
+ $temp++;
+ }
+ }
+ }
+ return $result;
+}
+
+sub whichfoils {
+ my ($max,$randomize)=@_;
+
my @truelist;
my @falselist;
- my $result;
- my $name;
-
- foreach $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') {
- push (@falselist,$name);
- } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
+ my @whichfalse =();
+ my ($truecnt,$falsecnt) = &getfoilcounts();
+ 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(&Math::Random::random_uniform() * ($count));
+ &Apache::lonxml::debug("Count is $count, $answer is $answer");
+ my @names;
+ if ( $Apache::response::foilgroup{'names'} ) {
+ @names= @{ $Apache::response::foilgroup{'names'} };
+ }
+ if (&Apache::response::showallfoils()) {
+ @whichfalse=@names;
+ } elsif ($randomize eq 'no') {
+ &Apache::lonxml::debug("No randomization");
+ my $havetrue=0;
+ foreach my $name (@names) {
+ if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+ if (!$havetrue ) {
+ push(@whichfalse,$name); $havetrue++; $answer=$#whichfalse;
+ }
+ } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
+ push (@whichfalse,$name);
+ } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
+ } else {
+ &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in "));
+ }
+ }
+ } else {
+ my $current=0;
+ &Apache::lonhomework::showhash(%Apache::response::foilgroup);
+ my (%top,%bottom);
+ #first find out where everyone wants to be
+ foreach my $name (@names) {
+ $current++;
+ if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+ push (@truelist,$name);
+ if ($Apache::response::foilgroup{$name.'.location'} eq 'top') {
+ $top{$name}=$current;
+ } elsif ($Apache::response::foilgroup{$name.'.location'} eq 'bottom') {
+ $bottom{$name}=$current;
+ }
+ } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
+ push (@falselist,$name);
+ if ($Apache::response::foilgroup{$name.'.location'} eq 'top') {
+ $top{$name}=$current;
+ } elsif ($Apache::response::foilgroup{$name.'.location'} eq 'bottom') {
+ $bottom{$name}=$current;
+ }
+ } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
+ } else {
+ &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in "));
+ }
+ }
+ #pick a true statement
+ my $whichtrue = int(&Math::Random::random_uniform() * ($#truelist+1));
+ &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
+ my (@toplist, @bottomlist);
+ my $topcount=0;
+ # assign everyone to either toplist/bottomlist or whichfalse
+ # which false is randomized, toplist bottomlist are in order
+ while ((($#whichfalse) < $max-2) && ($#falselist > -1)) {
+ &Apache::lonxml::debug("Have $#whichfalse max is $max");
+ my $afalse=int(&Math::Random::random_uniform() * ($#falselist+1));
+ &Apache::lonxml::debug("From $#falselist elms, picking $afalse");
+ $afalse=splice(@falselist,$afalse,1);
+ &Apache::lonxml::debug("Picked $afalse");
+ &Apache::lonhomework::showhash(('names'=>\@names));
+ &Apache::lonhomework::showhash(%top);
+ if ($top{$afalse}) {
+ $toplist[$top{$afalse}]=$afalse;
+ $topcount++;
+ } elsif ($bottom{$afalse}) {
+ $bottomlist[$bottom{$afalse}]=$afalse;
+ } else {
+ push (@whichfalse,$afalse);
+ }
+ }
+ my $truename=$truelist[$whichtrue];
+ my $dosplice=1;
+ #insert the true statement, keeping track of where it wants to be
+ if ($Apache::response::foilgroup{$truename.'.location'} eq 'top' ) {
+ $toplist[$top{$truename}]=$truename;
+ $answer=-1;
+ foreach my $top (reverse(@toplist)) {
+ if ($top) { $answer++;}
+ if ($top eq $truename) { last; }
+ }
+ $dosplice=0;
+ } elsif ($Apache::response::foilgroup{$truename.'.location'} eq 'bottom') {
+ $bottomlist[$bottom{$truename}]=$truename;
+ $answer=-1;
+ foreach my $bot (@bottomlist) {
+ if ($bot) { $answer++;}
+ if ($bot eq $truename) { last; }
+ }
+ $answer+=$topcount+$#whichfalse+1;
+ $dosplice=0;
} else {
- &Apache::lonxml::error("Unknown state $Apache::response::foilgroup{$name.'.value'} for $name in ");
+ if ($topcount>0) {
+ $answer = int(&Math::Random::random_uniform() * ($#whichfalse+1))
+ + $topcount;
+ }
}
+ #add the top items to the top, bottom items to the bottom
+ for (my $i=0;$i<=$#toplist;$i++) {
+ if ($toplist[$i]) { unshift(@whichfalse,$toplist[$i]) }
+ }
+ for (my $i=0;$i<=$#bottomlist;$i++) {
+ if ($bottomlist[$i]) { push(@whichfalse,$bottomlist[$i]) }
+ }
+ #if the true statement is randomized insert it into the list
+ if ($dosplice) { splice(@whichfalse,$answer,0,$truelist[$whichtrue]); }
}
- my $whichtrue = rand $#truelist;
- &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
- my @whichfalse =();
- while ((($#whichfalse+2) < $max) && ($#falselist > -1)) {
- my $afalse=rand $#falselist;
- &Apache::lonxml::debug("From $#falselist elms, picking $afalse");
- $afalse=splice(@falselist,$afalse,1);
- &Apache::lonxml::debug("Picked $afalse");
- push (@whichfalse,$afalse);
- }
- splice(@whichfalse,$answer,0,$truelist[$whichtrue]);
- &Apache::lonxml::debug("the true statement is $answer");
- if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
- foreach $name (@whichfalse) {
- $result.=" ";
+ &Apache::lonxml::debug("Answer is $answer");
+ return ($answer,@whichfalse);
+}
+
+sub displayfoils {
+ my ($target,$max,$randomize)=@_;
+ my $result;
+
+ my ($answer,@whichfoils)=&whichfoils($max,$randomize);
+ my $part=$Apache::inputtags::part;
+ my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
+ my $status=$Apache::inputtags::status[-1];
+ if ( ($target ne 'tex') &&
+ (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) ) {
+ foreach my $name (@whichfoils) {
+ if ($target ne 'tex') {
+ $result.=" ";
+ } else {
+ $result.='\item \vskip -2 mm ';
+ }
if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
- $result.='Correct';
+ if ($target ne 'tex') { $result.='Correct:'; } else { $result.='Correct: \textbf{';}
+ } else {
+ $result.='Incorrect:';
+ }
+ if ($target ne 'tex') {
+ $result.=$Apache::response::foilgroup{$name.'.text'}."\n";
} else {
- $result.='Incorrect';
+ $result.=$Apache::response::foilgroup{$name.'.text'};
+ }
+ if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+ if ($target ne 'tex') { $result.=' ';} else {$result.='}';}
}
- $result.=":".$Apache::response::foilgroup{$name.'.text'}."\n";
}
} else {
- my $temp=0;
- foreach $name (@whichfalse) {
- $result.=" ".$Apache::response::foilgroup{$name.'.text'}."\n";
+ my @alphabet = ('A'..'Z');
+ my $i = 0;
+ my $temp=0;
+ 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) {
+ if ($target ne 'tex') {
+ my $ValueForInput;
+ if ($Apache::lonhomework::type ne 'exam') {$ValueForInput=$temp;} else {$ValueForInput=$alphabet[$temp];}
+ $result.=" \n";
+ } else {
+ if ($Apache::lonhomework::type eq 'exam') {
+ $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs
+ $i++;
+ } else {
+ $result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
+ }
+ }
$temp++;
}
}
- return $result." ";
+ if ($target ne 'tex') { $result.=" "; } else { $result.='\vskip 0 mm '; }
+ return $result;
+}
+
+sub displayanswers {
+ my ($max,$randomize)=@_;
+ my ($answer,@whichopt) = &whichfoils($max,$randomize);
+ 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').
+ &Apache::edit::end_row().&Apache::edit::start_spanning_row();
+ } 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' || $target eq 'tex') {
+ if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
+ my @names = @{ $Apache::response::conceptgroup{'names'} };
+ my $pick=int(&Math::Random::random_uniform() * ($#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"};
+ $Apache::response::foilgroup{"$name.location"} = $Apache::response::conceptgroup{"$name.location"};
+ my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
+ $Apache::response::foilgroup{"$name.concept"} = $concept;
+ &Apache::lonxml::debug("Selecting $name in $concept");
+ my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+ push(@{ $Apache::hint::radiobutton{"$part_id.concepts"} },$concept);
+ $Apache::hint::radiobutton{"$part_id.concept.$concept"}=
+ $Apache::response::conceptgroup{'names'};
+ }
+ } 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' || $target eq 'tex') {
+ &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_or_text_arg('Correct Option:','value',
+ ['unused','true','false'],$token);
+ my $randomize=&Apache::lonxml::get_param('randomize',$parstack,
+ $safeeval,'-3');
+ if ($randomize ne 'no') {
+ $result.=&Apache::edit::select_arg('Location:','location',
+ ['random','top','bottom'],$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','location');
+ 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' || $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);
+ my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval);
+ if (!$name) { $name=$Apache::lonxml::curdepth; }
+ if ( $Apache::radiobuttonresponse::conceptgroup
+ && !&Apache::response::showallfoils() ) {
+ push @{ $Apache::response::conceptgroup{'names'} }, $name;
+ $Apache::response::conceptgroup{"$name.value"} = $value;
+ $Apache::response::conceptgroup{"$name.text"} = $text;
+ $Apache::response::conceptgroup{"$name.location"} = $location;
+ } else {
+ push @{ $Apache::response::foilgroup{'names'} }, $name;
+ $Apache::response::foilgroup{"$name.value"} = $value;
+ $Apache::response::foilgroup{"$name.text"} = $text;
+ $Apache::response::foilgroup{"$name.location"} = $location;
+ }
+ }
}
return '';
}
+sub insert_foil {
+ return '
+
+
+
+ ';
+}
1;
__END__