--- loncom/homework/radiobuttonresponse.pm 2004/03/15 22:09:52 1.86
+++ 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.86 2004/03/15 22:09:52 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.115 2007/05/17 10:01:44 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,6 +30,8 @@ package Apache::radiobuttonresponse;
use strict;
use HTML::Entities();
use Apache::lonlocal;
+use Apache::lonnet;
+use Apache::response;
BEGIN {
&Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));
@@ -38,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');
@@ -59,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,
@@ -77,6 +89,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 +118,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.'}.]';
}
@@ -112,16 +126,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
\n");
return '';
}
@@ -130,12 +149,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;
@@ -165,9 +184,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, $target);
} elsif ( $target eq 'answer' ) {
$result=&displayallanswers();
} elsif ( $target eq 'grade' ) {
@@ -180,7 +201,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') {
@@ -194,7 +215,14 @@ 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;
}
@@ -217,39 +245,94 @@ 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 ' ';
+
+}
+
sub displayallfoils {
+ 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=
$Apache::lonhomework::history{"resource.$part.$id.submission"};
+ if ($direction eq 'horizontal') { $result.='
";
+ } else {
+ if ($target eq 'tex') {
+ $result .= '\item \vskip -2mm ';
+ } else {
+ $result.=" "; + } + } if (defined($lastresponse{$name})) { - $result.=''; + if ($target eq 'tex') { + $result .= '}'; + } else { + $result.=''; + } } $result .= $Apache::response::foilgroup{$name.'.text'}; - if (defined($lastresponse{$name})) { + if (defined($lastresponse{$name}) && ($target ne 'tex')) { $result.=''; } + if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.=" | "; }
}
}
} else {
foreach my $name (@names) {
if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
- $result.="";
+ } else {
+ if ($target eq 'tex') {
+ $result .= '\item \vskip -2mm ';
+ } else {
+ $result.=" "; + } + } + if ($target eq 'tex') { + $result .= '$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs + $i++; + } else { + $result .= ' | "; }
+ } else {
+ $result.='\vskip 0 mm ';
+ }
}
}
}
+ if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.='
'; }
+ }
if ($target ne 'tex') {
$result.=" "; } else { @@ -406,14 +500,20 @@ sub displayfoils { } else { $result.='Incorrect:'; } - if ($target ne 'tex') { - $result.=$Apache::response::foilgroup{$name.'.text'}."\n"; - } else { - $result.=$Apache::response::foilgroup{$name.'.text'}; - } + if ($target eq 'web') { $result.=""; } if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { if ($target ne 'tex') { $result.='';} else {$result.='}';} } + if ($direction eq 'horizontal') { + if ($target ne 'tex') { $result.=' | '; }
+ }
+ }
+ if ($direction eq 'horizontal') {
+ if ($target ne 'tex') {
+ $result.='