--- rat/client/parameter.html	2015/11/21 00:16:09	1.69
+++ rat/client/parameter.html	2016/05/13 22:48:14	1.71
@@ -5,7 +5,7 @@
 The LearningOnline Network with CAPA
 Parameter Input Window
 //
-// $Id: parameter.html,v 1.69 2015/11/21 00:16:09 musolffc Exp $
+// $Id: parameter.html,v 1.71 2016/05/13 22:48:14 raeburn Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -40,6 +40,8 @@ Parameter Input Window
 var ptype='';
 var pvalue='';
 var pmodval='';
+var pextraval='';
+var pextravaltwo='';
 var preturn='';
 var pcode='';
 var pscat='';
@@ -269,7 +271,7 @@ function inthour() {
     }
     result += '</select>';
     return result;
-} 
+}
 
 function intsecond() {
     var thisseconds=csecs;
@@ -312,25 +314,100 @@ function intcalc() {
              sform.seconds.options[sform.seconds.selectedIndex].value*1;
     if ((ptype=='date') && (pscat=='interval')) {
         var newpmodval = '';
+        var newpextraval = '';
+        var newpextravaltwo = 'Done';
         if (sform.donebutton.length) {
             for (var i=0; i<sform.donebutton.length; i++) {
                 if (sform.donebutton[i].checked) {
                     if (sform.donebutton[i].value == '_done') {
                         newpmodval = sform.donebutton[i].value;
+                        newpextravaltwo = sform.donebutton_text.value;
+                    } else {
+                        if (sform.donebutton[i].value == '_done_proctor') { 
+                            newpmodval = sform.donebutton[i].value;
+                            newpextraval = sform.donebutton_proctorkey.value;
+                            newpextravaltwo = sform.donebutton_text.value;
+                            newpextravaltwo = newpextravaltwo.replace(/:/g,'');
+                        }
                     }
                 }
             }
         }
         pmodval = newpmodval;
+        pextraval = newpextraval;
+        pextravaltwo = newpextravaltwo;
         draw();
         if (pmodval) {
-            svalue += pmodval;
+            var doneRegExp = /^(_done)(|_proctor)$/;
+            var donevals = pmodval.match(doneRegExp);
+            if (donevals.length == 3) {
+                svalue += donevals[1];
+            }
+            if (newpextravaltwo) {
+                if (newpextravaltwo != 'Done') { 
+                    svalue += ':'+newpextravaltwo+':';
+                }
+            }
+            if (donevals[2] != '') {
+                svalue += donevals[2];
+                if (pextraval != '') {
+                    svalue += '_'+pextraval;
+                }
+            }
         }
     } else {
         draw();
     }
 }
 
+function toggleSecret() {
+    var sform=choices.document.forms.sch;
+    if (sform.donebutton.length) {
+        for (var i=0; i<sform.donebutton.length; i++) {
+            if (sform.donebutton[i].checked) {
+                if (sform.donebutton[i].value == '') {
+                    if (document.getElementById('donebuttontextdiv')) {
+                        document.getElementById('donebuttontextdiv').style.display='none';
+                    }
+                } else {
+                    if (document.getElementById('donebuttontextdiv')) {
+                        document.getElementById('donebuttontextdiv').style.display='block';
+                    }
+                }
+                if (sform.donebutton[i].value == '_done_proctor') {
+                    if (document.getElementById('done_proctorkey')) {
+                        document.getElementById('done_proctorkey').type='text';
+                    }
+                } else {
+                    if (document.getElementById('done_proctorkey')) {
+                        document.getElementById('done_proctorkey').type='hidden';
+                        document.getElementById('done_proctorkey').value='';
+                    }
+                }
+            }
+        }
+    }
+}
+
+function validateInterval() {
+    var sform=choices.document.forms.sch;
+    if (sform.donebutton.length) {
+        for (var i=0; i<sform.donebutton.length; i++) {
+            if (sform.donebutton[i].checked) {
+                if (sform.donebutton[i].value == '_done_proctor') {
+                    if ((sform.donebutton_proctorkey.value == '') || 
+                        (sform.donebutton_proctorkey.value == null)) {
+                        alert('Please provide a key for a proctor to enter when a student uses the "Done" button.');
+                        return;
+                    }
+                }
+            }
+        }
+    }
+    intcalc();
+    assemble();
+}
+
 function integereval() {
    svalue=choices.document.forms.sch.intval.value;
    svalue=Math.round(svalue);
@@ -373,7 +450,7 @@ function callradiostringeval(newval) {
 }
 
 function callintervalpmodval() {
-    return 'onclick="parent.intcalc()"';
+    return 'onclick="parent.intcalc();parent.toggleSecret()"';
 } 
 
 function intervaldis() {
@@ -500,6 +577,15 @@ function draw() {
          tablestart('Date and time');
       }
       if (pscat=='interval') {
+         var proctorkeytype = 'hidden'; 
+         var donebuttontext = 'none';
+         if (pmodval == '_done_proctor') {
+             proctorkeytype = 'text';
+             donebuttontext = 'block';
+         }
+         if (pmodval == '_done') {
+             donebuttontext = 'block';
+         }
          tablestart('Time interval');
          choicewrite( [
             '<tr><td colspan="3">'+intervaldis()+'</td></tr>',
@@ -514,14 +600,29 @@ function draw() {
             ].join("\n"));
          tablestart('Provide a "Done" button to students?');
          choicewrite('<tr><td>Value:</td><td colspan="2">');
+         choicewrite('<label><input name="donebutton" value=""'+
+                     ' type="radio" '+callintervalpmodval());
+         if (pmodval == '') { choicewrite(' checked="checked"'); }
+         choicewrite(' /> No</label><br />');
          choicewrite('<label><input name="donebutton" value="_done"'+
                      ' type="radio" '+callintervalpmodval());
-         if (pmodval =='_done') { choicewrite(' checked="checked"'); }
+         if (pmodval == '_done') { choicewrite(' checked="checked"'); }
          choicewrite(' /> Yes</label><br />');
-         choicewrite('<label><input name="donebutton" value=""'+
+         choicewrite('<span style="white-space:nowrap">'+
+                     '<label><input name="donebutton" value="_done_proctor"'+
                      ' type="radio" '+callintervalpmodval());
-         if (pmodval != '_done') { choicewrite(' checked="checked"'); }
-         choicewrite(' /> No</label><br />');
+         if (pmodval == '_done_proctor') { choicewrite(' checked="checked"'); }
+         choicewrite(' /> Yes, with proctor key</label>');
+         choicewrite('&nbsp;<input name="donebutton_proctorkey" value='+
+                     '"'+escapeHTML(pextraval)+'" type="'+proctorkeytype+
+                     '" id="done_proctorkey" size="10"'+
+                     ' onblur="parent.intcalc();" /></span><br />'+
+                     '<div id="donebuttontextdiv" style="display:'+donebuttontext+'">'+
+                     '<br /><span style="white-space:nowrap">'+
+                     'Button text:'+
+                     '<input name="donebutton_text" value='+
+                     '"'+escapeHTML(pextravaltwo)+'" type="text" '+
+                     'size="10" onblur="parent.intcalc();" /></span></div>');
          choicewrite('</td></tr></table>');
       } else {
          choicewrite('<tr><td colspan="3">'
@@ -874,7 +975,10 @@ function assemble() {
 function init() {
   var i;
   var subs=new Array();
-  var doneRegExp = /_done/;
+  var doneRegExp = /_done(|\:[^\:]+\:)/;
+  var doneproctorRegExp = /_done(|\:[^\:]+\:)_proctor/;
+  var proctorkeyRegExp = /^(\d+)_(.+)$/;
+  var donetextRegExp = /\:([^\:]+)\:/;
   var namevalue=this.window.location.search.split('&');
   namevalue[0]=namevalue[0].substr(1,namevalue[0].length-1);
 
@@ -905,10 +1009,44 @@ function init() {
   }
 
   if (ptype=='date' && pscat == 'interval') {
-      if (doneRegExp.test(pvalue)) {
-          var pnumval = pvalue.replace(doneRegExp,'');
-          pmodval = pvalue.match(doneRegExp);
-          pvalue = pnumval;
+      if (doneproctorRegExp.test(pvalue)) {
+          var current = pvalue.match(doneproctorRegExp);
+          if (current.length == 2) {
+              var textstr = current[1];
+              if (textstr != '') {
+                  var textvals = textstr.match(donetextRegExp);
+                  if (textvals.length == 2) {
+                      pextravaltwo = textvals[1];
+                  }
+              }
+          }
+          var intervalwithkey = pvalue.replace(doneproctorRegExp,'');
+          if (proctorkeyRegExp.test(intervalwithkey)) {
+              var currvals = intervalwithkey.match(proctorkeyRegExp);
+              if (currvals.length == 3) {
+                  pvalue = currvals[1];
+                  pextraval = currvals[2];
+                  pmodval = '_done_proctor';
+              } else {
+                  pmodval = '';
+              }
+          }
+      } else {
+          if (doneRegExp.test(pvalue)) {
+              var current = pvalue.match(doneRegExp); 
+              if (current.length == 2) {
+                  var textstr = current[1];
+                  if (textstr != '') {
+                      var textvals = textstr.match(donetextRegExp);
+                      if (textvals.length == 2) {
+                          pextravaltwo = textvals[1];
+                      }
+                  }
+              }
+              var pnumval = pvalue.replace(doneRegExp,'');
+              pmodval = '_done';
+              pvalue = pnumval;
+          }
       }
   }
   svalue=pvalue;
@@ -1032,8 +1170,12 @@ function init() {
   var targ='parent.opener';
   if (pmodal==1) {
      targ='parent.parent';
-  }  
-  selwrite('<a href="javascript:parent.assemble();');
+  }
+  if ((ptype=='date') && (pscat=='interval')) {
+      selwrite('<a href="javascript:parent.validateInterval();');
+  } else {
+      selwrite('<a href="javascript:parent.assemble();');
+  }
   if (preturn!='') {
      selwrite(targ+'.document.'+preturn+'_value.value=parent.window.svalue;');
      selwrite(targ+'.document.'+preturn+'_type.value=parent.window.stype;');