--- rat/lonpage.pm 2014/12/30 20:03:19 1.107 +++ rat/lonpage.pm 2018/03/01 13:25:46 1.111.2.5 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.107 2014/12/30 20:03:19 raeburn Exp $ +# $Id: lonpage.pm,v 1.111.2.5 2018/03/01 13:25:46 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,6 +40,7 @@ use Apache::lonhtmlcommon; use Apache::lonxml(); use Apache::lonlocal; use Apache::lonmenu; +use Apache::lonhomework; use HTML::TokeParser; use GDBM_File; use Apache::lonsequence; @@ -182,11 +183,24 @@ 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}; my $lastres=$hash{'map_finish_'.$requrl}; if (($firstres) && ($lastres)) { +# ------------------------------------------------------------- Countdown Timer + my $now = time; + my ($pagefirstaccess,%hastimeleft,%countdowndisp); + my ($pagesymb,$courseid,$domain,$name)=&Apache::lonnet::whichuser(); + if ($pagesymb && ($courseid ne '') && ($domain ne '') && ($name ne '')) { + my %times=&Apache::lonnet::get('firstaccesstimes', + [$courseid."\0".$pagesymb], + $domain,$name); + if ($times{$courseid."\0".$pagesymb} =~ /^\d+$/) { + $pagefirstaccess = $times{$courseid."\0".$pagesymb}; + } + } # ----------------------------------------------------------------- Render page @rows=(); @@ -216,6 +230,7 @@ sub handler { my $contents=0; my $nforms=0; my $nuploads=0; + my $ntimers=0; my %turninpaths; my %multiresps; my $turninparent; @@ -246,11 +261,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{$_}) { @@ -261,11 +282,8 @@ 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 $prefix='p_'.$_.'_'; + my $idprefix='p_'.join('_',($mapid,$resid,'')); my %posthash=('request.prefix' => $prefix, 'LONCAPA_INTERNAL_no_discussion' => 'true', 'symb' => $symb); @@ -298,11 +316,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; @@ -369,16 +390,28 @@ ENDEXT } $output=~s/\<\/body\>.*//si; if ($output=~/\
]*\>//gsi; $output=~s/\<\/form[^\>]*\>//gsi; if ($output=~/\]+name\s*=\s*[\'\"]*HWFILE/) { $nuploads++; } + if ($output=~/\]+name\s*=\s*[\'\"]*accessbutton/) { + $ntimers++; + $hastimer = 1; + } $output=~ s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi; $output=~ s/\<((?:input|select|button|textarea)[^\>]+)id\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 id="$idprefix$2" $3\>/gsi; + $output=~ + s/(\Qthis.form.elements['\E)(HW(?:VAL|CHK)_[^']+\'\]\.(?:value=\'|checked))/$1$prefix$2/gsi; + if ($hastimer) { + $output=~ + s/\<(input[^\>]+name=\Q"$prefix\Eaccessbutton"[^\>]+)(?:\Qdocument.markaccess.submit();\E)([^\>]*)\>/\<$1pageTimer(this.form,'$prefix')$2\>/gsi; + $output=~ s/\<(input[^\>]+name=\Q"$prefix\Emarkaccess"[^\>]+value=["'])(?:yes)(['"][^\>]*)\>/\<$1$2\>/gsi; + } if ($matheditor eq 'dragmath') { $output=~ s/(\Qjavascript:LC_mathedit_\E)(HWVAL_)([^'"]+?)(\(['"]*)(\QHWVAL_\E\3['"]\)\;void\(0\)\;)/$1$idprefix$2$3$4$idprefix$5/g; @@ -404,6 +437,61 @@ ENDEXT } $output=~ s/\<((?:input|select)[^\>]+\Qjavascript:setSubmittedPart\E)\(\s*[\'\"]([^\'\"]+)[\'\"]*\s*\)/\<$1('$2','$prefix')/gsi; + $output=~ + s/\<(input[^\>]+\Qonfocus=\"javascript:disableAutoComplete\E)\(\'([^\']+)\'\)(;\")/\<$1('$idprefix$2')$3/gsi; + unless ($hastimer) { + if ($plainsrc =~ /$LONCAPA::assess_re/) { + %Apache::lonhomework::history = + &Apache::lonnet::restore($symb,$courseid,$domain,$name); + my $type = 'problem'; + if ($extension eq 'task') { + $type = 'Task'; + } + my ($status,$accessmsg,$slot_name,$slot) = + &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') && + (($probstatus eq 'no') || ($probstatus eq 'no_feedback_ever')))) { + my ($slothastime,$timerhastime); + if ($slot_name ne '') { + if (ref($slot) eq 'HASH') { + if (($slot->{'starttime'} < $now) && + ($slot->{'endtime'} > $now)) { + $slothastime = $now - $slot->{'endtime'}; + } + } + } + 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); + if ($first_access > 0) { + my $timeremains = $first_access+$interval[0] - $now; + if ($timeremains > 0) { + $timerhastime = $timeremains; + } + } + } + if (($duedate && $duedate > $now) || + (!$duedate && $timerhastime > 0) || + ($slot_name ne '' && $slothastime)) { + if ((@interval > 1 && $timerhastime) || + ($type eq 'Task' && $slothastime)) { + $countdowndisp{$symb} = 'inline'; + if ((@interval > 1) && ($timerhastime)) { + $hastimeleft{$symb} = $timerhastime; + } else { + $hastimeleft{$symb} = $slothastime; + } + } else { + $hastimeleft{$symb} = $duedate - $now; + $countdowndisp{$symb} = 'none'; + } + } + } + } + } } $thisdir=~s/\/[^\/]*$//; foreach (@rlinks) { @@ -429,7 +517,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()); @@ -460,10 +548,64 @@ ENDEXT ); $allscript .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args); } + if ($ntimers) { + $allscript .= '\n"; + } + if (keys(%hastimeleft)) { + my (%uniquetimes,%uniquedisplays); + foreach my $item (values(%hastimeleft)) { + if (exists($uniquetimes{$item})) { + $uniquetimes{$item} ++; + } else { + $uniquetimes{$item} = 1; + } + } + if (keys(%uniquetimes) == 1) { + my (%uniquedisplays,%uniquedones,$currdisp); + if (keys(%countdowndisp)) { + foreach my $item (values(%countdowndisp)) { + if (exists($uniquedisplays{$item})) { + $uniquedisplays{$item} ++; + } else { + $uniquedisplays{$item} = 1; + } + } + my @countdowndisplay = keys(%uniquedisplays); + if (scalar(@countdowndisplay) == 1) { + $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'; + } + } + } # ------------------------------------------------------------------ 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(' 1) { $class = ' class="LC_hwk_submit"'; + if ($ntimers) { + $nforms = 1; + $class = ''; + } } $r->print( ' + +$collapse + + + +$expand +$alttxt$title +END + &Apache::lonhtmlcommon::clear_breadcrumb_tools(); + &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$output); + return; +} + + 1; __END__