--- loncom/homework/radiobuttonresponse.pm 2005/06/21 21:00:55 1.101
+++ 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.101 2005/06/21 21:00:55 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');
@@ -60,12 +69,14 @@ sub start_radiobuttonresponse {
$token,'4').
&Apache::edit::select_arg('Randomize Foil Order','randomize',
['yes','no'],$token).
+ &Apache::edit::select_arg('Display Direction','direction',
+ ['vertical','horizontal'],$token).
&Apache::edit::end_row().
&Apache::edit::start_spanning_row()."\n";
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
$safeeval,'max',
- 'randomize');
+ 'randomize','direction');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
} elsif ($target eq 'tex') {
my $type=&Apache::lonxml::get_param('TeXtype',$parstack,$safeeval,
@@ -177,7 +188,7 @@ sub end_foilgroup {
$safeeval,'-2');
if ( $style eq 'survey' && $target ne 'analyze') {
if ($target eq 'web' || $target eq 'tex') {
- $result=&displayallfoils($direction);
+ $result=&displayallfoils($direction, $target);
} elsif ( $target eq 'answer' ) {
$result=&displayallanswers();
} elsif ( $target eq 'grade' ) {
@@ -204,7 +215,13 @@ sub end_foilgroup {
('true','false'));
}
}
+ $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;
@@ -228,12 +245,26 @@ sub getfoilcounts {
return ($truecnt,$falsecnt);
}
+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 '<span class="LC_prior_radiobutton">'.
+ $foil_data->{$name.'.text'}.'</span>';
+
+}
+
sub displayallfoils {
- my ($direction)=@_;
+ my ($direction, $target)=@_;
my $result;
&Apache::lonxml::debug("survey style display");
- my @names = @{ $Apache::response::foilgroup{'names'} };
+ my @names;
+ if ( $Apache::response::foilgroup{'names'} ) {
+ @names= @{ $Apache::response::foilgroup{'names'} };
+ }
my $temp=0;
+ my $i =0;
my $id=$Apache::inputtags::response['-1'];
my $part=$Apache::inputtags::part;
my $lastresponse=
@@ -243,19 +274,27 @@ sub displayallfoils {
if (&Apache::response::show_answer() ) {
foreach my $name (@names) {
if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
- if ($direction eq 'horizontal') {
+ if (($direction eq 'horizontal') && ($target ne 'tex')) {
$result.="<td>";
} else {
- $result.="<br />";
+ if ($target eq 'tex') {
+ $result .= '\item \vskip -2mm ';
+ } else {
+ $result.="<br />";
+ }
}
if (defined($lastresponse{$name})) {
- $result.='<b>';
+ if ($target eq 'tex') {
+ $result .= '}';
+ } else {
+ $result.='<b>';
+ }
}
$result .= $Apache::response::foilgroup{$name.'.text'};
- if (defined($lastresponse{$name})) {
+ if (defined($lastresponse{$name}) && ($target ne 'tex')) {
$result.='</b>';
}
- if ($direction eq 'horizontal') { $result.="</td>"; }
+ if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.="</td>"; }
}
}
} else {
@@ -264,19 +303,36 @@ sub displayallfoils {
if ($direction eq 'horizontal') {
$result.="<td>";
} else {
- $result.="<br />";
+ if ($target eq 'tex') {
+ $result .= '\item \vskip -2mm ';
+ } else {
+ $result.="<br />";
+ }
+ }
+ if ($target eq 'tex') {
+ $result .= '$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs
+ $i++;
+ } else {
+ $result .= '<label>';
+ $result.="<input
+ onchange=\"javascript:setSubmittedPart('$part');\"
+ type=\"radio\"
+ name=\"HWVAL_$Apache::inputtags::response['-1']\"
+ value=\"$temp\" ";
+ if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
+ $result .= ' />'.$Apache::response::foilgroup{$name.'.text'}.
+ '</label>';
}
- $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'}.
- '</label>';
$temp++;
- if ($direction eq 'horizontal') { $result.="</td>"; }
+ if ($target ne 'tex') {
+ if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.="</td>"; }
+ } else {
+ $result.='\vskip 0 mm ';
+ }
}
}
}
- if ($direction eq 'horizontal') { $result.='</tr></table>'; }
+ if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.='</tr></table>'; }
return $result;
}
@@ -289,7 +345,7 @@ sub whichfoils {
my ($truecnt,$falsecnt) = &getfoilcounts();
my $count=0;
# we will add in 1 of the true statements
- if (($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; }
+ if ( $max>0 && ($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; $max=$count; }
my $answer=int(&Math::Random::random_uniform() * ($count));
&Apache::lonxml::debug("Count is $count, $answer is $answer");
my @names;
@@ -480,9 +536,13 @@ sub displayfoils {
}
if ($target ne 'tex') {
$result.= '<label>';
- $result.="<input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";
+ $result.=
+ "<input type=\"radio\"
+ onchange=\"javascript:setSubmittedPart('$part');\"
+ name=\"HWVAL_$Apache::inputtags::response['-1']\"
+ value=\"$temp\" ";
if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
- $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</label>";
+ $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
@@ -505,7 +565,10 @@ sub displayfoils {
}
sub displayallanswers {
- my @names = @{ $Apache::response::foilgroup{'names'} };
+ my @names;
+ if ( $Apache::response::foilgroup{'names'} ) {
+ @names= @{ $Apache::response::foilgroup{'names'} };
+ }
my $result=&Apache::response::answer_header('radiobuttonresponse');
foreach my $name (@names) {
@@ -520,10 +583,15 @@ sub displayanswers {
my ($max,$randomize)=@_;
my ($answer,@whichopt) = &whichfoils($max,$randomize);
my $result=&Apache::response::answer_header('radiobuttonresponse');
+ if ($Apache::lonhomework::type eq 'exam') {
+ my $correct = ('A'..'Z')[$answer];
+ $result.=&Apache::response::answer_part('radiobuttonresponse',
+ $correct);
+ }
foreach my $name (@whichopt) {
$result.=&Apache::response::answer_part('radiobuttonresponse',
- $Apache::response::foilgroup{$name.'.value'})
- }
+ $Apache::response::foilgroup{$name.'.value'});
+ }
$result.=&Apache::response::answer_footer('radiobuttonresponse');
return $result;
}
@@ -607,7 +675,7 @@ 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) {
+ if ($name eq "") {
&Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
$name=$Apache::lonxml::curdepth;
}