version 1.113, 2015/09/29 06:27:49
|
version 1.118, 2016/08/09 23:43:51
|
Line 192 sub handler {
|
Line 192 sub handler {
|
# ------------------------------------------------------------- Countdown Timer |
# ------------------------------------------------------------- Countdown Timer |
my $now = time; |
my $now = time; |
my ($pagefirstaccess,%hastimeleft,%countdowndisp,%donebutton, |
my ($pagefirstaccess,%hastimeleft,%countdowndisp,%donebutton, |
$donetime,$symbtosetdone); |
%donebtnextra,%buttonbytime,$donetime,$symbtosetdone); |
my ($pagesymb,$courseid,$domain,$name)=&Apache::lonnet::whichuser(); |
my ($pagesymb,$courseid,$domain,$name)=&Apache::lonnet::whichuser(); |
|
unless ($pagesymb) { |
|
$pagesymb=&Apache::lonnet::symbread($requrl); |
|
} |
if ($pagesymb && ($courseid ne '') && ($domain ne '') && ($name ne '')) { |
if ($pagesymb && ($courseid ne '') && ($domain ne '') && ($name ne '')) { |
my %times=&Apache::lonnet::get('firstaccesstimes', |
my %times=&Apache::lonnet::get('firstaccesstimes', |
[$courseid."\0".$pagesymb], |
[$courseid."\0".$pagesymb], |
Line 233 sub handler {
|
Line 236 sub handler {
|
if ($src =~ /$LONCAPA::assess_re/) { |
if ($src =~ /$LONCAPA::assess_re/) { |
my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb); |
my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb); |
if (@interval > 1) { |
if (@interval > 1) { |
if ($interval[1] eq 'map') { |
if (($interval[1] eq 'map') && ($pagefirstaccess)) { |
if ($pagefirstaccess + $interval[0] > $now) { |
my ($timelimit) = ($interval[0] =~ /^(\d+)/); |
$symbtosetdone = $symb; |
if ($timelimit) { |
|
if ($pagefirstaccess + $timelimit > $now) { |
|
$symbtosetdone = $symb; |
|
} |
} |
} |
} |
} |
} |
} |
Line 349 ENDEXT
|
Line 355 ENDEXT
|
my $output=Apache::lonnet::ssi($src,%posthash); |
my $output=Apache::lonnet::ssi($src,%posthash); |
$output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+?// END LON-CAPA Internal\s*(-->)?\s||gs; |
$output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+?// END LON-CAPA Internal\s*(-->)?\s||gs; |
if (($target eq 'tex') || ($target eq 'tex_answer')) { |
if (($target eq 'tex') || ($target eq 'tex_answer')) { |
$output =~ s/^([^&]+)\\begin{document}//; |
$output =~ s/^([^&]+)\\begin\{document}//; |
$output =~ s/\\end{document}//; |
$output =~ s/\\end\{document}//; |
# $output = '\parbox{\minipagewidth}{ '.$output.' }'; |
# $output = '\parbox{\minipagewidth}{ '.$output.' }'; |
#some additional cleanup necessary for LateX (due to limitations of table environment |
#some additional cleanup necessary for LateX (due to limitations of table environment |
$output =~ s/(\\vskip\s*\d+mm)\s*(\\\\)+/$1/g; |
$output =~ s/(\\vskip\s*\d+mm)\s*(\\\\)+/$1/g; |
Line 477 ENDEXT
|
Line 483 ENDEXT
|
undef(%Apache::lonhomework::history); |
undef(%Apache::lonhomework::history); |
my $probstatus = &Apache::lonnet::EXT("resource.0.problemstatus",$symb); |
my $probstatus = &Apache::lonnet::EXT("resource.0.problemstatus",$symb); |
if (($status eq 'CAN_ANSWER') || (($status eq 'CANNOT_ANSWER') && |
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); |
my ($slothastime,$timerhastime); |
if ($slot_name ne '') { |
if ($slot_name ne '') { |
if (ref($slot) eq 'HASH') { |
if (ref($slot) eq 'HASH') { |
Line 490 ENDEXT
|
Line 497 ENDEXT
|
my $duedate = &Apache::lonnet::EXT("resource.0.duedate",$symb); |
my $duedate = &Apache::lonnet::EXT("resource.0.duedate",$symb); |
my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb); |
my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb); |
if (@interval > 1) { |
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) { |
if ($first_access > 0) { |
my $timeremains = $first_access+$interval[0] - $now; |
my ($timelimit) = ($interval[0] =~ /^(\d+)/); |
if ($timeremains > 0) { |
if ($timelimit) { |
$timerhastime = $timeremains; |
my $timeremains = $timelimit + $first_access - $now; |
|
if ($timeremains > 0) { |
|
$timerhastime = $timeremains; |
|
} |
} |
} |
} |
} |
} |
} |
Line 507 ENDEXT
|
Line 529 ENDEXT
|
if ((@interval > 1) && ($timerhastime)) { |
if ((@interval > 1) && ($timerhastime)) { |
$hastimeleft{$symb} = $timerhastime; |
$hastimeleft{$symb} = $timerhastime; |
if ($pagefirstaccess) { |
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 { |
} else { |
$hastimeleft{$symb} = $slothastime; |
$hastimeleft{$symb} = $slothastime; |
Line 517 ENDEXT
|
Line 558 ENDEXT
|
$countdowndisp{$symb} = 'none'; |
$countdowndisp{$symb} = 'none'; |
} |
} |
unless ($donebutton{$symb}) { |
unless ($donebutton{$symb}) { |
$donebutton{$symb} = 0; |
$donebutton{$symb} = 0; |
} |
} |
} |
} |
} |
} |
Line 598 ENDEXT
|
Line 639 ENDEXT
|
$uniquetimes{$item} = 1; |
$uniquetimes{$item} = 1; |
} |
} |
} |
} |
if (keys(%uniquetimes) == 1) { |
if (scalar(keys(%uniquetimes)) == 1) { |
my (%uniquedisplays,%uniquedones,$currdisp,$donebuttontime); |
my (%uniquedisplays,%uniquedones,$currdisp,$donebuttontime, |
|
$donebuttonextras); |
if (keys(%countdowndisp)) { |
if (keys(%countdowndisp)) { |
foreach my $item (values(%countdowndisp)) { |
foreach my $item (values(%countdowndisp)) { |
if (exists($uniquedisplays{$item})) { |
if (exists($uniquedisplays{$item})) { |
Line 625 ENDEXT
|
Line 667 ENDEXT
|
if (scalar(@donebuttons) == 1) { |
if (scalar(@donebuttons) == 1) { |
if ($donebuttons[0]) { |
if ($donebuttons[0]) { |
$donebuttontime = $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 |
# ------------------------------------------------------------------ Start body |
Line 902 sub get_buttons {
|
Line 947 sub get_buttons {
|
} |
} |
|
|
sub add_countdown_timer { |
sub add_countdown_timer { |
my ($currdisp,$donebuttontime) = @_; |
my ($currdisp,$donebuttontime,$donebuttonextras) = @_; |
my ($collapse,$expand,$alttxt,$title,$donebutton); |
my ($collapse,$expand,$alttxt,$title,$donebutton); |
if ($currdisp eq 'inline') { |
if ($currdisp eq 'inline') { |
$collapse = '► '; |
$collapse = '► '; |
Line 910 sub add_countdown_timer {
|
Line 955 sub add_countdown_timer {
|
$expand = '◄ '; |
$expand = '◄ '; |
} |
} |
if ($donebuttontime) { |
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') { |
unless ($env{'environment.icons'} eq 'iconsonly') { |
$alttxt = &mt('Timer'); |
$alttxt = &mt('Timer'); |