--- loncom/homework/radiobuttonresponse.pm 2001/12/13 23:36:39 1.32
+++ loncom/homework/radiobuttonresponse.pm 2002/05/03 19:44:13 1.40
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.32 2001/12/13 23:36:39 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.40 2002/05/03 19:44:13 albertel 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'));
}
@@ -45,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;
}
@@ -63,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;
}
@@ -77,19 +82,17 @@ 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 =~ /[0-9]+/) {
- 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");
- }
- }
+ 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 '';
}
@@ -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') {
@@ -154,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++;
@@ -196,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') {
@@ -205,13 +213,13 @@ sub whichfoils {
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 ");
+ &Apache::lonxml::error(&HTML::Entites::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");
my @whichfalse =();
- while ((($#whichfalse+1) < $max) && ($#falselist > -1)) {
+ 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");
@@ -225,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 {
@@ -246,18 +256,22 @@ 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 {
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) {
@@ -276,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');
@@ -289,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));
@@ -315,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);
|