--- rat/lonpage.pm 2014/12/30 20:03:19 1.107 +++ rat/lonpage.pm 2020/01/18 01:09:11 1.129 @@ -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.129 2020/01/18 01:09:11 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,6 +40,9 @@ use Apache::lonhtmlcommon; use Apache::lonxml(); use Apache::lonlocal; use Apache::lonmenu; +use Apache::lonhomework; +use Apache::lonparmset; +use Apache::lonenc(); use HTML::TokeParser; use GDBM_File; use Apache::lonsequence; @@ -182,11 +185,33 @@ sub handler { if (($env{'request.course.fn'}) && (!$env{'form.forceselect'})) { my $fn=$env{'request.course.fn'}; if (-e "$fn.db") { + my %buttonshide; + my $hostname = $r->hostname(); 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,%donebutton, + %donebtnextra,%buttonbytime,$donetime,$symbtosetdone); + my ($pagesymb,$courseid,$domain,$name)=&Apache::lonnet::whichuser(); + 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); + 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=(); @@ -204,6 +229,27 @@ 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') && ($pagefirstaccess)) { + my ($timelimit) = ($interval[0] =~ /^(\d+)/); + if ($timelimit) { + if ($pagefirstaccess + $timelimit > $now) { + $symbtosetdone = $symb; + } + } + } + } + } + } } } } @@ -216,6 +262,7 @@ sub handler { my $contents=0; my $nforms=0; my $nuploads=0; + my $ntimers=0; my %turninpaths; my %multiresps; my $turninparent; @@ -237,6 +284,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++) { @@ -246,11 +303,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 +324,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); @@ -278,31 +338,36 @@ ENDEXT $posthash{'rndseed'}=$env{'form.rndseed'}; $posthash{'answer_output_mode'} = $env{'form.answer_output_mode'}; } - my $submitted=exists($env{'form.all_submit'}); + my $submitted=$env{'form.all_submit_pressed'}; if (!$submitted) { foreach my $key (keys(%env)) { - if ($key=~/^form.\Q$prefix\Esubmit_/) { - $submitted=1;last; + if ($key=~/^\Qform.$prefix\Esubmit_(.+)_pressed$/) { + if ($env{$key}) { + $submitted=1; + last; + } } - } + } } if ($submitted) { foreach my $key (keys(%env)) { - if ($key=~/^form.\Q$prefix\E/) { + if ($key=~/^\Qform.$prefix\E/) { my $name=$key; - $name=~s/^form.\Q$prefix\E//; + $name=~s/^\Qform.$prefix\E//; $posthash{$name}=$env{$key}; - } + } } - if (exists($env{'form.all_submit'})) { + if ($env{'form.all_submit_pressed'}) { $posthash{'all_submit'}='yes'; } - } + } elsif ($env{'form.'.$prefix.'markaccess'} eq 'yes') { + $posthash{'markaccess'} = $env{'form.'.$prefix.'markaccess'}; + } 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 +434,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; @@ -393,8 +470,6 @@ ENDEXT $output=~ s/(\Q)/$1$idprefix$2$3$4/g; if ($nuploads) { - $output=~ - s/\<(input[^\>]+name=\"\Q$prefix\EHWFILE[^\>]+)\s*id\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\)]*)\>/\<$1 id="$prefix$2" $3\>/gsi; ($turninpaths{$prefix},$multiresps{$prefix}) = &Apache::loncommon::get_turnedin_filepath($symb,$env{'user.name'},$env{'user.domain'}); if ($turninparent eq '') { @@ -404,6 +479,102 @@ 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'))) || + (($status eq 'NOT_YET_VIEWED') && ($posthash{'markaccess'} eq 'yes'))) { + 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; + 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 ($timelimit) = ($interval[0] =~ /^(\d+)/); + if ($timelimit) { + my $timeremains = $timelimit + $first_access - $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; + if ($pagefirstaccess) { + 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; + } + } else { + $hastimeleft{$symb} = $duedate - $now; + $countdowndisp{$symb} = 'none'; + } + unless ($donebutton{$symb}) { + $donebutton{$symb} = 0; + } + } + } + } + } } $thisdir=~s/\/[^\/]*$//; foreach (@rlinks) { @@ -452,7 +623,9 @@ ENDEXT "\n\n"; } if (($nforms) && ($nuploads)) { - $allscript .= &Apache::lonhtmlcommon::file_submissionchk_js(\%turninpaths,\%multiresps); + $allscript .= &Apache::lonhtmlcommon::file_submissionchk_js(\%turninpaths,\%multiresps). + ''; } if (($nforms) && (&Apache::lonhtmlcommon::htmlareabrowser())) { my %textarea_args = ( @@ -460,10 +633,83 @@ 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 (scalar(keys(%uniquetimes)) == 1) { + my (%uniquedisplays,%uniquedones,$currdisp,$donebuttontime, + $donebuttonextras); + 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]; + } + } + 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]; + if (ref($buttonbytime{$donebuttontime}) eq 'ARRAY') { + $donebuttonextras = $donebtnextra{$buttonbytime{$donebuttontime}->[0]}; + } + } + } + } + &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,$hostname).'
'; unless (($target eq 'tex') || ($target eq 'tex_answer')) { $r->print(' 1) { $class = ' class="LC_hwk_submit"'; + if ($ntimers) { + $nforms = 1; + $class = ''; + } } $r->print( ''. + ''. ''); } @@ -633,7 +885,7 @@ ENDEXT } sub get_buttons { - my ($hash,$rid) = @_; + my ($hash,$rid,$buttonshide,$hostname) = @_; my $metainfo = ''; my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid}); @@ -641,6 +893,11 @@ sub get_buttons { my $symb=&Apache::lonnet::encode_symb($hash->{'map_id_'.$mapid}, $resid, $hash->{'src_'.$rid}); + unless ($env{'request.role.adv'}) { + if ($buttonshide->{$symb} eq 'yes') { + return; + } + } if ($hash->{'encrypted_'.$rid}) { $symb=&Apache::lonenc::encrypted($symb); $esrc=&Apache::lonenc::encrypted($esrc); @@ -698,29 +955,110 @@ sub get_buttons { ''; } } - if (($env{'request.course.id'}) && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) { + if ($env{'request.course.id'}) { my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; my $file=&Apache::lonnet::declutter($hash->{'src_'.$rid}); - my ($cfile,$home,$switchserver,$forceedit,$forceview) = - &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,$hash->{'src_'.$rid},$symb); - if ($cfile ne '') { - my $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver, - $forceedit,1,$symb,undef, - &escape($env{'form.title'})); - if ($jscall) { + my $editbutton = ''; + if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { + my ($cfile,$home,$switchserver,$forceedit,$forceview) = + &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,$hash->{'src_'.$rid},$symb); + if ($cfile ne '') { + my $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver, + $forceedit,1,$symb,undef, + &escape($env{'form.title'}), + $hostname); + if ($jscall) { + $editbutton = 1; + my $icon = 'pcstr.png'; + my $label = &mt('Edit'); + my $title = &mt('Edit this resource'); + my $pic = ''.$label.''; + $metainfo .= ' '.$pic.''; + } + } + } + if ((!$editbutton) && ($file=~/$LONCAPA::assess_re/)) { + my $url = &Apache::lonnet::clutter($file); + my $viewsrcbutton; + if ((&Apache::lonnet::allowed('cre','/')) && + (&Apache::lonnet::metadata($url,'sourceavail') eq 'open')) { + $viewsrcbutton = 1; + } elsif (&Apache::lonnet::allowed('vxc',$env{'request.course.id'})) { + if ($url =~ m{^\Q/res/$cdom/\E($LONCAPA::match_username)/}) { + my $auname = $1; + if (($env{'request.course.adhocsrcaccess'} ne '') && + (grep(/^\Q$auname\E$/,split(/,/,$env{'request.course.adhocsrcaccess'})))) { + $viewsrcbutton = 1; + } + } + } + if ($viewsrcbutton) { my $icon = 'pcstr.png'; - my $label = &mt('Edit'); - my $title = &mt('Edit this resource'); + my $label = &mt('View Source'); + my $title = &mt('View source code'); + my $jsrid = $rid; + $jsrid =~ s/\./_/g; + my $showurl = &escape(&Apache::lonenc::check_encrypt($url)); my $pic = ''.$label.''; - $metainfo .= ' '.$pic.''; + $metainfo .= ' '.$pic.''."\n". + '\n"; } } } return $metainfo; } +sub add_countdown_timer { + my ($currdisp,$donebuttontime,$donebuttonextras) = @_; + my ($collapse,$expand,$alttxt,$title,$donebutton); + if ($currdisp eq 'inline') { + $collapse = '► '; + } else { + $expand = '◄ '; + } + if ($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'); + $title = $alttxt.' '; + } + my $desc = &mt('Countdown to due date/time'); + my $output = < + +$collapse + + + +$expand +$alttxt$title +END + &Apache::lonhtmlcommon::clear_breadcrumb_tools(); + &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$output); + return; +} + + 1; __END__