version 1.111.2.2, 2016/08/10 04:37:32
|
version 1.113, 2015/09/29 06:27:49
|
Line 41 use Apache::lonxml();
|
Line 41 use Apache::lonxml();
|
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonmenu; |
use Apache::lonmenu; |
use Apache::lonhomework; |
use Apache::lonhomework; |
|
use Apache::lonparmset; |
use HTML::TokeParser; |
use HTML::TokeParser; |
use GDBM_File; |
use GDBM_File; |
use Apache::lonsequence; |
use Apache::lonsequence; |
Line 190 sub handler {
|
Line 191 sub handler {
|
if (($firstres) && ($lastres)) { |
if (($firstres) && ($lastres)) { |
# ------------------------------------------------------------- Countdown Timer |
# ------------------------------------------------------------- Countdown Timer |
my $now = time; |
my $now = time; |
my ($pagefirstaccess,%hastimeleft,%countdowndisp); |
my ($pagefirstaccess,%hastimeleft,%countdowndisp,%donebutton, |
|
$donetime,$symbtosetdone); |
my ($pagesymb,$courseid,$domain,$name)=&Apache::lonnet::whichuser(); |
my ($pagesymb,$courseid,$domain,$name)=&Apache::lonnet::whichuser(); |
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', |
Line 198 sub handler {
|
Line 200 sub handler {
|
$domain,$name); |
$domain,$name); |
if ($times{$courseid."\0".$pagesymb} =~ /^\d+$/) { |
if ($times{$courseid."\0".$pagesymb} =~ /^\d+$/) { |
$pagefirstaccess = $times{$courseid."\0".$pagesymb}; |
$pagefirstaccess = $times{$courseid."\0".$pagesymb}; |
|
if ($pagefirstaccess && $env{'form.LC_interval_done'} eq 'true') { |
|
$donetime = $now - $pagefirstaccess; |
|
} |
} |
} |
} |
} |
|
|
# ----------------------------------------------------------------- Render page |
# ----------------------------------------------------------------- Render page |
|
|
@rows=(); |
@rows=(); |
Line 217 sub handler {
|
Line 223 sub handler {
|
my ($mapid,$resid)=split(/\./,$rid); |
my ($mapid,$resid)=split(/\./,$rid); |
$symbhash{$hash{'src_'.$rid}}= |
$symbhash{$hash{'src_'.$rid}}= |
[$hash{'src_'.$rid},$resid]; |
[$hash{'src_'.$rid},$resid]; |
|
if (($donetime) && ($symbtosetdone eq '')) { |
|
my $src = $hash{'src_'.$rid}; |
|
if ($hash{'encrypted_'.$rid}) { |
|
$src=&Apache::lonenc::encrypted($src); |
|
} |
|
my ($mapid,$resid)=split(/\./,$rid); |
|
my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src); |
|
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; |
|
} |
|
} |
|
} |
|
} |
|
} |
} |
} |
} |
} |
} |
} |
Line 251 sub handler {
|
Line 275 sub handler {
|
my $xmlheader=''; |
my $xmlheader=''; |
my $xmlbody=''; |
my $xmlbody=''; |
|
|
|
# ---------------------------------------------------------- Handle Done button |
|
|
|
# Set the event timer to zero if the "done button" was clicked. |
|
if ($donetime && $symbtosetdone) { |
|
&Apache::lonparmset::storeparm_by_symb_inner($symbtosetdone,'0_interval', |
|
2,$donetime,'date_interval', |
|
$name,$domain); |
|
undef($env{'form.LC_interval_done'}); |
|
} |
|
|
# --------------------------------------------- Get SSI output, post parameters |
# --------------------------------------------- Get SSI output, post parameters |
|
|
for ($i=0;$i<=$#rows;$i++) { |
for ($i=0;$i<=$#rows;$i++) { |
Line 315 ENDEXT
|
Line 349 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 472 ENDEXT
|
Line 506 ENDEXT
|
$countdowndisp{$symb} = 'inline'; |
$countdowndisp{$symb} = 'inline'; |
if ((@interval > 1) && ($timerhastime)) { |
if ((@interval > 1) && ($timerhastime)) { |
$hastimeleft{$symb} = $timerhastime; |
$hastimeleft{$symb} = $timerhastime; |
|
if ($pagefirstaccess) { |
|
$donebutton{$symb} = $interval[1]; |
|
} |
} else { |
} else { |
$hastimeleft{$symb} = $slothastime; |
$hastimeleft{$symb} = $slothastime; |
} |
} |
Line 479 ENDEXT
|
Line 516 ENDEXT
|
$hastimeleft{$symb} = $duedate - $now; |
$hastimeleft{$symb} = $duedate - $now; |
$countdowndisp{$symb} = 'none'; |
$countdowndisp{$symb} = 'none'; |
} |
} |
|
unless ($donebutton{$symb}) { |
|
$donebutton{$symb} = 0; |
|
} |
} |
} |
} |
} |
} |
} |
Line 559 ENDEXT
|
Line 599 ENDEXT
|
} |
} |
} |
} |
if (keys(%uniquetimes) == 1) { |
if (keys(%uniquetimes) == 1) { |
my (%uniquedisplays,%uniquedones,$currdisp); |
my (%uniquedisplays,%uniquedones,$currdisp,$donebuttontime); |
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 573 ENDEXT
|
Line 613 ENDEXT
|
$currdisp = $countdowndisplay[0]; |
$currdisp = $countdowndisplay[0]; |
} |
} |
} |
} |
&add_countdown_timer($currdisp); |
if (keys(%donebutton)) { |
|
foreach my $item (values(%donebutton)) { |
|
if (exists($uniquedones{$item})) { |
|
$uniquedones{$item} ++; |
|
} else { |
|
$uniquedones{$item} = 1; |
|
} |
|
} |
|
my @donebuttons = sort { $ <=> $b } (keys(%uniquedones)); |
|
if (scalar(@donebuttons) == 1) { |
|
if ($donebuttons[0]) { |
|
$donebuttontime = $donebuttons[0]; |
|
} |
|
} |
|
} |
|
&add_countdown_timer($currdisp,$donebuttontime); |
} |
} |
} |
} |
# ------------------------------------------------------------------ Start body |
# ------------------------------------------------------------------ Start body |
Line 847 sub get_buttons {
|
Line 902 sub get_buttons {
|
} |
} |
|
|
sub add_countdown_timer { |
sub add_countdown_timer { |
my ($currdisp) = @_; |
my ($currdisp,$donebuttontime) = @_; |
my ($collapse,$expand,$alttxt,$title); |
my ($collapse,$expand,$alttxt,$title,$donebutton); |
if ($currdisp eq 'inline') { |
if ($currdisp eq 'inline') { |
$collapse = '► '; |
$collapse = '► '; |
} else { |
} else { |
$expand = '◄ '; |
$expand = '◄ '; |
} |
} |
|
if ($donebuttontime) { |
|
$donebutton = &Apache::lonmenu::done_button_js($donebuttontime); |
|
} |
unless ($env{'environment.icons'} eq 'iconsonly') { |
unless ($env{'environment.icons'} eq 'iconsonly') { |
$alttxt = &mt('Timer'); |
$alttxt = &mt('Timer'); |
$title = $alttxt.' '; |
$title = $alttxt.' '; |
} |
} |
my $desc = &mt('Countdown to due date/time'); |
my $desc = &mt('Countdown to due date/time'); |
my $output = <<END; |
my $output = <<END; |
|
$donebutton |
<a href="javascript:toggleCountdown();" class="LC_menubuttons_link"> |
<a href="javascript:toggleCountdown();" class="LC_menubuttons_link"> |
<span id="ddcountcollapse" class="LC_menubuttons_inline_text"> |
<span id="ddcountcollapse" class="LC_menubuttons_inline_text"> |
$collapse |
$collapse |