--- loncom/homework/radiobuttonresponse.pm 2002/01/17 12:23:31 1.36
+++ loncom/homework/radiobuttonresponse.pm 2002/07/29 20:43:47 1.43
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.36 2002/01/17 12:23:31 harris41 Exp $
+# $Id: radiobuttonresponse.pm,v 1.43 2002/07/29 20:43:47 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,6 +29,7 @@
package Apache::radiobuttonresponse;
use strict;
+use HTML::Entities();
BEGIN {
&Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));
@@ -50,12 +51,14 @@ sub start_radiobuttonresponse {
."
 ".&Apache::edit::end_row()
.&Apache::edit::start_spanning_row();
- $result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4').
+ $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;
}
@@ -64,15 +67,16 @@ 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;
}
-%Apache::response::foilgroup={};
+%Apache::response::foilgroup=();
sub start_foilgroup {
- %Apache::response::foilgroup={};
+ %Apache::response::foilgroup=();
$Apache::radiobuttonresponse::conceptgroup=0;
&Apache::response::setrandomnumber();
return '';
@@ -123,10 +127,10 @@ sub end_foilgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
- if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') {
+ 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') {
+ if ($target eq 'web' || $target eq 'answer' || $target eq 'tex') {
$result=&displayallfoils();
} elsif ( $target eq 'grade' ) {
$result=&storesurvey();
@@ -139,8 +143,8 @@ 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') {
@@ -197,46 +201,52 @@ sub whichfoils {
my @truelist;
my @falselist;
+ my @whichfalse =();
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') {
- push (@truelist,$name);
- } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
- push (@falselist,$name);
- } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
- } else {
- &Apache::lonxml::error("Unknown state $Apache::response::foilgroup{$name.'.value'} for $name in ");
+ if (&Apache::response::showallfoils()) {
+ @whichfalse=@names;
+ } else {
+ 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') {
+ push (@falselist,$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 "));
+ }
}
+ my $whichtrue = int(rand($#truelist+1));
+ &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
+ while ((($#whichfalse+1) < $max-1) && ($#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");
+ push (@whichfalse,$afalse);
+ }
+ splice(@whichfalse,$answer,0,$truelist[$whichtrue]);
+ &Apache::lonxml::debug("the true statement is $answer");
}
- my $whichtrue = int(rand($#truelist+1));
- &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
- my @whichfalse =();
- 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");
- push (@whichfalse,$afalse);
- }
- splice(@whichfalse,$answer,0,$truelist[$whichtrue]);
- &Apache::lonxml::debug("the true statement is $answer");
return @whichfalse;
}
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 {
@@ -251,13 +261,18 @@ sub displayfoils {
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 {
@@ -275,7 +290,7 @@ sub displayanswers {
sub start_conceptgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
$Apache::radiobuttonresponse::conceptgroup=1;
- %Apache::response::conceptgroup={};
+ %Apache::response::conceptgroup=();
my $result;
if ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
@@ -293,7 +308,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));
@@ -319,32 +334,36 @@ 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',
+ $result.=&Apache::edit::select_or_text_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);
if (!$name) { $name=$Apache::lonxml::curdepth; }
- if ( $Apache::radiobuttonresponse::conceptgroup ) {
+ 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;
|