--- loncom/homework/radiobuttonresponse.pm 2007/03/01 02:31:20 1.112
+++ loncom/homework/radiobuttonresponse.pm 2007/06/26 10:42:09 1.120
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.112 2007/03/01 02:31:20 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.120 2007/06/26 10:42:09 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,6 +31,11 @@ use strict;
use HTML::Entities();
use Apache::lonlocal;
use Apache::lonnet;
+use Apache::response;
+
+my $default_bubbles_per_line = 10;
+my $bubbles_per_line;
+my $bubble_lines = 1;
BEGIN {
&Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));
@@ -39,10 +44,18 @@ 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');
my $id = &Apache::response::start_response($parstack,$safeeval);
+ $bubbles_per_line =
+ &Apache::response::get_response_param($Apache::inputtags::part."_$id",
+ 'numbubbles',
+ $default_bubbles_per_line);
+
%Apache::hint::radiobutton=();
undef(%Apache::response::foilnames);
if ($target eq 'meta') {
@@ -124,6 +137,7 @@ sub storesurvey {
my $part = $Apache::inputtags::part;
my $id = $Apache::inputtags::response['-1'];
my @whichfoils=@{ $Apache::response::foilgroup{'names'} };
+ &bubble_line_count(scalar(@whichfoils));
my %responsehash;
$responsehash{$whichfoils[$response]}=$response;
my $responsestr=&Apache::lonnet::hash2str(%responsehash);
@@ -136,17 +150,40 @@ sub storesurvey {
return '';
}
+sub bubble_line_count {
+ my ($numfoils) = @_;
+ $bubble_lines = int($numfoils / $bubbles_per_line);
+ if (($numfoils % $bubbles_per_line) != 0) {
+ $bubble_lines++;
+ }
+ return $bubble_lines;
+
+}
+
sub grade_response {
my ($max,$randomize)=@_;
#keep the random numbers the same must always call this
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);
+ &bubble_line_count($numfoils);
+
+
+
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']};
}
+
+
if ( $response !~ /[0-9]+/) { return; }
my $part=$Apache::inputtags::part;
my $id = $Apache::inputtags::response['-1'];
@@ -180,9 +217,6 @@ sub end_foilgroup {
if ( $style eq 'survey' && $target ne 'analyze') {
if ($target eq 'web' || $target eq 'tex') {
$result=&displayallfoils($direction, $target);
- if ($target eq 'web') {
- &setup_prior_tries_hash();
- }
} elsif ( $target eq 'answer' ) {
$result=&displayallanswers();
} elsif ( $target eq 'grade' ) {
@@ -196,15 +230,13 @@ sub end_foilgroup {
$safeeval,'-2');
if ($target eq 'web' || $target eq 'tex') {
$result=&displayfoils($target,$max,$randomize,$direction);
- if ($target eq 'web') {
- &setup_prior_tries_hash();
- }
} elsif ($target eq 'answer' ) {
$result=&displayanswers($max,$randomize);
} elsif ( $target eq 'grade') {
&grade_response($max,$randomize);
} elsif ( $target eq 'analyze') {
my @shown = &whichfoils($max,$randomize);
+ &bubble_line_count(scalar(@shown));
&Apache::response::analyze_store_foilgroup(\@shown,
['text','value','location']);
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
@@ -214,8 +246,13 @@ sub end_foilgroup {
}
$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();
+ &Apache::lonxml::increment_counter($bubble_lines);
return $result;
}
@@ -237,18 +274,14 @@ sub getfoilcounts {
return ($truecnt,$falsecnt);
}
-sub setup_prior_tries_hash {
- my $part=$Apache::inputtags::part;
- my $id=$Apache::inputtags::response[-1];
- foreach my $i (1..$Apache::lonhomework::history{'version'}) {
- my $key = "$i:resource.$part.$id.submission";
- next if (!exists($Apache::lonhomework::history{"$key"}));
- my %response =
- &Apache::lonnet::str2hash($Apache::lonhomework::history{$key});
- my ($name) = keys(%response);
- $Apache::inputtags::submission_display{$key} =
- $Apache::response::foilgroup{$name.'.text'}
- }
+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 {
@@ -256,9 +289,12 @@ sub displayallfoils {
my $result;
&Apache::lonxml::debug("survey style display");
my @names;
+ &Apache::lonnet::loghthis("Display all foils");
if ( $Apache::response::foilgroup{'names'} ) {
@names= @{ $Apache::response::foilgroup{'names'} };
}
+ &bubble_line_count(scalar(@names));
+
my $temp=0;
my $i =0;
my $id=$Apache::inputtags::response['-1'];
@@ -310,7 +346,11 @@ sub displayallfoils {
$i++;
} else {
$result .= '