--- rat/lonpage.pm 2016/10/29 05:59:30 1.111.2.3
+++ rat/lonpage.pm 2015/09/29 06:27:49 1.113
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Page Handler
#
-# $Id: lonpage.pm,v 1.111.2.3 2016/10/29 05:59:30 raeburn Exp $
+# $Id: lonpage.pm,v 1.113 2015/09/29 06:27:49 musolffc Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -41,6 +41,7 @@ use Apache::lonxml();
use Apache::lonlocal;
use Apache::lonmenu;
use Apache::lonhomework;
+use Apache::lonparmset;
use HTML::TokeParser;
use GDBM_File;
use Apache::lonsequence;
@@ -183,7 +184,6 @@ sub handler {
if (($env{'request.course.fn'}) && (!$env{'form.forceselect'})) {
my $fn=$env{'request.course.fn'};
if (-e "$fn.db") {
- my %buttonshide;
if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) {
# ------------------------------------------------------------------- Hash tied
my $firstres=$hash{'map_start_'.$requrl};
@@ -191,7 +191,8 @@ sub handler {
if (($firstres) && ($lastres)) {
# ------------------------------------------------------------- Countdown Timer
my $now = time;
- my ($pagefirstaccess,%hastimeleft,%countdowndisp);
+ my ($pagefirstaccess,%hastimeleft,%countdowndisp,%donebutton,
+ $donetime,$symbtosetdone);
my ($pagesymb,$courseid,$domain,$name)=&Apache::lonnet::whichuser();
if ($pagesymb && ($courseid ne '') && ($domain ne '') && ($name ne '')) {
my %times=&Apache::lonnet::get('firstaccesstimes',
@@ -199,8 +200,12 @@ sub handler {
$domain,$name);
if ($times{$courseid."\0".$pagesymb} =~ /^\d+$/) {
$pagefirstaccess = $times{$courseid."\0".$pagesymb};
+ if ($pagefirstaccess && $env{'form.LC_interval_done'} eq 'true') {
+ $donetime = $now - $pagefirstaccess;
+ }
}
}
+
# ----------------------------------------------------------------- Render page
@rows=();
@@ -218,6 +223,24 @@ sub handler {
my ($mapid,$resid)=split(/\./,$rid);
$symbhash{$hash{'src_'.$rid}}=
[$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;
+ }
+ }
+ }
+ }
+ }
}
}
}
@@ -252,6 +275,16 @@ sub handler {
my $xmlheader='';
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
for ($i=0;$i<=$#rows;$i++) {
@@ -261,17 +294,11 @@ sub handler {
$lcm*=($#colcont+1)/euclid($lcm,($#colcont+1));
foreach (@colcont) {
my $src=$hash{'src_'.$_};
- my $plainsrc = $src;
my ($extension)=($src=~/\.(\w+)$/);
$cellexternal{$_}=($hash{'ext_'.$_} eq 'true:');
if ($hash{'encrypted_'.$_}) {
$src=&Apache::lonenc::encrypted($src);
}
- my ($mapid,$resid)=split(/\./,$_);
- my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src);
- unless ($env{'request.role.adv'}) {
- $buttonshide{$symb} = &Apache::lonnet::EXT("resource.0.buttonshide",$symb);
- }
$cellemb{$_}=
&Apache::loncommon::fileembstyle($extension);
if ($cellexternal{$_}) {
@@ -282,6 +309,9 @@ ENDEXT
}
} elsif ($cellemb{$_} eq 'ssi') {
# --------------------------------------------------------- This is an SSI cell
+ my ($mapid,$resid)=split(/\./,$_);
+ my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src);
+
my $prefix=$_.'_';
my $idprefix= join('_',($mapid,$resid,''));
my %posthash=('request.prefix' => $prefix,
@@ -319,8 +349,8 @@ ENDEXT
my $output=Apache::lonnet::ssi($src,%posthash);
$output=~s|//(\s*)?\s||gs;
if (($target eq 'tex') || ($target eq 'tex_answer')) {
- $output =~ s/^([^&]+)\\begin\{document}//;
- $output =~ s/\\end\{document}//;
+ $output =~ s/^([^&]+)\\begin{document}//;
+ $output =~ s/\\end{document}//;
# $output = '\parbox{\minipagewidth}{ '.$output.' }';
#some additional cleanup necessary for LateX (due to limitations of table environment
$output =~ s/(\\vskip\s*\d+mm)\s*(\\\\)+/$1/g;
@@ -435,11 +465,11 @@ ENDEXT
$output=~
s/\<(input[^\>]+\Qonfocus=\"javascript:disableAutoComplete\E)\(\'([^\']+)\'\)(;\")/\<$1('$idprefix$2')$3/gsi;
unless ($hastimer) {
- if ($plainsrc =~ /$LONCAPA::assess_re/) {
+ if ($src =~ /$LONCAPA::assess_re/) {
%Apache::lonhomework::history =
&Apache::lonnet::restore($symb,$courseid,$domain,$name);
my $type = 'problem';
- if ($extension eq 'task') {
+ if ($src =~ /\.task$/) {
$type = 'Task';
}
my ($status,$accessmsg,$slot_name,$slot) =
@@ -476,6 +506,9 @@ ENDEXT
$countdowndisp{$symb} = 'inline';
if ((@interval > 1) && ($timerhastime)) {
$hastimeleft{$symb} = $timerhastime;
+ if ($pagefirstaccess) {
+ $donebutton{$symb} = $interval[1];
+ }
} else {
$hastimeleft{$symb} = $slothastime;
}
@@ -483,6 +516,9 @@ ENDEXT
$hastimeleft{$symb} = $duedate - $now;
$countdowndisp{$symb} = 'none';
}
+ unless ($donebutton{$symb}) {
+ $donebutton{$symb} = 0;
+ }
}
}
}
@@ -512,7 +548,7 @@ ENDEXT
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
$r->print(&Apache::loncommon::start_page(undef,undef,
- {'force_register' => 1}));
+ {'force_register' => 1,}));
$r->print(&mt('This page is either empty or it only contains resources that are currently hidden').'. ');
$r->print('
'.&mt('Please use the LON-CAPA navigation arrows to move to another item in the course').
&Apache::loncommon::end_page());
@@ -563,7 +599,7 @@ ENDEXT
}
}
if (keys(%uniquetimes) == 1) {
- my (%uniquedisplays,%uniquedones,$currdisp);
+ my (%uniquedisplays,%uniquedones,$currdisp,$donebuttontime);
if (keys(%countdowndisp)) {
foreach my $item (values(%countdowndisp)) {
if (exists($uniquedisplays{$item})) {
@@ -577,30 +613,28 @@ ENDEXT
$currdisp = $countdowndisplay[0];
}
}
- &add_countdown_timer($currdisp);
- }
- }
- my $pagebuttonshide;
- if (keys(%buttonshide)) {
- my %uniquebuttonhide;
- foreach my $item (values(%buttonshide)) {
- if (exists($uniquebuttonhide{$item})) {
- $uniquebuttonhide{$item} ++;
- } else {
- $uniquebuttonhide{$item} = 1;
- }
- }
- if (keys(%uniquebuttonhide) == 1) {
- if (lc((keys(%uniquebuttonhide))[0]) eq 'yes') {
- $pagebuttonshide = 'yes';
+ 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
$r->print(&Apache::loncommon::start_page(undef,$allscript,
{'force_register' => 1,
- 'bgcolor' => '#ffffff',
- 'hide_buttons' => $pagebuttonshide}));
+ 'bgcolor' => '#ffffff',}));
# ------------------------------------------------------------------ Start form
if ($nforms) {
my $fmtag = '';
+ my $metainfo =&get_buttons(\%hash,$rid).'
';
unless (($target eq 'tex') || ($target eq 'tex_answer')) {
$r->print('{'src_'.$rid});
@@ -783,7 +817,7 @@ sub get_buttons {
$resid,
$hash->{'src_'.$rid});
unless ($env{'request.role.adv'}) {
- if ($buttonshide->{$symb} eq 'yes') {
+ if (&Apache::lonnet::EXT('resource.0.buttonshide',$symb)) {
return;
}
}
@@ -868,19 +902,23 @@ sub get_buttons {
}
sub add_countdown_timer {
- my ($currdisp) = @_;
- my ($collapse,$expand,$alttxt,$title);
+ my ($currdisp,$donebuttontime) = @_;
+ my ($collapse,$expand,$alttxt,$title,$donebutton);
if ($currdisp eq 'inline') {
$collapse = '► ';
} else {
$expand = '◄ ';
}
+ if ($donebuttontime) {
+ $donebutton = &Apache::lonmenu::done_button_js($donebuttontime);
+ }
unless ($env{'environment.icons'} eq 'iconsonly') {
$alttxt = &mt('Timer');
$title = $alttxt.' ';
}
my $desc = &mt('Countdown to due date/time');
my $output = < |