--- loncom/homework/optionresponse.pm 2002/11/11 20:26:59 1.62
+++ loncom/homework/optionresponse.pm 2003/09/24 18:18:38 1.87
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.62 2002/11/11 20:26:59 albertel Exp $
+# $Id: optionresponse.pm,v 1.87 2003/09/24 18:18:38 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -141,7 +141,7 @@ ENDTABLE
$result.=')">';
} # else nothing changed so just use the default mechanism
}
- if ($target eq 'tex') {
+ if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
$result .= ' \begin{enumerate} ';
}
return $result;
@@ -152,9 +152,11 @@ sub end_foilgroup {
my $result;
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {
+ my $tex_option_switch=&Apache::lonxml::get_param('texoptions',$parstack,$safeeval);
my $name;
my @opt;
eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
+ if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();}
&Apache::lonxml::debug("Options are $#opt");
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
@@ -185,7 +187,10 @@ sub end_foilgroup {
my $wrong=0;
my $ignored=0;
foreach $name (@whichopt) {
- my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};
+ my $response=&Apache::response::getresponse($temp);
+ if ($ENV{'form.submitted'} eq 'scantron') {
+ $response = $opt[$response];
+ }
$responsehash{$name}=$response;
if ( $response =~ /[^\s]/) {
my $value=$Apache::response::foilgroup{$name.'.value'};
@@ -207,30 +212,47 @@ sub end_foilgroup {
my %previous=&Apache::response::check_for_previous($responsestr,
$part,$id);
&Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored");
- my $ad;
- if ($wrong==0 && $ignored==0) {
- $ad='EXACT_ANS';
- } elsif ($wrong==0 && $right==0) {
- #nothing submitted
- } else {
- if ($ignored==0) {
- $ad='INCORRECT';
- } else {
- $ad='MISSING_ANSWER';
- }
- }
$Apache::lonhomework::results{"resource.$part.$id.submission"}=
- $responsestr;
+ $responsestr;
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
- $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
- $ad;
- &Apache::response::handle_previous(\%previous,$ad);
+
+ if (!$Apache::lonhomework::scantronmode) {
+ my $ad;
+ if ($wrong==0 && $ignored==0) {
+ $ad='EXACT_ANS';
+ } elsif ($wrong==0 && $right==0) {
+ #nothing submitted
+ } else {
+ if ($ignored==0) {
+ $ad='INCORRECT';
+ } else {
+ $ad='MISSING_ANSWER';
+ }
+ }
+ $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
+ &Apache::response::handle_previous(\%previous,$ad);
+ } else {
+ my $ad;
+ if ($wrong==0 && $right==0) {
+ #nothing submitted
+ } else {
+ $ad='ASSIGNED_SCORE';
+ }
+ $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
+ $Apache::lonhomework::results{"resource.$part.$id.awarded"}=
+ $right/(scalar(@whichopt));
+ $Apache::lonhomework::results{"resource.$part.$id.numfoils"}=
+ scalar(@whichopt);
+ }
}
}
+ &Apache::lonxml::increment_counter(&getfoilcounts($max));
} elsif ($target eq 'edit') {
$result.=&Apache::edit::end_table();
- }
- if ($target eq 'tex') {$result .= '\end{enumerate}';}
+ }
+ if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
+ $result .= '\end{enumerate}';
+ }
return $result;
}
@@ -245,55 +267,15 @@ sub getfoilcounts {
}
sub whichfoils {
- my ($max,$randomize)=@_;
- $max = &getfoilcounts($max);
- &Apache::lonxml::debug("randomize $randomize");
- my @names = @{ $Apache::response::foilgroup{'names'} };
- my @whichopt =();
- my (%top,@toplist,%bottom,@bottomlist);
- if (!(&Apache::response::showallfoils() || ($randomize eq 'no'))) {
- my $current=0;
- foreach my $name (@names) {
- $current++;
- if ($Apache::response::foilgroup{$name.'.location'} eq 'top') {
- $top{$name}=$current;
- } elsif ($Apache::response::foilgroup{$name.'.location'} eq
- 'bottom') {
- $bottom{$name}=$current;
- }
- }
- }
- while ((($#whichopt+1) < $max) && ($#names > -1)) {
- &Apache::lonxml::debug("Have $#whichopt max is $max");
- my $aopt;
- if (&Apache::response::showallfoils() || ($randomize eq 'no')) {
- $aopt=0;
- } else {
- $aopt=int(&Math::Random::random_uniform() * ($#names+1));
- }
- &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
- $aopt=splice(@names,$aopt,1);
- &Apache::lonxml::debug("Picked $aopt");
- if ($top{$aopt}) {
- $toplist[$top{$aopt}]=$aopt;
- } elsif ($bottom{$aopt}) {
- $bottomlist[$bottom{$aopt}]=$aopt;
- } else {
- push (@whichopt,$aopt);
- }
- }
- for (my $i=0;$i<=$#toplist;$i++) {
- if ($toplist[$i]) { unshift(@whichopt,$toplist[$i]) }
- }
- for (my $i=0;$i<=$#bottomlist;$i++) {
- if ($bottomlist[$i]) { push(@whichopt,$bottomlist[$i]) }
- }
-
- return @whichopt;
+ my ($max,$randomize)=@_;
+ return &Apache::response::whichorder($max,$randomize,
+ &Apache::response::showallfoils(),
+ \%Apache::response::foilgroup);
}
sub displayanswers {
my ($max,$randomize,@opt)=@_;
+ if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
my @names = @{ $Apache::response::foilgroup{'names'} };
my @whichopt = &whichfoils($max,$randomize);
my $result=&Apache::response::answer_header('optionresponse');
@@ -307,20 +289,22 @@ sub displayanswers {
sub displayfoils {
my ($target,$max,$randomize,@opt)=@_;
+ if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
my @names = @{ $Apache::response::foilgroup{'names'} };
my @truelist;
my @falselist;
- my $result;
+ my $result;
my $name;
my $displayoptionintex=0;
- 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 @whichopt = &whichfoils($max,$randomize);
my $part=$Apache::inputtags::part;
my $id=$Apache::inputtags::response[-1];
my $break;
- if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/) || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) {
- my $temp=1; ####
+ my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
+ my $status=$Apache::inputtags::status[-1];
+ if ( ($target ne 'tex') &&
+ &Apache::response::show_answer() ) {
foreach $name (@whichopt) {
my $text=$Apache::response::foilgroup{$name.'.text'};
if ($text!~/^\s*$/) {
@@ -343,7 +327,8 @@ sub displayfoils {
$result.=$text."\n";
} elsif ($target eq 'tex') {
$Apache::response::foilgroup{$name.'.text'}=~s/\\item//;
- $result .='\item \textit{'.$Apache::response::foilgroup{$name.'.value'}.'}'.
+ if ($max>1) {$result .='\item ';}
+ $result .=' \textit{'.$Apache::response::foilgroup{$name.'.value'}.'}'.
":".$Apache::response::foilgroup{$name.'.text'}."\n";
}
if ($Apache::lonhomework::type eq 'exam') {
@@ -353,11 +338,11 @@ sub displayfoils {
$result.=&bubbles(\@alphabet,\@opt);
}
}
- $temp++;
}
} else {
my $temp=1;
my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
+ my $internal_counter=$Apache::lonxml::counter;
foreach $name (@whichopt) {
my $text=$Apache::response::foilgroup{$name.'.text'};
if ($text!~/^\s*$/) {
@@ -378,16 +363,18 @@ sub displayfoils {
}
}
if ($target ne 'tex') {
- $optionlist='<select name="HWVAL_'.
+ if ($Apache::lonhomework::type ne 'exam') {
+ $optionlist='<select name="HWVAL_'.
$Apache::inputtags::response['-1'].':'.$temp.'">'.
$optionlist."</select>\n";
+ }
my $text=$Apache::response::foilgroup{$name.'.text'};
- if (!($text=~s|<drawoptionlist\s*/>|$optionlist|)) {
+ if (!($text=~s|<drawoptionlist\s*/>|$optionlist|) && $Apache::lonhomework::type ne 'exam') {
$text=$optionlist.$text;
}
$result.=$break.$text."\n";
if ($Apache::lonhomework::type eq 'exam') {
- $result.=&webbubbles(\@opt,\@alphabet);
+ $result.=&webbubbles(\@opt,\@alphabet,$temp);
}
$temp++;
} else {
@@ -396,27 +383,28 @@ sub displayfoils {
if ($Apache::lonhomework::type eq 'exam') {$texoptionlist='';} #if exam we do not need to show optionlist
if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
if ($Apache::lonhomework::type eq 'exam') {
- $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\item[\\textbf{$Apache::lonxml::counter}\.]/;
+ $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\vskip 2 mm/;
}
if ($Apache::response::foilgroup{$name.'.text'}=~/<drawoptionlist\s*\/>/) {
$Apache::response::foilgroup{$name.'.text'}=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;
- $result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'};
}
+ $result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'};
} else {
if ($Apache::lonhomework::type eq 'exam') {
- $result.= $texoptionlist.'\vspace*{-2 mm}\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'};
+ $result.= $texoptionlist.' '.$Apache::response::foilgroup{$name.'.text'};
} else {
$result.= $texoptionlist.'\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
}
}
if ($Apache::lonhomework::type eq 'exam') {
- $result.=&bubbles(\@alphabet,\@opt);
+ $result.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -9 mm \strut ';
+ $internal_counter++;
}
$displayoptionintex=1;
} else {
if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
if ($Apache::lonhomework::type eq 'exam') {
- $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\item[\\textbf{$Apache::lonxml::counter}\.]/;
+ $Apache::response::foilgroup{$name.'.text'}=~s/\\item//;
}
if ($Apache::response::foilgroup{$name.'.text'}=~/<drawoptionlist\s*\/>/) {
$Apache::response::foilgroup{$name.'.text'}=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;
@@ -424,13 +412,14 @@ sub displayfoils {
$result.= $Apache::response::foilgroup{$name.'.text'};
} else {
if ($Apache::lonhomework::type eq 'exam') {
- $result.= '\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'};
+ $result.= ' '.$Apache::response::foilgroup{$name.'.text'};
} else {
$result.= '\item '.$Apache::response::foilgroup{$name.'.text'};
}
}
if ($Apache::lonhomework::type eq 'exam') {
- $result.=&bubbles(\@alphabet,\@opt);
+ $result.='\vskip -2 mm \parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -9 mm \strut ';
+ $internal_counter++;
}
}
}
@@ -447,28 +436,34 @@ sub displayfoils {
sub optionlist_correction {
my $texoptionlist = shift;
- $texoptionlist =~ s/<option><\/option>/\\item \[\] Possible answers are:/;
- $texoptionlist =~ s/<option>/\{\\bf /g;
- $texoptionlist =~ s/<option selected="on">/\{\\bf /g;
- $texoptionlist =~ s/<\/option>/\},/g;
- $texoptionlist =~ s/,$/\./g;
- $texoptionlist =~ s/>/\$>\$/g;
- $texoptionlist =~ s/</\$<\$/g;
- $texoptionlist =~ s/=/\$=\$/g;
+ if ($texoptionlist=~/<option selected/ or $texoptionlist=~/<option>[^<]+<\/option>/) {
+ $texoptionlist =~ s/<option><\/option>/\\item \[\] Choices: /;
+ $texoptionlist =~ s/<option>/\{\\bf /g;
+ $texoptionlist =~ s/<option selected="on">/\{\\bf /g;
+ $texoptionlist =~ s/<\/option>/\},/g;
+ $texoptionlist =~ s/,$/\./g;
+ $texoptionlist =~ s/>/\$>\$/g;
+ $texoptionlist =~ s/</\$<\$/g;
+ $texoptionlist =~ s/=/\$=\$/g;
+ $texoptionlist =~ s/\^(\d+)/<m>\$$1\$<\/m>/g;
+ } else {
+ $texoptionlist =~ s/<option><\/option>/\\item \[\] \\vskip -5 mm/;
+ }
return $texoptionlist;
}
sub webbubbles {
- my ($ropt,$ralphabet)=@_;
+ my ($ropt,$ralphabet,$temp)=@_;
my @opt=@$ropt;
my @alphabet=@$ralphabet;
my $result='';
my $number_of_bubbles = $#opt + 1;
$result.= '<table border="1"><tr>';
for (my $ind=0;$ind<$number_of_bubbles;$ind++) {
- $result.='<td>'.$alphabet[$ind].': '.$opt[$ind].'</td>';
+ $result.='<td><input type="radio" name="HWVAL_'.$Apache::inputtags::response['-1'].':'.$temp.
+ '" value='.$opt[$ind].'>'.$alphabet[$ind].': '.$opt[$ind].'</td>';
}
$result.='</tr></table>';
return $result;
@@ -497,7 +492,6 @@ sub bubbles {
}
}
- &Apache::lonxml::increment_counter();
return $result;
}
@@ -610,7 +604,7 @@ sub end_foil {
my $result = '';
if ($target eq 'web' || $target eq 'tex') {
$text=&Apache::lonxml::endredirection;
- if ($target eq 'tex') { $text = '\vspace*{-2 mm}\item '.$text; }
+ if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { $text = '\vspace*{-2 mm}\item '.$text; }
}
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'
|| $target eq 'tex' || $target eq 'analyze') {
@@ -625,12 +619,20 @@ sub end_foil {
&& !&Apache::response::showallfoils() ) {
push @{ $Apache::response::conceptgroup{'names'} }, $name;
$Apache::response::conceptgroup{"$name.value"} = $value;
- $Apache::response::conceptgroup{"$name.text"} = $text;
+ if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
+ $Apache::response::conceptgroup{"$name.text"} = '\vskip 4 mm $\triangleright$ '.$text;
+ } else {
+ $Apache::response::conceptgroup{"$name.text"} = $text;
+ }
$Apache::response::conceptgroup{"$name.location"} = $location;
} else {
push @{ $Apache::response::foilgroup{'names'} }, $name;
$Apache::response::foilgroup{"$name.value"} = $value;
- $Apache::response::foilgroup{"$name.text"} = $text;
+ if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
+ $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
+ } else {
+ $Apache::response::foilgroup{"$name.text"} = $text;
+ }
$Apache::response::foilgroup{"$name.location"} = $location;
}
}