version 1.368, 2017/04/03 13:01:43
|
version 1.369, 2017/12/22 02:00:39
|
Line 190 sub proctor_checked_in {
|
Line 190 sub proctor_checked_in {
|
if ($type eq 'Task') { |
if ($type eq 'Task') { |
my $version=$Apache::lonhomework::history{'resource.0.version'}; |
my $version=$Apache::lonhomework::history{'resource.0.version'}; |
$key ="resource.$version.0.checkedin"; |
$key ="resource.$version.0.checkedin"; |
} elsif ($type eq 'problem') { |
} elsif (($type eq 'problem') || ($type eq 'tool')) { |
$key ='resource.0.checkedin'; |
$key ='resource.0.checkedin'; |
} |
} |
# backward compatability, used to be username@domain, |
# backward compatability, used to be username@domain, |
Line 205 sub proctor_checked_in {
|
Line 205 sub proctor_checked_in {
|
return 1; |
return 1; |
} |
} |
} |
} |
|
|
return 0; |
return 0; |
} |
} |
|
|
Line 350 sub check_slot_access {
|
Line 349 sub check_slot_access {
|
$is_correct = |
$is_correct = |
($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' |
($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' |
|| $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ ); |
|| $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ ); |
} elsif ($type eq 'problem') { |
} elsif (($type eq 'problem') || ($type eq 'tool')) { |
if ((ref($partlist) eq 'ARRAY') && (@{$partlist} > 0)) { |
if ((ref($partlist) eq 'ARRAY') && (@{$partlist} > 0)) { |
my ($numcorrect,$numgraded) = (0,0); |
my ($numcorrect,$numgraded) = (0,0); |
foreach my $part (@{$partlist}) { |
foreach my $part (@{$partlist}) { |
Line 410 sub check_slot_access {
|
Line 409 sub check_slot_access {
|
# used to gain access to it to work on it, until the due date is reached, and the |
# used to gain access to it to work on it, until the due date is reached, and the |
# problem then becomes CLOSED. Therefore return the slotstatus - |
# problem then becomes CLOSED. Therefore return the slotstatus - |
# (which will be one of: NOT_IN_A_SLOT, RESERVABLE, RESERVABLE_LATER, or NOTRESERVABLE). |
# (which will be one of: NOT_IN_A_SLOT, RESERVABLE, RESERVABLE_LATER, or NOTRESERVABLE). |
if (!defined($slot_name) && $type eq 'problem') { |
if (!defined($slot_name) && (($type eq 'problem') || ($type eq 'tool'))) { |
if ($slotstatus eq 'NOT_IN_A_SLOT') { |
if ($slotstatus eq 'NOT_IN_A_SLOT') { |
if (!$num_usable_slots) { |
if (!$num_usable_slots) { |
if ($env{'request.course.id'}) { |
if ($env{'request.course.id'}) { |
Line 501 sub check_slot_access {
|
Line 500 sub check_slot_access {
|
} |
} |
|
|
if (($is_correct) && ($blockip ne 'answer')) { |
if (($is_correct) && ($blockip ne 'answer')) { |
if ($type eq 'problem') { |
if (($type eq 'problem') || ($type eq 'tool')) { |
return ($status); |
return ($status); |
} |
} |
return ('SHOW_ANSWER'); |
return ('SHOW_ANSWER'); |