--- loncom/homework/matchresponse.pm 2003/02/20 09:30:42 1.3 +++ loncom/homework/matchresponse.pm 2003/03/26 18:43:15 1.14 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Full matching style response # -# $Id: matchresponse.pm,v 1.3 2003/02/20 09:30:42 albertel Exp $ +# $Id: matchresponse.pm,v 1.14 2003/03/26 18:43:15 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,6 +31,10 @@ package Apache::matchresponse; use strict; use HTML::Entities(); use Math::Random(); +use Apache::optionresponse; + +my $flag_for_exam_printing = 1; +my @Items = (); BEGIN { &Apache::lonxml::register('Apache::matchresponse',('matchresponse')); @@ -85,11 +89,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; } @@ -112,20 +129,34 @@ sub end_itemgroup { foreach my $name (@names) { $letter_name_map{$alphabet[$i]}=$name; $name_letter_map{$name}=$alphabet[$i]; + $Items[$i] = $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) { + $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g; + $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; } @@ -133,7 +164,7 @@ 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, @@ -159,11 +190,11 @@ 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); @@ -208,11 +239,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); @@ -306,9 +337,21 @@ 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 $question; my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize, &Apache::response::showallfoils(), \%Apache::response::foilgroup); @@ -330,7 +373,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; @@ -338,28 +385,64 @@ sub displayfoils { my $id=$Apache::inputtags::response[-1]; my $part=$Apache::inputtags::part; my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; - my %lastresponse=&Apache::lonnet::str2hash($lastresponse); + my %lastresponse=&Apache::lonnet::str2hash($lastresponse); + my @alphabet=('A'..'Z'); + my @Items_letter = splice @alphabet, 0, $#Items + 1; 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}'; + } + } 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"; + } 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_letter,\@Items); + } + } else { + if ($Apache::lonhomework::type eq 'exam') { + $question.=' '.$optionlist.$text."\n"; + my @emptyItems = (); + for (my $i=0;$i<=$#Items;$i++) {push @emptyItems, ' ';} + $question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@Items_letter,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut '; + } 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; } @@ -482,7 +565,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"); @@ -514,10 +597,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); @@ -529,12 +612,24 @@ 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') { + $Apache::response::conceptgroup{"$name.text"} = ' $\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 ($Apache::lonhomework::type eq 'exam' and $flag_for_exam_printing) { + $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text; + } else { + if ($target eq 'tex') { + $Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text; + } else { + $Apache::response::foilgroup{"$name.text"} = $text; + } + } $Apache::response::foilgroup{"$name.location"} = $location; } }