--- loncom/homework/matchresponse.pm 2007/03/27 19:20:49 1.61 +++ loncom/homework/matchresponse.pm 2010/02/28 23:39:00 1.79 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Full matching style response # -# $Id: matchresponse.pm,v 1.61 2007/03/27 19:20:49 albertel Exp $ +# $Id: matchresponse.pm,v 1.79 2010/02/28 23:39:00 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,6 +33,7 @@ use Math::Random(); use Apache::optionresponse(); use Apache::lonlocal; use Apache::lonnet; +use Apache::lonxml; BEGIN { &Apache::lonxml::register('Apache::matchresponse',('matchresponse')); @@ -53,14 +54,16 @@ sub start_matchresponse { $result=&Apache::response::meta_package_write('matchresponse'); } elsif ($target eq 'edit' ) { $result.=&Apache::edit::start_table($token). - ''.&Apache::lonxml::description($token)."Delete:". - &Apache::edit::deletelist($target,$token) - ." ".&Apache::edit::end_row() - .&Apache::edit::start_spanning_row(); + ''.&Apache::lonxml::description($token).'' + .''.&mt('Delete?').' ' + .&Apache::edit::deletelist($target,$token) + .'' + .' '.&Apache::edit::end_row() + .&Apache::edit::start_spanning_row(); $result.= &Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4'). - &Apache::edit::select_arg('Randomize Foil Order','randomize', + &Apache::edit::select_arg('Randomize Foil Order:','randomize', ['yes','no'],$token). &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n"; } elsif ($target eq 'modified') { @@ -70,7 +73,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; } @@ -97,12 +103,12 @@ sub start_itemgroup { if ($target eq 'edit') { $result=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::select_arg('Randomize Order:','randomize', - ['yes','no'],$token); + ['yes','no'],$token).' 'x 3; $result.=&Apache::edit::select_arg('Items Display Location:', 'location', ['top','bottom','left','right'], - $token); - $result.=&Apache::edit::select_arg('Items Display Directection:', + $token).' 'x 3; + $result.=&Apache::edit::select_arg('Items Display Direction:', 'direction', ['vertical','horizontal'], $token); @@ -174,7 +180,7 @@ sub end_itemgroup { $i++; } $table.=' \end{description} \strut '; - if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';} + if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';} $Apache::matchresponse::itemtable{'display'}=$table; $Apache::lonxml::post_evaluate=0; } @@ -192,7 +198,8 @@ sub start_item { $result=&Apache::edit::tag_start($target,$token,"Item"); $result.=&Apache::edit::text_arg('Name:','name',$token); if ($randomize ne 'no') { - $result.=&Apache::edit::select_arg('Location:','location', + $result.=' 'x 3 . + &Apache::edit::select_arg('Location:','location', ['random','top','bottom'], $token); } @@ -248,9 +255,11 @@ sub start_foilgroup { &Apache::response::pushrandomnumber(); if ($target eq 'edit') { $result.=&Apache::edit::start_table($token) - ."Collection Of FoilsDelete:" + .''.&mt('Collection Of Foils').'' + .''.&mt('Delete?') .&Apache::edit::deletelist($target,$token) - ." ".&Apache::edit::end_row() + .'' + .' '.&Apache::edit::end_row() .&Apache::edit::start_spanning_row()."\n"; } return $result; @@ -259,6 +268,9 @@ 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, @@ -276,7 +288,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(); } @@ -375,9 +392,21 @@ sub grade_response { $itemstr; $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}= $gradestr; - if ($Apache::lonhomework::type eq 'survey') { + if (($Apache::lonhomework::type eq 'survey') || + ($Apache::lonhomework::type eq 'surveycred') || + ($Apache::lonhomework::type eq 'anonsurvey') || + ($Apache::lonhomework::type eq 'anonsurveycred')) { if ($ignored == 0) { - my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED'; + my $ad; + if ($Apache::lonhomework::type eq 'anonsurvey') { + $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS'; + } elsif ($Apache::lonhomework::type eq 'anonsurveycred') { + $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS_CREDIT'; + } elsif ($Apache::lonhomework::type eq 'surveycred') { + $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED_CREDIT'; + } else { + $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED'; + } &Apache::response::handle_previous(\%previous,$ad); } elsif ($wrong==0 && $right==0) { } else { @@ -415,6 +444,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' && @@ -426,8 +473,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), @@ -462,7 +512,10 @@ sub displayfoils { my $temp=1; my $id=$Apache::inputtags::response[-1]; my $part=$Apache::inputtags::part; - my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; + my $lastresponse; + unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) { + $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; + } my %lastresponse=&Apache::lonnet::str2hash($lastresponse); my @alphabet=('A'..'Z'); my @used_letters=sort(keys(%letter_name_map)); @@ -475,15 +528,32 @@ sub displayfoils { $optionlist="\n"; } else { if ($Apache::lonhomework::type ne 'exam') { - $optionlist='\framebox[5 mm][s]{\tiny\strut}'; - } + if($env{'form.pdfFormFields'} eq 'yes' + && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') { + my $fieldname = $env{'request.symb'} . '&part_'. $Apache::inputtags::part .'&matchresponse'. '&HWVAL_' . $Apache::inputtags::response['-1'] . ':' . $temp . '&submit_' . $Apache::inputtags::part . '&'; + $optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname); + } else { + + $optionlist='\framebox[10 mm][s]{\tiny\strut}'; + } + } } my $option; foreach $option (@used_letters) { if ($option eq $last_letter) { - if ($target ne 'tex') {$optionlist.="\n";} + if ($target ne 'tex') { + $optionlist.="\n"; + } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' + && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') { + $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); + } } else { - if ($target ne 'tex') {$optionlist.="\n";} + if ($target ne 'tex') { + $optionlist.="\n"; + } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' + && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') { + $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); + } } } if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { @@ -493,6 +563,25 @@ sub displayfoils { $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; @@ -504,14 +593,30 @@ sub displayfoils { $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter); } } else { - if ($Apache::lonhomework::type eq 'exam') { + # Note that if left or right positioned, we must + # confine the bubbles to righttabsize: + # + if ($Apache::lonhomework::type eq 'exam' && $env{'form.pdfFormFields'} ne 'yes') { $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 .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize); + } + else { + $question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems); + } + $question .= '\end{list} \vskip -8 mm \strut '; $internal_counter++; } else { - $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n"; + if($env{'form.pdfFormFields'} eq 'yes' + && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') { + $question .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut'; + } else { + $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n"; + } } } $temp++; @@ -528,17 +633,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}'; @@ -550,22 +644,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; } @@ -673,23 +762,25 @@ 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, $safeeval); if ( $Apache::matchresponse::conceptgroup && !&Apache::response::showallfoils() ) { + push @{ $Apache::response::conceptgroup{'names'} }, $name; $Apache::response::conceptgroup{"$name.value"} = $value; $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;