--- loncom/homework/matchresponse.pm 2006/04/04 22:30:52 1.59 +++ loncom/homework/matchresponse.pm 2008/08/08 16:37:13 1.70 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Full matching style response # -# $Id: matchresponse.pm,v 1.59 2006/04/04 22:30:52 foxr Exp $ +# $Id: matchresponse.pm,v 1.70 2008/08/08 16:37:13 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -70,7 +70,10 @@ sub start_matchresponse { if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } elsif ($target eq 'analyze') { my $part_id="$Apache::inputtags::part.$id"; + $Apache::lonhomework::analyze{"$part_id.type"} = 'matchresponse'; push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); + push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, + 1); } return $result; } @@ -163,6 +166,7 @@ sub end_itemgroup { if ($direction eq 'horizontal') { $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; @@ -175,6 +179,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; } @@ -257,12 +262,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') { @@ -273,7 +282,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(); } @@ -412,6 +426,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 .= ''.$item.''; + } + return if (!defined($output)); + + $output = ''.$output.'
'; + return $output; +} + sub itemdisplay { my ($location)=@_; if ($location eq 'top' && @@ -423,8 +455,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), @@ -484,11 +519,31 @@ sub displayfoils { } } if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { - $optionlist='\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.="
\n".$optionlist.$text; @@ -500,11 +555,22 @@ sub displayfoils { $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"; @@ -524,17 +590,6 @@ sub displayfoils { $result='
'.$question. ''.$result.'
'; } 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}'; @@ -546,22 +601,17 @@ sub displayfoils { $result='
'.$result. ''.$question.'
'; } 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.="
";} else {$result.=' \\\\ ';} return $result; } @@ -669,12 +719,12 @@ sub end_foil { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); &Apache::lonxml::debug("Got a name of :$name:"); if (!$name) { - &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction."); + &Apache::lonxml::warning(&mt('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 [_1] appears more than once. Foil names need to be unique.",$name)); + &Apache::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique.",''.$name.'')); } $Apache::response::foilnames{$name}++; my $location =&Apache::lonxml::get_param('location',$parstack,