version 1.344.2.3, 2016/08/06 23:23:18
|
version 1.345, 2014/08/07 19:53:19
|
Line 208 sub proctor_checked_in {
|
Line 208 sub proctor_checked_in {
|
} |
} |
|
|
sub check_slot_access { |
sub check_slot_access { |
my ($id,$type,$partlist)=@_; |
my ($id,$type)=@_; |
|
|
# does it pass normal muster |
# does it pass normal muster |
my ($status,$datemsg)=&check_access($id); |
my ($status,$datemsg)=&check_access($id); |
Line 271 sub check_slot_access {
|
Line 271 sub check_slot_access {
|
$slotstatus=$status; |
$slotstatus=$status; |
} |
} |
|
|
my ($is_correct,$got_grade,$checkinslot,$checkedin,$consumed_uniq); |
my ($is_correct,$got_grade,$checkedin); |
if ($type eq 'Task') { |
if ($type eq 'Task') { |
my $version=$Apache::lonhomework::history{'resource.0.version'}; |
my $version=$Apache::lonhomework::history{'resource.0.version'}; |
$got_grade = |
$got_grade = |
Line 283 sub check_slot_access {
|
Line 283 sub check_slot_access {
|
$checkedin = |
$checkedin = |
$Apache::lonhomework::history{"resource.$version.0.checkedin"}; |
$Apache::lonhomework::history{"resource.$version.0.checkedin"}; |
} elsif ($type eq 'problem') { |
} elsif ($type eq 'problem') { |
|
$got_grade = 1; |
$checkedin = $Apache::lonhomework::history{"resource.0.checkedin"}; |
$checkedin = $Apache::lonhomework::history{"resource.0.checkedin"}; |
} |
$is_correct = |
if ($checkedin) { |
($Apache::lonhomework::history{"resource.0.solved"} =~/^correct_/); |
$checkinslot = $Apache::lonhomework::history{"$checkin.slot"}; |
|
my %slot=&Apache::lonnet::get_slot($checkinslot); |
|
$consumed_uniq = $slot{'uniqueperiod'}; |
|
} |
|
if ($type eq 'problem') { |
|
if ((ref($partlist) eq 'ARRAY') && (@{$partlist} > 0)) { |
|
my ($numcorrect,$numgraded) = (0,0); |
|
foreach my $part (@{$partlist}) { |
|
my $currtries = $Apache::lonhomework::history{"resource.$part.tries"}; |
|
my $maxtries = &Apache::lonnet::EXT("resource.$part.maxtries",$symb); |
|
my $probstatus = &Apache::structuretags::get_problem_status($part); |
|
my $earlyout; |
|
unless (($probstatus eq 'no') || |
|
($probstatus eq 'no_feedback_ever')) { |
|
if ($Apache::lonhomework::history{"resource.$part.solved"} =~/^correct_/) { |
|
$numcorrect ++; |
|
} else { |
|
$earlyout = 1; |
|
} |
|
} |
|
if (($currtries == $maxtries) || ($is_correct)) { |
|
$earlyout = 1; |
|
} else { |
|
$numgraded ++; |
|
} |
|
last if ($earlyout); |
|
} |
|
my $numparts = scalar(@{$partlist}); |
|
if ($numparts == $numcorrect) { |
|
$is_correct = 1; |
|
} |
|
if ($numparts == $numgraded) { |
|
$got_grade = 1; |
|
} |
|
} else { |
|
my $currtries = $Apache::lonhomework::history{"resource.0.tries"}; |
|
my $maxtries = &Apache::lonnet::EXT("resource.0.maxtries",$symb); |
|
my $probstatus = &Apache::structuretags::get_problem_status('0'); |
|
unless (($probstatus eq 'no') || |
|
($probstatus eq 'no_feedback_ever')) { |
|
$is_correct = |
|
($Apache::lonhomework::history{"resource.0.solved"} =~/^correct_/); |
|
} |
|
unless (($currtries == $maxtries) || ($is_correct)) { |
|
$got_grade = 1; |
|
} |
|
} |
|
} |
} |
|
|
&Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)"); |
&Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)"); |
Line 363 sub check_slot_access {
|
Line 317 sub check_slot_access {
|
&Apache::loncommon::get_future_slots($cnum,$cdom,$now,$symb); |
&Apache::loncommon::get_future_slots($cnum,$cdom,$now,$symb); |
if ((ref($reservable_now_order) eq 'ARRAY') && (ref($reservable_now) eq 'HASH')) { |
if ((ref($reservable_now_order) eq 'ARRAY') && (ref($reservable_now) eq 'HASH')) { |
if (@{$reservable_now_order} > 0) { |
if (@{$reservable_now_order} > 0) { |
if ((!$checkedin) || (ref($consumed_uniq) ne 'ARRAY')) { |
$slotstatus = 'RESERVABLE'; |
$slotstatus = 'RESERVABLE'; |
$datemsg = $reservable_now->{$reservable_now_order->[-1]}{'endreserve'}; |
$datemsg = $reservable_now->{$reservable_now_order->[-1]}{'endreserve'}; |
|
} else { |
|
my ($uniqstart,$uniqend,$useslot); |
|
if (ref($consumed_uniq) eq 'ARRAY') { |
|
($uniqstart,$uniqend)=@{$consumed_uniq}; |
|
} |
|
foreach my $slot (reverse(@{$reservable_now_order})) { |
|
if ($reservable_now->{$slot}{'uniqueperiod'} =~ /^(\d+)\,(\d+)$/) { |
|
my ($new_uniq_start,$new_uniq_end) = ($1,$2); |
|
next if (! |
|
($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) || |
|
($uniqstart > $new_uniq_end && $uniqend > $new_uniq_end )); |
|
} |
|
$useslot = $slot; |
|
last; |
|
} |
|
if ($useslot) { |
|
$slotstatus = 'RESERVABLE'; |
|
$datemsg = $reservable_now->{$useslot}{'endreserve'}; |
|
} |
|
} |
|
} |
} |
} |
} |
unless ($slotstatus eq 'RESERVABLE') { |
unless ($slotstatus eq 'RESERVABLE') { |
if ((ref($reservable_future_order) eq 'ARRAY') && (ref($reservable_future) eq 'HASH')) { |
if ((ref($reservable_future_order) eq 'ARRAY') && (ref($reservable_future) eq 'HASH')) { |
if (@{$reservable_future_order} > 0) { |
if (@{$reservable_future_order} > 0) { |
if ((!$checkedin) || (ref($consumed_uniq) ne 'ARRAY')) { |
$slotstatus = 'RESERVABLE_LATER'; |
$slotstatus = 'RESERVABLE_LATER'; |
$datemsg = $reservable_future->{$reservable_future_order->[0]}{'startreserve'}; |
$datemsg = $reservable_future->{$reservable_future_order->[0]}{'startreserve'}; |
|
} else { |
|
my ($uniqstart,$uniqend,$useslot); |
|
if (ref($consumed_uniq) eq 'ARRAY') { |
|
($uniqstart,$uniqend)=@{$consumed_uniq}; |
|
} |
|
foreach my $slot (@{$reservable_future_order}) { |
|
if ($reservable_future->{$slot}{'uniqueperiod'} =~ /^(\d+),(\d+)$/) { |
|
my ($new_uniq_start,$new_uniq_end) = ($1,$2); |
|
next if (! |
|
($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) || |
|
($uniqstart > $new_uniq_end && $uniqend > $new_uniq_end )); |
|
} |
|
$useslot = $slot; |
|
last; |
|
} |
|
if ($useslot) { |
|
$slotstatus = 'RESERVABLE_LATER'; |
|
$datemsg = $reservable_future->{$useslot}{'startreserve'}; |
|
} |
|
} |
|
} |
} |
} |
} |
} |
} |
Line 557 sub check_access {
|
Line 469 sub check_access {
|
if ( $tries eq '' ) { $tries = '0'; } |
if ( $tries eq '' ) { $tries = '0'; } |
if ( $maxtries eq '' && |
if ( $maxtries eq '' && |
$env{'request.state'} ne 'construct') { $maxtries = '2'; } |
$env{'request.state'} ne 'construct') { $maxtries = '2'; } |
|
$Apache::lonhomework::results{'resource.'.$id.'.maxtries'}=$maxtries; |
if ($maxtries && $tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } |
if ($maxtries && $tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } |
# if (correct and show prob status) or excused then CANNOT_ANSWER |
# if (correct and show prob status) or excused then CANNOT_ANSWER |
if ( ($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/) |
if ( ($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/) |
Line 677 sub showarray {
|
Line 590 sub showarray {
|
sub showhashsubset { |
sub showhashsubset { |
my ($hash,$keyre) = @_; |
my ($hash,$keyre) = @_; |
my $resultkey; |
my $resultkey; |
foreach $resultkey (sort(keys(%$hash))) { |
foreach $resultkey (sort keys %$hash) { |
if ($resultkey !~ /$keyre/) { next; } |
if ($resultkey !~ /$keyre/) { next; } |
if (ref($$hash{$resultkey}) eq 'ARRAY' ) { |
if (ref($$hash{$resultkey}) eq 'ARRAY' ) { |
&Apache::lonxml::debug("$resultkey ---- ". |
&Apache::lonxml::debug("$resultkey ---- ". |
Line 1365 sub handler {
|
Line 1278 sub handler {
|
my $file=&Apache::lonnet::filelocation("",$request->uri); |
my $file=&Apache::lonnet::filelocation("",$request->uri); |
|
|
#check if we know where we are |
#check if we know where we are |
if ($env{'request.course.fn'} && !&Apache::lonnet::symbread('','',1,1)) { |
if ($env{'request.course.fn'} && !&Apache::lonnet::symbread()) { |
# if we are browsing we might not be able to know where we are |
# if we are browsing we might not be able to know where we are |
if ($Apache::lonhomework::browse ne 'F' && |
if ($Apache::lonhomework::browse ne 'F' && |
$env{'request.state'} ne "construct") { |
$env{'request.state'} ne "construct") { |