--- loncom/homework/optionresponse.pm 2007/01/17 10:46:13 1.136 +++ loncom/homework/optionresponse.pm 2007/03/27 19:20:49 1.139 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # option list style responses # -# $Id: optionresponse.pm,v 1.136 2007/01/17 10:46:13 foxr Exp $ +# $Id: optionresponse.pm,v 1.139 2007/03/27 19:20:49 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -183,6 +183,7 @@ sub end_foilgroup { $safeeval,'-2'); if ($target eq 'web' || $target eq 'tex') { $result.=&displayfoils($target,$max,$randomize,$TeXlayout,@opt); + $Apache::lonxml::post_evaluate=0; } elsif ( $target eq 'answer') { $result.=&displayanswers($max,$randomize,@opt); @@ -354,6 +355,27 @@ sub check_for_invalid { } } +sub setup_prior_tries_hash { + my ($whichopt) = @_; + my $part=$Apache::inputtags::part; + my $id=$Apache::inputtags::response[-1]; + foreach my $i (1..$Apache::lonhomework::history{'version'}) { + my $key = "$i:resource.$part.$id.submission"; + next if (!exists($Apache::lonhomework::history{"$key"})); + my %lastresponse= + &Apache::lonnet::str2hash($Apache::lonhomework::history{$key}); + my $output; + foreach my $name (@$whichopt) { + next if (!defined($lastresponse{$name})); + $output .= ''.$lastresponse{$name}.''; + } + next if (!defined($output)); + $output = + ''.$output.'
'; + $Apache::inputtags::submission_display{$key} = $output; + } +} + sub displayfoils { my ($target,$max,$randomize,$TeXlayout,@opt)=@_; if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;} @@ -422,7 +444,8 @@ sub displayfoils { } if ($target ne 'tex') { if ($Apache::lonhomework::type ne 'exam') { - $optionlist='\n"; } else { @@ -474,6 +497,11 @@ sub displayfoils { } } } + + if ($target eq 'web') { + &setup_prior_tries_hash(\@whichopt); + } + if ($target ne 'tex') { return $result.$break; } else {