--- loncom/homework/matchresponse.pm 2003/01/28 00:11:49 1.1
+++ loncom/homework/matchresponse.pm 2003/09/15 18:13:52 1.22
@@ -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.22 2003/09/15 18:13:52 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,6 +31,7 @@ package Apache::matchresponse;
use strict;
use HTML::Entities();
use Math::Random();
+use Apache::optionresponse;
BEGIN {
&Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
@@ -85,11 +86,25 @@ 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' or $target eq 'tex') {
+ $Apache::matchresponse::itemtable{'location'}=
+ &Apache::lonxml::get_param('location',$parstack,$safeeval);
}
return $result;
}
@@ -98,11 +113,13 @@ sub end_itemgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
+ if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
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=&Apache::response::whichorder($#names+1,$randomize,0,
+ \%Apache::response::itemgroup);
}
my %letter_name_map;
my %name_letter_map;
@@ -116,31 +133,51 @@ sub end_itemgroup {
$Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map;
$Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map;
if ($target eq 'web') {
- $result.='<table>';
+ my $table='<table>';
my $i=0;
foreach my $name (@names) {
- $result.='<tr><td>'.$alphabet[$i].'</td><td>'.
+ $table.='<tr><td>'.$alphabet[$i].'</td><td>'.
$Apache::response::itemgroup{$name.'.text'}.
'</td></tr>';
$i++;
}
- $result.='</table>';
- } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); }
+ $table.='</table>';
+ $Apache::matchresponse::itemtable{'display'}=$table;
+ } elsif ($target eq 'tex') {
+ my $table=' \begin{description} ';
+ my $i=0;
+ foreach my $name (@names) {
+ $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
+ $table.='\item['.$alphabet[$i].'] '.
+ $Apache::response::itemgroup{$name.'.text'};
+ $i++;
+ }
+ $table.=' \end{description} \strut ';
+ $Apache::matchresponse::itemtable{'display'}=$table;
+ }
return $result;
}
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 +187,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,17 +236,18 @@ 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);
} elsif ( $target eq 'grade') {
&grade_response($max,$randomize);
}
+ &Apache::lonxml::increment_counter(&getfoilcounts($max));
} elsif ($target eq 'edit') {
$result=&Apache::edit::end_table();
}
@@ -217,7 +258,10 @@ 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 = &Apache::response::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 +280,10 @@ sub displayanswers {
sub grade_response {
my ($max,$randomize)=@_;
- my (@whichfoils)=&whichfoils($max,$randomize);
+ my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max),
+ $randomize,
+ &Apache::response::showallfoils(),
+ \%Apache::response::foilgroup);
if (!defined($ENV{'form.submitted'})) { return; }
my %responsehash;
my %grade;
@@ -290,10 +337,25 @@ 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)=&Apache::response::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 +374,11 @@ sub displayfoils {
my $text=$Apache::response::foilgroup{$name.'.text'};
my $value=$Apache::response::foilgroup{$name.'.value'};
my $letter=$name_letter_map{$value};
- $result.='<br />'.$letter.':'.$text;
+ if ($target eq 'tex') {
+ $question.=' \\\\ '.$letter.':'.$text;
+ } else {
+ $question.='<br />'.$letter.':'.$text;
+ }
}
} else {
my $i = 0;
@@ -320,28 +386,70 @@ 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 @used_letters=sort(keys(%letter_name_map));
+ my $internal_counter=$Apache::lonxml::counter;
foreach my $name (@whichfoils) {
my $lastopt=$lastresponse{$name};
my $last_letter=$name_letter_map{$lastopt};
- my $optionlist="<option></option>\n";
+ my $optionlist = '';
+ if ($target ne 'tex') {
+ $optionlist="<option></option>\n";
+ } else {
+ if ($Apache::lonhomework::type ne 'exam') {
+ $optionlist='\framebox[5 mm][s]{\tiny\strut}';
+ }
+ }
my $option;
- foreach $option (sort(keys(%letter_name_map))) {
+ foreach $option (@used_letters) {
if ($option eq $last_letter) {
- $optionlist.="<option selected=\"on\">$option</option>\n";
+ if ($target ne 'tex') {$optionlist.="<option selected=\"on\">$option</option>\n";}
} else {
- $optionlist.="<option>$option</option>\n";
+ if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";}
}
}
- $optionlist='<select name="HWVAL_'.
- $Apache::inputtags::response[-1].':'.$temp.'">'.
- $optionlist."</select>\n";
+ if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {
+ $optionlist='<select name="HWVAL_'.
+ $Apache::inputtags::response[-1].':'.$temp.'">'.
+ $optionlist."</select>\n";
+ }
my $text=$Apache::response::foilgroup{$name.'.text'};
- $result.='<br />'.$optionlist.$text."\n";
+ if ($target ne 'tex') {
+ if ($Apache::lonhomework::type ne 'exam') {
+ $question.='<br />'.$optionlist.$text."\n";
+ } else {
+ $question.='<br />'.$text."\n";
+ }
+ if ($Apache::lonhomework::type eq 'exam') {
+ $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters,$temp);
+ }
+ } else {
+ if ($Apache::lonhomework::type eq 'exam') {
+ $question.=' '.$optionlist.$text."\n";
+ my @emptyItems = ();
+ for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}
+ $question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut ';
+ $internal_counter++;
+ } else {
+ $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
+ }
+ }
$temp++;
}
}
- $result.="<br />";
+ if ($result=&itemdisplay('top')) {
+ $result.=$question;
+ } elsif ($result=&itemdisplay('bottom')) {
+ $result=$question.$result;
+ } elsif ($result=&itemdisplay('right')) {
+ $result='<table><tr><td>'.$question.'</td><td>'.$result.
+ '</td></tr></table>';
+ } elsif ($result=&itemdisplay('left')) {
+ $result='<table><tr><td>'.$result.'</td><td>'.$question.
+ '</td></tr></table>';
+ }
+ if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';}
return $result;
}
@@ -355,54 +463,6 @@ 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'} };
- 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;
-}
sub start_conceptgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
@@ -427,7 +487,7 @@ sub end_conceptgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
$Apache::matchresponse::conceptgroup=0;
my $result='';
- if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) {
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
#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'} };
@@ -466,7 +526,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 +558,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);
@@ -513,12 +573,28 @@ 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::lonhomework::type eq 'exam') {
+ $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') {
+ if ($target eq 'tex') {
+ $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
+ } else {
+ $Apache::response::foilgroup{"$name.text"} = $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;
}
}