--- loncom/homework/radiobuttonresponse.pm 2002/01/11 16:32:29 1.35
+++ loncom/homework/radiobuttonresponse.pm 2002/04/03 16:54:37 1.38
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.35 2002/01/11 16:32:29 matthew Exp $
+# $Id: radiobuttonresponse.pm,v 1.38 2002/04/03 16:54:37 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,7 +30,7 @@
package Apache::radiobuttonresponse;
use strict;
-sub BEGIN {
+BEGIN {
&Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));
}
@@ -50,12 +50,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,6 +66,7 @@ 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'));
@@ -123,10 +126,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 +142,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') {
@@ -230,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 {
@@ -251,13 +256,21 @@ 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') {
+ return $result." ";
+ } else {
+ return $result;
+ }
}
sub displayanswers {
@@ -293,7 +306,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,8 +332,11 @@ 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);
@@ -331,15 +347,15 @@ sub start_foil {
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);
|