--- loncom/homework/caparesponse/caparesponse.pm 2004/10/21 02:43:34 1.156
+++ loncom/homework/caparesponse/caparesponse.pm 2005/02/21 20:39:46 1.164
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# caparesponse definition
#
-# $Id: caparesponse.pm,v 1.156 2004/10/21 02:43:34 albertel Exp $
+# $Id: caparesponse.pm,v 1.164 2005/02/21 20:39:46 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -128,7 +128,7 @@ sub end_numericalresponse {
}
my $tag;
if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }
- if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {
+ if ( $target eq 'grade' && &Apache::response::submitted() ) {
&Apache::response::setup_params($tag,$safeeval);
$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
my $partid = $Apache::inputtags::part;
@@ -136,16 +136,6 @@ sub end_numericalresponse {
if ($Apache::lonhomework::type eq 'exam' &&
$tag eq 'formularesponse') {
$increment=&Apache::response::scored_response($partid,$id);
- } elsif ($Apache::lonhomework::type eq 'survey') {
- if ( !defined($ENV{'form.submitted'})) { return ''; }
- my $response = &Apache::response::getresponse();
- if ( $response =~ /[^\s]/) {
- my %previous=&Apache::response::check_for_previous($response,
- $partid,$id);
- $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
- my $ad=$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}='SUBMITTED';
- &Apache::response::handle_previous(\%previous,$ad);
- }
} else {
my $response = &Apache::response::getresponse();
if ( $response =~ /[^\s]/) {
@@ -154,14 +144,15 @@ sub end_numericalresponse {
&Apache::lonxml::debug("submitted a $response
\n");
&Apache::lonxml::debug($$parstack[-1] . "\n
");
- if ($ENV{'form.submitted'} eq 'scantron') {
+ if ( &Apache::response::submitted('scantron')) {
my $number_of_bubbles = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.numbubbles');
if (!$number_of_bubbles) { $number_of_bubbles=8; }
my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
- my @values=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect,$safeeval);
- $response=$values[$response];
+ if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }
+ my ($values,$display)=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect,$safeeval);
+ $response=$values->[$response];
}
$Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
@@ -184,7 +175,7 @@ sub end_numericalresponse {
}
#sig fig don't make much sense either
if (($Apache::lonhomework::type eq 'exam' ||
- $ENV{'form.submitted'} eq 'scantron') &&
+ &Apache::response::submitted('scantron')) &&
$tag eq 'numericalresponse') {
delete($$args_ref{'sig'});
}
@@ -213,6 +204,11 @@ sub end_numericalresponse {
$Apache::inputtags::params{'sig'});
}
&Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n");
+ if ($Apache::lonhomework::type eq 'survey' &&
+ ($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' ||
+ $ad eq 'EXACT_ANS')) {
+ $ad='SUBMITTED';
+ }
&Apache::response::handle_previous(\%previous,$ad);
$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
$Apache::lonhomework::results{"resource.$partid.$id.awardmsg"}=$msg;
@@ -238,9 +234,11 @@ sub end_numericalresponse {
my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
$safeeval);
my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
- my @bubble_values=&make_numerical_bubbles($number_of_bubbles,
- $target,$answers[0],
- $formats[0],\@incorrect,$safeeval);
+ if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }
+ my ($bubble_values,$bubble_display)=
+ &make_numerical_bubbles($number_of_bubbles,
+ $target,$answers[0],
+ $formats[0],\@incorrect,$safeeval);
my @alphabet=('A'..'Z');
if ($target eq 'web') {
if ($tag eq 'numericalresponse') {
@@ -249,13 +247,13 @@ sub end_numericalresponse {
my $previous=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.$id.submission"};
for (my $ind=0;$ind<$number_of_bubbles;$ind++) {
my $checked='';
- if ($previous eq $bubble_values[$ind]) {
+ if ($previous eq $bubble_values->[$ind]) {
$checked=" checked='on' ";
}
$result.='