version 1.447, 2016/05/04 05:54:51
|
version 1.448, 2016/05/13 22:48:05
|
Line 1634 END
|
Line 1634 END
|
# LC_interval_done is true. |
# LC_interval_done is true. |
# |
# |
sub done_button_js { |
sub done_button_js { |
my ($type,$width,$height,$proctor) = @_; |
my ($type,$width,$height,$proctor,$donebuttontext) = @_; |
return unless (($type eq 'map') || ($type eq 'resource')); |
return unless (($type eq 'map') || ($type eq 'resource')); |
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
title => 'WARNING!', |
title => 'WARNING!', |
button => 'Done', |
|
preamble => 'You are trying to end this timed event early.', |
preamble => 'You are trying to end this timed event early.', |
map => 'Confirming that you are done will cause the time to expire and prevent you from changing any answers in the current folder.', |
map => 'Confirming that you are done will cause the time to expire and prevent you from changing any answers in the current folder.', |
resource => 'Confirming that you are done will cause the time to expire for this question, and prevent you from changing your answer(s).', |
resource => 'Confirming that you are done will cause the time to expire for this question, and prevent you from changing your answer(s).', |
Line 1715 sub done_button_js {
|
Line 1714 sub done_button_js {
|
<form method="post" name="LCdoneButton" action=""> |
<form method="post" name="LCdoneButton" action=""> |
<input type="hidden" name="LC_interval_done" value="" /> |
<input type="hidden" name="LC_interval_done" value="" /> |
<input type="hidden" name="LC_interval_done_proctorpass" value="" /> |
<input type="hidden" name="LC_interval_done_proctorpass" value="" /> |
<button id="LC_done-confirm-opener" type="button">$lt{'button'}</button> |
<button id="LC_done-confirm-opener" type="button">$donebuttontext</button> |
</form> |
</form> |
|
|
<div id="LC_done-confirm" title="$lt{'title'}"> |
<div id="LC_done-confirm" title="$lt{'title'}"> |
Line 2501 sub countdown_timer {
|
Line 2500 sub countdown_timer {
|
} |
} |
my $duedate = &Apache::lonnet::EXT("resource.0.duedate"); |
my $duedate = &Apache::lonnet::EXT("resource.0.duedate"); |
my @interval=&Apache::lonnet::EXT("resource.0.interval"); |
my @interval=&Apache::lonnet::EXT("resource.0.interval"); |
my ($timelimit,$usesdone,$proctor,$secret); |
my ($timelimit,$usesdone,$donebuttontext,$proctor,$secret); |
if (@interval > 1) { |
if (@interval > 1) { |
($timelimit,$usesdone,$proctor,$secret) = split(/_/,$interval[0]); |
($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); |
|
} |
my $first_access=&Apache::lonnet::get_first_access($interval[1]); |
my $first_access=&Apache::lonnet::get_first_access($interval[1]); |
if ($first_access > 0) { |
if ($first_access > 0) { |
if ($first_access+$timelimit > time) { |
if ($first_access+$timelimit > time) { |
Line 2521 sub countdown_timer {
|
Line 2528 sub countdown_timer {
|
$collapse = '► '; |
$collapse = '► '; |
if ((@interval > 1) && ($hastimeleft)) { |
if ((@interval > 1) && ($hastimeleft)) { |
if ($usesdone eq 'done') { |
if ($usesdone eq 'done') { |
$donebutton = &done_button_js($interval[1],'','',$proctor); |
$donebutton = &done_button_js($interval[1],'','',$proctor,$donebuttontext); |
} |
} |
} |
} |
} else { |
} else { |