--- rat/lonpage.pm 2015/07/17 19:48:51 1.112 +++ rat/lonpage.pm 2017/06/21 16:01:40 1.120.4.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.112 2015/07/17 19:48:51 raeburn Exp $ +# $Id: lonpage.pm,v 1.120.4.1 2017/06/21 16:01:40 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}; @@ -192,9 +193,12 @@ 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(); - if (($pagesymb && ($courseid ne '') && ($domain ne '') && ($name ne '')) { + unless ($pagesymb) { + $pagesymb=&Apache::lonnet::symbread($requrl); + } + if ($pagesymb && ($courseid ne '') && ($domain ne '') && ($name ne '')) { my %times=&Apache::lonnet::get('firstaccesstimes', [$courseid."\0".$pagesymb], $domain,$name); @@ -233,9 +237,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; + } } } } @@ -294,11 +301,17 @@ 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{$_}) { @@ -309,9 +322,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, @@ -346,11 +356,14 @@ ENDEXT $posthash{'all_submit'}='yes'; } } + if ($env{'environment.remote'} eq 'on') { + $posthash{'inhibitmenu'} = 'yes'; + } 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; @@ -465,11 +478,11 @@ ENDEXT $output=~ s/\<(input[^\>]+\Qonfocus=\"javascript:disableAutoComplete\E)\(\'([^\']+)\'\)(;\")/\<$1('$idprefix$2')$3/gsi; unless ($hastimer) { - if ($src =~ /$LONCAPA::assess_re/) { + if ($plainsrc =~ /$LONCAPA::assess_re/) { %Apache::lonhomework::history = &Apache::lonnet::restore($symb,$courseid,$domain,$name); my $type = 'problem'; - if ($src =~ /\.task$/) { + if ($extension eq 'task') { $type = 'Task'; } my ($status,$accessmsg,$slot_name,$slot) = @@ -477,7 +490,8 @@ ENDEXT 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 +504,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 +536,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 +565,7 @@ ENDEXT $countdowndisp{$symb} = 'none'; } unless ($donebutton{$symb}) { - $donebutton{$symb} = 0; + $donebutton{$symb} = 0; } } } @@ -598,8 +646,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,16 +674,36 @@ 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); + } + } + 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}); @@ -817,7 +886,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; } } @@ -902,7 +971,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 +979,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');