--- loncom/homework/matchresponse.pm 2003/03/17 19:54:20 1.5
+++ loncom/homework/matchresponse.pm 2003/06/30 20:23:33 1.19
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Full matching style response
#
-# $Id: matchresponse.pm,v 1.5 2003/03/17 19:54:20 sakharuk Exp $
+# $Id: matchresponse.pm,v 1.19 2003/06/30 20:23:33 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'));
@@ -86,6 +87,7 @@ sub start_itemgroup {
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',
@@ -111,12 +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 ne 'no' ) {
- @names=&whichorder($#names+1,$randomize,0,
- \%Apache::response::itemgroup)
+ @names=&Apache::response::whichorder($#names+1,$randomize,0,
+ \%Apache::response::itemgroup);
}
my %letter_name_map;
my %name_letter_map;
@@ -141,17 +144,18 @@ sub end_itemgroup {
$table.='</table>';
$Apache::matchresponse::itemtable{'display'}=$table;
} elsif ($target eq 'tex') {
- my $table=' \\\\\\\\ \begin{tabular}{ll} ';
+ my $table=' \\\\\\\\ \begin{description} ';
my $i=0;
foreach my $name (@names) {
- $table.=' '.$alphabet[$i].' & '.
+ $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
+ $table.='\item['.$alphabet[$i].'] '.
$Apache::response::itemgroup{$name.'.text'}.
' \\\\ ';
$i++;
}
- $table.=' \end{tabular} \\\\ ';
+ $table.=' \end{description} \strut \\\\ ';
$Apache::matchresponse::itemtable{'display'}=$table;
- } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); }
+ }
return $result;
}
@@ -254,9 +258,10 @@ sub displayanswers {
my ($max,$randomize,@opt)=@_;
if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
my @names = @{ $Apache::response::foilgroup{'names'} };
- my @whichfoils = &whichorder(&getfoilcounts($max),$randomize,
- &Apache::response::showallfoils(),
- \%Apache::response::foilgroup);
+ 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'} })) {
@@ -275,9 +280,10 @@ sub displayanswers {
sub grade_response {
my ($max,$randomize)=@_;
- my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize,
- &Apache::response::showallfoils(),
- \%Apache::response::foilgroup);
+ my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max),
+ $randomize,
+ &Apache::response::showallfoils(),
+ \%Apache::response::foilgroup);
if (!defined($ENV{'form.submitted'})) { return; }
my %responsehash;
my %grade;
@@ -346,9 +352,10 @@ sub displayfoils {
my ($target,$max,$randomize)=@_;
my $result;
my $question;
- my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize,
- &Apache::response::showallfoils(),
- \%Apache::response::foilgroup);
+ 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];
@@ -379,37 +386,52 @@ 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 $localcount = 1;
+ my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
+ my @alphabet=('A'..'Z');
+ my @used_letters=sort(keys(%letter_name_map));
foreach my $name (@whichfoils) {
my $lastopt=$lastresponse{$name};
my $last_letter=$name_letter_map{$lastopt};
my $optionlist = '';
- if ($target ne 'tex') {$optionlist="<option></option>\n";} else {$optionlist=' '.$localcount.'. '; $localcount++;}
+ 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) {
- if ($target ne 'tex') {
- $optionlist.="<option selected=\"on\">$option</option>\n";
- }
+ if ($target ne 'tex') {$optionlist.="<option selected=\"on\">$option</option>\n";}
} else {
- if ($target ne 'tex') {
- $optionlist.="<option>$option</option>\n";
- }
+ if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";}
}
}
- if ($target ne 'tex') {
+ if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {
$optionlist='<select name="HWVAL_'.
$Apache::inputtags::response[-1].':'.$temp.'">'.
$optionlist."</select>\n";
- } else {
- $optionlist=$optionlist;
}
my $text=$Apache::response::foilgroup{$name.'.text'};
if ($target ne 'tex') {
- $question.='<br />'.$optionlist.$text."\n";
- } else {
- $question.=' \\\\ '.$optionlist.$text."\n";
+ 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{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut ';
+ } else {
+ $question.=' \\\\ '.$optionlist.$text."\n";
+ }
}
$temp++;
}
@@ -439,52 +461,6 @@ sub getfoilcounts {
return $count;
}
-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 (!($showall || ($randomize eq 'no'))) {
- my $current=0;
- foreach my $name (@names) {
- $current++;
- if ($$hash{"$name.location"} eq 'top') {
- $top{$name}=$current;
- } elsif ($$hash{"$name.location"} eq 'bottom') {
- $bottom{$name}=$current;
- }
- }
- }
- while ((($#whichopt+1) < $max) && ($#names > -1)) {
- #&Apache::lonxml::debug("Have $#whichopt max is $max");
- my $aopt;
- 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");
- $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)=@_;
@@ -595,12 +571,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;
}
}