--- loncom/homework/matchresponse.pm 2003/01/28 00:11:49 1.1 +++ loncom/homework/matchresponse.pm 2003/03/19 18:36:37 1.7 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Full matching style response # -# $Id: matchresponse.pm,v 1.1 2003/01/28 00:11:49 albertel Exp $ +# $Id: matchresponse.pm,v 1.7 2003/03/19 18:36:37 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,6 +31,9 @@ package Apache::matchresponse; use strict; use HTML::Entities(); use Math::Random(); +use Apache::optionresponse; + +my @Items; BEGIN { &Apache::lonxml::register('Apache::matchresponse',('matchresponse')); @@ -85,11 +88,24 @@ sub start_itemgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; %Apache::response::itemgroup=(); + %Apache::matchresponse::itemtable=(); if ($target eq 'edit') { $result=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::select_arg('Randomize Order:','randomize', ['yes','no'],$token); + $result.=&Apache::edit::select_arg('Items Display Location:', + 'location', + ['top','bottom','left','right'], + $token); $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'randomize', + 'location'); + if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } + } elsif ($target eq 'web') { + $Apache::matchresponse::itemtable{'location'}= + &Apache::lonxml::get_param('location',$parstack,$safeeval); } return $result; } @@ -101,8 +117,9 @@ sub end_itemgroup { if (!defined(@{ $Apache::response::itemgroup{'names'} })) { return; } my @names=@{ $Apache::response::itemgroup{'names'} }; my $randomize =&Apache::lonxml::get_param('randomize',$parstack,$safeeval); - if ($randomize != 'no' ) { - @names=&Math::Random::random_permutation(@names); + if ($randomize ne 'no' ) { + @names=&whichorder($#names+1,$randomize,0, + \%Apache::response::itemgroup) } my %letter_name_map; my %name_letter_map; @@ -111,20 +128,33 @@ sub end_itemgroup { foreach my $name (@names) { $letter_name_map{$alphabet[$i]}=$name; $name_letter_map{$name}=$alphabet[$i]; + push @Items, $alphabet[$i]; $i++; } - $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map; + $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map; $Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map; if ($target eq 'web') { - $result.=''; + my $table='
'; my $i=0; foreach my $name (@names) { - $result.=''; $i++; } - $result.='
'.$alphabet[$i].''. + $table.='
'.$alphabet[$i].''. $Apache::response::itemgroup{$name.'.text'}. '
'; + $table.=''; + $Apache::matchresponse::itemtable{'display'}=$table; + } elsif ($target eq 'tex') { + my $table=' \\\\\\\\ \begin{tabular}{ll} '; + my $i=0; + foreach my $name (@names) { + $table.=' '.$alphabet[$i].' & '. + $Apache::response::itemgroup{$name.'.text'}. + ' \\\\ '; + $i++; + } + $table.=' \end{tabular} \\\\ '; + $Apache::matchresponse::itemtable{'display'}=$table; } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); } return $result; } @@ -132,15 +162,23 @@ sub end_itemgroup { sub start_item { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web' ) { + if ($target eq 'web' || $target eq 'tex') { &Apache::lonxml::startredirection; } elsif ($target eq 'edit') { + my $randomize=&Apache::lonxml::get_param('randomize',$parstack, + $safeeval,'-2'); $result=&Apache::edit::tag_start($target,$token,"Item"); $result.=&Apache::edit::text_arg('Name:','name',$token); - $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); + if ($randomize ne 'no') { + $result.=&Apache::edit::select_arg('Location:','location', + ['random','top','bottom'], + $token); + } + $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack, - $safeeval,'name'); + $safeeval,'name', + 'location'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } return $result; @@ -150,17 +188,20 @@ sub end_item { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $text =''; my $result = ''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { $text=&Apache::lonxml::endredirection; } if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || - $target eq 'edit') { + $target eq 'edit' || $target eq 'tex') { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); + my $location=&Apache::lonxml::get_param('location',$parstack, + $safeeval); &Apache::lonxml::debug("Got a name of :$name:"); if (!$name) { $name=$Apache::lonxml::curdepth; } &Apache::lonxml::debug("Using a name of :$name:"); push @{ $Apache::response::itemgroup{'names'} }, $name; $Apache::response::itemgroup{"$name.text"} = $text; + $Apache::response::itemgroup{"$name.location"} = $location; } if ($target eq 'edit') { $result.= &Apache::edit::tag_end($target,$token,''); @@ -196,11 +237,11 @@ sub start_foilgroup { sub end_foilgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; - if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') { + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') { my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); my $randomize = &Apache::lonxml::get_param('randomize',$parstack, $safeeval,'-2'); - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { $result=&displayfoils($target,$max,$randomize); } elsif ($target eq 'answer' ) { $result=&displayanswers($max,$randomize); @@ -217,7 +258,9 @@ sub displayanswers { my ($max,$randomize,@opt)=@_; if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; } my @names = @{ $Apache::response::foilgroup{'names'} }; - my @whichfoils = &whichfoils($max,$randomize); + my @whichfoils = &whichorder(&getfoilcounts($max),$randomize, + &Apache::response::showallfoils(), + \%Apache::response::foilgroup); my $result=&Apache::response::answer_header('matchresponse'); my %name_letter_map; if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) { @@ -236,7 +279,9 @@ sub displayanswers { sub grade_response { my ($max,$randomize)=@_; - my (@whichfoils)=&whichfoils($max,$randomize); + my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize, + &Apache::response::showallfoils(), + \%Apache::response::foilgroup); if (!defined($ENV{'form.submitted'})) { return; } my %responsehash; my %grade; @@ -290,10 +335,24 @@ sub grade_response { &Apache::response::handle_previous(\%previous,$ad); } +sub itemdisplay { + my ($location)=@_; + if ($location eq 'top' && + !defined($Apache::matchresponse::itemtable{'location'})) { + return $Apache::matchresponse::itemtable{'display'}; + } + if ($Apache::matchresponse::itemtable{'location'} eq $location) { + return $Apache::matchresponse::itemtable{'display'}; + } + return undef; +} sub displayfoils { my ($target,$max,$randomize)=@_; my $result; - my (@whichfoils)=&whichfoils($max,$randomize); + my $question; + my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize, + &Apache::response::showallfoils(), + \%Apache::response::foilgroup); my $part=$Apache::inputtags::part; my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; my $status=$Apache::inputtags::status[-1]; @@ -312,7 +371,11 @@ sub displayfoils { my $text=$Apache::response::foilgroup{$name.'.text'}; my $value=$Apache::response::foilgroup{$name.'.value'}; my $letter=$name_letter_map{$value}; - $result.='
'.$letter.':'.$text; + if ($target eq 'tex') { + $question.=' \\\\ '.$letter.':'.$text; + } else { + $question.='
'.$letter.':'.$text; + } } } else { my $i = 0; @@ -324,24 +387,61 @@ sub displayfoils { foreach my $name (@whichfoils) { my $lastopt=$lastresponse{$name}; my $last_letter=$name_letter_map{$lastopt}; - my $optionlist="\n"; + my $optionlist = ''; + if ($target ne 'tex') { + $optionlist="\n"; + } else { + if ($Apache::lonhomework::type ne 'exam') { + $optionlist='\framebox[5 mm][s]{\tiny\strut}'; + } else { + $optionlist='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]'; + } + } my $option; foreach $option (sort(keys(%letter_name_map))) { if ($option eq $last_letter) { - $optionlist.="\n"; + if ($target ne 'tex') {$optionlist.="\n";} } else { - $optionlist.="\n"; + if ($target ne 'tex') {$optionlist.="\n";} } } - $optionlist='\n"; + if ($target ne 'tex') { + $optionlist='\n"; + } else { + $optionlist=$optionlist; + } my $text=$Apache::response::foilgroup{$name.'.text'}; - $result.='
'.$optionlist.$text."\n"; + if ($target ne 'tex') { + $question.='
'.$optionlist.$text."\n"; + if ($Apache::lonhomework::type eq 'exam') { + $question.=&Apache::optionresponse::webbubbles(\@Items,\@Items); + } + } else { + if ($Apache::lonhomework::type eq 'exam') { + $question.=' '.$optionlist.$text."\n"; + $question.=&Apache::optionresponse::bubbles(\@Items,\@Items).'\end{enumerate} \vskip -7 mm \strut '; + &Apache::lonxml::increment_counter(); + } else { + $question.=' \\\\ '.$optionlist.$text."\n"; + } + } $temp++; } } - $result.="
"; + if ($result=&itemdisplay('top')) { + $result.=$question; + } elsif ($result=&itemdisplay('bottom')) { + $result=$question.$result; + } elsif ($result=&itemdisplay('right')) { + $result='
'.$question.''.$result. + '
'; + } elsif ($result=&itemdisplay('left')) { + $result='
'.$result.''.$question. + '
'; + } + if ($target ne 'tex') {$result.="
";} else {$result.=' \\\\ ';} return $result; } @@ -355,37 +455,35 @@ sub getfoilcounts { return $count; } -sub whichfoils { - my ($max,$randomize)=@_; - $max = &getfoilcounts($max); - # &Apache::lonxml::debug("man $max randomize $randomize"); - if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; } - my @names = @{ $Apache::response::foilgroup{'names'} }; +sub whichorder { + my ($max,$randomize,$showall,$hash)=@_; + #&Apache::lonxml::debug("man $max randomize $randomize"); + if (!defined(@{ $$hash{'names'} })) { return; } + my @names = @{ $$hash{'names'} }; my @whichopt =(); my (%top,@toplist,%bottom,@bottomlist); - if (!(&Apache::response::showallfoils() || ($randomize eq 'no'))) { + if (!($showall || ($randomize eq 'no'))) { my $current=0; foreach my $name (@names) { $current++; - if ($Apache::response::foilgroup{"$name.location"} eq 'top') { + if ($$hash{"$name.location"} eq 'top') { $top{$name}=$current; - } elsif ($Apache::response::foilgroup{"$name.location"} eq - 'bottom') { + } elsif ($$hash{"$name.location"} eq 'bottom') { $bottom{$name}=$current; } } } while ((($#whichopt+1) < $max) && ($#names > -1)) { -# &Apache::lonxml::debug("Have $#whichopt max is $max"); + #&Apache::lonxml::debug("Have $#whichopt max is $max"); my $aopt; - if (&Apache::response::showallfoils() || ($randomize eq 'no')) { + if ($showall || ($randomize eq 'no')) { $aopt=0; } else { $aopt=int(&Math::Random::random_uniform() * ($#names+1)); } -# &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt"); + #&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt"); $aopt=splice(@names,$aopt,1); -# &Apache::lonxml::debug("Picked $aopt"); + #&Apache::lonxml::debug("Picked $aopt"); if ($top{$aopt}) { $toplist[$top{$aopt}]=$aopt; } elsif ($bottom{$aopt}) { @@ -466,7 +564,7 @@ sub insert_conceptgroup { sub start_foil { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web' ) { + if ($target eq 'web' || $target eq 'tex') { &Apache::lonxml::startredirection; } elsif ($target eq 'edit') { $result=&Apache::edit::tag_start($target,$token,"Foil"); @@ -498,10 +596,10 @@ sub end_foil { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $text =''; my $result = ''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { $text=&Apache::lonxml::endredirection; } - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); if ($value ne 'unused') { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);