--- loncom/homework/radiobuttonresponse.pm 2004/03/08 23:23:04 1.85
+++ loncom/homework/radiobuttonresponse.pm 2004/10/21 03:34:06 1.96
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.85 2004/03/08 23:23:04 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.96 2004/10/21 03:34:06 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -77,6 +77,8 @@ sub start_radiobuttonresponse {
$result .= ' \renewcommand{\labelenumi}{\alph{enumi}.}';
} elsif ($type eq 'i') {
$result .= ' \renewcommand{\labelenumi}{\roman{enumi}.}';
+ } else {
+ $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}';
}
$result .= '\begin{enumerate}';
} elsif ($target eq 'analyze') {
@@ -104,7 +106,7 @@ sub start_foilgroup {
my $result;
%Apache::response::foilgroup=();
$Apache::radiobuttonresponse::conceptgroup=0;
- &Apache::response::setrandomnumber();
+ &Apache::response::pushrandomnumber();
if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
$result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';
}
@@ -116,12 +118,17 @@ sub storesurvey {
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 '';
}
@@ -165,9 +172,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' ) {
@@ -180,7 +189,7 @@ sub end_foilgroup {
my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
$safeeval,'-2');
if ($target eq 'web' || $target eq 'tex') {
- $result=&displayfoils($target,$max,$randomize);
+ $result=&displayfoils($target,$max,$randomize,$direction);
} elsif ($target eq 'answer' ) {
$result=&displayanswers($max,$randomize);
} elsif ( $target eq 'grade') {
@@ -195,6 +204,7 @@ sub end_foilgroup {
}
}
}
+ &Apache::response::poprandomnumber();
&Apache::lonxml::increment_counter();
return $result;
}
@@ -218,6 +228,7 @@ sub getfoilcounts {
}
sub displayallfoils {
+ my ($direction)=@_;
my $result;
&Apache::lonxml::debug("survey style display");
my @names = @{ $Apache::response::foilgroup{'names'} };
@@ -226,11 +237,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>';
}
@@ -238,18 +254,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>\n";
+ $result .= '>'.$Apache::response::foilgroup{$name.'.text'}.
+ '</label>';
$temp++;
+ if ($direction eq 'horizontal') { $result.="</td>"; }
}
}
}
+ if ($direction eq 'horizontal') { $result.='</tr></table>'; }
return $result;
}
@@ -283,7 +309,7 @@ sub whichfoils {
push (@whichfalse,$name);
} elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
} else {
- &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>"));
+ &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>",'<>&"'));
}
}
} else {
@@ -309,7 +335,7 @@ sub whichfoils {
}
} elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
} else {
- &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>"));
+ &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>",'<>&"'));
}
}
#pick a true statement
@@ -387,7 +413,7 @@ sub whichfoils {
}
sub displayfoils {
- my ($target,$max,$randomize)=@_;
+ my ($target,$max,$randomize,$direction)=@_;
my $result;
my ($answer,@whichfoils)=&whichfoils($max,$randomize);
@@ -395,7 +421,15 @@ sub displayfoils {
my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
if ( ($target ne 'tex') &&
&Apache::response::show_answer() ) {
+ if ($direction eq 'horizontal') {
+ if ($target ne 'tex') {
+ $result.='<table><tr>';
+ }
+ }
foreach my $name (@whichfoils) {
+ if ($direction eq 'horizontal') {
+ if ($target ne 'tex') { $result.='<td>'; }
+ }
if ($target ne 'tex') {
$result.="<br />";
} else {
@@ -406,14 +440,20 @@ sub displayfoils {
} else {
$result.='Incorrect:';
}
- if ($target ne 'tex') {
- $result.=$Apache::response::foilgroup{$name.'.text'}."</input>\n";
- } else {
- $result.=$Apache::response::foilgroup{$name.'.text'};
- }
+ if ($target eq 'web') { $result.="<label>"; }
+ $result.=$Apache::response::foilgroup{$name.'.text'};
+ if ($target eq 'web') { $result.="</label>"; }
if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
if ($target ne 'tex') { $result.='</b>';} else {$result.='}';}
}
+ if ($direction eq 'horizontal') {
+ if ($target ne 'tex') { $result.='</td>'; }
+ }
+ }
+ if ($direction eq 'horizontal') {
+ if ($target ne 'tex') {
+ $result.='</tr></table>';
+ }
}
} else {
my @alphabet = ('A'..'Z');
@@ -423,11 +463,22 @@ sub displayfoils {
my $part=$Apache::inputtags::part;
my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
+ if ($target ne 'tex' && $direction eq 'horizontal') {
+ $result.="<table><tr>";
+ }
foreach my $name (@whichfoils) {
if ($target ne 'tex') {
- $result.="<br /><input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";
+ if ($direction eq 'horizontal') {
+ $result.="<td>";
+ } else {
+ $result.="<br />";
+ }
+ }
+ 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>\n";
+ $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
@@ -436,10 +487,16 @@ sub displayfoils {
$result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
}
}
+ if ($target ne 'tex' && $direction eq 'horizontal') {
+ $result.="</td>";
+ }
$temp++;
}
+ if ($target ne 'tex' && $direction eq 'horizontal') {
+ $result.="</tr></table>";
+ }
}
- if ($target ne 'tex') { $result.="<br />"; } else { $result.='\vskip 0 mm '; }
+ if ($target ne 'tex') { if ($direction ne 'horizontal') { $result.="<br />";} } else { $result.='\vskip 0 mm '; }
return $result;
}
@@ -510,6 +567,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);
@@ -547,6 +607,7 @@ sub end_foil {
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));
}
+ $Apache::response::foilnames{$name}++;
my $location =&Apache::lonxml::get_param('location',$parstack,
$safeeval);
if ( $Apache::radiobuttonresponse::conceptgroup