--- loncom/homework/radiobuttonresponse.pm 2004/08/30 02:03:44 1.93
+++ loncom/homework/radiobuttonresponse.pm 2006/11/27 11:42:40 1.107
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.93 2004/08/30 02:03:44 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.107 2006/11/27 11:42:40 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,6 +30,9 @@ package Apache::radiobuttonresponse;
use strict;
use HTML::Entities();
use Apache::lonlocal;
+use Apache::lonnet;
+
+my $exam_max_bubbles = 10;
BEGIN {
&Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));
@@ -59,12 +62,14 @@ sub start_radiobuttonresponse {
$token,'4').
&Apache::edit::select_arg('Randomize Foil Order','randomize',
['yes','no'],$token).
+ &Apache::edit::select_arg('Display Direction','direction',
+ ['vertical','horizontal'],$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');
+ 'randomize','direction');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
} elsif ($target eq 'tex') {
my $type=&Apache::lonxml::get_param('TeXtype',$parstack,$safeeval,
@@ -114,16 +119,21 @@ sub start_foilgroup {
}
sub storesurvey {
- if ( !defined($ENV{'form.submitted'})) { return ''; }
- my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1']};
+ if ( !&Apache::response::submitted() ) { return ''; }
+ my $response = $env{'form.HWVAL_'.$Apache::inputtags::response['-1']};
&Apache::lonxml::debug("Here I am!:$response:");
if ( $response !~ /[0-9]+/) { return ''; }
+ my $part = $Apache::inputtags::part;
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';
+ my $responsestr=&Apache::lonnet::hash2str(%responsehash);
+ $Apache::lonhomework::results{"resource.$part.$id.submission"}=
+ $responsestr;
+ my %previous=&Apache::response::check_for_previous($responsestr,$part,$id);
+ my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
+ &Apache::response::handle_previous(\%previous,$ad);
&Apache::lonxml::debug("submitted a $response
\n");
return '';
}
@@ -132,12 +142,12 @@ 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; }
+ if ( !&Apache::response::submitted() ) { return; }
my $response;
- if ($ENV{'form.submitted'} eq 'scantron') {
+ if ($env{'form.submitted'} eq 'scantron') {
$response=&Apache::response::getresponse();
} else {
- $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1']};
+ $response = $env{'form.HWVAL_'.$Apache::inputtags::response['-1']};
}
if ( $response !~ /[0-9]+/) { return; }
my $part=$Apache::inputtags::part;
@@ -226,7 +236,10 @@ sub displayallfoils {
my ($direction)=@_;
my $result;
&Apache::lonxml::debug("survey style display");
- my @names = @{ $Apache::response::foilgroup{'names'} };
+ my @names;
+ if ( $Apache::response::foilgroup{'names'} ) {
+ @names= @{ $Apache::response::foilgroup{'names'} };
+ }
my $temp=0;
my $id=$Apache::inputtags::response['-1'];
my $part=$Apache::inputtags::part;
@@ -260,9 +273,11 @@ sub displayallfoils {
} else {
$result.="
";
}
+ $result .= '';
$temp++;
if ($direction eq 'horizontal') { $result.=""; }
}
@@ -281,7 +296,7 @@ sub whichfoils {
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; }
+ if ( $max>0 && ($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; $max=$count; }
my $answer=int(&Math::Random::random_uniform() * ($count));
&Apache::lonxml::debug("Count is $count, $answer is $answer");
my @names;
@@ -305,6 +320,9 @@ sub whichfoils {
&Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in ",'<>&"'));
}
}
+ if (!$havetrue && $Apache::lonhomework::type ne 'survey') {
+ &Apache::lonxml::error("There are no true statements available.
");
+ }
} else {
my $current=0;
&Apache::lonhomework::showhash(%Apache::response::foilgroup);
@@ -433,8 +451,9 @@ sub displayfoils {
} else {
$result.='Incorrect:';
}
+ if ($target eq 'web') { $result.=""; }
if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
if ($target ne 'tex') { $result.='';} else {$result.='}';}
}
@@ -467,13 +486,25 @@ sub displayfoils {
}
}
if ($target ne 'tex') {
+ $result.= '";
} else {
if ($Apache::lonhomework::type eq 'exam') {
+
+ # If necessary, start a new group of bubbles
+ # in the next row on the scantron sheet:
+ #
+ if ($i >= $exam_max_bubbles) {
+ $i = 0; # Back to A.
+ $Apache::lonxml::counter++; # Next row of bubbles...
+ $result .= '\item[\textbf{'.$Apache::lonxml::counter.'}.]';
+ }
+
$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'};
}
@@ -492,7 +523,10 @@ sub displayfoils {
}
sub displayallanswers {
- my @names = @{ $Apache::response::foilgroup{'names'} };
+ my @names;
+ if ( $Apache::response::foilgroup{'names'} ) {
+ @names= @{ $Apache::response::foilgroup{'names'} };
+ }
my $result=&Apache::response::answer_header('radiobuttonresponse');
foreach my $name (@names) {
@@ -507,10 +541,15 @@ sub displayanswers {
my ($max,$randomize)=@_;
my ($answer,@whichopt) = &whichfoils($max,$randomize);
my $result=&Apache::response::answer_header('radiobuttonresponse');
+ if ($Apache::lonhomework::type eq 'exam') {
+ my $correct = ('A'..'Z')[$answer];
+ $result.=&Apache::response::answer_part('radiobuttonresponse',
+ $correct);
+ }
foreach my $name (@whichopt) {
$result.=&Apache::response::answer_part('radiobuttonresponse',
- $Apache::response::foilgroup{$name.'.value'})
- }
+ $Apache::response::foilgroup{$name.'.value'});
+ }
$result.=&Apache::response::answer_footer('radiobuttonresponse');
return $result;
}
@@ -558,6 +597,9 @@ sub start_foil {
my $result='';
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
&Apache::lonxml::startredirection;
+ if ($target eq 'analyze') {
+ &Apache::response::check_if_computed($token,$parstack,$safeeval,'value');
+ }
} elsif ($target eq 'edit') {
$result=&Apache::edit::tag_start($target,$token);
$result.=&Apache::edit::text_arg('Name:','name',$token);
@@ -591,7 +633,10 @@ sub end_foil {
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 ($name eq "") {
+ &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
+ $name=$Apache::lonxml::curdepth;
+ }
if (defined($Apache::response::foilnames{$name})) {
&Apache::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique.",$name));
}