--- loncom/homework/rankresponse.pm 2005/12/06 10:13:46 1.49 +++ loncom/homework/rankresponse.pm 2007/10/15 09:47:29 1.55 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # rank style response # -# $Id: rankresponse.pm,v 1.49 2005/12/06 10:13:46 albertel Exp $ +# $Id: rankresponse.pm,v 1.55 2007/10/15 09:47:29 foxr Exp $ # Copyright Michigan State University Board of Trustees # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). @@ -67,6 +67,8 @@ sub start_rankresponse { } 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; } @@ -105,6 +107,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 +120,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(); } @@ -263,6 +272,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; @@ -304,7 +329,8 @@ sub displayfoils { } } if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { - $optionlist='\n"; } else { @@ -333,6 +359,11 @@ sub displayfoils { $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; }