version 1.386, 2012/09/04 20:47:56
|
version 1.387, 2012/09/12 05:14:17
|
Line 1843 sub required_privs {
|
Line 1843 sub required_privs {
|
|
|
sub countdown_timer { |
sub countdown_timer { |
if (($env{'request.course.id'}) && ($env{'request.symb'} ne '') && |
if (($env{'request.course.id'}) && ($env{'request.symb'} ne '') && |
($env{'request.filename'}=~/$LONCAPA::assess_re/) && |
($env{'request.filename'}=~/$LONCAPA::assess_re/)) { |
($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) { |
my ($type,$hastimeleft,$slothastime); |
|
my $now = time; |
|
if ($env{'request.filename'} =~ /\.task$/) { |
|
$type = 'Task'; |
|
} else { |
|
$type = 'problem'; |
|
} |
|
my ($status,$accessmsg,$slot_name,$slot) = |
|
&Apache::lonhomework::check_slot_access('0',$type); |
|
if ($slot_name ne '') { |
|
if (ref($slot) eq 'HASH') { |
|
if (($slot->{'starttime'} < $now) && |
|
($slot->{'endtime'} > $now)) { |
|
$slothastime = 1; |
|
} |
|
} |
|
} |
|
if ($status ne 'CAN_ANSWER') { |
|
return; |
|
} |
my $duedate = &Apache::lonnet::EXT("resource.0.duedate"); |
my $duedate = &Apache::lonnet::EXT("resource.0.duedate"); |
my @interval=&Apache::lonnet::EXT("resource.0.interval"); |
my @interval=&Apache::lonnet::EXT("resource.0.interval"); |
my $hastimeleft; |
my $hastimeleft; |
Line 1857 sub countdown_timer {
|
Line 1876 sub countdown_timer {
|
} |
} |
} |
} |
if (($duedate && $duedate > time) || |
if (($duedate && $duedate > time) || |
(!$duedate && $hastimeleft)) { |
(!$duedate && $hastimeleft) || |
|
($slot_name ne '' && $slothastime)) { |
my ($collapse,$expand,$alttxt,$title,$currdisp); |
my ($collapse,$expand,$alttxt,$title,$currdisp); |
if (@interval > 1 && $hastimeleft) { |
if ((@interval > 1 && $hastimeleft) || |
|
($type eq 'Task' && $slothastime)) { |
$currdisp = 'inline'; |
$currdisp = 'inline'; |
$collapse = '► '; |
$collapse = '► '; |
} else { |
} else { |