version 1.732, 2015/02/22 01:34:48
|
version 1.735, 2015/03/18 12:53:24
|
Line 2231 sub submission {
|
Line 2231 sub submission {
|
if ($hide eq 'rand') { |
if ($hide eq 'rand') { |
$type = 'randomizetry'; |
$type = 'randomizetry'; |
$trial = $record{"resource.$partid.tries"}; |
$trial = $record{"resource.$partid.tries"}; |
if (exists($record{"resource.$partid.rawrndseed"})) { |
$rndseed = $record{"resource.$partid.rndseed"}; |
$rndseed = $record{"resource.$partid.rawrndseed"}; |
|
} else { |
|
$rndseed = $record{"resource.$partid.rndseed"}; |
|
} |
|
} |
} |
if ($env{'form.checkPlag'}) { |
if ($env{'form.checkPlag'}) { |
my ($oname,$odom,$ocrsid,$oessay,$osim)= |
my ($oname,$odom,$ocrsid,$oessay,$osim)= |
Line 4810 sub displaySubByDates {
|
Line 4806 sub displaySubByDates {
|
|
|
my $interaction; |
my $interaction; |
my $no_increment = 1; |
my $no_increment = 1; |
my %lastrndseed; |
my (%lastrndseed,%lasttype); |
for ($version=1;$version<=$$record{'version'};$version++) { |
for ($version=1;$version<=$$record{'version'};$version++) { |
my $timestamp = |
my $timestamp = |
&Apache::lonlocal::locallocaltime($$record{$version.':timestamp'}); |
&Apache::lonlocal::locallocaltime($$record{$version.':timestamp'}); |
Line 4861 sub displaySubByDates {
|
Line 4857 sub displaySubByDates {
|
my ($trial,$rndseed,$newvariation); |
my ($trial,$rndseed,$newvariation); |
if ($type eq 'randomizetry') { |
if ($type eq 'randomizetry') { |
$trial = $$record{"$where.$partid.tries"}; |
$trial = $$record{"$where.$partid.tries"}; |
if (exists($$record{"$where.$partid.rawrndseed"})) { |
$rndseed = $$record{"$where.$partid.rndseed"}; |
$rndseed = $$record{"$where.$partid.rawrndseed"}; |
|
} else { |
|
$rndseed = $$record{"$where.$partid.rndseed"}; |
|
} |
|
} |
} |
if ($$record{"$where.$partid.tries"} eq '') { |
if ($$record{"$where.$partid.tries"} eq '') { |
$displaySub[0].=&mt('Trial not counted'); |
$displaySub[0].=&mt('Trial not counted'); |
} else { |
} else { |
$displaySub[0].=&mt('Trial: [_1]', |
$displaySub[0].=&mt('Trial: [_1]', |
$$record{"$where.$partid.tries"}); |
$$record{"$where.$partid.tries"}); |
if ($rndseed || $lastrndseed{$partid}) { |
if (($rndseed ne '') && ($lastrndseed{$partid} ne '')) { |
if ($rndseed ne $lastrndseed{$partid}) { |
if (($rndseed ne $lastrndseed{$partid}) && |
|
(($type eq 'randomizetry') || ($lasttype{$partid} eq 'randomizetry'))) { |
$newvariation = ' ('.&mt('New variation this try').')'; |
$newvariation = ' ('.&mt('New variation this try').')'; |
} |
} |
} |
} |
$lastrndseed{$partid} = $rndseed; |
$lastrndseed{$partid} = $rndseed; |
|
$lasttype{$partid} = $type; |
} |
} |
my $responseType=($isTask ? 'Task' |
my $responseType=($isTask ? 'Task' |
: $responseType->{$partid}->{$responseId}); |
: $responseType->{$partid}->{$responseId}); |