--- rat/client/parameter.html	2022/03/26 00:50:53	1.64.2.5.4.1
+++ rat/client/parameter.html	2015/09/13 21:48:37	1.68
@@ -5,7 +5,7 @@
 The LearningOnline Network with CAPA
 Parameter Input Window
 //
-// $Id: parameter.html,v 1.64.2.5.4.1 2022/03/26 00:50:53 raeburn Exp $
+// $Id: parameter.html,v 1.68 2015/09/13 21:48:37 raeburn Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -40,8 +40,6 @@ Parameter Input Window
 var ptype='';
 var pvalue='';
 var pmodval='';
-var pextraval='';
-var pextravaltwo='';
 var preturn='';
 var pcode='';
 var pscat='';
@@ -244,66 +242,58 @@ function month() {
 function intminute() {
    var thisminutes=cmins;
     var i;
-    var result = '';
-    result += '<select name="minutes" onchange="parent.intcalc();">';
+    choicewrite('<select name="minutes" onchange="parent.intcalc();">');
     for (i=0;i<=59;i++) {
-        result += '<option value="'+i+'"';
+        choicewrite('<option value="'+i+'"');
         if (i==thisminutes) {
-            result += ' selected="selected"';
+            choicewrite(' selected="selected"');
         }
-        result += '>'+i+'</option>';
+        choicewrite('>'+i+'</option>');
     }
-    result += '</select>';
-    return result;
+    choicewrite('</select>');
 } 
 
 function inthour() {
    var thishours=chours;
     var i;
-    var result = '';
-    result += '<select name="hours" onchange="parent.intcalc();">';
+    choicewrite('<select name="hours" onchange="parent.intcalc();">');
     for (i=0;i<=23;i++) {
-        result += '<option value="'+i+'"';
+        choicewrite('<option value="'+i+'"');
         if (i==thishours) {
-            result += ' selected="selected"';
+            choicewrite(' selected="selected"');
         }
-        result += '>'+i+'</option>';
+        choicewrite('>'+i+'</option>');
     }
-    result += '</select>';
-    return result;
-}
+    choicewrite('</select>');
+} 
 
 function intsecond() {
-    var thisseconds=csecs;
+   var thisseconds=csecs;
     var i;
-    var result = '';
-    result += '<select name="seconds" onchange="parent.intcalc();">';
+    choicewrite('<select name="seconds" onchange="parent.intcalc();">');
     for (i=0;i<=59;i++) {
-        result += '<option value="'+i+'"';
+        choicewrite('<option value="'+i+'"');
         if (i==thisseconds) {
-            result += ' selected="selected"';
+            choicewrite(' selected="selected"');
         }
-        result += '>'+i+'</option>';
+        choicewrite('>'+i+'</option>');
     }
-    result += '</select>';
-    return result;
-}
+    choicewrite('</select>');
+} 
 
 
 function intday() {
    var thisdate=cdays;
     var i;
-    var result ='';
-    result += '<select name="date" onchange="parent.intcalc();">';
+    choicewrite('<select name="date" onchange="parent.intcalc();">');
     for (i=0;i<=31;i++) {
-        result += '<option value="'+i+'"';
+        choicewrite('<option value="'+i+'"');
         if (i==thisdate) {
-            result += ' selected="selected"';
+            choicewrite(' selected="selected"');
         }
-        result += '>'+i+'</option>';
+        choicewrite('>'+i+'</option>');
     }
-    result += '</select>';
-    return result;
+    choicewrite('</select>');
 }
 
 function intcalc() {
@@ -314,100 +304,25 @@ 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) {
-            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;
-                }
-            }
+            svalue += pmodval;
         }
     } 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);
@@ -440,61 +355,6 @@ function stringeval() {
    draw();
 }
 
-function ipstringeval() {
-    var patternIp = /^([\[\]a-zA-Z\.\d\*\-]+)$/;
-    var acctypes = new Array;
-    acctypes = ['allow','deny'];
-    svalue = '';
-    for (var i=0; i<acctypes.length; i++) {
-        var items = choices.document.getElementsByName('setip'+acctypes[i]);
-        if (items.length > 0) {
-            for (var j=0; j<items.length; j++) {
-                if (items[j].type == "text") {
-                    var possip = items[j].value;
-                    possip = possip.replace(/^\s+|\s+$/g,'');
-                    if (patternIp.test(possip)) {
-                        if (acctypes[i] == 'deny') {
-                            possip = '!'+possip;
-                        }
-                        if (svalue == '') {
-                            svalue = possip;
-                        } else {
-                            svalue += ','+possip;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-function addIpRule(iptype) {
-    var frame = window.frames["choices"];
-    if (frame.document.getElementById('LC_string_ipacc_inner_'+iptype)) {
-        var innerDiv = frame.document.getElementById('LC_string_ipacc_inner_'+iptype);
-        var count = innerDiv.childNodes.length
-        var ipDiv = frame.document.createElement('div');
-        ipDiv.innerHTML = '<input type="text" size="10" name="setip'+iptype+'" onblur="parent.ipstringeval();" />'+
-                          '<a href="#" onclick="parent.removeIpRule(\''+iptype+'\',\''+count+'\')">Remove</a>';
-        frame.document.getElementById('LC_string_ipacc_inner_'+iptype).appendChild(ipDiv);
-    }
-    return false;
-}
-
-function removeIpRule(iptype,num) {
-    var frame = window.frames["choices"];
-    if (frame.document.getElementById('LC_string_ipacc_inner_'+iptype)) {
-        var innerDiv = frame.document.getElementById('LC_string_ipacc_inner_'+iptype);
-        for (var i=0; i<innerDiv.childNodes.length; i++) {
-            if (i==num) {
-                innerDiv.removeChild(innerDiv.childNodes[i]);
-                ipstringeval();
-                break;
-            }
-        }
-    }
-}
-
 function radiostringeval(newval) {
    svalue=newval;
    draw();
@@ -505,8 +365,8 @@ function callradiostringeval(newval) {
 }
 
 function callintervalpmodval() {
-    return 'onclick="parent.intcalc();parent.toggleSecret()"';
-}
+    return 'onclick="parent.intcalc()"';
+} 
 
 function intervaldis() {
     csecs=svalue;
@@ -516,7 +376,8 @@ function intervaldis() {
     csecs-=chours*3600;
     cmins=Math.floor(csecs/60);
     csecs-=cmins*60;
-    return cdays+' days '+chours+' hours '+cmins+' mins '+csecs+' secs';
+    choicewrite(cdays+' days '+chours+' hours '
+               +cmins+' mins '+csecs+' secs');
 }
 
 function pickcolor(picked) {
@@ -545,11 +406,7 @@ function draw() {
       choicewrite(' action="javascript:floateval();"');
    }
    if (ptype=='string') {
-      if (pscat == 'ip') {
-          choicewrite(' action="javascript:ipstringeval();"');
-      } else {
-          choicewrite(' action="javascript:stringeval();"');
-      }
+      choicewrite(' action="javascript:stringeval();"');
    }
    if (ptype != 'int' && ptype != 'float' && ptype != 'string') {
        choicewrite(' action=""');
@@ -636,52 +493,26 @@ 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>',
-            '<tr><td>Time:</td><td colspan="2">',
-                '<span style="white-space:nowrap">'+intday()+' days </span>',
-                '<span style="white-space:nowrap">'+inthour()+' hours</span>',
-                '<span style="white-space:nowrap">'+intminute()+' mins</span>',
-                '<span style="white-space:nowrap">'+intsecond()+' secs</span>',
-            '</td></tr>',
-            '</table>',
-            '<br />',
-            ].join("\n"));
+         choicewrite('<tr><td colspan="3">');
+         intervaldis();
+         choicewrite('</td></tr><tr><td>Time:'
+         +'</td><td colspan="2">');
+         intday();choicewrite('days ');
+         inthour();choicewrite('hours ');
+         intminute(); choicewrite('mins '); intsecond();
+         choicewrite('secs</td></tr></table>');
+         choicewrite('<br />');
          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('<span style="white-space:nowrap">'+
-                     '<label><input name="donebutton" value="_done_proctor"'+
+         choicewrite('<label><input name="donebutton" value=""'+
                      ' type="radio" '+callintervalpmodval());
-         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>');
+         if (pmodval != '_done') { choicewrite(' checked="checked"'); }
+         choicewrite(' /> No</label><br />');
          choicewrite('</td></tr></table>');
       } else {
          choicewrite('<tr><td colspan="3">'
@@ -764,7 +595,7 @@ function draw() {
    }
 
    if (ptype=='string') {
-        if ((pscat=='any') || (pscat=='') || (pscat=='default') ||
+        if ((pscat=='any') || (pscat=='') || (pscat=='default') ||  
             (typeof(pscat)=='undefined')) {
            tablestart('Text');
            choicewrite('<tr><td>Value:</td><td colspan="2">');
@@ -833,7 +664,7 @@ function draw() {
            choicewrite('<label><input name="stringval" value="exam"'+
                   ' type="radio" '+callradiostringeval('exam'));
            if (svalue=='exam') { choicewrite(' checked="checked"'); }
-           choicewrite(' /> Exam</label><br />');
+           choicewrite(' /> Bubblesheet Exam</label><br />');
 //         choicewrite('<label><input name="stringval" value="assess"'+
 //              ' type="radio" '+callradiostringeval('assess'));
 //         if (svalue=='assess') { choicewrite(' checked="checked"'); }
@@ -900,51 +731,10 @@ function draw() {
            choicewrite(' /> No</label><br />');
         }
         if (pscat=='ip') {
-            var currallow = new Array;
-            var currdeny = new Array;
-            if ((svalue != '') && (svalue != null)) {
-                var patternComma = /,/;
-                var patternAllow = /^([\[\]a-zA-Z\.\d\*\-]+)$/;
-                var patternDeny = /^\!([\[\]a-zA-Z\.\d\*\-]+)$/;
-                var current = new Array;
-                if (patternComma.test(svalue)) {
-                    current = svalue.split(',');
-                } else {
-                    current = [svalue];
-                }
-                for (var i=0; i<current.length; i++) {
-                    if (patternDeny.test(current[i])) {
-                        var denied = current[i].replace(/^!/,'');
-                        currdeny.push(denied);
-                    } else {
-                        if (patternAllow.test(current[i])) {
-                            currallow.push(current[i]);
-                        }
-                    }
-                }
-            }
-            if (currdeny.length == 0) {
-                currdeny = ('');
-            }
-            if (currallow.length == 0) {
-                currallow = ('');
-            }
-            var curripaccess = [currallow,currdeny];
-            tablestart('IP Number/Name');
-            choicewrite('<tr><th>Allow from</th><th>Deny from</th></tr><tr>');
-            var acctypes = ['allow','deny'];
-            for (var i=0; i<acctypes.length; i++) {
-                choicewrite('<td valign="top">'+
-                            '<div class="LC_string_ipacc_wrap" id="LC_string_ipacc_'+acctypes[i]+'">'+
-                            '<div class="LC_string_ipacc_inner" id="LC_string_ipacc_inner_'+acctypes[i]+'">');
-                for (var j=0; j<curripaccess[i].length; j++) {
-                    choicewrite('<div><input type="text" size="10" name="setip'+acctypes[i]+'" value="'+curripaccess[i][j]+'" onblur="parent.ipstringeval();" />');
-                    choicewrite('<a href="#" onclick="parent.removeIpRule(\''+acctypes[i]+'\',\''+j+'\')">Remove</a>');
-                    choicewrite('</div>');
-                }
-                choicewrite('</div><button onclick="parent.addIpRule(\''+acctypes[i]+'\');">Add item</button>');
-            }
-            choicewrite('</div></td></tr></table>');
+           tablestart('IP Number/Name');
+	   choicewrite('<tr><td>Value:</td><td colspan="2">');
+           choicewrite('<input name="stringval" size="20" value="'+escapeHTML(svalue)+
+                    '" onchange="parent.stringeval()" />');
         }
         if (pscat=='fileext') {
             tablestart('Allowed File Extensions');
@@ -975,15 +765,15 @@ function draw() {
            choicewrite('<label><input name="stringval" value="resource"'+
                   ' type="radio" '+callradiostringeval('resource'));
            if (svalue=='resource') { choicewrite(' checked="checked"'); }
-           choicewrite(' /> Yes, and the scope of the slot is a single resource.</label><br />');
+           choicewrite(' /> Yes, and the scope of student selected slot is a single resource.</label><br />');
            choicewrite('<label><input name="stringval" value="map"'+
                   ' type="radio" '+callradiostringeval('map'));
            if (svalue=='map') { choicewrite(' checked="checked"'); }
-           choicewrite(' /> Yes, and the scope of the slot is the enclosing map/folder. When checking in, it applies to only one resource.</label><br />');
+           choicewrite(' /> Yes, and the scope of student selected slot is the enclosing map/folder. When checking in, it applies to only one resource.</label><br />');
            choicewrite('<label><input name="stringval" value="map_map"'+
                   ' type="radio" '+callradiostringeval('map_map'));
            if (svalue=='map_map') { choicewrite(' checked="checked"'); }
-           choicewrite(' /> Yes, and the scope of the slot is the enclosing map/folder. When checking in, all resources in the map/folder are checked in.</label><br />');
+           choicewrite(' /> Yes, and the scope of student selected slot is the enclosing map/folder. When checking in, all resources in the map/folder are checked in.</label><br />');
         choicewrite('</td></tr></table>');
       }
    }
@@ -1075,10 +865,7 @@ function assemble() {
 function init() {
   var i;
   var subs=new Array();
-  var doneRegExp = /_done(|\:[^\:]+\:)/;
-  var doneproctorRegExp = /_done(|\:[^\:]+\:)_proctor/;
-  var proctorkeyRegExp = /^(\d+)_(.+)$/;
-  var donetextRegExp = /\:([^\:]+)\:/;
+  var doneRegExp = /_done/;
   var namevalue=this.window.location.search.split('&');
   namevalue[0]=namevalue[0].substr(1,namevalue[0].length-1);
 
@@ -1109,44 +896,10 @@ function init() {
   }
 
   if (ptype=='date' && pscat == 'interval') {
-      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;
-          }
+      if (doneRegExp.test(pvalue)) {
+          var pnumval = pvalue.replace(doneRegExp,'');
+          pmodval = pvalue.match(doneRegExp);
+          pvalue = pnumval;
       }
   }
   svalue=pvalue;
@@ -1270,12 +1023,8 @@ function init() {
   var targ='parent.opener';
   if (pmodal==1) {
      targ='parent.parent';
-  }
-  if ((ptype=='date') && (pscat=='interval')) {
-      selwrite('<a href="javascript:parent.validateInterval();');
-  } else {
-      selwrite('<a href="javascript:parent.assemble();');
-  }
+  }  
+  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;');
@@ -1302,7 +1051,7 @@ function init() {
   selwrite('</body></html>');
   this.window.selector.document.close();
   draw();
-
+  
 }
 
 // ]]>