--- loncom/homework/radiobuttonresponse.pm 2007/03/01 02:31:20 1.112
+++ loncom/homework/radiobuttonresponse.pm 2007/05/17 10:01:44 1.115
@@ -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.115 2007/05/17 10:01:44 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,6 +31,7 @@ use strict;
use HTML::Entities();
use Apache::lonlocal;
use Apache::lonnet;
+use Apache::response;
BEGIN {
&Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));
@@ -39,6 +40,14 @@ BEGIN {
sub start_radiobuttonresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
+ #----- test/debugging to figure out some crap
+
+ my $partid = $Apache::inputtags::part;
+ &Apache::lonnet::logthis("Part id = $partid");
+ my $bubble_max = &Apache::response::get_response_param($partid, 'numbubbles', 10);
+ &Apache::lonnet::logthis("numbubbles [10] = $bubble_max");
+
+ #----- End test/debugging
#when in a radiobutton response use these
&Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
push (@Apache::lonxml::namespace,'radiobuttonresponse');
@@ -180,9 +189,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,9 +202,6 @@ 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') {
@@ -214,6 +217,11 @@ 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();
return $result;
@@ -237,18 +245,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 {
@@ -310,7 +314,11 @@ sub displayallfoils {
$i++;
} else {
$result .= '