--- loncom/homework/matchresponse.pm 2004/07/08 17:51:31 1.44
+++ loncom/homework/matchresponse.pm 2008/01/30 17:50:13 1.68
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Full matching style response
#
-# $Id: matchresponse.pm,v 1.44 2004/07/08 17:51:31 sakharuk Exp $
+# $Id: matchresponse.pm,v 1.68 2008/01/30 17:50:13 raeburn 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'));
@@ -70,6 +71,8 @@ sub start_matchresponse {
} elsif ($target eq 'analyze') {
my $part_id="$Apache::inputtags::part.$id";
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
+ push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} },
+ 1);
}
return $result;
}
@@ -101,11 +104,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 +149,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 +178,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 +221,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;
@@ -247,12 +261,16 @@ sub start_foilgroup {
sub end_foilgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
+ my $part = $Apache::inputtags::part;
+ my $response_id = $Apache::inputtags::response[-1];
+
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
$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') {
@@ -263,7 +281,12 @@ sub end_foilgroup {
['text','value','location']);
#FIXME need to store options in some way
}
- &Apache::lonxml::increment_counter(&getfoilcounts($max));
+ &Apache::lonxml::increment_counter(&getfoilcounts($max),
+ "$part.$response_id");
+ if ($target eq 'analyze') {
+ &Apache::lonhomework::set_bubble_lines();
+ }
+
} elsif ($target eq 'edit') {
$result=&Apache::edit::end_table();
}
@@ -287,18 +310,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 +344,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);
@@ -350,7 +385,16 @@ sub grade_response {
$itemstr;
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=
$gradestr;
- if (!$Apache::lonhomework::scantronmode) {
+ if ($Apache::lonhomework::type eq 'survey') {
+ if ($ignored == 0) {
+ my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
+ &Apache::response::handle_previous(\%previous,$ad);
+ } elsif ($wrong==0 && $right==0) {
+ } else {
+ my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='MISSING_ANSWER';
+ &Apache::response::handle_previous(\%previous,$ad);
+ }
+ } elsif (!$Apache::lonhomework::scantronmode) {
my $ad;
if ($wrong==0 && $ignored==0) {
$ad='EXACT_ANS';
@@ -381,6 +425,24 @@ sub grade_response {
}
}
+sub format_prior_answer {
+ my ($mode,$answer,$other_data) = @_;
+ my %answer =&Apache::lonnet::str2hash($answer);
+ my $foil_order =$other_data->[0];
+ my %grading =&Apache::lonnet::str2hash($other_data->[1]);
+ my @items =&Apache::lonnet::str2array($other_data->[2]);
+ my $output;
+
+ foreach my $name (@{ $foil_order }) {
+ my $item=shift(@items);
+ $output .= '<tr><td>'.$item.'</td></tr>';
+ }
+ return if (!defined($output));
+
+ $output = '<table class="LC_prior_match">'.$output.'</table>';
+ return $output;
+}
+
sub itemdisplay {
my ($location)=@_;
if ($location eq 'top' &&
@@ -392,8 +454,11 @@ sub itemdisplay {
}
return undef;
}
+
sub displayfoils {
my ($target,$max,$randomize)=@_;
+ my ($tabsize, $lefttabsize, $righttabsize);
+
my $result;
my $question;
my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max),
@@ -420,7 +485,7 @@ sub displayfoils {
if ($target eq 'tex') {
$question.=' \\\\ '.$letter.':'.$text;
} else {
- $question.='<br />'.$letter.':'.$text;
+ $question.='<br /><b>'.$letter.':</b> '.$text;
}
}
} else {
@@ -453,27 +518,58 @@ 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";
}
my $text=$Apache::response::foilgroup{$name.'.text'};
+ #
+ # Factor out the tex computations of the left/right 1/2 minipage
+ # widths for left or right positioning. This allows us
+ # to, if necessary constrain the bubble widths:
+ #
+ if ($target eq 'tex' &&
+ (&itemdisplay('left') || &itemdisplay('right'))) {
+ $tabsize=&Apache::londefdef::recalc($env{'form.textwidth'});
+ ($lefttabsize,$righttabsize)=(0,0);
+ if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
+ $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
+ $lefttabsize=$tabsize*$1/100;
+ $righttabsize=0.95*($tabsize-$lefttabsize);
+ } else {
+ $tabsize=~/(\d+\.?\d*)/;
+ $lefttabsize=$1/2.1;
+ $righttabsize=0.95*($1-$lefttabsize);
+ }
+ }
if ($target ne 'tex') {
if ($Apache::lonhomework::type ne 'exam') {
- $question.='<br />'.$optionlist.$text."\n";
+ $question.="<br />\n".$optionlist.$text;
} else {
- $question.='<br />'.$text."\n";
+ $question.="<br />\n".$text;
}
if ($Apache::lonhomework::type eq 'exam') {
my @blank;
$question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter);
}
} else {
+ # Note that if left or right positioned, we must
+ # confine the bubbles to righttabsize:
+ #
if ($Apache::lonhomework::type eq 'exam') {
$question.=' '.$optionlist.$text."\n";
my @emptyItems = ();
for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}
- $question.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'\end{enumerate} \vskip -8 mm \strut ';
+ $question.='\vskip -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}'
+ .'\item \hskip -3mm \textbf{'.$internal_counter.'}';
+ if (&itemdisplay('left') || &itemdisplay('right')) {
+ $question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize);
+ }
+ else {
+ $question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems);
+ }
+ $question .= '\end{list} \vskip -8 mm \strut ';
$internal_counter++;
} else {
$question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
@@ -488,45 +584,33 @@ sub displayfoils {
$result=$question.$result;
} elsif ($result=&itemdisplay('right')) {
if ($target ne 'tex') {
- $result='<table><tr><td>'.$question.'</td><td>'.$result.
- '</td></tr></table>';
+ #remove the first <br />
+ $question=~s|<br />||;
+ $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 ($lefttabsize,$righttabsize)=(0,0);
- if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
- $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
- $lefttabsize=$tabsize*$1/100;
- $righttabsize=0.95*($tabsize-$lefttabsize);
- } else {
- $tabsize=~/(\d+\.?\d*)/;
- $lefttabsize=$1/2.1;
- $righttabsize=0.95*($1-$lefttabsize);
- }
$lefttabsize.=' mm ';
$righttabsize.=' mm ';
$result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$righttabsize.'}p{'.$lefttabsize.'}}\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}\end{tabular}';
}
} elsif ($result=&itemdisplay('left')) {
if ($target ne 'tex') {
- $result='<table><tr><td>'.$result.'</td><td>'.$question.
- '</td></tr></table>';
+ #remove the first <br />
+ $question=~s|<br />||;
+ $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 ($lefttabsize,$righttabsize)=(0,0);
- if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
- $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
- $lefttabsize=$tabsize*$1/100;
- $righttabsize=0.95*($tabsize-$lefttabsize);
- } else {
- $tabsize=~/(\d+\.?\d*)/;
- $lefttabsize=$1/2.1;
- $righttabsize=0.95*($1-$lefttabsize);
- }
$lefttabsize.=' mm ';
$righttabsize.=' mm ';
$result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$lefttabsize.'}p{'.$righttabsize.'}}\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}\end{tabular}';
}
}
+ if ($target eq 'web') {
+ &Apache::response::setup_prior_tries_hash(\&format_prior_answer,
+ [\@whichfoils,
+ 'submissiongrading',
+ 'submissionitems']);
+ }
if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';}
return $result;
}
@@ -587,6 +671,9 @@ sub start_foil {
my $result='';
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
&Apache::lonxml::startredirection;
+ if ($target eq 'analyze') {
+ &Apache::response::check_if_computed($token,$parstack,$safeeval,'value');
+ }
} elsif ($target eq 'edit') {
$result=&Apache::edit::tag_start($target,$token,"Foil");
my $level='-2';
@@ -620,13 +707,20 @@ sub end_foil {
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
$text=&Apache::lonxml::endredirection;
}
+
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
$target eq 'tex' || $target eq 'analyze') {
+ if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
+ $text='\vskip 5mm $\triangleright$ '.$text;
+ }
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
if ($value ne 'unused') {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
&Apache::lonxml::debug("Got a name of :$name:");
- if (!$name) { $name=$Apache::lonxml::curdepth; }
+ if (!$name) {
+ &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:");
if (defined($Apache::response::foilnames{$name})) {
&Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
@@ -638,28 +732,12 @@ sub end_foil {
&& !&Apache::response::showallfoils() ) {
push @{ $Apache::response::conceptgroup{'names'} }, $name;
$Apache::response::conceptgroup{"$name.value"} = $value;
- 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.text"} = $text;
$Apache::response::conceptgroup{"$name.location"} = $location;
} else {
push @{ $Apache::response::foilgroup{'names'} }, $name;
$Apache::response::foilgroup{"$name.value"} = $value;
- 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"} = $text;
- } else {
- $Apache::response::foilgroup{"$name.text"} = $text;
- }
- }
+ $Apache::response::foilgroup{"$name.text"} = $text;
$Apache::response::foilgroup{"$name.location"} = $location;
}
}