--- rat/lonpage.pm 2016/05/30 03:02:37 1.114
+++ rat/lonpage.pm 2016/10/29 05:29:39 1.119
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Page Handler
#
-# $Id: lonpage.pm,v 1.114 2016/05/30 03:02:37 raeburn Exp $
+# $Id: lonpage.pm,v 1.119 2016/10/29 05:29:39 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -184,6 +184,7 @@ 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};
@@ -305,6 +306,11 @@ sub handler {
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{$_}) {
@@ -315,9 +321,6 @@ 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,
@@ -355,8 +358,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;
@@ -479,7 +482,7 @@ ENDEXT
$type = 'Task';
}
my ($status,$accessmsg,$slot_name,$slot) =
- &Apache::lonhomework::check_slot_access('0',$type,$symb,$pagesymb);
+ &Apache::lonhomework::check_slot_access('0',$type,$symb);
undef(%Apache::lonhomework::history);
my $probstatus = &Apache::lonnet::EXT("resource.0.problemstatus",$symb);
if (($status eq 'CAN_ANSWER') || (($status eq 'CANNOT_ANSWER') &&
@@ -498,32 +501,25 @@ ENDEXT
my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb);
if (@interval > 1) {
my $first_access;
- if ($first_access > 0) {
- 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 ($interval[1] eq 'map') {
+ my $ignorecache;
+ if ($env{'form.'.$prefix.'markaccess'} eq 'yes') {
+ $ignorecache = 1;
}
- if ($first_access > 0) {
- my ($timelimit) = ($interval[0] =~ /^(\d+)/);
- if ($timelimit) {
- my $timeremains = $timelimit + $first_access - $now;
- if ($timeremains > 0) {
- $timerhastime = $timeremains;
- }
- }
+ $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 ($timelimit) = ($interval[0] =~ /^(\d+)/);
- my $timeremains = $first_access+$timelimit - $now;
- if ($timeremains > 0) {
- $timerhastime = $timeremains;
+ if ($timelimit) {
+ my $timeremains = $timelimit + $first_access - $now;
+ if ($timeremains > 0) {
+ $timerhastime = $timeremains;
+ }
}
}
}
@@ -683,10 +679,27 @@ ENDEXT
&add_countdown_timer($currdisp,$donebuttontime,$donebuttonextras);
}
}
+ 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';
+ }
+ }
+ }
# ------------------------------------------------------------------ Start body
$r->print(&Apache::loncommon::start_page(undef,$allscript,
{'force_register' => 1,
- 'bgcolor' => '#ffffff',}));
+ 'bgcolor' => '#ffffff',
+ 'hide_buttons' => $pagebuttonshide}));
# ------------------------------------------------------------------ Start form
if ($nforms) {
my $fmtag = '';
+ my $metainfo =&get_buttons(\%hash,$rid,\%buttonshide).'
';
unless (($target eq 'tex') || ($target eq 'tex_answer')) {
$r->print('{'src_'.$rid});
@@ -869,7 +882,7 @@ sub get_buttons {
$resid,
$hash->{'src_'.$rid});
unless ($env{'request.role.adv'}) {
- if (&Apache::lonnet::EXT('resource.0.buttonshide',$symb)) {
+ if ($buttonshide->{$symb} eq 'yes') {
return;
}
}
@@ -969,6 +982,7 @@ sub add_countdown_timer {
$type = $donebuttonextras->{'type'};
} else {
$donebuttontext = &mt('Done');
+ $type = 'map';
}
$donebutton =
&Apache::lonmenu::done_button_js($type,'','',$proctor,$donebuttontext);
|