--- rat/lonpage.pm 2015/03/11 19:55:44 1.108 +++ rat/lonpage.pm 2015/07/17 19:11:03 1.111 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.108 2015/03/11 19:55:44 raeburn Exp $ +# $Id: lonpage.pm,v 1.111 2015/07/17 19:11:03 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; @@ -187,6 +188,18 @@ sub handler { 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 +229,7 @@ sub handler { my $contents=0; my $nforms=0; my $nuploads=0; + my $ntimers=0; my %turninpaths; my %multiresps; my $turninparent; @@ -369,16 +383,26 @@ 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; + 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; @@ -406,6 +430,59 @@ ENDEXT 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 ($src =~ /$LONCAPA::assess_re/) { + %Apache::lonhomework::history = + &Apache::lonnet::restore($symb,$courseid,$domain,$name); + my $type = 'problem'; + if ($src =~ /\.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) { @@ -462,6 +539,43 @@ 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); + } + } # ------------------------------------------------------------------ Start body $r->print(&Apache::loncommon::start_page(undef,$allscript, {'force_register' => 1, @@ -593,6 +707,10 @@ ENDEXT my $class; if ($nforms > 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__