version 1.104, 2012/10/12 12:45:46
|
version 1.105, 2013/04/30 03:03:34
|
Line 391 sub get_prior_options {
|
Line 391 sub get_prior_options {
|
@whichopt = @{$curropt}; |
@whichopt = @{$curropt}; |
@images = @{$currimages}; |
@images = @{$currimages}; |
} |
} |
my $submission = $Apache::lonhomework::history{$sub_key}; |
my $submission; |
|
if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) || |
|
(($env{'form.grade_username'} eq $env{'user.name'}) && |
|
($env{'form.grade_domain'} eq $env{'user.domain'}))) { |
|
$submission = $Apache::lonhomework::history{$sub_key}; |
|
} else { |
|
unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || |
|
($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) { |
|
$submission = $Apache::lonhomework::history{$sub_key}; |
|
} |
|
} |
my $output = &format_prior_response('grade',$submission, |
my $output = &format_prior_response('grade',$submission, |
[\@images,\@whichopt]); |
[\@images,\@whichopt]); |
if (defined($output)) { |
if (defined($output)) { |
Line 543 sub get_submission {
|
Line 553 sub get_submission {
|
if (!defined($string)) { |
if (!defined($string)) { |
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::part; |
my $respid=$Apache::inputtags::response['-1']; |
my $respid=$Apache::inputtags::response['-1']; |
$string = |
my $newvariation; |
$Apache::lonhomework::history{"resource.$part.$respid.submission"}; |
if ((($Apache::lonhomework::history{"resource.$part.type"} eq 'randomizetry') || |
|
($Apache::lonhomework::type eq 'randomizetry')) && |
|
($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) { |
|
if ($env{'form.'.$part.'.rndseed'} ne |
|
$Apache::lonhomework::history{"resource.$part.rndseed"}) { |
|
$newvariation = 1; |
|
} |
|
} |
|
unless ($newvariation) { |
|
if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) || |
|
(($env{'form.grade_username'} eq $env{'user.name'}) && |
|
($env{'form.grade_domain'} eq $env{'user.domain'}))) { |
|
$string = |
|
$Apache::lonhomework::history{"resource.$part.$respid.submission"}; |
|
} else { |
|
unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || |
|
($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) { |
|
$string = |
|
$Apache::lonhomework::history{"resource.$part.$respid.submission"}; |
|
} |
|
} |
|
} |
} |
} |
|
|
if ($string !~ /=/) { |
if ($string !~ /=/) { |
Line 558 sub get_submission {
|
Line 589 sub get_submission {
|
sub end_foilgroup { |
sub end_foilgroup { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
my @whichopt; |
my (@images,@whichopt); |
|
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' || |
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' || |
$target eq 'analyze' || $target eq 'answer') { |
$target eq 'analyze' || $target eq 'answer') { |
Line 573 sub end_foilgroup {
|
Line 604 sub end_foilgroup {
|
$result=&displayfoils($target,@whichopt); |
$result=&displayfoils($target,@whichopt); |
if ($Apache::lonhomework::type eq 'randomizetry') { |
if ($Apache::lonhomework::type eq 'randomizetry') { |
if ($target eq 'web') { |
if ($target eq 'web') { |
&get_prior_options($target,@whichopt); |
&get_prior_options(\@images,\@whichopt); |
} |
} |
} |
} |
$Apache::lonxml::post_evaluate=0; |
$Apache::lonxml::post_evaluate=0; |