version 1.512.2.18, 2019/10/23 22:30:28
|
version 1.512.2.20, 2019/11/04 18:01:04
|
Line 643 sub get_resource_name {
|
Line 643 sub get_resource_name {
|
sub setup_rndseed { |
sub setup_rndseed { |
my ($safeeval,$target,$probpartlist)=@_; |
my ($safeeval,$target,$probpartlist)=@_; |
my ($symb)=&Apache::lonnet::whichuser(); |
my ($symb)=&Apache::lonnet::whichuser(); |
my ($questiontype,$set_safespace,$rndseed); |
my ($questiontype,$set_safespace,$rndseed,$numtries,$reqtries); |
if ($target eq 'analyze') { |
if ($target eq 'analyze') { |
$questiontype = $env{'form.grade_questiontype'}; |
$questiontype = $env{'form.grade_questiontype'}; |
} |
} |
unless (defined($questiontype)) { |
unless (defined($questiontype)) { |
$questiontype = $Apache::lonhomework::type; |
$questiontype = $Apache::lonhomework::type; |
} |
} |
|
if ($Apache::lonhomework::type eq 'randomizetry') { |
|
my $partfortries = $Apache::inputtags::part; |
|
if (ref($probpartlist) eq 'ARRAY') { |
|
if ((@{$probpartlist} == 1) && ($probpartlist->[0] ne $Apache::inputtags::part)) { |
|
$partfortries = $probpartlist->[0]; |
|
} |
|
} |
|
$numtries = $Apache::lonhomework::history{"resource.$partfortries.tries"}; |
|
$reqtries = &Apache::lonnet::EXT("resource.$partfortries.randomizeontries"); |
|
} |
if (($env{'request.state'} eq "construct") |
if (($env{'request.state'} eq "construct") |
|| ($symb eq '') |
|| ($symb eq '') |
|| ($Apache::lonhomework::type eq 'practice') |
|| ($Apache::lonhomework::type eq 'practice') |
Line 667 sub setup_rndseed {
|
Line 677 sub setup_rndseed {
|
$env{'form.rndseed'}=$rndseed; |
$env{'form.rndseed'}=$rndseed; |
} |
} |
} |
} |
if (($env{'request.state'} eq "construct") && |
if ((($env{'request.state'} eq "construct") || ($symb eq '')) && |
($Apache::lonhomework::type eq 'randomizetry')) { |
($Apache::lonhomework::type eq 'randomizetry')) { |
my $tries = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.tries"}; |
if ($numtries) { |
if ($tries) { |
if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) { |
$rndseed += $tries; |
my $inc = int($numtries/$reqtries); |
|
$rndseed += $inc; |
|
} else { |
|
$rndseed += $numtries; |
|
} |
} |
} |
$env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed; |
$env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed; |
} |
} |
Line 709 sub setup_rndseed {
|
Line 723 sub setup_rndseed {
|
} |
} |
unless (($target eq 'analyze') && (defined($rndseed))) { |
unless (($target eq 'analyze') && (defined($rndseed))) { |
$rndseed=&Apache::lonnet::rndseed(); |
$rndseed=&Apache::lonnet::rndseed(); |
my $partfortries = $Apache::inputtags::part; |
my $curr_try = $numtries; |
if (ref($probpartlist) eq 'ARRAY') { |
|
if ((@{$probpartlist} == 1) && ($probpartlist->[0] ne $Apache::inputtags::part)) { |
|
$partfortries = $probpartlist->[0]; |
|
} |
|
} |
|
my $curr_try = $Apache::lonhomework::history{"resource.$partfortries.tries"}; |
|
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
$curr_try ++; |
$curr_try ++; |
} |
} |
Line 723 sub setup_rndseed {
|
Line 731 sub setup_rndseed {
|
$rndseed = $1; |
$rndseed = $1; |
} |
} |
if ($curr_try) { |
if ($curr_try) { |
my $reqtries = &Apache::lonnet::EXT("resource.$partfortries.randomizeontries"); |
|
if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) { |
if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) { |
my $inc = int(($curr_try-1)/$reqtries); |
my $inc = int(($curr_try-1)/$reqtries); |
$rndseed += $inc; |
$rndseed += $inc; |
Line 1584 sub start_problem {
|
Line 1591 sub start_problem {
|
|
|
if ($env{'request.state'} ne "construct" && |
if ($env{'request.state'} ne "construct" && |
($symb eq '' || $Apache::lonhomework::type eq 'practice')) { |
($symb eq '' || $Apache::lonhomework::type eq 'practice')) { |
|
my $rndseedval = $rndseed; |
|
if (($symb eq '') && ($Apache::lonhomework::type eq 'randomizetry')) { |
|
$rndseedval = $env{'form.rndseed'}; |
|
} |
$form_tag_start.='<input type="hidden" name="rndseed" value="'. |
$form_tag_start.='<input type="hidden" name="rndseed" value="'. |
$rndseed.'" />'. |
$rndseedval.'" />'. |
'<input type="submit" name="resetdata" |
'<input type="submit" name="resetdata" |
value="'.&mt('New Problem Variation').'" />'; |
value="'.&mt('New Problem Variation').'" />'; |
if (exists($env{'form.username'})) { |
if (exists($env{'form.username'})) { |
Line 1607 sub start_problem {
|
Line 1618 sub start_problem {
|
$form_tag_start.=&practice_problem_header(); |
$form_tag_start.=&practice_problem_header(); |
} |
} |
$form_tag_start.='<hr />'; |
$form_tag_start.='<hr />'; |
} elsif (($env{'request.state'} ne "construct") && |
} |
($Apache::lonhomework::type eq 'randomizetry') && |
if (($env{'request.state'} ne "construct") && |
($status eq 'CAN_ANSWER')) { |
($Apache::lonhomework::type eq 'randomizetry') && |
|
($status eq 'CAN_ANSWER')) { |
my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries"); |
my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries"); |
my $problemstatus = &get_problem_status($Apache::inputtags::part); |
my $problemstatus = &get_problem_status($Apache::inputtags::part); |
$form_tag_start.=&randomizetry_problem_header($problemstatus,$reqtries); |
$form_tag_start.=&randomizetry_problem_header($problemstatus,$reqtries); |
Line 1728 sub start_problem {
|
Line 1740 sub start_problem {
|
$result.= '<input type="submit" name="resetdata" '. |
$result.= '<input type="submit" name="resetdata" '. |
'value="'.&mt('New Problem Variation').'" />'. |
'value="'.&mt('New Problem Variation').'" />'. |
&practice_problem_header().'<hr />'; |
&practice_problem_header().'<hr />'; |
|
} elsif ($Apache::lonhomework::type eq 'randomizetry') { |
|
my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries"); |
|
my $problemstatus = &get_problem_status($Apache::inputtags::part); |
|
$result.=&randomizetry_problem_header($problemstatus,$reqtries); |
} |
} |
} |
} |
# if we are viewing someone else preserve that info |
# if we are viewing someone else preserve that info |