--- loncom/homework/radiobuttonresponse.pm 2004/08/27 21:47:34 1.92
+++ loncom/homework/radiobuttonresponse.pm 2005/06/22 12:03:23 1.102
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.92 2004/08/27 21:47:34 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.102 2005/06/22 12:03:23 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,6 +30,7 @@ package Apache::radiobuttonresponse;
use strict;
use HTML::Entities();
use Apache::lonlocal;
+use Apache::lonnet;
BEGIN {
&Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));
@@ -114,16 +115,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<br />\n");
return '';
}
@@ -132,12 +138,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;
@@ -167,9 +173,11 @@ sub end_foilgroup {
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
$target eq 'tex' || $target eq 'analyze') {
my $style = $Apache::lonhomework::type;
+ my $direction = &Apache::lonxml::get_param('direction',$parstack,
+ $safeeval,'-2');
if ( $style eq 'survey' && $target ne 'analyze') {
if ($target eq 'web' || $target eq 'tex') {
- $result=&displayallfoils();
+ $result=&displayallfoils($direction);
} elsif ( $target eq 'answer' ) {
$result=&displayallanswers();
} elsif ( $target eq 'grade' ) {
@@ -181,9 +189,6 @@ sub end_foilgroup {
'-2');
my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
$safeeval,'-2');
- my $direction = &Apache::lonxml::get_param('direction',$parstack,
- $safeeval,'-2');
- &Apache::lonxml::debug("direction is $direction");
if ($target eq 'web' || $target eq 'tex') {
$result=&displayfoils($target,$max,$randomize,$direction);
} elsif ($target eq 'answer' ) {
@@ -224,6 +229,7 @@ sub getfoilcounts {
}
sub displayallfoils {
+ my ($direction)=@_;
my $result;
&Apache::lonxml::debug("survey style display");
my @names = @{ $Apache::response::foilgroup{'names'} };
@@ -232,11 +238,16 @@ sub displayallfoils {
my $part=$Apache::inputtags::part;
my $lastresponse=
$Apache::lonhomework::history{"resource.$part.$id.submission"};
+ if ($direction eq 'horizontal') { $result.='<table><tr>'; }
my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
if (&Apache::response::show_answer() ) {
foreach my $name (@names) {
if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
- $result.="<br />";
+ if ($direction eq 'horizontal') {
+ $result.="<td>";
+ } else {
+ $result.="<br />";
+ }
if (defined($lastresponse{$name})) {
$result.='<b>';
}
@@ -244,18 +255,28 @@ sub displayallfoils {
if (defined($lastresponse{$name})) {
$result.='</b>';
}
+ if ($direction eq 'horizontal') { $result.="</td>"; }
}
}
} else {
foreach my $name (@names) {
if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
- $result.="<br /><input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";
+ if ($direction eq 'horizontal') {
+ $result.="<td>";
+ } else {
+ $result.="<br />";
+ }
+ $result .= '<label>';
+ $result.="<input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";
if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
- $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>";
+ $result .= '>'.$Apache::response::foilgroup{$name.'.text'}.
+ '</label>';
$temp++;
+ if ($direction eq 'horizontal') { $result.="</td>"; }
}
}
}
+ if ($direction eq 'horizontal') { $result.='</tr></table>'; }
return $result;
}
@@ -292,6 +313,9 @@ sub whichfoils {
&Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>",'<>&"'));
}
}
+ if (!$havetrue && $Apache::lonhomework::type ne 'survey') {
+ &Apache::lonxml::error("There are no true statements available.<br />");
+ }
} else {
my $current=0;
&Apache::lonhomework::showhash(%Apache::response::foilgroup);
@@ -420,8 +444,9 @@ sub displayfoils {
} else {
$result.='Incorrect:';
}
+ if ($target eq 'web') { $result.="<label>"; }
$result.=$Apache::response::foilgroup{$name.'.text'};
- if ($target eq 'web') { $result.="</input>"; }
+ if ($target eq 'web') { $result.="</label>"; }
if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
if ($target ne 'tex') { $result.='</b>';} else {$result.='}';}
}
@@ -454,9 +479,10 @@ sub displayfoils {
}
}
if ($target ne 'tex') {
+ $result.= '<label>';
$result.="<input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";
if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
- $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>";
+ $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</label>";
} else {
if ($Apache::lonhomework::type eq 'exam') {
$result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs
@@ -545,6 +571,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);
@@ -578,7 +607,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 <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
}