version 1.556, 2016/03/02 14:14:06
|
version 1.559, 2016/05/13 22:48:05
|
Line 759 sub storeparm_by_symb_inner {
|
Line 759 sub storeparm_by_symb_inner {
|
&Apache::lonnet::expirespread('','','studentcalc'); |
&Apache::lonnet::expirespread('','','studentcalc'); |
if (($snum==13) || ($snum==9) || ($snum==5)) { |
if (($snum==13) || ($snum==9) || ($snum==5)) { |
&Apache::lonnet::expirespread('','','assesscalc',$symb); |
&Apache::lonnet::expirespread('','','assesscalc',$symb); |
#FIXME |
|
} elsif (($snum==14) || ($snum==10) || ($snum==6)) { |
} elsif (($snum==14) || ($snum==10) || ($snum==6)) { |
&Apache::lonnet::expirespread('','','assesscalc',$map); |
&Apache::lonnet::expirespread('','','assesscalc',$map); |
} else { |
} else { |
Line 825 sub valout {
|
Line 824 sub valout {
|
} |
} |
} else { |
} else { |
if ($type eq 'date_interval') { |
if ($type eq 'date_interval') { |
my ($totalsecs,$donebutton) = split(/_/,$value); |
my ($totalsecs,$donesuffix) = split(/_/,$value,2); |
|
my ($usesdone,$donebuttontext,$proctor,$secretkey); |
|
if ($donesuffix =~ /^done\:([^\:]+)\:(.*)$/) { |
|
$donebuttontext = $1; |
|
(undef,$proctor,$secretkey) = split(/_/,$2); |
|
$usesdone = 'done'; |
|
} elsif ($donesuffix =~ /^done(|_.+)$/) { |
|
$donebuttontext = &mt('Done'); |
|
($usesdone,$proctor,$secretkey) = split(/_/,$donesuffix); |
|
} |
my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($totalsecs); |
my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($totalsecs); |
my @timer; |
my @timer; |
$year=$year-70; |
$year=$year-70; |
Line 859 sub valout {
|
Line 867 sub valout {
|
push(@timer,&mt('[quant,_1,sec]',0)); |
push(@timer,&mt('[quant,_1,sec]',0)); |
} |
} |
$result.=join(", ",@timer); |
$result.=join(", ",@timer); |
if ($donebutton eq 'done') { |
if ($usesdone eq 'done') { |
$result .= ' '.&mt('+ "done"'); |
if ($secretkey) { |
|
$result .= ' '.&mt('+ "[_1]" with proctor key: [_2]',$donebuttontext,$secretkey); |
|
} else { |
|
$result .= ' + "'.$donebuttontext.'"'; |
|
} |
} |
} |
} elsif (&isdateparm($type)) { |
} elsif (&isdateparm($type)) { |
$result = &Apache::lonlocal::locallocaltime($value). |
$result = &Apache::lonlocal::locallocaltime($value). |
Line 1126 sub ipacc_boxes_js {
|
Line 1138 sub ipacc_boxes_js {
|
END |
END |
} |
} |
|
|
|
sub done_proctor_js { |
|
return <<"END"; |
|
function toggleSecret(form,radio,key) { |
|
var radios = form[radio+key]; |
|
if (radios.length) { |
|
for (var i=0; i<radios.length; i++) { |
|
if (radios[i].checked) { |
|
if (radios[i].value == '_done_proctor') { |
|
if (document.getElementById('done_'+key+'_proctorkey')) { |
|
document.getElementById('done_'+key+'_proctorkey').type='text'; |
|
} |
|
} else { |
|
if (document.getElementById('done_'+key+'_proctorkey')) { |
|
document.getElementById('done_'+key+'_proctorkey').type='hidden'; |
|
document.getElementById('done_'+key+'_proctorkey').value=''; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
END |
|
|
|
} |
|
|
sub startpage { |
sub startpage { |
my ($r,$psymb,$crstype) = @_; |
my ($r,$psymb,$crstype) = @_; |
|
|
Line 2412 sub assessparms {
|
Line 2449 sub assessparms {
|
my $totalstored = 0; |
my $totalstored = 0; |
my $now = time; |
my $now = time; |
for (my $i=0;$i<=$#markers;$i++) { |
for (my $i=0;$i<=$#markers;$i++) { |
my ($needsrelease,$needsnewer,$name); |
my ($needsrelease,$needsnewer,$name,$namematch); |
if (($env{'request.course.sec'} ne '') && ($markers[$i] =~ /\&(9|10|11|12)$/)) { |
if (($env{'request.course.sec'} ne '') && ($markers[$i] =~ /\&(9|10|11|12)$/)) { |
next if ($csec ne $env{'request.course.sec'}); |
next if ($csec ne $env{'request.course.sec'}); |
} |
} |
if ($markers[$i] =~ /\&(8|7|6|5)$/) { |
if ($markers[$i] =~ /\&(8|7|6|5)$/) { |
next if ($noeditgrp); |
next if ($noeditgrp); |
} |
} |
|
if ($markers[$i] =~ /\&(17|11|7|3)$/) { |
|
$namematch = 'maplevelrecurse'; |
|
} |
if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3|4)$/) { |
if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3|4)$/) { |
my (@ok_slots,@fail_slots,@del_slots); |
my (@ok_slots,@fail_slots,@del_slots); |
my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom); |
my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom); |
Line 2505 sub assessparms {
|
Line 2545 sub assessparms {
|
} |
} |
} |
} |
$needsrelease = |
$needsrelease = |
$Apache::lonnet::needsrelease{"parameter:$name:$val:$valmatch"}; |
$Apache::lonnet::needsrelease{"parameter:$name:$val:$valmatch:"}; |
if ($needsrelease) { |
if ($needsrelease) { |
unless ($got_chostname) { |
unless ($got_chostname) { |
($chostname,$cmajor,$cminor) = ¶meter_release_vars(); |
($chostname,$cmajor,$cminor) = ¶meter_release_vars(); |
$got_chostname = 1; |
$got_chostname = 1; |
} |
} |
$needsnewer = ¶meter_releasecheck($name,$val,$valmatch, |
$needsnewer = ¶meter_releasecheck($name,$val,$valmatch,undef, |
$needsrelease, |
$needsrelease, |
$cmajor,$cminor); |
$cmajor,$cminor); |
} |
} |
} |
} |
if ($needsnewer) { |
if ($needsnewer) { |
$message .= &oldversion_warning($name,$values[$i],$chostname,$cmajor, |
undef($namematch); |
|
} else { |
|
my $currneeded; |
|
if ($needsrelease) { |
|
$currneeded = $needsrelease; |
|
} |
|
if ($namematch) { |
|
$needsrelease = |
|
$Apache::lonnet::needsrelease{"parameter::::$namematch"}; |
|
if (($needsrelease) && (($currneeded eq '') || ($needsrelease < $currneeded))) { |
|
unless ($got_chostname) { |
|
($chostname,$cmajor,$cminor) = ¶meter_release_vars(); |
|
$got_chostname = 1; |
|
} |
|
$needsnewer = ¶meter_releasecheck(undef,undef,undef,$namematch, |
|
$needsrelease, |
|
$cmajor,$cminor); |
|
} else { |
|
undef($namematch); |
|
} |
|
} |
|
} |
|
if ($needsnewer) { |
|
$message .= &oldversion_warning($name,$namematch,$values[$i],$chostname,$cmajor, |
$cminor,$needsrelease); |
$cminor,$needsrelease); |
} else { |
} else { |
$message.=&storeparm(split(/\&/,$markers[$i]), |
$message.=&storeparm(split(/\&/,$markers[$i]), |
Line 3153 sub storedata {
|
Line 3216 sub storedata {
|
$tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./; |
$tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./; |
} |
} |
if ($cmd eq 'set' || $cmd eq 'datepointer' || $cmd eq 'dateinterval') { |
if ($cmd eq 'set' || $cmd eq 'datepointer' || $cmd eq 'dateinterval') { |
my ($data, $typeof, $text, $name, $valchk, $valmatch); |
my ($data, $typeof, $text, $name, $valchk, $valmatch, $namematch); |
if ($cmd eq 'set') { |
if ($cmd eq 'set') { |
$data=$env{$key}; |
$data=$env{$key}; |
$valmatch = ''; |
$valmatch = ''; |
Line 3234 sub storedata {
|
Line 3297 sub storedata {
|
$typeof=$env{'form.typeof_'.$thiskey}; |
$typeof=$env{'form.typeof_'.$thiskey}; |
$text = &mt('Saved modified date for'); |
$text = &mt('Saved modified date for'); |
} |
} |
if ($name ne '') { |
if ($thiskey =~ m{\.(?:sequence|page)___\(rec\)}) { |
|
$namematch = 'maplevelrecurse'; |
|
} |
|
if (($name ne '') || ($namematch ne '')) { |
my ($needsrelease,$needsnewer); |
my ($needsrelease,$needsnewer); |
$needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk:$valmatch"}; |
if ($name ne '') { |
if ($needsrelease) { |
$needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk:$valmatch:"}; |
unless ($got_chostname) { |
if ($needsrelease) { |
($chostname,$cmajor,$cminor)=¶meter_release_vars(); |
unless ($got_chostname) { |
$got_chostname = 1; |
($chostname,$cmajor,$cminor)=¶meter_release_vars(); |
|
$got_chostname = 1; |
|
} |
|
$needsnewer = ¶meter_releasecheck($name,$valchk,$valmatch,undef, |
|
$needsrelease, |
|
$cmajor,$cminor); |
} |
} |
$needsnewer = ¶meter_releasecheck($name,$valchk,$valmatch, |
} |
$needsrelease, |
if ($namematch ne '') { |
$cmajor,$cminor); |
|
if ($needsnewer) { |
if ($needsnewer) { |
$r->print('<br />'.&oldversion_warning($name,$data, |
undef($namematch); |
$chostname,$cmajor, |
} else { |
$cminor,$needsrelease)); |
my $currneeded; |
next; |
if ($needsrelease) { |
|
$currneeded = $needsrelease; |
|
} |
|
$needsrelease = |
|
$Apache::lonnet::needsrelease{"parameter::::$namematch"}; |
|
if (($needsrelease) && (($currneeded eq '') || ($needsrelease < $currneeded))) { |
|
unless ($got_chostname) { |
|
($chostname,$cmajor,$cminor) = ¶meter_release_vars(); |
|
$got_chostname = 1; |
|
} |
|
$needsnewer = ¶meter_releasecheck(undef,$valchk,$valmatch,$namematch, |
|
$needsrelease,$cmajor,$cminor); |
|
} else { |
|
undef($namematch); |
|
} |
} |
} |
} |
} |
|
if ($needsnewer) { |
|
$r->print('<br />'.&oldversion_warning($name,$namematch,$data, |
|
$chostname,$cmajor, |
|
$cminor,$needsrelease)); |
|
next; |
|
} |
} |
} |
if (defined($data) and $$olddata{$thiskey} ne $data) { |
if (defined($data) and $$olddata{$thiskey} ne $data) { |
if ($tuname) { |
if ($tuname) { |
Line 3549 sub get_date_interval_from_form {
|
Line 3639 sub get_date_interval_from_form {
|
$seconds += $env{'form.'.$name.'_'.$key} * $factor; |
$seconds += $env{'form.'.$name.'_'.$key} * $factor; |
} |
} |
} |
} |
if (($key =~ /\.interval$/) && ($env{'form.done_'.$key} eq '_done')) { |
if (($key =~ /\.interval$/) && (($env{'form.done_'.$key} eq '_done') || ($env{'form.done_'.$key} eq '_done_proctor'))) { |
$seconds .= $env{'form.done_'.$key}; |
if ($env{'form.done_'.$key.'_buttontext'}) { |
|
$env{'form.done_'.$key.'_buttontext'} =~ s/\://g; |
|
$seconds .= '_done:'.$env{'form.done_'.$key.'_buttontext'}.':'; |
|
if ($env{'form.done_'.$key} eq '_done_proctor') { |
|
$seconds .= '_proctor'; |
|
} |
|
} else { |
|
$seconds .= $env{'form.done_'.$key}; |
|
} |
|
if (($env{'form.done_'.$key} eq '_done_proctor') && |
|
($env{'form.done_'.$key.'_proctorkey'})) { |
|
$seconds .= '_'.$env{'form.done_'.$key.'_proctorkey'}; |
|
} |
} |
} |
return $seconds; |
return $seconds; |
} |
} |
Line 3735 sub string_selector {
|
Line 3837 sub string_selector {
|
($chostname,$cmajor,$cminor)=¶meter_release_vars(); |
($chostname,$cmajor,$cminor)=¶meter_release_vars(); |
$got_chostname = 1; |
$got_chostname = 1; |
} |
} |
my $needsnewer=¶meter_releasecheck($name,$parmval,$parmmatch, |
my $needsnewer=¶meter_releasecheck($name,$parmval,$parmmatch,undef, |
$needsrelease,$cmajor,$cminor); |
$needsrelease,$cmajor,$cminor); |
if ($needsnewer) { |
if ($needsnewer) { |
if ($parmmatch ne '') { |
if ($parmmatch ne '') { |
Line 3851 my %intervals =
|
Line 3953 my %intervals =
|
( |
( |
'date_interval' |
'date_interval' |
=> [[ 'done', 'Yes' ], |
=> [[ 'done', 'Yes' ], |
|
[ 'done_proctor', 'Yes, with proctor key'], |
[ '', 'No' ]], |
[ '', 'No' ]], |
); |
); |
|
|
my %intervalmatches = ( |
my %intervalmatches = ( |
'date_interval' |
'date_interval' |
=> [['done','\d+_done$'],], |
=> [['done','\d+_done(|\:[^\:]+\:)$'], |
|
['done_proctor','\d+_done(|\:[^\:]+\:)_proctor_']], |
); |
); |
|
|
my %intervaltypes = ( |
my %intervaltypes = ( |
Line 3914 sub date_interval_selector {
|
Line 4018 sub date_interval_selector {
|
($chostname,$cmajor,$cminor)=¶meter_release_vars(); |
($chostname,$cmajor,$cminor)=¶meter_release_vars(); |
$got_chostname = 1; |
$got_chostname = 1; |
} |
} |
my $needsnewer=¶meter_releasecheck($name,$parmval,$parmmatch, |
my $needsnewer=¶meter_releasecheck($name,$parmval,$parmmatch,undef, |
$needsrelease,$cmajor,$cminor); |
$needsrelease,$cmajor,$cminor); |
if ($needsnewer) { |
if ($needsnewer) { |
if ($parmmatch ne '') { |
if ($parmmatch ne '') { |
Line 3944 sub date_interval_selector {
|
Line 4048 sub date_interval_selector {
|
if ($name eq 'interval') { |
if ($name eq 'interval') { |
unless ($skipval{'done'}) { |
unless ($skipval{'done'}) { |
my $checkedon = ''; |
my $checkedon = ''; |
|
my $checkedproc = ''; |
|
my $currproctorkey = ''; |
|
my $currprocdisplay = 'hidden'; |
|
my $currdonetext = &mt('Done'); |
my $checkedoff = ' checked="checked"'; |
my $checkedoff = ' checked="checked"'; |
if ($currval =~ /^(\d+)_done$/) { |
if ($currval =~ /^(?:\d+)_done$/) { |
$checkedon = ' checked="checked"'; |
$checkedon = ' checked="checked"'; |
$checkedoff = ''; |
$checkedoff = ''; |
|
} elsif ($currval =~ /^(?:\d+)_done\:([^\:]+)\:$/) { |
|
$currdonetext = $1; |
|
$checkedon = ' checked="checked"'; |
|
$checkedoff = ''; |
|
} elsif ($currval =~ /^(?:\d+)_done_proctor_(.+)$/) { |
|
$currproctorkey = $1; |
|
$checkedproc = ' checked="checked"'; |
|
$checkedoff = ''; |
|
$currprocdisplay = 'text'; |
|
} elsif ($currval =~ /^(?:\d+)_done\:([^\:]+)\:_proctor_(.+)$/) { |
|
$currdonetext = $1; |
|
$currproctorkey = $2; |
|
$checkedproc = ' checked="checked"'; |
|
$checkedoff = ''; |
|
$currprocdisplay = 'text'; |
} |
} |
$result .= '<span class="LC_nobreak">'.(' ' x 3).'('.&mt('Include "done" button'). |
my $onclick = ' onclick="toggleSecret(this.form,'."'done_','$thiskey'".');"'; |
'<label><input type="radio" value="_done" name="done_'.$thiskey.'"'.$checkedon.' />'. |
$result .= '<br /><span class="LC_nobreak">'.&mt('Include "done" button'). |
&mt('Yes').'</label>'. |
'<label><input type="radio" value="" name="done_'.$thiskey.'"'.$checkedoff.$onclick.' />'. |
'<label><input type="radio" value="" name="done_'.$thiskey.'"'.$checkedoff.' />'. |
&mt('No').'</label>'.(' 'x2). |
&mt('No').'</label>)</span>'; |
'<label><input type="radio" value="_done" name="done_'.$thiskey.'"'.$checkedon.$onclick.' />'. |
|
&mt('Yes').'</label>'.(' 'x2). |
|
'<label><input type="radio" value="_done_proctor" name="done_'.$thiskey.'"'.$checkedproc.$onclick.' />'. |
|
&mt('Yes, with proctor key').'</label>'. |
|
'<input type="'.$currprocdisplay.'" id="done_'.$thiskey.'_proctorkey" '. |
|
'name="done_'.$thiskey.'_proctorkey" value="'.&HTML::Entities::encode($currproctorkey,'"<>&').'" /></span><br />'. |
|
'<span class="LC_nobreak">'.&mt('Button text').': '. |
|
'<input type="text" name="done_'.$thiskey.'_buttontext" value="'.&HTML::Entities::encode($currdonetext,'"<>&').'" /></span>'; |
} |
} |
} |
} |
unless ($readonly) { |
unless ($readonly) { |
Line 3963 sub date_interval_selector {
|
Line 4093 sub date_interval_selector {
|
} |
} |
|
|
sub oldversion_warning { |
sub oldversion_warning { |
my ($name,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_; |
my ($name,$namematch,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_; |
|
my $standard_name = &standard_parameter_names($name); |
|
if ($namematch) { |
|
my $level = &standard_parameter_levels($namematch); |
|
my $msg = ''; |
|
if ($level) { |
|
$msg = &mt('[_1] was [_2]not[_3] set at the level of: [_4].', |
|
$standard_name,'<b>','</b>','"'.$level.'"'); |
|
} else { |
|
$msg = &mt('[_1] was [_2]not[_3] set.', |
|
$standard_name,'<b>','</b>'); |
|
} |
|
return '<p class="LC_warning">'.$msg.'<br />'. |
|
&mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).', |
|
$cmajor.'.'.$cminor,$chostname, |
|
$needsrelease). |
|
'</p>'; |
|
} |
my $desc; |
my $desc; |
my $stringtype = &get_stringtype($name); |
my $stringtype = &get_stringtype($name); |
if ($stringtype ne '') { |
if ($stringtype ne '') { |
Line 4008 sub oldversion_warning {
|
Line 4155 sub oldversion_warning {
|
} |
} |
} |
} |
} |
} |
my $standard_name = &standard_parameter_names($name); |
|
return '<p class="LC_warning">'. |
return '<p class="LC_warning">'. |
&mt('[_1] was [_2]not[_3] set to [_4].', |
&mt('[_1] was [_2]not[_3] set to [_4].', |
$standard_name,'<b>','</b>','"'.$desc.'"').'<br />'. |
$standard_name,'<b>','</b>','"'.$desc.'"').'<br />'. |
&mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).', |
&mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).', |
$cmajor.'.'.$cminor,$chostname, |
$cmajor.'.'.$cminor,$chostname, |
$needsrelease). |
$needsrelease). |
'</p>'; |
'</p>'; |
} |
} |
|
|
} |
} |
Line 4076 sub newoverview {
|
Line 4222 sub newoverview {
|
&toggleparmtextbox_js()."\n". |
&toggleparmtextbox_js()."\n". |
&validateparms_js()."\n". |
&validateparms_js()."\n". |
&ipacc_boxes_js()."\n". |
&ipacc_boxes_js()."\n". |
|
&done_proctor_js()."\n". |
'// ]]> |
'// ]]> |
</script> |
</script> |
'; |
'; |
Line 4275 sub overview {
|
Line 4422 sub overview {
|
&toggleparmtextbox_js()."\n". |
&toggleparmtextbox_js()."\n". |
&validateparms_js()."\n". |
&validateparms_js()."\n". |
&ipacc_boxes_js()."\n". |
&ipacc_boxes_js()."\n". |
|
&done_proctor_js()."\n". |
'// ]]>'."\n". |
'// ]]>'."\n". |
'</script>'."\n"; |
'</script>'."\n"; |
&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview', |
&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview', |
Line 5177 sub standard_parameter_types {
|
Line 5325 sub standard_parameter_types {
|
return; |
return; |
} |
} |
|
|
|
sub standard_parameter_levels { |
|
my ($name)=@_; |
|
my %levels = ( |
|
'resourcelevel' => 'a single resource', |
|
'maplevel' => 'the enclosing map/folder', |
|
'maplevelrecurse' => 'the enclosing map/folder (recursive into sub-folders)', |
|
'courselevel' => 'the general (course) level', |
|
); |
|
if ($levels{$name}) { |
|
return $levels{$name}; |
|
} |
|
return; |
|
} |
|
|
sub parm_change_log { |
sub parm_change_log { |
my ($r)=@_; |
my ($r)=@_; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
Line 5472 sub parameter_release_vars {
|
Line 5634 sub parameter_release_vars {
|
} |
} |
|
|
sub parameter_releasecheck { |
sub parameter_releasecheck { |
my ($name,$value,$valmatch,$needsrelease,$cmajor,$cminor) = @_; |
my ($name,$value,$valmatch,$namematch,$needsrelease,$cmajor,$cminor) = @_; |
my $needsnewer; |
my $needsnewer; |
my ($needsmajor,$needsminor) = split(/\./,$needsrelease); |
my ($needsmajor,$needsminor) = split(/\./,$needsrelease); |
if (($cmajor < $needsmajor) || |
if (($cmajor < $needsmajor) || |
($cmajor == $needsmajor && $cminor < $needsminor)) { |
($cmajor == $needsmajor && $cminor < $needsminor)) { |
$needsnewer = 1; |
$needsnewer = 1; |
} elsif ($valmatch) { |
} elsif ($name) { |
&Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.'::'.$valmatch}); |
if ($valmatch) { |
} elsif ($value) { |
&Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.'::'.$valmatch.':'}); |
&Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.':'.$value.':'}); |
} elsif ($value) { |
|
&Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.':'.$value.'::'}); |
|
} |
|
} elsif ($namematch) { |
|
&Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter::::'.$namematch}); |
} |
} |
return $needsnewer; |
return $needsnewer; |
} |
} |