--- loncom/interface/lonparmset.pm	2016/03/02 14:14:06	1.556
+++ loncom/interface/lonparmset.pm	2016/03/15 14:25:26	1.558
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.556 2016/03/02 14:14:06 raeburn Exp $
+# $Id: lonparmset.pm,v 1.558 2016/03/15 14:25:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -759,7 +759,6 @@ sub storeparm_by_symb_inner {
     &Apache::lonnet::expirespread('','','studentcalc');
     if (($snum==13) || ($snum==9) || ($snum==5)) {
         &Apache::lonnet::expirespread('','','assesscalc',$symb);
-#FIXME
     } elsif (($snum==14) || ($snum==10) || ($snum==6)) {
         &Apache::lonnet::expirespread('','','assesscalc',$map);
     } else {
@@ -825,7 +824,7 @@ sub valout {
         }
     } else {
         if ($type eq 'date_interval') {
-            my ($totalsecs,$donebutton) = split(/_/,$value);
+            my ($totalsecs,$donebutton,$proctor,$secretkey) = split(/_/,$value);
             my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($totalsecs);
             my @timer;
             $year=$year-70;
@@ -860,7 +859,11 @@ sub valout {
             }
             $result.=join(", ",@timer);
             if ($donebutton eq 'done') {
-                $result .= ' '.&mt('+ "done"');
+                if ($secretkey) {
+                    $result .= ' '.&mt('+ "done" with proctor key: [_1]',$secretkey);  
+                } else {
+                    $result .= ' '.&mt('+ "done"');
+                }  
             }
         } elsif (&isdateparm($type)) {
             $result = &Apache::lonlocal::locallocaltime($value).
@@ -1126,6 +1129,31 @@ sub ipacc_boxes_js  {
 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 {
     my ($r,$psymb,$crstype) = @_;
 
@@ -2412,13 +2440,16 @@ sub assessparms {
         my $totalstored = 0;
         my $now = time;
         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)$/)) {
                 next if ($csec ne $env{'request.course.sec'});
             }
             if ($markers[$i] =~ /\&(8|7|6|5)$/) {
                 next if ($noeditgrp);
-            } 
+            }
+            if ($markers[$i] =~ /\&(17|11|7|3)$/) {
+                $namematch = 'maplevelrecurse';
+            }
             if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3|4)$/) {
                 my (@ok_slots,@fail_slots,@del_slots);
                 my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
@@ -2505,19 +2536,42 @@ sub assessparms {
                     }
                 }
                 $needsrelease =
-                    $Apache::lonnet::needsrelease{"parameter:$name:$val:$valmatch"};
+                    $Apache::lonnet::needsrelease{"parameter:$name:$val:$valmatch:"};
                 if ($needsrelease) {
                     unless ($got_chostname) {
                         ($chostname,$cmajor,$cminor) = &parameter_release_vars();
                         $got_chostname = 1;
                     } 
-                    $needsnewer = &parameter_releasecheck($name,$val,$valmatch,
+                    $needsnewer = &parameter_releasecheck($name,$val,$valmatch,undef,
                                                           $needsrelease,
                                                           $cmajor,$cminor);
                 }
             }
             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) = &parameter_release_vars();
+                            $got_chostname = 1;
+                        }
+                        $needsnewer = &parameter_releasecheck(undef,undef,undef,$namematch,
+                                                              $needsrelease,
+                                                              $cmajor,$cminor);
+                    } else {
+                        undef($namematch);
+                    }
+                }
+            }
+            if ($needsnewer) {
+                $message .= &oldversion_warning($name,$namematch,$values[$i],$chostname,$cmajor,
                                                 $cminor,$needsrelease);
             } else {
                 $message.=&storeparm(split(/\&/,$markers[$i]),
@@ -3153,7 +3207,7 @@ sub storedata {
         $tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
         }
         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') {
             $data=$env{$key};
             $valmatch = '';
@@ -3234,24 +3288,51 @@ sub storedata {
             $typeof=$env{'form.typeof_'.$thiskey};
             $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);
-            $needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk:$valmatch"};
-            if ($needsrelease) {
-                unless ($got_chostname) {
-                    ($chostname,$cmajor,$cminor)=&parameter_release_vars();
-                    $got_chostname = 1;
+            if ($name ne '') {
+                $needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk:$valmatch:"};
+                if ($needsrelease) {
+                    unless ($got_chostname) {
+                        ($chostname,$cmajor,$cminor)=&parameter_release_vars();
+                        $got_chostname = 1;
+                    }
+                    $needsnewer = &parameter_releasecheck($name,$valchk,$valmatch,undef,
+                                                          $needsrelease,
+                                                          $cmajor,$cminor);
                 }
-                $needsnewer = &parameter_releasecheck($name,$valchk,$valmatch,
-                                                      $needsrelease,
-                                                      $cmajor,$cminor);
+            }
+            if ($namematch ne '') {
                 if ($needsnewer) {
-                    $r->print('<br />'.&oldversion_warning($name,$data,
-                                                           $chostname,$cmajor,
-                                                           $cminor,$needsrelease));
-                    next;
+                    undef($namematch);
+                } else {
+                    my $currneeded;
+                    if ($needsrelease) {
+                        $currneeded = $needsrelease;
+                    }
+                    $needsrelease =
+                        $Apache::lonnet::needsrelease{"parameter::::$namematch"};
+                    if (($needsrelease) && (($currneeded eq '') || ($needsrelease < $currneeded))) {
+                        unless ($got_chostname) {
+                            ($chostname,$cmajor,$cminor) = &parameter_release_vars();
+                            $got_chostname = 1;
+                        }
+                        $needsnewer = &parameter_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 ($tuname) {
@@ -3549,8 +3630,11 @@ sub get_date_interval_from_form {
         $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.'_proctorkey'}) {
+            $seconds .= '_'.$env{'form.done_'.$key.'_proctorkey'};
+        }
     }
     return $seconds;
 }
@@ -3735,7 +3819,7 @@ sub string_selector {
                     ($chostname,$cmajor,$cminor)=&parameter_release_vars();
                     $got_chostname = 1;
                 }
-                my $needsnewer=&parameter_releasecheck($name,$parmval,$parmmatch,
+                my $needsnewer=&parameter_releasecheck($name,$parmval,$parmmatch,undef,
                                                        $needsrelease,$cmajor,$cminor);
                 if ($needsnewer) {
                     if ($parmmatch ne '') {
@@ -3851,12 +3935,14 @@ my %intervals =
     (
      'date_interval'
              => [[ 'done', 'Yes' ],
+                 [ 'done_proctor', 'Yes, with proctor key'],                  
                  [ '', 'No' ]],
     );
 
 my %intervalmatches = (
          'date_interval'
-              => [['done','\d+_done$'],],
+              => [['done','\d+_done$'],
+                  ['done_proctor','\d+_done_proctor_']],
     );
 
 my %intervaltypes = (
@@ -3914,7 +4000,7 @@ sub date_interval_selector {
                     ($chostname,$cmajor,$cminor)=&parameter_release_vars();
                     $got_chostname = 1;
                 }
-                my $needsnewer=&parameter_releasecheck($name,$parmval,$parmmatch,
+                my $needsnewer=&parameter_releasecheck($name,$parmval,$parmmatch,undef,
                                                        $needsrelease,$cmajor,$cminor);
                 if ($needsnewer) {
                     if ($parmmatch ne '') {
@@ -3944,16 +4030,29 @@ sub date_interval_selector {
     if ($name eq 'interval') {
         unless ($skipval{'done'}) {
             my $checkedon = '';
+            my $checkedproc = '';
+            my $currproctorkey = '';
+            my $currprocdisplay = 'hidden';
             my $checkedoff = ' checked="checked"';
             if ($currval =~ /^(\d+)_done$/) {
                 $checkedon = ' checked="checked"';
                 $checkedoff = '';
+            } elsif ($currval =~ /^(?:\d+)_done_proctor_(.+)$/) {
+                $currproctorkey = $1;
+                $checkedproc = ' checked="checked"';
+                $checkedoff = '';
+                $currprocdisplay = 'text';
             }
-            $result .= '<span class="LC_nobreak">'.('&nbsp;' x 3).'('.&mt('Include "done" button').
-                       '<label><input type="radio" value="_done" name="done_'.$thiskey.'"'.$checkedon.' />'.
-                       &mt('Yes').'</label>'.
-                       '<label><input type="radio" value="" name="done_'.$thiskey.'"'.$checkedoff.' />'.
-                       &mt('No').'</label>)</span>';
+            my $onclick = ' onclick="toggleSecret(this.form,'."'done_','$thiskey'".');"';
+            $result .= '<br /><span class="LC_nobreak">'.&mt('Include "done" button').
+                       '<label><input type="radio" value="" name="done_'.$thiskey.'"'.$checkedoff.$onclick.' />'.
+                       &mt('No').'</label>'.('&nbsp;'x2).
+                       '<label><input type="radio" value="_done" name="done_'.$thiskey.'"'.$checkedon.$onclick.' />'.
+                       &mt('Yes').'</label>'.('&nbsp;'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="'.$currproctorkey.'" /></span>';
         }
     }
     unless ($readonly) {
@@ -3963,7 +4062,24 @@ sub date_interval_selector {
 }
 
 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 $stringtype = &get_stringtype($name);
     if ($stringtype ne '') {
@@ -4008,14 +4124,13 @@ sub oldversion_warning {
             }
         }
     }
-    my $standard_name = &standard_parameter_names($name);
     return '<p class="LC_warning">'.
-           &mt('[_1] was [_2]not[_3] set to [_4].',
-               $standard_name,'<b>','</b>','"'.$desc.'"').'<br />'.
-           &mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
-           $cmajor.'.'.$cminor,$chostname,
-           $needsrelease).
-           '</p>';
+       &mt('[_1] was [_2]not[_3] set to [_4].',
+           $standard_name,'<b>','</b>','"'.$desc.'"').'<br />'.
+       &mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
+       $cmajor.'.'.$cminor,$chostname,
+       $needsrelease).
+       '</p>';
 }
 
 }
@@ -4076,6 +4191,7 @@ sub newoverview {
             &toggleparmtextbox_js()."\n".
             &validateparms_js()."\n".
             &ipacc_boxes_js()."\n".
+            &done_proctor_js()."\n".
 '// ]]>
 </script>
 ';
@@ -4275,6 +4391,7 @@ sub overview {
              &toggleparmtextbox_js()."\n".
              &validateparms_js()."\n".
              &ipacc_boxes_js()."\n".
+             &done_proctor_js()."\n".
              '// ]]>'."\n".
              '</script>'."\n";
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
@@ -5177,6 +5294,20 @@ sub standard_parameter_types {
     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 {
     my ($r)=@_;
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -5472,16 +5603,20 @@ sub parameter_release_vars {
 }
 
 sub parameter_releasecheck {
-    my ($name,$value,$valmatch,$needsrelease,$cmajor,$cminor) = @_;
+    my ($name,$value,$valmatch,$namematch,$needsrelease,$cmajor,$cminor) = @_;
     my $needsnewer;
     my ($needsmajor,$needsminor) = split(/\./,$needsrelease);
     if (($cmajor < $needsmajor) || 
         ($cmajor == $needsmajor && $cminor < $needsminor)) {
         $needsnewer = 1;
-    } elsif ($valmatch) {
-        &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.'::'.$valmatch});
-    } elsif ($value) { 
-        &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.':'.$value.':'});
+    } elsif ($name) {
+        if ($valmatch) {
+            &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.'::'.$valmatch.':'});
+        } 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;
 }