--- loncom/homework/radiobuttonresponse.pm 2006/12/19 11:05:21 1.110
+++ loncom/homework/radiobuttonresponse.pm 2007/06/20 22:50:27 1.119
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.110 2006/12/19 11:05:21 foxr Exp $
+# $Id: radiobuttonresponse.pm,v 1.119 2007/06/20 22:50:27 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,6 +31,9 @@ use strict;
use HTML::Entities();
use Apache::lonlocal;
use Apache::lonnet;
+use Apache::response;
+
+my $bubbles_per_line = 10;
BEGIN {
&Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));
@@ -39,6 +42,7 @@ BEGIN {
sub start_radiobuttonresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
+
#when in a radiobutton response use these
&Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
push (@Apache::lonxml::namespace,'radiobuttonresponse');
@@ -142,11 +146,26 @@ sub grade_response {
my ($answer,@whichfoils)=&whichfoils($max,$randomize);
if ( !&Apache::response::submitted() ) { return; }
my $response;
+
+ # Need to know how many foils we have so that I know how many
+ # bubble lines to consume:
+
+ my $numfoils = scalar(@whichfoils);
+ my $bubble_lines = int($numfoils / $bubbles_per_line);
+ if (($numfoils % $bubbles_per_line) != 0) {
+ $bubble_lines++; # Partial line of bubbles too.
+ }
+
+
if ($env{'form.submitted'} eq 'scantron') {
- $response=&Apache::response::getresponse();
+ $response = &Apache::response::getresponse(1,undef,$bubble_lines,
+ $bubbles_per_line);
+
} else {
$response = $env{'form.HWVAL_'.$Apache::inputtags::response['-1']};
}
+ &Apache::lonxml::increment_counter($bubble_lines-1);
+
if ( $response !~ /[0-9]+/) { return; }
my $part=$Apache::inputtags::part;
my $id = $Apache::inputtags::response['-1'];
@@ -206,7 +225,13 @@ sub end_foilgroup {
('true','false'));
}
}
+ $Apache::lonxml::post_evaluate=0;
}
+ if ($target eq 'web') {
+ &Apache::response::setup_prior_tries_hash(\&format_prior_answer,
+ [\%Apache::response::foilgroup]);
+ }
+
&Apache::response::poprandomnumber();
&Apache::lonxml::increment_counter();
return $result;
@@ -230,6 +255,16 @@ sub getfoilcounts {
return ($truecnt,$falsecnt);
}
+sub format_prior_answer {
+ my ($mode,$answer,$other_data) = @_;
+ my $foil_data = $other_data->[0];
+ my %response = &Apache::lonnet::str2hash($answer);
+ my ($name) = keys(%response);
+ return ''.
+ $foil_data->{$name.'.text'}.'';
+
+}
+
sub displayallfoils {
my ($direction, $target)=@_;
my $result;
@@ -289,7 +324,11 @@ sub displayallfoils {
$i++;
} else {
$result .= '