--- loncom/homework/radiobuttonresponse.pm 2005/04/07 06:56:22 1.100
+++ loncom/homework/radiobuttonresponse.pm 2007/06/26 10:42:09 1.120
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.100 2005/04/07 06:56:22 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.120 2007/06/26 10:42:09 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,6 +31,11 @@ use strict;
use HTML::Entities();
use Apache::lonlocal;
use Apache::lonnet;
+use Apache::response;
+
+my $default_bubbles_per_line = 10;
+my $bubbles_per_line;
+my $bubble_lines = 1;
BEGIN {
&Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));
@@ -39,10 +44,18 @@ BEGIN {
sub start_radiobuttonresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
+
+
+
#when in a radiobutton response use these
&Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
push (@Apache::lonxml::namespace,'radiobuttonresponse');
my $id = &Apache::response::start_response($parstack,$safeeval);
+ $bubbles_per_line =
+ &Apache::response::get_response_param($Apache::inputtags::part."_$id",
+ 'numbubbles',
+ $default_bubbles_per_line);
+
%Apache::hint::radiobutton=();
undef(%Apache::response::foilnames);
if ($target eq 'meta') {
@@ -60,12 +73,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,
@@ -122,6 +137,7 @@ sub storesurvey {
my $part = $Apache::inputtags::part;
my $id = $Apache::inputtags::response['-1'];
my @whichfoils=@{ $Apache::response::foilgroup{'names'} };
+ &bubble_line_count(scalar(@whichfoils));
my %responsehash;
$responsehash{$whichfoils[$response]}=$response;
my $responsestr=&Apache::lonnet::hash2str(%responsehash);
@@ -134,17 +150,40 @@ sub storesurvey {
return '';
}
+sub bubble_line_count {
+ my ($numfoils) = @_;
+ $bubble_lines = int($numfoils / $bubbles_per_line);
+ if (($numfoils % $bubbles_per_line) != 0) {
+ $bubble_lines++;
+ }
+ return $bubble_lines;
+
+}
+
sub grade_response {
my ($max,$randomize)=@_;
#keep the random numbers the same must always call this
my ($answer,@whichfoils)=&whichfoils($max,$randomize);
if ( !&Apache::response::submitted() ) { return; }
my $response;
+
+ # Need to know how many foils we have so that I know how many
+ # bubble lines to consume:
+
+ my $numfoils = scalar(@whichfoils);
+ &bubble_line_count($numfoils);
+
+
+
if ($env{'form.submitted'} eq 'scantron') {
- $response=&Apache::response::getresponse();
+ $response = &Apache::response::getresponse(1,undef,$bubble_lines,
+ $bubbles_per_line);
+
} else {
$response = $env{'form.HWVAL_'.$Apache::inputtags::response['-1']};
}
+
+
if ( $response !~ /[0-9]+/) { return; }
my $part=$Apache::inputtags::part;
my $id = $Apache::inputtags::response['-1'];
@@ -177,7 +216,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' ) {
@@ -197,6 +236,7 @@ sub end_foilgroup {
&grade_response($max,$randomize);
} elsif ( $target eq 'analyze') {
my @shown = &whichfoils($max,$randomize);
+ &bubble_line_count(scalar(@shown));
&Apache::response::analyze_store_foilgroup(\@shown,
['text','value','location']);
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
@@ -204,9 +244,15 @@ 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();
+ &Apache::lonxml::increment_counter($bubble_lines);
return $result;
}
@@ -228,12 +274,29 @@ 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;
+ &Apache::lonnet::loghthis("Display all foils");
+ if ( $Apache::response::foilgroup{'names'} ) {
+ @names= @{ $Apache::response::foilgroup{'names'} };
+ }
+ &bubble_line_count(scalar(@names));
+
my $temp=0;
+ my $i =0;
my $id=$Apache::inputtags::response['-1'];
my $part=$Apache::inputtags::part;
my $lastresponse=
@@ -243,19 +306,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 +335,37 @@ 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 +378,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;
@@ -421,6 +510,7 @@ sub displayfoils {
my $result;
my ($answer,@whichfoils)=&whichfoils($max,$randomize);
+ &bubble_line_count(scalar(@whichfoils));
my $part=$Apache::inputtags::part;
my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
if ( ($target ne 'tex') &&
@@ -462,6 +552,7 @@ sub displayfoils {
} else {
my @alphabet = ('A'..'Z');
my $i = 0;
+ my $bubble_number = 0;
my $temp=0;
my $id=$Apache::inputtags::response['-1'];
my $part=$Apache::inputtags::part;
@@ -480,13 +571,23 @@ 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
$i++;
+ $bubble_number++;
+ if($bubble_number >= $bubbles_per_line) {
+ $i = 0;
+ $bubble_number = 0;
+ $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';
+ }
} else {
$result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
}
@@ -505,8 +606,11 @@ sub displayfoils {
}
sub displayallanswers {
- my @names = @{ $Apache::response::foilgroup{'names'} };
-
+ my @names;
+ if ( $Apache::response::foilgroup{'names'} ) {
+ @names= @{ $Apache::response::foilgroup{'names'} };
+ }
+ &bubble_line_count(scalar(@names));
my $result=&Apache::response::answer_header('radiobuttonresponse');
foreach my $name (@names) {
$result.=&Apache::response::answer_part('radiobuttonresponse',
@@ -520,10 +624,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,8 +716,8 @@ 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) {
- &Apache::lonxml::error("Foils without names exist. This can cause problems to malfunction.");
+ 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})) {