--- loncom/homework/matchresponse.pm 2005/01/10 19:21:57 1.49
+++ loncom/homework/matchresponse.pm 2007/03/27 19:20:49 1.61
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Full matching style response
#
-# $Id: matchresponse.pm,v 1.49 2005/01/10 19:21:57 albertel Exp $
+# $Id: matchresponse.pm,v 1.61 2007/03/27 19:20:49 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -32,6 +32,7 @@ use HTML::Entities();
use Math::Random();
use Apache::optionresponse();
use Apache::lonlocal;
+use Apache::lonnet;
BEGIN {
&Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
@@ -101,11 +102,15 @@ sub start_itemgroup {
'location',
['top','bottom','left','right'],
$token);
+ $result.=&Apache::edit::select_arg('Items Display Directection:',
+ 'direction',
+ ['vertical','horizontal'],
+ $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');
+ 'location','direction');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
} elsif ($target eq 'web' or $target eq 'tex') {
$Apache::matchresponse::itemtable{'location'}=
@@ -142,22 +147,28 @@ sub end_itemgroup {
}
$Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map;
$Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map;
+ my $direction=&Apache::lonxml::get_param('direction',$parstack,$safeeval);
if ($target eq 'web') {
- my $table='<table>';
+
+ my $table='<br /><table>'; # extra space to match what latex does.
my $i=0;
+ if ($direction eq 'horizontal') { $table .='<tr>';}
foreach my $name (@names) {
- $table.='<tr><td>'.$alphabet[$i].'</td><td>'.
- $Apache::response::itemgroup{$name.'.text'}.
- '</td></tr>';
+ if ($direction ne 'horizontal') { $table.='<tr>'; }
+ $table.='<td>'.$alphabet[$i].'</td><td>'.
+ $Apache::response::itemgroup{$name.'.text'}.'</td>';
+ if ($direction ne 'horizontal') { $table.='</tr>'; }
$i++;
}
+ if ($direction eq 'horizontal') { $table .='</tr>';}
$table.='</table>';
$Apache::matchresponse::itemtable{'display'}=$table;
+ $Apache::lonxml::post_evaluate=0;
} elsif ($target eq 'tex') {
my $table=' \begin{description}\setlength{\leftmargin}{2em}\setlength{\labelwidth}{1em}\setlength{\itemsep}{0.5pt plus1pt minus2pt}\setlength{\listparindent}{0em} ';
my $i=0;
foreach my $name (@names) {
- $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
+ # $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
$table.='\item['.$alphabet[$i].'] '.
$Apache::response::itemgroup{$name.'.text'};
$i++;
@@ -165,6 +176,7 @@ sub end_itemgroup {
$table.=' \end{description} \strut ';
if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';}
$Apache::matchresponse::itemtable{'display'}=$table;
+ $Apache::lonxml::post_evaluate=0;
}
return $result;
}
@@ -207,7 +219,7 @@ sub end_item {
my $location=&Apache::lonxml::get_param('location',$parstack,
$safeeval);
&Apache::lonxml::debug("Got a name of :$name:");
- if (!$name) { $name=$Apache::lonxml::curdepth; }
+ if ($name eq "") { $name=$Apache::lonxml::curdepth; }
&Apache::lonxml::debug("Using a name of :$name:");
push @{ $Apache::response::itemgroup{'names'} }, $name;
$Apache::response::itemgroup{"$name.text"} = $text;
@@ -253,6 +265,7 @@ sub end_foilgroup {
$safeeval,'-2');
if ($target eq 'web' || $target eq 'tex') {
$result=&displayfoils($target,$max,$randomize);
+ $Apache::lonxml::post_evaluate=0;
} elsif ($target eq 'answer' ) {
$result=&displayanswers($max,$randomize);
} elsif ( $target eq 'grade') {
@@ -287,18 +300,30 @@ sub displayanswers {
$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'} })) {
%name_letter_map=
%{ $Apache::response::itemgroup{'name_letter_map'} };
}
- foreach my $name (@whichfoils) {
- my $value_name=$Apache::response::foilgroup{$name.'.value'};
- my $letter=$name_letter_map{$value_name};
- $result.=&Apache::response::answer_part('matchresponse',$letter);
+ my $result;
+ if ($Apache::lonhomework::type eq 'exam') {
+ my $i=0;
+ foreach my $name (@whichfoils) {
+ $result.=&Apache::response::answer_header('matchresponse',$i++);
+ my $value_name=$Apache::response::foilgroup{$name.'.value'};
+ my $letter=$name_letter_map{$value_name};
+ $result.=&Apache::response::answer_part('matchresponse',$letter);
+ $result.=&Apache::response::answer_footer('matchresponse');
+ }
+ } else {
+ $result=&Apache::response::answer_header('matchresponse');
+ foreach my $name (@whichfoils) {
+ my $value_name=$Apache::response::foilgroup{$name.'.value'};
+ my $letter=$name_letter_map{$value_name};
+ $result.=&Apache::response::answer_part('matchresponse',$letter);
+ }
+ $result.=&Apache::response::answer_footer('matchresponse');
}
- $result.=&Apache::response::answer_footer('matchresponse');
return $result;
}
@@ -309,7 +334,7 @@ sub grade_response {
$randomize,
&Apache::response::showallfoils(),
\%Apache::response::foilgroup);
- if (!defined($ENV{'form.submitted'})) { return; }
+ if (!&Apache::response::submitted()) { return; }
my %responsehash;
my %grade;
my ($temp,$right,$wrong,$ignored)=(1,0,0,0);
@@ -429,7 +454,7 @@ sub displayfoils {
if ($target eq 'tex') {
$question.=' \\\\ '.$letter.':'.$text;
} else {
- $question.='<br />'.$letter.':'.$text;
+ $question.='<br /><b>'.$letter.':</b> '.$text;
}
}
} else {
@@ -462,7 +487,8 @@ sub displayfoils {
}
}
if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {
- $optionlist='<select name="HWVAL_'.
+ $optionlist='<select onchange="javascript:setSubmittedPart(\''.
+ $part.'\');" name="HWVAL_'.
$Apache::inputtags::response[-1].':'.$temp.'">'.
$optionlist."</select>\n";
}
@@ -502,7 +528,7 @@ sub displayfoils {
$result='<table><tr><td valign="top">'.$question.
'</td><td valign="top">'.$result.'</td></tr></table>';
} else {
- my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'});
+ my $tabsize=&Apache::londefdef::recalc($env{'form.textwidth'});
my ($lefttabsize,$righttabsize)=(0,0);
if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
$Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
@@ -524,7 +550,7 @@ sub displayfoils {
$result='<table><tr><td valign="top">'.$result.
'</td><td valign="top">'.$question.'</td></tr></table>';
} else {
- my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'});
+ my $tabsize=&Apache::londefdef::recalc($env{'form.textwidth'});
my ($lefttabsize,$righttabsize)=(0,0);
if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
$Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
@@ -647,7 +673,7 @@ sub end_foil {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
&Apache::lonxml::debug("Got a name of :$name:");
if (!$name) {
- &Apache::lonxml::error("Foils without names exist. This can cause problems to malfunction.");
+ &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
$name=$Apache::lonxml::curdepth;
}
&Apache::lonxml::debug("Using a name of :$name:");