version 1.112, 2015/07/17 19:48:51
|
version 1.121, 2017/02/20 18:29:33
|
Line 184 sub handler {
|
Line 184 sub handler {
|
if (($env{'request.course.fn'}) && (!$env{'form.forceselect'})) { |
if (($env{'request.course.fn'}) && (!$env{'form.forceselect'})) { |
my $fn=$env{'request.course.fn'}; |
my $fn=$env{'request.course.fn'}; |
if (-e "$fn.db") { |
if (-e "$fn.db") { |
|
my %buttonshide; |
if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) { |
if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) { |
# ------------------------------------------------------------------- Hash tied |
# ------------------------------------------------------------------- Hash tied |
my $firstres=$hash{'map_start_'.$requrl}; |
my $firstres=$hash{'map_start_'.$requrl}; |
Line 192 sub handler {
|
Line 193 sub handler {
|
# ------------------------------------------------------------- Countdown Timer |
# ------------------------------------------------------------- Countdown Timer |
my $now = time; |
my $now = time; |
my ($pagefirstaccess,%hastimeleft,%countdowndisp,%donebutton, |
my ($pagefirstaccess,%hastimeleft,%countdowndisp,%donebutton, |
$donetime,$symbtosetdone); |
%donebtnextra,%buttonbytime,$donetime,$symbtosetdone); |
my ($pagesymb,$courseid,$domain,$name)=&Apache::lonnet::whichuser(); |
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', |
my %times=&Apache::lonnet::get('firstaccesstimes', |
[$courseid."\0".$pagesymb], |
[$courseid."\0".$pagesymb], |
$domain,$name); |
$domain,$name); |
Line 233 sub handler {
|
Line 237 sub handler {
|
if ($src =~ /$LONCAPA::assess_re/) { |
if ($src =~ /$LONCAPA::assess_re/) { |
my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb); |
my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb); |
if (@interval > 1) { |
if (@interval > 1) { |
if ($interval[1] eq 'map') { |
if (($interval[1] eq 'map') && ($pagefirstaccess)) { |
if ($pagefirstaccess + $interval[0] > $now) { |
my ($timelimit) = ($interval[0] =~ /^(\d+)/); |
$symbtosetdone = $symb; |
if ($timelimit) { |
|
if ($pagefirstaccess + $timelimit > $now) { |
|
$symbtosetdone = $symb; |
|
} |
} |
} |
} |
} |
} |
} |
Line 294 sub handler {
|
Line 301 sub handler {
|
$lcm*=($#colcont+1)/euclid($lcm,($#colcont+1)); |
$lcm*=($#colcont+1)/euclid($lcm,($#colcont+1)); |
foreach (@colcont) { |
foreach (@colcont) { |
my $src=$hash{'src_'.$_}; |
my $src=$hash{'src_'.$_}; |
|
my $plainsrc = $src; |
my ($extension)=($src=~/\.(\w+)$/); |
my ($extension)=($src=~/\.(\w+)$/); |
$cellexternal{$_}=($hash{'ext_'.$_} eq 'true:'); |
$cellexternal{$_}=($hash{'ext_'.$_} eq 'true:'); |
if ($hash{'encrypted_'.$_}) { |
if ($hash{'encrypted_'.$_}) { |
$src=&Apache::lonenc::encrypted($src); |
$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{$_}= |
$cellemb{$_}= |
&Apache::loncommon::fileembstyle($extension); |
&Apache::loncommon::fileembstyle($extension); |
if ($cellexternal{$_}) { |
if ($cellexternal{$_}) { |
Line 309 ENDEXT
|
Line 322 ENDEXT
|
} |
} |
} elsif ($cellemb{$_} eq 'ssi') { |
} elsif ($cellemb{$_} eq 'ssi') { |
# --------------------------------------------------------- This is an SSI cell |
# --------------------------------------------------------- This is an SSI cell |
my ($mapid,$resid)=split(/\./,$_); |
|
my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src); |
|
|
|
my $prefix=$_.'_'; |
my $prefix=$_.'_'; |
my $idprefix= join('_',($mapid,$resid,'')); |
my $idprefix= join('_',($mapid,$resid,'')); |
my %posthash=('request.prefix' => $prefix, |
my %posthash=('request.prefix' => $prefix, |
Line 349 ENDEXT
|
Line 359 ENDEXT
|
my $output=Apache::lonnet::ssi($src,%posthash); |
my $output=Apache::lonnet::ssi($src,%posthash); |
$output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+?// END LON-CAPA Internal\s*(-->)?\s||gs; |
$output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+?// END LON-CAPA Internal\s*(-->)?\s||gs; |
if (($target eq 'tex') || ($target eq 'tex_answer')) { |
if (($target eq 'tex') || ($target eq 'tex_answer')) { |
$output =~ s/^([^&]+)\\begin{document}//; |
$output =~ s/^([^&]+)\\begin\{document}//; |
$output =~ s/\\end{document}//; |
$output =~ s/\\end\{document}//; |
# $output = '\parbox{\minipagewidth}{ '.$output.' }'; |
# $output = '\parbox{\minipagewidth}{ '.$output.' }'; |
#some additional cleanup necessary for LateX (due to limitations of table environment |
#some additional cleanup necessary for LateX (due to limitations of table environment |
$output =~ s/(\\vskip\s*\d+mm)\s*(\\\\)+/$1/g; |
$output =~ s/(\\vskip\s*\d+mm)\s*(\\\\)+/$1/g; |
Line 465 ENDEXT
|
Line 475 ENDEXT
|
$output=~ |
$output=~ |
s/\<(input[^\>]+\Qonfocus=\"javascript:disableAutoComplete\E)\(\'([^\']+)\'\)(;\")/\<$1('$idprefix$2')$3/gsi; |
s/\<(input[^\>]+\Qonfocus=\"javascript:disableAutoComplete\E)\(\'([^\']+)\'\)(;\")/\<$1('$idprefix$2')$3/gsi; |
unless ($hastimer) { |
unless ($hastimer) { |
if ($src =~ /$LONCAPA::assess_re/) { |
if ($plainsrc =~ /$LONCAPA::assess_re/) { |
%Apache::lonhomework::history = |
%Apache::lonhomework::history = |
&Apache::lonnet::restore($symb,$courseid,$domain,$name); |
&Apache::lonnet::restore($symb,$courseid,$domain,$name); |
my $type = 'problem'; |
my $type = 'problem'; |
if ($src =~ /\.task$/) { |
if ($extension eq 'task') { |
$type = 'Task'; |
$type = 'Task'; |
} |
} |
my ($status,$accessmsg,$slot_name,$slot) = |
my ($status,$accessmsg,$slot_name,$slot) = |
Line 477 ENDEXT
|
Line 487 ENDEXT
|
undef(%Apache::lonhomework::history); |
undef(%Apache::lonhomework::history); |
my $probstatus = &Apache::lonnet::EXT("resource.0.problemstatus",$symb); |
my $probstatus = &Apache::lonnet::EXT("resource.0.problemstatus",$symb); |
if (($status eq 'CAN_ANSWER') || (($status eq 'CANNOT_ANSWER') && |
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); |
my ($slothastime,$timerhastime); |
if ($slot_name ne '') { |
if ($slot_name ne '') { |
if (ref($slot) eq 'HASH') { |
if (ref($slot) eq 'HASH') { |
Line 490 ENDEXT
|
Line 501 ENDEXT
|
my $duedate = &Apache::lonnet::EXT("resource.0.duedate",$symb); |
my $duedate = &Apache::lonnet::EXT("resource.0.duedate",$symb); |
my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb); |
my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb); |
if (@interval > 1) { |
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) { |
if ($first_access > 0) { |
my $timeremains = $first_access+$interval[0] - $now; |
my ($timelimit) = ($interval[0] =~ /^(\d+)/); |
if ($timeremains > 0) { |
if ($timelimit) { |
$timerhastime = $timeremains; |
my $timeremains = $timelimit + $first_access - $now; |
|
if ($timeremains > 0) { |
|
$timerhastime = $timeremains; |
|
} |
} |
} |
} |
} |
} |
} |
Line 507 ENDEXT
|
Line 533 ENDEXT
|
if ((@interval > 1) && ($timerhastime)) { |
if ((@interval > 1) && ($timerhastime)) { |
$hastimeleft{$symb} = $timerhastime; |
$hastimeleft{$symb} = $timerhastime; |
if ($pagefirstaccess) { |
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 { |
} else { |
$hastimeleft{$symb} = $slothastime; |
$hastimeleft{$symb} = $slothastime; |
Line 517 ENDEXT
|
Line 562 ENDEXT
|
$countdowndisp{$symb} = 'none'; |
$countdowndisp{$symb} = 'none'; |
} |
} |
unless ($donebutton{$symb}) { |
unless ($donebutton{$symb}) { |
$donebutton{$symb} = 0; |
$donebutton{$symb} = 0; |
} |
} |
} |
} |
} |
} |
Line 598 ENDEXT
|
Line 643 ENDEXT
|
$uniquetimes{$item} = 1; |
$uniquetimes{$item} = 1; |
} |
} |
} |
} |
if (keys(%uniquetimes) == 1) { |
if (scalar(keys(%uniquetimes)) == 1) { |
my (%uniquedisplays,%uniquedones,$currdisp,$donebuttontime); |
my (%uniquedisplays,%uniquedones,$currdisp,$donebuttontime, |
|
$donebuttonextras); |
if (keys(%countdowndisp)) { |
if (keys(%countdowndisp)) { |
foreach my $item (values(%countdowndisp)) { |
foreach my $item (values(%countdowndisp)) { |
if (exists($uniquedisplays{$item})) { |
if (exists($uniquedisplays{$item})) { |
Line 625 ENDEXT
|
Line 671 ENDEXT
|
if (scalar(@donebuttons) == 1) { |
if (scalar(@donebuttons) == 1) { |
if ($donebuttons[0]) { |
if ($donebuttons[0]) { |
$donebuttontime = $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 |
# ------------------------------------------------------------------ Start body |
$r->print(&Apache::loncommon::start_page(undef,$allscript, |
$r->print(&Apache::loncommon::start_page(undef,$allscript, |
{'force_register' => 1, |
{'force_register' => 1, |
'bgcolor' => '#ffffff',})); |
'bgcolor' => '#ffffff', |
|
'hide_buttons' => $pagebuttonshide})); |
# ------------------------------------------------------------------ Start form |
# ------------------------------------------------------------------ Start form |
if ($nforms) { |
if ($nforms) { |
my $fmtag = '<form name="lonhomework" method="post" enctype="multipart/form-data"'; |
my $fmtag = '<form name="lonhomework" method="post" enctype="multipart/form-data"'; |
Line 680 ENDEXT
|
Line 746 ENDEXT
|
my $avespan=$lcm/($#colcont+1); |
my $avespan=$lcm/($#colcont+1); |
for ($j=0;$j<=$#colcont;$j++) { |
for ($j=0;$j<=$#colcont;$j++) { |
my $rid=$colcont[$j]; |
my $rid=$colcont[$j]; |
my $metainfo =&get_buttons(\%hash,$rid).'<br />'; |
my $metainfo =&get_buttons(\%hash,$rid,\%buttonshide).'<br />'; |
unless (($target eq 'tex') || ($target eq 'tex_answer')) { |
unless (($target eq 'tex') || ($target eq 'tex_answer')) { |
$r->print('<td colspan="'.$avespan.'"'); |
$r->print('<td colspan="'.$avespan.'"'); |
} |
} |
Line 808 ENDEXT
|
Line 874 ENDEXT
|
} |
} |
|
|
sub get_buttons { |
sub get_buttons { |
my ($hash,$rid) = @_; |
my ($hash,$rid,$buttonshide) = @_; |
|
|
my $metainfo = ''; |
my $metainfo = ''; |
my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid}); |
my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid}); |
Line 817 sub get_buttons {
|
Line 883 sub get_buttons {
|
$resid, |
$resid, |
$hash->{'src_'.$rid}); |
$hash->{'src_'.$rid}); |
unless ($env{'request.role.adv'}) { |
unless ($env{'request.role.adv'}) { |
if (&Apache::lonnet::EXT('resource.0.buttonshide',$symb)) { |
if ($buttonshide->{$symb} eq 'yes') { |
return; |
return; |
} |
} |
} |
} |
Line 885 sub get_buttons {
|
Line 951 sub get_buttons {
|
my ($cfile,$home,$switchserver,$forceedit,$forceview) = |
my ($cfile,$home,$switchserver,$forceedit,$forceview) = |
&Apache::lonnet::can_edit_resource($file,$cnum,$cdom,$hash->{'src_'.$rid},$symb); |
&Apache::lonnet::can_edit_resource($file,$cnum,$cdom,$hash->{'src_'.$rid},$symb); |
if ($cfile ne '') { |
if ($cfile ne '') { |
|
my $hostname = $r->hostname(); |
my $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver, |
my $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver, |
$forceedit,1,$symb,undef, |
$forceedit,1,$symb,undef, |
&escape($env{'form.title'})); |
&escape($env{'form.title'}), |
|
$hostname); |
if ($jscall) { |
if ($jscall) { |
my $icon = 'pcstr.png'; |
my $icon = 'pcstr.png'; |
my $label = &mt('Edit'); |
my $label = &mt('Edit'); |
Line 902 sub get_buttons {
|
Line 970 sub get_buttons {
|
} |
} |
|
|
sub add_countdown_timer { |
sub add_countdown_timer { |
my ($currdisp,$donebuttontime) = @_; |
my ($currdisp,$donebuttontime,$donebuttonextras) = @_; |
my ($collapse,$expand,$alttxt,$title,$donebutton); |
my ($collapse,$expand,$alttxt,$title,$donebutton); |
if ($currdisp eq 'inline') { |
if ($currdisp eq 'inline') { |
$collapse = '► '; |
$collapse = '► '; |
Line 910 sub add_countdown_timer {
|
Line 978 sub add_countdown_timer {
|
$expand = '◄ '; |
$expand = '◄ '; |
} |
} |
if ($donebuttontime) { |
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') { |
unless ($env{'environment.icons'} eq 'iconsonly') { |
$alttxt = &mt('Timer'); |
$alttxt = &mt('Timer'); |