--- rat/lonpage.pm 2015/09/29 06:27:49 1.113
+++ rat/lonpage.pm 2016/05/30 09:27:35 1.116
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Page Handler
#
-# $Id: lonpage.pm,v 1.113 2015/09/29 06:27:49 musolffc Exp $
+# $Id: lonpage.pm,v 1.116 2016/05/30 09:27:35 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -192,8 +192,11 @@ sub handler {
# ------------------------------------------------------------- Countdown Timer
my $now = time;
my ($pagefirstaccess,%hastimeleft,%countdowndisp,%donebutton,
- $donetime,$symbtosetdone);
+ %donebtnextra,%buttonbytime,$donetime,$symbtosetdone);
my ($pagesymb,$courseid,$domain,$name)=&Apache::lonnet::whichuser();
+ unless ($pagesymb) {
+ $pagesymb=&Apache::lonnet::symbread($requrl);
+ }
if ($pagesymb && ($courseid ne '') && ($domain ne '') && ($name ne '')) {
my %times=&Apache::lonnet::get('firstaccesstimes',
[$courseid."\0".$pagesymb],
@@ -233,9 +236,12 @@ sub handler {
if ($src =~ /$LONCAPA::assess_re/) {
my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb);
if (@interval > 1) {
- if ($interval[1] eq 'map') {
- if ($pagefirstaccess + $interval[0] > $now) {
- $symbtosetdone = $symb;
+ if (($interval[1] eq 'map') && ($pagefirstaccess)) {
+ my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+ if ($timelimit) {
+ if ($pagefirstaccess + $timelimit > $now) {
+ $symbtosetdone = $symb;
+ }
}
}
}
@@ -473,11 +479,12 @@ ENDEXT
$type = 'Task';
}
my ($status,$accessmsg,$slot_name,$slot) =
- &Apache::lonhomework::check_slot_access('0',$type,$symb);
+ &Apache::lonhomework::check_slot_access('0',$type,$symb,$pagesymb);
undef(%Apache::lonhomework::history);
my $probstatus = &Apache::lonnet::EXT("resource.0.problemstatus",$symb);
if (($status eq 'CAN_ANSWER') || (($status eq 'CANNOT_ANSWER') &&
- (($probstatus eq 'no') || ($probstatus eq 'no_feedback_ever')))) {
+ (($probstatus eq 'no') || ($probstatus eq 'no_feedback_ever'))) ||
+ (($status eq 'NOT_YET_VIEWED') && ($posthash{'markaccess'} eq 'yes'))) {
my ($slothastime,$timerhastime);
if ($slot_name ne '') {
if (ref($slot) eq 'HASH') {
@@ -490,11 +497,26 @@ ENDEXT
my $duedate = &Apache::lonnet::EXT("resource.0.duedate",$symb);
my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb);
if (@interval > 1) {
- my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);
+ my $first_access;
+ if ($interval[1] eq 'map') {
+ my $ignorecache;
+ if ($env{'form.'.$prefix.'markaccess'} eq 'yes') {
+ $ignorecache = 1;
+ }
+ $first_access=&Apache::lonnet::get_first_access($interval[1],undef,$pagesymb,$ignorecache);
+ if (($first_access) && (!$pagefirstaccess)) {
+ $pagefirstaccess = $first_access;
+ }
+ } else {
+ $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);
+ }
if ($first_access > 0) {
- my $timeremains = $first_access+$interval[0] - $now;
- if ($timeremains > 0) {
- $timerhastime = $timeremains;
+ my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+ if ($timelimit) {
+ my $timeremains = $timelimit + $first_access - $now;
+ if ($timeremains > 0) {
+ $timerhastime = $timeremains;
+ }
}
}
}
@@ -507,7 +529,26 @@ ENDEXT
if ((@interval > 1) && ($timerhastime)) {
$hastimeleft{$symb} = $timerhastime;
if ($pagefirstaccess) {
- $donebutton{$symb} = $interval[1];
+ my ($timelimit,$usesdone,$donebuttontext,$proctor,$secret);
+ ($timelimit,my $donesuffix) = split(/_/,$interval[0],2);
+ if ($donesuffix =~ /^done\:([^\:]+)\:(.*)$/) {
+ $usesdone = 'done';
+ $donebuttontext = $1;
+ (undef,$proctor,$secret) = split(/_/,$2);
+ } elsif ($donesuffix =~ /^done(|_.+)$/) {
+ $donebuttontext = &mt('Done');
+ ($usesdone,$proctor,$secret) = split(/_/,$donesuffix);
+ }
+ if ($usesdone eq 'done') {
+ $donebutton{$symb} = $timelimit;
+ push(@{$buttonbytime{$timelimit}},$symb);
+ $donebtnextra{$symb} = {
+ text => $donebuttontext,
+ proctor => $proctor,
+ secret => $secret,
+ type => $interval[1],
+ };
+ }
}
} else {
$hastimeleft{$symb} = $slothastime;
@@ -517,7 +558,7 @@ ENDEXT
$countdowndisp{$symb} = 'none';
}
unless ($donebutton{$symb}) {
- $donebutton{$symb} = 0;
+ $donebutton{$symb} = 0;
}
}
}
@@ -598,8 +639,9 @@ ENDEXT
$uniquetimes{$item} = 1;
}
}
- if (keys(%uniquetimes) == 1) {
- my (%uniquedisplays,%uniquedones,$currdisp,$donebuttontime);
+ if (scalar(keys(%uniquetimes)) == 1) {
+ my (%uniquedisplays,%uniquedones,$currdisp,$donebuttontime,
+ $donebuttonextras);
if (keys(%countdowndisp)) {
foreach my $item (values(%countdowndisp)) {
if (exists($uniquedisplays{$item})) {
@@ -625,10 +667,13 @@ ENDEXT
if (scalar(@donebuttons) == 1) {
if ($donebuttons[0]) {
$donebuttontime = $donebuttons[0];
+ if (ref($buttonbytime{$donebuttontime}) eq 'ARRAY') {
+ $donebuttonextras = $donebtnextra{$buttonbytime{$donebuttontime}->[0]};
+ }
}
}
}
- &add_countdown_timer($currdisp,$donebuttontime);
+ &add_countdown_timer($currdisp,$donebuttontime,$donebuttonextras);
}
}
# ------------------------------------------------------------------ Start body
@@ -902,7 +947,7 @@ sub get_buttons {
}
sub add_countdown_timer {
- my ($currdisp,$donebuttontime) = @_;
+ my ($currdisp,$donebuttontime,$donebuttonextras) = @_;
my ($collapse,$expand,$alttxt,$title,$donebutton);
if ($currdisp eq 'inline') {
$collapse = '► ';
@@ -910,7 +955,17 @@ sub add_countdown_timer {
$expand = '◄ ';
}
if ($donebuttontime) {
- $donebutton = &Apache::lonmenu::done_button_js($donebuttontime);
+ my ($type,$proctor,$donebuttontext);
+ if (ref($donebuttonextras) eq 'HASH') {
+ $proctor = $donebuttonextras->{'proctor'};
+ $donebuttontext = $donebuttonextras->{'text'};
+ $type = $donebuttonextras->{'type'};
+ } else {
+ $donebuttontext = &mt('Done');
+ $type = 'map';
+ }
+ $donebutton =
+ &Apache::lonmenu::done_button_js($type,'','',$proctor,$donebuttontext);
}
unless ($env{'environment.icons'} eq 'iconsonly') {
$alttxt = &mt('Timer');
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.