--- loncom/homework/radiobuttonresponse.pm 2002/10/25 19:02:38 1.58
+++ loncom/homework/radiobuttonresponse.pm 2003/05/16 19:25:08 1.71
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.58 2002/10/25 19:02:38 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.71 2003/05/16 19:25:08 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -62,6 +62,16 @@ sub start_radiobuttonresponse {
$safeeval,'max','randomize');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
} elsif ($target eq 'tex') {
+ my $type=&Apache::lonxml::get_param('TeXtype',$parstack,$safeeval,undef,0);
+ if ($type eq '1') {
+ $result .= ' \renewcommand{\labelenumi}{\arabic{enumi}.}';
+ } elsif ($type eq 'A') {
+ $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}';
+ } elsif ($type eq 'a') {
+ $result .= ' \renewcommand{\labelenumi}{\alph{enumi}.}';
+ } elsif ($type eq 'i') {
+ $result .= ' \renewcommand{\labelenumi}{\roman{enumi}.}';
+ }
$result .= '\begin{enumerate}';
}
return $result;
@@ -87,14 +97,13 @@ sub start_foilgroup {
&Apache::response::setrandomnumber();
if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
$result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';
- &Apache::lonxml::increment_counter();
}
return $result;
}
sub storesurvey {
if ( !defined($ENV{'form.submitted'})) { return ''; }
- my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
+ my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1']};
&Apache::lonxml::debug("Here I am!:$response:");
if ( $response !~ /[0-9]+/) { return ''; }
my $id = $Apache::inputtags::response['-1'];
@@ -112,7 +121,12 @@ sub grade_response {
#keep the random numbers the same must always call this
my ($answer,@whichfoils)=&whichfoils($max,$randomize);
if (!defined($ENV{'form.submitted'})) { return; }
- my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
+ my $response;
+ if ($ENV{'form.submitted'} eq 'scantron') {
+ $response=&Apache::response::getresponse();
+ } 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'];
@@ -160,6 +174,7 @@ sub end_foilgroup {
}
}
}
+ &Apache::lonxml::increment_counter();
return $result;
}
@@ -206,7 +221,7 @@ sub displayallfoils {
} 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\" ";
+ $result.="<br /><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";
$temp++;
@@ -278,12 +293,12 @@ sub whichfoils {
#pick a true statement
my $whichtrue = int(&Math::Random::random_uniform() * ($#truelist+1));
&Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
- my $numinserted;
my (@toplist, @bottomlist);
my $topcount=0;
+ my $bottomcount=0;
# assign everyone to either toplist/bottomlist or whichfalse
# which false is randomized, toplist bottomlist are in order
- while ((($numinserted) < $max-1) && ($#falselist > -1)) {
+ while ((($#whichfalse+$topcount+$bottomcount) < $max-2) && ($#falselist > -1)) {
&Apache::lonxml::debug("Have $#whichfalse max is $max");
my $afalse=int(&Math::Random::random_uniform() * ($#falselist+1));
&Apache::lonxml::debug("From $#falselist elms, picking $afalse");
@@ -296,10 +311,12 @@ sub whichfoils {
$topcount++;
} elsif ($bottom{$afalse}) {
$bottomlist[$bottom{$afalse}]=$afalse;
+ $bottomcount++;
} else {
push (@whichfalse,$afalse);
}
}
+ &Apache::lonxml::debug("Answer wants $answer");
my $truename=$truelist[$whichtrue];
my $dosplice=1;
#insert the true statement, keeping track of where it wants to be
@@ -321,11 +338,12 @@ sub whichfoils {
$answer+=$topcount+$#whichfalse+1;
$dosplice=0;
} else {
- if ($topcount>0) {
- $answer = int(&Math::Random::random_uniform() * ($#whichfalse+1))
- + $topcount;
+ if ($topcount>0 || $bottomcount>0) {
+ $answer = int(&Math::Random::random_uniform() * ($#whichfalse+1))
+ + $topcount;
}
}
+ &Apache::lonxml::debug("Answer now wants $answer");
#add the top items to the top, bottom items to the bottom
for (my $i=0;$i<=$#toplist;$i++) {
if ($toplist[$i]) { unshift(@whichfalse,$toplist[$i]) }
@@ -345,15 +363,19 @@ sub displayfoils {
my $result;
my ($answer,@whichfoils)=&whichfoils($max,$randomize);
- if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) {
+ my $part=$Apache::inputtags::part;
+ my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
+ my $status=$Apache::inputtags::status[-1];
+ if ( ($target ne 'tex') &&
+ (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) ) {
foreach my $name (@whichfoils) {
if ($target ne 'tex') {
$result.="<br />";
} else {
- $result.='\vskip 0 mm \item ';
+ $result.='\item \vskip -2 mm ';
}
if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
- if ($target ne 'tex') { $result.='Correct:<b>'; } else { $result.='Correct: ';}
+ if ($target ne 'tex') { $result.='Correct:<b>'; } else { $result.='Correct: \textbf{';}
} else {
$result.='Incorrect:';
}
@@ -363,11 +385,11 @@ sub displayfoils {
$result.=$Apache::response::foilgroup{$name.'.text'};
}
if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
- if ($target ne 'tex') { $result.='</b>';}
+ if ($target ne 'tex') { $result.='</b>';} else {$result.='}';}
}
}
} else {
- my @alphabet = ('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z');
+ my @alphabet = ('A'..'Z');
my $i = 0;
my $temp=0;
my $id=$Apache::inputtags::response['-1'];
@@ -376,18 +398,15 @@ sub displayfoils {
my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
foreach my $name (@whichfoils) {
if ($target ne 'tex') {
- $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
+ $result.="<br /><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";
- if ($Apache::lonhomework::type eq 'exam') {
- $result .= '<table border="1"><tr><td>A: Correct</td><td>B: Incorrect</td></tr></table>';
- }
} else {
if ($Apache::lonhomework::type eq 'exam') {
$result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs
$i++;
} else {
- $result .= '\item '.$Apache::response::foilgroup{$name.'.text'};
+ $result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
}
}
$temp++;