--- loncom/homework/optionresponse.pm 2003/09/22 20:49:01 1.86
+++ loncom/homework/optionresponse.pm 2004/03/08 23:23:04 1.103
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.86 2003/09/22 20:49:01 albertel Exp $
+# $Id: optionresponse.pm,v 1.103 2004/03/08 23:23:04 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,11 +25,10 @@
#
# http://www.lon-capa.org/
#
-# 2/21 Guy
-# 01/18 Alex
package Apache::optionresponse;
use strict;
-use Apache::response;
+use Apache::response();
+use Apache::lonlocal;
BEGIN {
&Apache::lonxml::register('Apache::optionresponse',('optionresponse'));
@@ -43,9 +42,11 @@ sub start_optionresponse {
push (@Apache::lonxml::namespace,'optionresponse');
my $id = &Apache::response::start_response($parstack,$safeeval);
%Apache::hint::option=();
+ undef(%Apache::response::foilnames);
if ($target eq 'edit') {
$result.=&Apache::edit::start_table($token).
- "<tr><td>Multiple Option Response Question</td><td>Delete:".
+ "<tr><td>Multiple Option Response Question ".
+ &Apache::loncommon::help_open_topic('Option_Response_Problems')."</td><td>Delete:".
&Apache::edit::deletelist($target,$token)
."</td><td> ".
&Apache::edit::end_row().
@@ -63,7 +64,7 @@ sub start_optionresponse {
} elsif ($target eq 'meta') {
$result=&Apache::response::meta_package_write('optionresponse');
} elsif ($target eq 'analyze') {
- my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+ my $part_id="$Apache::inputtags::part.$id";
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
}
return $result;
@@ -76,6 +77,7 @@ sub end_optionresponse {
&Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
my $result;
if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
+ undef(%Apache::response::foilnames);
return $result;
}
@@ -151,7 +153,8 @@ sub end_foilgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
- if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {
+ 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;
@@ -166,17 +169,11 @@ sub end_foilgroup {
} elsif ( $target eq 'answer') {
$result.=&displayanswers($max,$randomize,@opt);
} elsif ( $target eq 'analyze') {
- my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
- foreach my $name (@{ $Apache::response::foilgroup{'names'} }) {
- if (defined($Apache::lonhomework::analyze{"$part_id.foil.value.$name"})) { next; }
- push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },$name);
- $Apache::lonhomework::analyze{"$part_id.foil.value.$name"} =
- $Apache::response::foilgroup{"$name.value"};
- $Apache::lonhomework::analyze{"$part_id.foil.text.$name"} =
- $Apache::response::foilgroup{"$name.text"};
- }
- push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
- push (@{ $Apache::lonhomework::analyze{"$part_id.shown"} },&whichfoils($max,$randomize));
+ my @shown = &whichfoils($max,$randomize);
+ &Apache::response::analyze_store_foilgroup(\@shown,
+ ['text','value','location']);
+ my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+ push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
} elsif ( $target eq 'grade') {
if ( defined $ENV{'form.submitted'}) {
my @whichopt = &whichfoils($max,$randomize);
@@ -191,8 +188,8 @@ sub end_foilgroup {
if ($ENV{'form.submitted'} eq 'scantron') {
$response = $opt[$response];
}
- $responsehash{$name}=$response;
if ( $response =~ /[^\s]/) {
+ $responsehash{$name}=$response;
my $value=$Apache::response::foilgroup{$name.'.value'};
&Apache::lonxml::debug("submitted a $response for $value<br />\n");
if ($value eq $response) {
@@ -295,25 +292,21 @@ sub displayfoils {
my @falselist;
my $result;
my $name;
- my $displayoptionintex=0;
+ my $displayoptionintex=1;
my @alphabet = ('A'..'Z');
my @whichopt = &whichfoils($max,$randomize);
my $part=$Apache::inputtags::part;
my $id=$Apache::inputtags::response[-1];
my $break;
my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
- my $status=$Apache::inputtags::status[-1];
if ( ($target ne 'tex') &&
&Apache::response::show_answer() ) {
+ my $temp=1;
foreach $name (@whichopt) {
my $text=$Apache::response::foilgroup{$name.'.text'};
- if ($text!~/^\s*$/) {
- if ($target eq 'tex') {
- $break='\vskip 0 mm ';
- } elsif ($target eq 'web') {
- $break='<br />';
- }
- }
+ my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
+ my $lastopt=$lastresponse{$name};
+ if ($text!~/^\s*$/) { $break='<br />'; }
$result.=$break;
if ($target eq 'web') {
my $value=$Apache::response::foilgroup{$name.'.value'};
@@ -323,21 +316,15 @@ sub displayfoils {
} else {
$text=$value.': '.$text;
}
+ } else {
+ $text='•'.$text;
}
$result.=$text."\n";
- } elsif ($target eq 'tex') {
- $Apache::response::foilgroup{$name.'.text'}=~s/\\item//;
- if ($max>1) {$result .='\item ';}
- $result .=' \textit{'.$Apache::response::foilgroup{$name.'.value'}.'}'.
- ":".$Apache::response::foilgroup{$name.'.text'}."\n";
}
if ($Apache::lonhomework::type eq 'exam') {
- if ($target ne 'tex') {
- $result.=&webbubbles(\@opt,\@alphabet);
- } else {
- $result.=&bubbles(\@alphabet,\@opt);
- }
+ $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt);
}
+ $temp++;
}
} else {
my $temp=1;
@@ -364,64 +351,55 @@ sub displayfoils {
}
if ($target ne 'tex') {
if ($Apache::lonhomework::type ne 'exam') {
- $optionlist='<select name="HWVAL_'.
- $Apache::inputtags::response['-1'].':'.$temp.'">'.
+ $optionlist='<select name="HWVAL_'.
+ $Apache::inputtags::response['-1'].':'.$temp.'">'.
$optionlist."</select>\n";
+ } else {
+ $optionlist='<u>'.(' 'x10).'</u>';
}
- my $text=$Apache::response::foilgroup{$name.'.text'};
- if (!($text=~s|<drawoptionlist\s*/>|$optionlist|) && $Apache::lonhomework::type ne 'exam') {
- $text=$optionlist.$text;
+ if ($text=~s|<drawoptionlist\s*/>|$optionlist|) {
+ if ($Apache::lonhomework::type ne 'exam') {
+ $text='•'.$text;
+ }
+ } else {
+ if ($Apache::lonhomework::type ne 'exam') {
+ $text=$optionlist.$text;
+ }
}
$result.=$break.$text."\n";
if ($Apache::lonhomework::type eq 'exam') {
- $result.=&webbubbles(\@opt,\@alphabet,$temp);
+ $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt);
}
$temp++;
} else {
- my $texoptionlist = &optionlist_correction($optionlist);
- if ($displayoptionintex == 0) {
- 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/\\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'};
- } else {
- if ($Apache::lonhomework::type eq 'exam') {
- $result.= $texoptionlist.' '.$Apache::response::foilgroup{$name.'.text'};
- } else {
- $result.= $texoptionlist.'\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
- }
- }
+ my $texoptionlist='';
+ if ($displayoptionintex &&
+ $Apache::lonhomework::type ne 'exam') {
+ $texoptionlist = &optionlist_correction(@opt);
+ }
+ if ($text=~/<drawoptionlist\s*\/>/) {
+ $text=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;
+ }
+
+ if ($text=~m/\\item /) {
if ($Apache::lonhomework::type eq 'exam') {
- $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++;
+ $text=~s/\\item/\\vskip 2 mm/;
}
- $displayoptionintex=1;
+ $result.= $texoptionlist.$text;
} else {
- if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
- if ($Apache::lonhomework::type eq 'exam') {
- $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\} |;
- }
- $result.= $Apache::response::foilgroup{$name.'.text'};
- } else {
- if ($Apache::lonhomework::type eq 'exam') {
- $result.= ' '.$Apache::response::foilgroup{$name.'.text'};
- } else {
- $result.= '\item '.$Apache::response::foilgroup{$name.'.text'};
- }
- }
if ($Apache::lonhomework::type eq 'exam') {
- $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++;
+ $result.= $texoptionlist.' '.$text;
+ } else {
+ $result.= $texoptionlist.'\vspace*{-2 mm}\item '.$text;
}
}
+ if ($Apache::lonhomework::type eq 'exam') {
+ $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.
+ $internal_counter.'}.]'.&bubbles(\@alphabet,\@opt).
+ '\end{enumerate} \vskip -8 mm \strut ';
+ $internal_counter++;
+ }
+ $displayoptionintex=0;
}
}
}
@@ -434,58 +412,71 @@ sub displayfoils {
sub optionlist_correction {
-
- my $texoptionlist = shift;
- 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;
+ my @options = @_;
+ my $texoptionlist='\\item [] Choices: ';
+ if (scalar(@options) > 0) {
+ foreach my $option (@options) {
+ $texoptionlist.='{\bf '.
+ &Apache::lonxml::latex_special_symbols($option).
+ '},';
+ }
+ chop($texoptionlist);
+ $texoptionlist.='.';
} else {
- $texoptionlist =~ s/<option><\/option>/\\item \[\] \\vskip -5 mm/;
+ $texoptionlist='\\item [] \\vskip -5 mm';
}
return $texoptionlist;
}
sub webbubbles {
-
- my ($ropt,$ralphabet,$temp)=@_;
+ my ($ropt,$ralphabet,$temp,$lastopt)=@_;
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><input type="radio" name="HWVAL_'.$Apache::inputtags::response['-1'].':'.$temp.
- '" value='.$opt[$ind].'>'.$alphabet[$ind].': '.$opt[$ind].'</td>';
+ my $number_of_bubbles = $#opt + 1;
+ $result.= '<table border="1"><tr>';
+ for (my $ind=0;$ind<$number_of_bubbles;$ind++) {
+ my $checked='';
+ if ($lastopt eq $opt[$ind]) {
+ $checked=' checked="on" ';
}
- $result.='</tr></table>';
- return $result;
+ $result.='<td><input type="radio" name="HWVAL_'.
+ $Apache::inputtags::response['-1'].':'.$temp.
+ '" value="'.$opt[$ind].'" '.$checked.' />'.$alphabet[$ind].': '.
+ $opt[$ind].'</td>';
+ }
+ $result.='</tr></table>';
+ return $result;
}
sub bubbles {
-
my ($ralphabit,$ropt) = @_;
my @alphabet = @$ralphabit;
my @opt = @$ropt;
my ($result,$head,$line) =('','','');
my $number_of_bubbles = $#opt + 1;
my $current_length = 0;
+ my $textwidth;
+ if ($ENV{'form.textwidth'} ne '') {
+ $ENV{'form.textwidth'}=~/(\d+)/;
+ $textwidth=$1;
+ } else {
+ $ENV{'textwidth'}=~/(\d*)\.?(\d*)/;
+ $textwidth=$1.'.'.$2;
+ }
for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {
- $current_length += (length($opt[$ind])+length($alphabet[$ind])+2)*2;
- if ($current_length<0.9*$ENV{'form.textwidth'} and $ind!=$number_of_bubbles) {
+ my $leftmargin;
+ $opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]);
+ if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;}
+ $current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2;
+ if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) {
$line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';
$head.='lr';
} else {
$line=~s/\&\s*$//;
- $result.='\vskip -5 mm\begin{tabular}{'.$head.'}\\\\'.$line.'\\\\\end{tabular}';
+ $result.='\vskip -2 mm\noindent\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}';
$line = '\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';;
$head ='lr';
$current_length = (length($opt[$ind])+length($alphabet[$ind]))*2;
@@ -517,47 +508,13 @@ sub end_conceptgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
$Apache::optionresponse::conceptgroup=0;
my $result='';
- if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'
- || $target eq 'tex' || $target eq 'analyze') {
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+ $target eq 'tex' || $target eq 'analyze') {
#if not there aren't any foils to display and thus no question
- if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
- my @names = @{ $Apache::response::conceptgroup{'names'} };
- my $pick=int(&Math::Random::random_uniform() * ($#names+1));
- my $name=$names[$pick];
- push @{ $Apache::response::foilgroup{'names'} }, $name;
- $Apache::response::foilgroup{"$name.value"} =
- $Apache::response::conceptgroup{"$name.value"};
- $Apache::response::foilgroup{"$name.text"} =
- $Apache::response::conceptgroup{"$name.text"};
- $Apache::response::foilgroup{"$name.location"} =
- $Apache::response::conceptgroup{"$name.location"};
- my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
- $Apache::response::foilgroup{"$name.concept"} = $concept;
- &Apache::lonxml::debug("Selecting $name in $concept");
- if ($target eq 'analyze') {
- my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
- push (@{ $Apache::lonhomework::analyze{"$part_id.concepts"} },
- $concept);
- $Apache::lonhomework::analyze{"$part_id.concept.$concept"}=
- $Apache::response::conceptgroup{'names'};
- foreach my $name (@{ $Apache::response::conceptgroup{'names'} }) {
- push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },
- $name);
- $Apache::lonhomework::analyze{"$part_id.foil.value.$name"} =
- $Apache::response::conceptgroup{"$name.value"};
- $Apache::lonhomework::analyze{"$part_id.foil.text.$name"} =
- $Apache::response::conceptgroup{"$name.text"};
- $Apache::lonhomework::analyze{"$part_id.foil.location.$name"} =
- $Apache::response::conceptgroup{"$name.location"};
- }
- } elsif ($target eq 'web') {
- my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
- push(@{ $Apache::hint::option{"$part_id.concepts"} },
- $concept);
- $Apache::hint::option{"$part_id.concept.$concept"}=
- $Apache::response::conceptgroup{'names'};
- }
- }
+ &Apache::response::pick_foil_for_concept($target,
+ ['value','text','location'],
+ \%Apache::hint::option,
+ $parstack,$safeeval);
} elsif ($target eq 'edit') {
$result=&Apache::edit::end_table();
}
@@ -602,7 +559,7 @@ sub end_foil {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $text ='';
my $result = '';
- if ($target eq 'web' || $target eq 'tex') {
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
$text=&Apache::lonxml::endredirection;
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { $text = '\vspace*{-2 mm}\item '.$text; }
}
@@ -611,10 +568,14 @@ 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);
- my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval);
+ $Apache::response::foilnames{$name}++;
&Apache::lonxml::debug("Got a name of :$name:");
if (!$name) { $name=$Apache::lonxml::curdepth; }
&Apache::lonxml::debug("Using a name of :$name:");
+ if (defined($Apache::response::foilnames{$name})) {
+ &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
+ }
+ my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval);
if ( $Apache::optionresponse::conceptgroup
&& !&Apache::response::showallfoils() ) {
push @{ $Apache::response::conceptgroup{'names'} }, $name;
@@ -622,11 +583,7 @@ sub end_foil {
if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
$Apache::response::conceptgroup{"$name.text"} = '\vskip 4 mm $\triangleright$ '.$text;
} else {
- if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
- $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
- } else {
- $Apache::response::conceptgroup{"$name.text"} = $text;
- }
+ $Apache::response::conceptgroup{"$name.text"} = $text;
}
$Apache::response::conceptgroup{"$name.location"} = $location;
} else {
@@ -635,11 +592,7 @@ sub end_foil {
if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
$Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
} else {
- if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
- $Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;
- } else {
- $Apache::response::foilgroup{"$name.text"} = $text;
- }
+ $Apache::response::foilgroup{"$name.text"} = $text;
}
$Apache::response::foilgroup{"$name.location"} = $location;
}