version 1.332, 2011/12/08 01:34:47
|
version 1.335, 2011/12/21 21:25:36
|
Line 246 sub check_slot_access {
|
Line 246 sub check_slot_access {
|
# } |
# } |
my $slotstatus='NOT_IN_A_SLOT'; |
my $slotstatus='NOT_IN_A_SLOT'; |
my ($returned_slot,$slot_name); |
my ($returned_slot,$slot_name); |
|
my $now = time; |
|
my $num_usable_slots = 0; |
foreach my $slot (@slots) { |
foreach my $slot (@slots) { |
$slot =~ s/(^\s*|\s*$)//g; |
$slot =~ s/(^\s*|\s*$)//g; |
&Apache::lonxml::debug("getting $slot"); |
&Apache::lonxml::debug("getting $slot"); |
my %slot=&Apache::lonnet::get_slot($slot); |
my %slot=&Apache::lonnet::get_slot($slot); |
&Apache::lonhomework::showhash(%slot); |
&Apache::lonhomework::showhash(%slot); |
if ($slot{'starttime'} < time && |
next if ($slot{'endtime'} < $now); |
$slot{'endtime'} > time && |
$num_usable_slots ++; |
|
if ($slot{'starttime'} < $now && |
|
$slot{'endtime'} > $now && |
&Apache::loncommon::check_ip_acc($slot{'ip'})) { |
&Apache::loncommon::check_ip_acc($slot{'ip'})) { |
&Apache::lonxml::debug("$slot is good"); |
&Apache::lonxml::debug("$slot is good"); |
$slotstatus='NEEDS_CHECKIN'; |
$slotstatus='NEEDS_CHECKIN'; |
$returned_slot=\%slot; |
$returned_slot=\%slot; |
$slot_name=$slot; |
$slot_name=$slot; |
last; |
last; |
} |
} |
} |
} |
if ($slotstatus eq 'NEEDS_CHECKIN' && |
if ($slotstatus eq 'NEEDS_CHECKIN' && |
&proctor_checked_in($slot_name,$returned_slot,$type)) { |
&proctor_checked_in($slot_name,$returned_slot,$type)) { |
Line 299 sub check_slot_access {
|
Line 303 sub check_slot_access {
|
# However, the problem is not closed, and potentially, another slot might be |
# However, the problem is not closed, and potentially, another slot might be |
# 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 NOT_IN_SLOT). |
# (which will be one of: NOT_IN_A_SLOT, RESERVABLE, RESERVABLE_LATER, or NOTRESERVABLE. |
if (!defined($slot_name) |
if (!defined($slot_name) && $type eq 'problem') { |
&& $checkedin |
if ($slotstatus eq 'NOT_IN_A_SLOT') { |
&& $type eq 'problem') { |
if (!$num_usable_slots) { |
return ($slotstatus); |
if ($env{'request.course.id'}) { |
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
my ($symb)=&Apache::lonnet::whichuser(); |
|
$slotstatus = 'NOTRESERVABLE'; |
|
my ($reservable_now_order,$reservable_now,$reservable_future_order, |
|
$reservable_future) = |
|
&Apache::loncommon::get_future_slots($cnum,$cdom,$now,$symb); |
|
if ((ref($reservable_now_order) eq 'ARRAY') && (ref($reservable_now) eq 'HASH')) { |
|
if (@{$reservable_now_order} > 0) { |
|
$slotstatus = 'RESERVABLE'; |
|
$datemsg = $reservable_now->{$reservable_now_order->[-1]}{'endreserve'}; |
|
} |
|
} |
|
unless ($slotstatus eq 'RESERVABLE') { |
|
if ((ref($reservable_future_order) eq 'ARRAY') && (ref($reservable_future) eq 'HASH')) { |
|
if (@{$reservable_future_order} > 0) { |
|
$slotstatus = 'RESERVABLE_LATER'; |
|
$datemsg = $reservable_future->{$reservable_future_order->[0]}{'startreserve'}; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
return ($slotstatus,$datemsg); |
} |
} |
|
|
if ($slotstatus eq 'NOT_IN_A_SLOT' |
if ($slotstatus eq 'NOT_IN_A_SLOT' |
Line 444 sub check_access {
|
Line 473 sub check_access {
|
# 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/) |
&& (&show_problem_status()) ) { |
&& (&show_problem_status()) ) { |
if (&Apache::inputtags::grading_is_nonlenient($id) || |
if (($Apache::lonhomework::history{"resource.$id.awarded"} >= 1) || |
$Apache::lonhomework::history{"resource.$id.awarded"} == 1) { |
(&Apache::lonnet::EXT("resource.$id.retrypartial") !~/^1|on|yes$/i)) { |
$status = 'CANNOT_ANSWER'; |
$status = 'CANNOT_ANSWER'; |
} |
} |
} elsif ($Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) { |
} elsif ($Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) { |
Line 750 sub analyze {
|
Line 779 sub analyze {
|
my $rndseed=$env{'form.rndseed'}; |
my $rndseed=$env{'form.rndseed'}; |
&analyze_header($request); |
&analyze_header($request); |
my %prog_state= |
my %prog_state= |
&Apache::lonhtmlcommon::Create_PrgWin($request,&mt('Analyze Progress'), |
&Apache::lonhtmlcommon::Create_PrgWin($request,$env{'form.numtoanalyze'}); |
&mt('Getting Problem Variants'), |
|
$env{'form.numtoanalyze'}, |
|
'inline',undef); |
|
for(my $i=1;$i<$env{'form.numtoanalyze'}+1;$i++) { |
for(my $i=1;$i<$env{'form.numtoanalyze'}+1;$i++) { |
&Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state, |
&Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state,'last problem'); |
&mt('last problem')); |
|
if (&Apache::loncommon::connection_aborted($request)) { return; } |
if (&Apache::loncommon::connection_aborted($request)) { return; } |
my $thisseed=$i+$rndseed; |
my $thisseed=$i+$rndseed; |
my $subresult=&Apache::lonnet::ssi($request->uri, |
my $subresult=&Apache::lonnet::ssi($request->uri, |
Line 798 sub analyze {
|
Line 823 sub analyze {
|
} |
} |
} |
} |
} |
} |
&Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state, |
&Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state,&mt('Analyzing Results')); |
&mt('Analyzing Results')); |
|
$request->print('<hr />' |
$request->print('<hr />' |
.'<h3>' |
.'<h3>' |
.&mt('List of possible answers') |
.&mt('List of possible answers') |