--- loncom/homework/rankresponse.pm 2005/01/31 22:00:40 1.44 +++ loncom/homework/rankresponse.pm 2008/12/12 09:19:34 1.61 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # rank style response # -# $Id: rankresponse.pm,v 1.44 2005/01/31 22:00:40 albertel Exp $ +# $Id: rankresponse.pm,v 1.61 2008/12/12 09:19:34 bisitz Exp $ # Copyright Michigan State University Board of Trustees # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). @@ -30,6 +30,8 @@ use strict; use HTML::Entities(); use Apache::optionresponse(); use Apache::lonlocal; +use Apache::lonxml; +use Apache::lonnet; BEGIN { &Apache::lonxml::register('Apache::rankresponse',('rankresponse')); @@ -48,15 +50,17 @@ sub start_rankresponse { if ($target eq 'meta') { $result=&Apache::response::meta_package_write('rankresponse'); } 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(); + $result.=&Apache::edit::start_table($token) + .''.&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') { @@ -66,7 +70,10 @@ sub start_rankresponse { 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"} = 'rankresponse'; push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); + push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, 1); + } return $result; } @@ -105,6 +112,7 @@ sub end_foilgroup { if (!defined($tol)) { $tol=0; } if ($target eq 'web' || $target eq 'tex') { $result=&displayfoils($target,$max,$randomize,$tol); + $Apache::lonxml::post_evaluate=0; } elsif ($target eq 'answer' ) { $result=&displayanswers($max,$randomize,$tol); } elsif ( $target eq 'grade') { @@ -117,7 +125,13 @@ sub end_foilgroup { "$Apache::inputtags::part.$Apache::inputtags::response[-1]"; $Apache::lonhomework::analyze{"$part_id.tol"}=$tol; } - &Apache::lonxml::increment_counter(&getfoilcounts($max)); + my $part = $Apache::inputtags::part; + my $id = $Apache::inputtags::response[-1]; + &Apache::lonxml::increment_counter(&getfoilcounts($max), + "$part.$id"); + if ($target eq 'analyze') { + &Apache::lonhomework::set_bubble_lines(); + } } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); } @@ -166,18 +180,31 @@ sub displayanswers { if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; } my @names = @{ $Apache::response::foilgroup{'names'} }; my @whichfoils = &whichfoils($max,$randomize); - my $result=&Apache::response::answer_header('rankresponse'); my @correctorder=&get_correct_order($tol,@whichfoils); - foreach my $order (@correctorder) { - $result.=&Apache::response::answer_part('rankresponse',$order); + my $result; + if ($Apache::lonhomework::type eq 'exam') { + my @alphabet = ('A'..'Z'); + my $i=0; + foreach my $order (@correctorder) { + $result.=&Apache::response::answer_header('rankresponse',$i++); + $result.=&Apache::response::answer_part('rankresponse', + $alphabet[$order-1]); + $result.=&Apache::response::answer_part('rankresponse',$order); + $result.=&Apache::response::answer_footer('rankresponse'); + } + } else { + $result=&Apache::response::answer_header('rankresponse'); + foreach my $order (@correctorder) { + $result.=&Apache::response::answer_part('rankresponse',$order); + } + $result.=&Apache::response::answer_footer('rankresponse'); } - $result.=&Apache::response::answer_footer('rankresponse'); return $result; } sub check_response_order { my (%responsehash)=@_; - my @order=sort(values(%responsehash)); + my @order=sort( {$a <=> $b} values(%responsehash)); my $lastvalue=0; my $expected=1; my $malformed=0; @@ -250,6 +277,22 @@ sub grade_response { &Apache::response::handle_previous(\%previous,$ad); } +sub format_prior_answer { + my ($mode,$answer,$other_data) = @_; + my %lastresponse=&Apache::lonnet::str2hash($answer); + my $foil_order =$other_data->[0]; + my %grading =&Apache::lonnet::str2hash($other_data->[1]); + my $output; + foreach my $name (@{ $foil_order }) { + next if (!defined($lastresponse{$name})); + $output .= ''.$lastresponse{$name}.''; + } + return if (!defined($output)); + $output = + ''.$output.'
'; + return $output; +} + sub displayfoils { my ($target,$max,$randomize,$tol)=@_; my $result; @@ -263,8 +306,11 @@ sub displayfoils { foreach my $name (@whichfoils) { my $text=$Apache::response::foilgroup{$name.'.text'}; my $value=shift(@correctorder); - if ($target eq 'web') {$result.='
';} else {$result.=' \strut\\\\\strut ';} - $result.=$value.':'.$text; + if ($target eq 'web') { + $result.='
'.$value.': '.$text; + } else { + $result.=' \strut\\\\\strut '.$value.':'.$text; + } } } else { my $i = 0; @@ -275,23 +321,43 @@ sub displayfoils { my %lastresponse=&Apache::lonnet::str2hash($lastresponse); my @alp = splice @alphabet, 0, $#whichopt + 1; my $internal_counter=$Apache::lonxml::counter; - foreach my $name (@whichfoils) { + if($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') { + $result .= '\strut \\\\ \strut \\\\' ; + } + foreach my $name (@whichfoils) { my $lastopt=$lastresponse{$name}; my $optionlist=''; - if ($target ne 'tex') {$optionlist="\n";} + if ($target ne 'tex') { + $optionlist = "\n"; + } + if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') { + my $fieldname = $env{'request.symb'}.'&part_'.$Apache::inputtags::part.'&rankresponse'.'&HWVAL_'.$Apache::inputtags::response['-1'].':'.$temp; + $optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname); + } my $option; foreach $option (@whichopt) { if ($option eq $lastopt) { - if ($target ne 'tex') {$optionlist.="\n";} + if ($target ne 'tex' ) { + $optionlist.="\n"; + } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') { + $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') { + $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); + } + } } if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { - $optionlist='\n"; - } else { + } elsif ($env{'form.pdfFormFields'} eq 'yes') { + #do nothing + } else { $optionlist=' '.$temp.' '.$optionlist.' '; } my $text=$Apache::response::foilgroup{$name.'.text'}; @@ -311,12 +377,21 @@ sub displayfoils { $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@alp,\@whichopt,'rankresponse').'\end{enumerate} \vskip -8 mm \strut '; $internal_counter++; } else { - $result.=' \vskip 0mm \framebox[5 mm][s]{\tiny\strut} '.$text."\n"; + if($env{'form.pdfFormFields'} ne 'yes') { + $result.=' \vskip 0mm \framebox[5 mm][s]{\tiny\strut} '.$text."\n"; + } else { + $result.= $optionlist.' '. &Apache::lonxml::print_pdf_end_combobox($text).'\strut \\\\'; + } } } $temp++; } } + if ($target eq 'web') { + &Apache::response::setup_prior_tries_hash(\&format_prior_answer, + [\@whichfoils, + 'submissiongrading']); + } if ($target ne 'tex') {$result.="
";} else {$result.=' \vskip 0 mm ';} return $result; } @@ -425,13 +500,13 @@ sub end_foil { if ($value ne 'unused') { 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."); + if ($name eq "") { + &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,