--- rat/client/parameter.html	2010/02/28 23:48:10	1.57
+++ rat/client/parameter.html	2016/05/21 22:59:58	1.75
@@ -5,7 +5,7 @@
 The LearningOnline Network with CAPA
 Parameter Input Window
 //
-// $Id: parameter.html,v 1.57 2010/02/28 23:48:10 raeburn Exp $
+// $Id: parameter.html,v 1.75 2016/05/21 22:59:58 raeburn Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -39,10 +39,14 @@ Parameter Input Window
 
 var ptype='';
 var pvalue='';
+var pmodval='';
+var pextraval='';
+var pextravaltwo='';
 var preturn='';
 var pcode='';
 var pscat='';
 var pmarker='';
+var pmodal='';
 var pname='';
 
 var defhour=0;
@@ -70,9 +74,12 @@ function selwrite(text) {
 }
 
 function choicestart() {
-  this.window.choices.document.clear();
-  choicewrite('<html><body>');
+  this.window.choices.document.open();
+  choicewrite('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');
+  choicewrite('<html xmlns="http://www.w3.org/1999/xhtml">');
   choicewrite('<head>');
+  choicewrite('<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />');
+  choicewrite('<title>LON-CAPA</title>');
   choicewrite('<style type="text/css">');
   choicewrite('<!--');
   choicewrite('body {');
@@ -86,6 +93,7 @@ function choicestart() {
   choicewrite('-->');
   choicewrite('</style>');
   choicewrite('</head>');
+  choicewrite('<body>');
 }
 
 function choiceend() {
@@ -236,58 +244,66 @@ function month() {
 function intminute() {
    var thisminutes=cmins;
     var i;
-    choicewrite('<select name="minutes" onchange="parent.intcalc();">');
+    var result = '';
+    result += '<select name="minutes" onchange="parent.intcalc();">';
     for (i=0;i<=59;i++) {
-        choicewrite('<option value="'+i+'"');
+        result += '<option value="'+i+'"';
         if (i==thisminutes) {
-            choicewrite(' selected="selected"');
+            result += ' selected="selected"';
         }
-        choicewrite('>'+i+'</option>');
+        result += '>'+i+'</option>';
     }
-    choicewrite('</select>');
+    result += '</select>';
+    return result;
 } 
 
 function inthour() {
    var thishours=chours;
     var i;
-    choicewrite('<select name="hours" onchange="parent.intcalc();">');
+    var result = '';
+    result += '<select name="hours" onchange="parent.intcalc();">';
     for (i=0;i<=23;i++) {
-        choicewrite('<option value="'+i+'"');
+        result += '<option value="'+i+'"';
         if (i==thishours) {
-            choicewrite(' selected="selected"');
+            result += ' selected="selected"';
         }
-        choicewrite('>'+i+'</option>');
+        result += '>'+i+'</option>';
     }
-    choicewrite('</select>');
-} 
+    result += '</select>';
+    return result;
+}
 
 function intsecond() {
-   var thisseconds=csecs;
+    var thisseconds=csecs;
     var i;
-    choicewrite('<select name="seconds" onchange="parent.intcalc();">');
+    var result = '';
+    result += '<select name="seconds" onchange="parent.intcalc();">';
     for (i=0;i<=59;i++) {
-        choicewrite('<option value="'+i+'"');
+        result += '<option value="'+i+'"';
         if (i==thisseconds) {
-            choicewrite(' selected="selected"');
+            result += ' selected="selected"';
         }
-        choicewrite('>'+i+'</option>');
+        result += '>'+i+'</option>';
     }
-    choicewrite('</select>');
+    result += '</select>';
+    return result;
 } 
 
 
 function intday() {
    var thisdate=cdays;
     var i;
-    choicewrite('<select name="date" onchange="parent.intcalc();">');
+    var result ='';
+    result += '<select name="date" onchange="parent.intcalc();">';
     for (i=0;i<=31;i++) {
-        choicewrite('<option value="'+i+'"');
+        result += '<option value="'+i+'"';
         if (i==thisdate) {
-            choicewrite(' selected="selected"');
+            result += ' selected="selected"';
         }
-        choicewrite('>'+i+'</option>');
+        result += '>'+i+'</option>';
     }
-    choicewrite('</select>');
+    result += '</select>';
+    return result;
 }
 
 function intcalc() {
@@ -296,7 +312,100 @@ function intcalc() {
              sform.hours.options[sform.hours.selectedIndex].value*1)*60+
              sform.minutes.options[sform.minutes.selectedIndex].value*1)*60+
              sform.seconds.options[sform.seconds.selectedIndex].value*1;
-    draw();
+    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;
+                }
+            }
+        }
+    } 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() {
@@ -331,17 +440,113 @@ 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();
 }
 
 function callradiostringeval(newval) {
-   return 'onchange="parent.radiostringeval(\''
-          +newval+'\')" onclick="parent.radiostringeval(\''
-          +newval+'\')"';
+    return 'onclick="parent.radiostringeval(\''+newval+'\')"';
 }
 
+function lenienteval(newval) {
+    if (newval == 'weighted') {
+        if (document.getElementById('lenientweighteddiv')) {
+            document.getElementById('lenientweighteddiv').style.display='block';
+        }
+        var patternRelWeight = /^\-?[\d.]+$/;
+        var sform=choices.document.forms.sch; 
+        if ((sform.lenientrelwt.length != 'undefined')  && (sform.lenientrelwt.length) != 'null') {
+            for (var i=0; i<sform.lenientrelwt.length; i++) {
+                var relweight = sform.lenientrelwt[i].value;
+                relweight = relweight.replace(/^\s+|\s+$/g,'');
+                if (!patternRelWeight.test(relweight)) {
+                    if (i<2) {
+                        relweight = '1.0';
+                    } else {
+                        relweight = '0.0';
+                    }
+                }
+                sform.lenientrelwt[i].value = relweight;
+                if (i==0) {
+                    svalue = relweight;
+                } else {
+                    svalue += ','+relweight;
+                }
+            }
+        }
+    } else {
+        if (document.getElementById('lenientweighteddiv')) {
+            document.getElementById('lenientweighteddiv').style.display='none';
+        }
+        svalue=newval;
+    }
+    draw();
+}
+
+function calllenientradioeval(newval) {
+    return 'onclick="parent.lenienteval(\''+newval+'\')"';
+}
+
+function callintervalpmodval() {
+    return 'onclick="parent.intcalc();parent.toggleSecret()"';
+} 
+
 function intervaldis() {
     csecs=svalue;
     cdays=Math.floor(csecs/86400);
@@ -350,8 +555,7 @@ function intervaldis() {
     csecs-=chours*3600;
     cmins=Math.floor(csecs/60);
     csecs-=cmins*60;
-    choicewrite(cdays+' days '+chours+' hours '
-               +cmins+' mins '+csecs+' secs');
+    return cdays+' days '+chours+' hours '+cmins+' mins '+csecs+' secs';
 }
 
 function pickcolor(picked) {
@@ -380,7 +584,14 @@ function draw() {
       choicewrite(' action="javascript:floateval();"');
    }
    if (ptype=='string') {
-      choicewrite(' action="javascript:stringeval();"');
+      if (pscat == 'ip') {
+          choicewrite(' action="javascript:ipstringeval();"');
+      } else {
+          choicewrite(' action="javascript:stringeval();"');
+      }
+   }
+   if (ptype != 'int' && ptype != 'float' && ptype != 'string') {
+       choicewrite(' action=""');
    }
    choicewrite('>');
    if (ptype=='tolerance') {
@@ -464,16 +675,54 @@ 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();
-         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>');         
-      } else { 
+         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"));
+         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"'); }
+         choicewrite(' /> Yes</label><br />');
+         choicewrite('<span style="white-space:nowrap">'+
+                     '<label><input name="donebutton" value="_done_proctor"'+
+                     ' 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>');
+         choicewrite('</td></tr></table>');
+      } else {
          choicewrite('<tr><td colspan="3">'
          +cdate.toString()+
          '</td></tr><tr><td>Date:</td><td colspan="2">');
@@ -623,7 +872,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"'); }
@@ -648,17 +897,123 @@ function draw() {
                 ' type="radio" '+callradiostringeval('anonsurveycred'));
            if (svalue=='anonsurveycred') { choicewrite(' checked="checked"'); }
            choicewrite('> Anonymous Survey (credit for submission)</label><br />');
-
+           choicewrite('<label><input name="stringval" value="randomizetry"'+
+                ' type="radio" '+callradiostringeval('randomizetry'));
+           if (svalue=='randomizetry') { choicewrite(' checked="checked"'); }
+           choicewrite('> New Randomization Each N Tries (default N=1)</label><br />');
            choicewrite('<label><input name="stringval" value="library"'+
                ' type="radio" '+callradiostringeval('library'));
            if (svalue=='library') { choicewrite(' checked="checked"'); }
            choicewrite(' /> Library</label><br />');
         }
+        if (pscat=='lenient') {
+           var patternLenientStd = /^(yes|no|default)$/;
+           var patternLenientRel = /^([\-\d\.]+)\,([\-\d\.]+)\,([\-\d\.]+)\,([\-\d\.]+)$/;
+           var lenientweighted = 'none';
+           var relatives = new Array;
+           tablestart('Lenient Grading (Partial Credit)');
+           choicewrite('<tr><td>Value:</td><td colspan="2">');
+           choicewrite('<label><input name="stringval" value="yes"'+
+                  ' type="radio" '+calllenientradioeval('yes'));
+           if (svalue=='yes') { choicewrite(' checked="checked"'); }
+           choicewrite(' /> Yes</label><br />');
+           choicewrite('<label><input name="stringval" value="no"'+
+                  ' type="radio" '+calllenientradioeval('no'));
+           if (svalue=='no') { choicewrite(' checked="checked"'); }
+           choicewrite(' /> No</label><br />');
+           choicewrite('<label><input name="stringval" value="default"'+
+               ' type="radio" '+calllenientradioeval('default'));
+           if (svalue=='default') { choicewrite(' checked="checked"'); }
+           choicewrite(' /> Default (only bubblesheet grading is lenient)</label><br />');
+           choicewrite('<label><input name="stringval" value="weighted"'+
+               ' type="radio" '+calllenientradioeval('weighted'));
+           if (!patternLenientStd.test(svalue) && svalue != '') {
+              choicewrite(' checked="checked"');
+              lenientweighted='block';
+              var relatives = svalue.match(patternLenientRel);
+           }
+           choicewrite(' />Yes, weighted (optionresponse in checkbox mode)</label><br /><br />'+
+                       '<div id="lenientweighteddiv" style="display:'+lenientweighted+'">'+
+                       '<table class="LC_parmsel_table"><tr bgcolor="#C5DB99">'+
+                       '<th colspan="2">Foil submission status</th><th>Points</th></tr>');
+           var lenienttypes = ['Correct (checked)','Correct (unchecked)','Incorrect (checked)','Incorrect (unchecked)'];
+           for (var i=0; i<lenienttypes.length; i++) {
+               var j = i+1;
+               if (relatives[j] == '') {
+                   if (i < 2) {
+                       relatives[j] = '1.0';
+                   } else {
+                       relatives[j] = '0.0';
+                   }
+               }
+               choicewrite('<tr><td colspan="2">'+lenienttypes[i]+'</td>'+
+                           '<td><input type="text" name="lenientrelwt" value="'+relatives[j]+'"'+
+                           ' size="3" onblur="parent.lenienteval(\'weighted\')" /></td></tr>');
+           }
+           choicewrite('</table></div>');
+        }
+        if (pscat=='discussvote') {
+           tablestart('Discussion Voting');
+           choicewrite('<tr><td>Value:</td><td colspan="2">');
+           choicewrite('<label><input name="stringval" value="yes"'+
+                  ' type="radio" '+callradiostringeval('yes'));
+           if (svalue=='yes') { choicewrite(' checked="checked"'); }
+           choicewrite(' /> Yes</label><br />');
+           choicewrite('<label><input name="stringval" value="notended"'+
+                  ' type="radio" '+callradiostringeval('notended'));
+           if (svalue=='notended') { choicewrite(' checked="checked"'); }
+           choicewrite(' /> Yes, unless discussion ended</label><br />');
+           choicewrite('<label><input name="stringval" value="no"'+
+                  ' type="radio" '+callradiostringeval('no'));
+           if (svalue=='no') { choicewrite(' checked="checked"'); }
+           choicewrite(' /> No</label><br />');
+        }
         if (pscat=='ip') {
-           tablestart('IP Number/Name');
-	   choicewrite('<tr><td>Value:</td><td colspan="2">');
-           choicewrite('<input name="stringval" size="20" value="'+escapeHTML(svalue)+
-                    '" onchange="parent.stringeval()" />');
+            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>');
         }
         if (pscat=='fileext') {
             tablestart('Allowed File Extensions');
@@ -671,8 +1026,9 @@ function draw() {
                ' type="radio" '+callradiostringeval('png,jpg,jpeg,gif'));
            if (svalue=='png,jpg,jpeg,gif') { choicewrite(' checked="checked"'); }
            choicewrite(' /> Picture File</label><br />');
-           choicewrite('<label><input name="radstringval" value="doc,xls,ppt"'+
-               ' type="radio" '+callradiostringeval('doc,xls,ppt'));
+           choicewrite('<label><input name="radstringval" value="doc,docx,xls,xlsx,ppt,pptx"'+
+               ' type="radio" '+callradiostringeval('doc,docx,xls,xlsx,ppt,pptx'));
+           if (svalue=='doc,docx,xls,xlsx,ppt,pptx') { choicewrite(' checked="checked"'); }
            if (svalue=='doc,xls,ppt') { choicewrite(' checked="checked"'); }
            choicewrite(' /> Office Document</label><br />');
            choicewrite('<input name="stringval" size="20" value="'+escapeHTML(svalue)+
@@ -788,6 +1144,10 @@ function assemble() {
 function init() {
   var i;
   var subs=new Array();
+  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);
 
@@ -809,6 +1169,7 @@ function init() {
      if (pair[0]=='call') { pcode=pair[1]; }
      if (pair[0]=='marker') { pmarker=pair[1]; }
      if (pair[0]=='name') { pname=pair[1]; }
+     if (pair[0]=='modal') { pmodal=pair[1]; }
      if (pair[0]=='defhour' && pair[1] >= 0 && pair[1] < 24 ) {
          defhour=pair[1];
      }
@@ -816,6 +1177,47 @@ function init() {
      if (pair[0]=='defsec' && pair[1] >= 0 && pair[1] < 60) { defsec=pair[1]; }
   }
 
+  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;
+          }
+      }
+  }
   svalue=pvalue;
   if (((ptype=='float') || (ptype=='string') || (ptype=='int')) &&
       (pscat=='default') && 
@@ -836,9 +1238,12 @@ function init() {
      }
   }
 
-  this.window.selector.document.clear();
-  selwrite('<html><body>');
+  this.window.selector.document.open();
+  selwrite('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');
+  selwrite('<html xmlns="http://www.w3.org/1999/xhtml">');
   selwrite('<head>');
+  selwrite('<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />');
+  selwrite('<title>LON-CAPA</title>');
   selwrite('<style type="text/css">');
   selwrite('<!--');
   selwrite('body {');
@@ -850,8 +1255,9 @@ function init() {
   selwrite('-->');
   selwrite('</style>');
   selwrite('</head>');
-  selwrite('<form name="fsel"><b>'+pname+'</b><br />');
-  selwrite('<select name="fcat" onchange="parent.catchange();">');
+  selwrite('<body>');
+  selwrite('<form name="fsel" action=""><b>'+pname+'</b><br />');
+  selwrite('Format of Value(s): <select name="fcat" onchange="parent.catchange();">');
 
   if (ptype=='tolerance') {
      sopt('default','Default');
@@ -915,6 +1321,8 @@ function init() {
      else if (pscat == 'problemstatus'){ sopt('problemstatus','Problem Status'); }
      else if (pscat == 'examtype')     { sopt('examtype','Exam Type'); }
      else if (pscat == 'questiontype') { sopt('questiontype','Question Type'); }
+     else if (pscat == 'lenient')      { sopt('lenient','Lenient Grading (Partial Credit)'); }
+     else if (pscat == 'discussvote')  { sopt('discussvote','Discussion Voting'); }
      else if (pscat == 'ip')           { sopt('ip','IP Number/Name'); }
      else if (pscat == 'fileext')      { sopt('fileext','File Extension'); }
      else if (pscat == 'useslots')     { sopt('useslots','Slots control access'); }
@@ -928,56 +1336,38 @@ function init() {
   }
 
   selwrite('</select></form>');
-
-  selwrite('<a href="javascript:parent.assemble();');
+  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();');
+  }
   if (preturn!='') {
-     selwrite(
-      'parent.opener.document.'+preturn+'_value.value=parent.window.svalue;');
-     selwrite(
-      'parent.opener.document.'+preturn+'_type.value=parent.window.stype;');
+     selwrite(targ+'.document.'+preturn+'_value.value=parent.window.svalue;');
+     selwrite(targ+'.document.'+preturn+'_type.value=parent.window.stype;');
   }
   if (pmarker!='') {
-     selwrite(
-     'parent.opener.document.'+preturn+'_marker.value=parent.window.pmarker;');
+     selwrite(targ+'.document.'+preturn+'_marker.value=parent.window.pmarker;');
   }
   if (pcode!='') {
-     selwrite('parent.opener.'+pcode+'();');
+     selwrite(targ+'.'+pcode+'();');
   }
   selwrite('">Save</a>&nbsp;&nbsp;');
 
   selwrite('<a href="javascript:');
-     selwrite(
-      'parent.opener.document.'+preturn+'_value.value='+"'';");
+  selwrite(targ+'.document.'+preturn+'_value.value='+"'';");
   if (pmarker!='') {
      selwrite(
-     'parent.opener.document.'+preturn+'_marker.value=parent.window.pmarker;');
+     targ+'.document.'+preturn+'_marker.value=parent.window.pmarker;');
   }
   if (pcode!='') {
-     selwrite('parent.opener.'+pcode+'();');
+     selwrite(targ+'.'+pcode+'();');
   }
   selwrite('">Delete</a>&nbsp;&nbsp;');
  
-  selwrite('<a href="javascript:');
-// Old code :
-//----------------------------------------------------------------------
-//  if (preturn!='') {
-//     selwrite('parent.opener.document.'+preturn+'_value.value='+"'';");
-//     selwrite('parent.opener.document.'+preturn+'_type.value='+"'';");
-// }
-//  if (pmarker!='') {
-//     selwrite('parent.opener.document.'+preturn+'_marker.value='+"'';");
-//  }
-//  if (pcode!='') {
-//     selwrite('parent.opener.'+pcode+'();');
-//  }
-//----------------------------------------------------------------------
-// Just close the window to 'cancel' the operation.  There are javascript
-// errors in the above commented out code that I have not been able to 
-// track down.  I think they reside in 'parent.opener.'+pcode+'();'
-//
-  selwrite('this.parent.close();');
-  selwrite('">Cancel</a>'); 
- 
   selwrite('</body></html>');
   this.window.selector.document.close();
   draw();
