--- rat/client/parameter.html	2022/05/27 17:58:03	1.64.2.5.2.2
+++ rat/client/parameter.html	2022/07/06 22:00:43	1.88
@@ -5,7 +5,7 @@
 The LearningOnline Network with CAPA
 Parameter Input Window
 //
-// $Id: parameter.html,v 1.64.2.5.2.2 2022/05/27 17:58:03 raeburn Exp $
+// $Id: parameter.html,v 1.88 2022/07/06 22:00:43 raeburn Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -45,9 +45,14 @@ var pextravaltwo='';
 var preturn='';
 var pcode='';
 var pscat='';
+var psmap='';
 var pmarker='';
 var pmodal='';
 var pname='';
+var precursive='';
+var pnonreccol='';
+var pmarkerst='';
+var pparm='';
 var pextra='';
 
 var defhour=0;
@@ -189,7 +194,7 @@ function second() {
         choicewrite('>'+i+'</option>');
     }
     choicewrite('</select>');
-} 
+}
 
 
 function date() {
@@ -240,8 +245,8 @@ function month() {
     }
     choicewrite('</select>');
 }
-    
-    
+
+
 function intminute() {
    var thisminutes=cmins;
     var i;
@@ -288,7 +293,7 @@ function intsecond() {
     }
     result += '</select>';
     return result;
-}
+} 
 
 
 function intday() {
@@ -324,7 +329,7 @@ function intcalc() {
                         newpmodval = sform.donebutton[i].value;
                         newpextravaltwo = sform.donebutton_text.value;
                     } else {
-                        if (sform.donebutton[i].value == '_done_proctor') {
+                        if (sform.donebutton[i].value == '_done_proctor') { 
                             newpmodval = sform.donebutton[i].value;
                             newpextraval = sform.donebutton_proctorkey.value;
                             newpextravaltwo = sform.donebutton_text.value;
@@ -345,7 +350,7 @@ function intcalc() {
                 svalue += donevals[1];
             }
             if (newpextravaltwo) {
-                if (newpextravaltwo != 'Done') {
+                if (newpextravaltwo != 'Done') { 
                     svalue += ':'+newpextravaltwo+':';
                 }
             }
@@ -396,9 +401,9 @@ function validateInterval() {
         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.');
+                    var keyval = sform.donebutton_proctorkey.value;
+                    if ((keyval == '') || (typeof(keyval) == 'undefined')) {
+                        alert('Please enter a key for a proctor to enter when a student uses the "Done" button.');
                         return;
                     }
                 }
@@ -412,7 +417,7 @@ function validateInterval() {
 function validateDeepLink() {
     var sform=choices.document.forms.sch;
     svalue = sform.deeplinkstate.options[sform.deeplinkstate.selectedIndex].value+',';
-    svalue += sform.deeplinkothers.options[sform.deeplinkothers.selectedIndex].value+',';
+    svalue += sform.deeplinkothers.options[sform.deeplinkothers.selectedIndex].value+','; 
     svalue += sform.deeplinklisted.options[sform.deeplinklisted.selectedIndex].value+',';
     svalue += sform.deeplinkacc.options[sform.deeplinkacc.selectedIndex].value+',';
     var keyRegExp = /^[a-zA-Z\d_.!@#$%^&*()+=-]+$/;
@@ -429,7 +434,7 @@ function validateDeepLink() {
                     } else {
                         alert('Please enter a value for the key containing one or more of: a-zA-Z0-9_.!@#$%^&*()+=-\n'+
                               'or choose a different supported link type.');
-                        return;
+                        return; 
                     }
                 } else if (sform.deeplinkprotect[i].value == 'ltic') {
                     var possltic = sform.linkpossltic.options[sform.linkpossltic.selectedIndex].value;
@@ -460,7 +465,7 @@ function validateDeepLink() {
                     svalue += '0';
                 } else if (sform.deeplinkmenus[i].value == 'collnum') {
                     var posscoll = sform.linkpossmenu.options[sform.linkpossmenu.selectedIndex].value;
-                    if ((numRegExp.test(posscoll)) && (posscoll > 0)) {
+                    if ((numRegExp.test(posscoll)) && (posscoll > 0)) { 
                         svalue += posscoll;
                     } else {
                         alert("Please select either a numbered collection or check 'Standard (all menus)'.");
@@ -567,7 +572,7 @@ function ipstringeval() {
     svalue = '';
     for (var i=0; i<acctypes.length; i++) {
         var items = choices.document.getElementsByName('setip'+acctypes[i]);
-        if (items.length > 0) {
+        if (items.length > 0) { 
             for (var j=0; j<items.length; j++) {
                 if (items[j].type == "text") {
                     var possip = items[j].value;
@@ -592,7 +597,7 @@ 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 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>';
@@ -624,6 +629,46 @@ function callradiostringeval(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;
+        var relwtlength = sform.lenientrelwt.length;
+        if ((relwtlength != '') && (typeof(relwtlength) != 'undefined')) {
+            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()"';
 }
@@ -652,8 +697,7 @@ function colorfield(ir,ig,ib) {
    if (color==svalue) { selection="<font color='#"+col[10-ir]+col[10-ig]+col[10-ib]+"'>X</font>"; }
    choicewrite('<td bgcolor="'+color+'"><a href="javascript:parent.pickcolor('+"'"+
                color+"'"+')">'+selection+'</a></td>');
-               
-}    
+}
 
 function draw() {
    choicestart();
@@ -756,7 +800,7 @@ function draw() {
          tablestart('Date and time');
       }
       if (pscat=='interval') {
-         var proctorkeytype = 'hidden';
+         var proctorkeytype = 'hidden'; 
          var donebuttontext = 'none';
          if (pmodval == '_done_proctor') {
              proctorkeytype = 'text';
@@ -865,7 +909,7 @@ function draw() {
    if (ptype=='float') {
       if (pscat=='default') {
          tablestart('Default value or none');
-         choicewrite('</table>');         
+         choicewrite('</table>');
       } else {
         if (pscat=='pos') {
            tablestart('Positive floating point number or zero');
@@ -884,7 +928,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">');
@@ -953,7 +997,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"'); }
@@ -988,20 +1032,50 @@ function draw() {
            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" '+callradiostringeval('yes'));
+                  ' type="radio" '+calllenientradioeval('yes'));
            if (svalue=='yes') { choicewrite(' checked="checked"'); }
            choicewrite(' /> Yes</label><br />');
            choicewrite('<label><input name="stringval" value="no"'+
-                  ' type="radio" '+callradiostringeval('no'));
+                  ' type="radio" '+calllenientradioeval('no'));
            if (svalue=='no') { choicewrite(' checked="checked"'); }
            choicewrite(' /> No</label><br />');
            choicewrite('<label><input name="stringval" value="default"'+
-               ' type="radio" '+callradiostringeval('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');
@@ -1022,7 +1096,7 @@ function draw() {
         if (pscat=='ip') {
             var currallow = new Array;
             var currdeny = new Array;
-            if ((svalue != '') && (svalue != null)) {
+            if ((svalue != '') && (typeof(svalue) != 'undefined')) {
                 var patternComma = /,/;
                 var patternAllow = /^([\[\]a-zA-Z\.\d\*\-]+)$/;
                 var patternDeny = /^\!([\[\]a-zA-Z\.\d\*\-]+)$/;
@@ -1104,8 +1178,8 @@ function draw() {
                   ' 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('</td></tr></table>');
-      }
+           choicewrite('</td></tr></table>');
+       }
        if (pscat=='deeplink') {
            var deeplinkvals = new Array();
            var linkprotectparts = new Array();
@@ -1115,7 +1189,7 @@ function draw() {
            var dlinklticdivsty = 'none';
            var dlinkltiddivsty = 'none';
            var dlinkmenusdivsty = 'none';
-           if ((svalue != '') && (svalue != null)) {
+           if ((svalue != '') && (typeof(svalue) != 'undefined')) {
                deeplinkvals = svalue.split(',');
                if (ltikeyRegExp.test(deeplinkvals[4])) {
                    linkprotectparts = deeplinkvals[4].split(':');
@@ -1212,7 +1286,7 @@ function draw() {
            choicewrite('</span><br />');
 
            var possmenus = new Array();
-           if ((pextra != '') && (pextra != null)) {
+           if ((pextra != '') && (typeof(pextra) != 'undefined')) {
                var lticRegExp = /^ltic_/;
                var ltidRegExp = /^ltid_/;
                var menusRegExp = /^menus_/;
@@ -1313,7 +1387,7 @@ function draw() {
                choicewrite(' checked="checked"');
            }
            choicewrite(' /> Standard (all menus)</label></span><br />');
-           if (possmenus.length >= 1) {
+           if (possmenus.length >= 1) {  
                choicewrite('<span style="white-space: nowrap;"><label>');
                choicewrite('<input name="deeplinkmenus" value="collnum"'+
                            ' type="radio" '+calldeeplink('menus'));
@@ -1351,7 +1425,7 @@ function draw() {
            choicewrite('</td></tr></table>');
        }
    }
-   
+
    if (ptype=='color') {
       tablestart('Choose a Color');
       choicewrite('<table>');
@@ -1366,7 +1440,7 @@ function draw() {
                   colorfield(ir,ig,ib);
 	      }
               choicewrite('</tr>');
-	  }	      
+	  }
       }
       choicewrite('</table></td></table>');
    }
@@ -1389,6 +1463,22 @@ function catchange() {
    draw();
 }
 
+function recursechange() {
+   var rform=selector.document.forms.frec;
+   var count = rform.recurse.length;
+   if (count > 0) {
+       for (var i=0; i<count; i++) {
+           if (rform.recurse[i].checked) {
+               var colnum = pnonreccol;
+               if (rform.recurse[i].value == 1) {
+                   colnum++;
+               }
+               pmarker = pmarkerst+'_'+pparm+'&'+colnum;
+           }
+       }
+   }
+}
+
 function assemble() {
     if ((ptype=='date') && (pscat!='interval')) {
         svalue=Math.floor(cdate.getTime()/1000);
@@ -1443,6 +1533,7 @@ function init() {
   var doneproctorRegExp = /_done(|\:[^\:]+\:)_proctor/;
   var proctorkeyRegExp = /^(\d+)_(.+)$/;
   var donetextRegExp = /\:([^\:]+)\:/;
+  var markerRegExp = /^(.+)_([A-Za-z0-9]+)\&(\d+)$/;
   var namevalue=this.window.location.search.split('&');
   namevalue[0]=namevalue[0].substr(1,namevalue[0].length-1);
 
@@ -1453,10 +1544,10 @@ function init() {
      if (pair[0]=='type') { subs=pair[1].split('_');
                             ptype=subs[0];
                             pscat=subs[1];
-                            if (typeof(subs[2])!="undefined") { 
-                               pscat+='_'+subs[2]; 
+                            if (typeof(subs[2])!="undefined") {
+                               pscat+='_'+subs[2];
                             }
-                            if ((pscat=='') || (typeof(pscat)=="undefined")) { 
+                            if ((pscat=='') || (typeof(pscat)=="undefined")) {
                                pscat='default';
                             }
                            }
@@ -1473,6 +1564,44 @@ function init() {
      if (pair[0]=='extra') { pextra=pair[1]; }
   }
 
+  var tablecol = '';
+  var ismap = '';
+  if (markerRegExp.test(pmarker)) {
+      var markerinfo = pmarker.match(markerRegExp);
+      if (markerinfo.length == 4) {
+          pmarkerst = markerinfo[1];
+          pparm = markerinfo[2];
+          tablecol = markerinfo[3];
+          if (tablecol == 17 || tablecol == 16) {
+              ismap = 1;
+              if (tablecol == 17) {
+                  precursive = 1;
+              }
+              pnonreccol = 16;
+          } else if (tablecol == 11 || tablecol == 10) {
+              ismap = 1;
+              if (tablecol == 11) {
+                  precursive = 1;
+              }
+              pnonreccol = 10;
+          } else if (tablecol == 7 || tablecol == 6) {
+              ismap = 1;
+              if (tablecol == 7) {
+                  precursive = 1;
+              }
+              pnonreccol = 6;
+          } else if (tablecol == 3 || tablecol == 2) {
+              ismap = 1;
+              if (tablecol == 3) {
+                  precursive = 1;
+              }
+              pnonreccol = 2;
+          }
+      }
+  }
+  psmap = ismap;
+
+
   if (ptype=='date' && pscat == 'interval') {
       if (doneproctorRegExp.test(pvalue)) {
           var current = pvalue.match(doneproctorRegExp);
@@ -1516,8 +1645,8 @@ function init() {
   }
   svalue=pvalue;
   if (((ptype=='float') || (ptype=='string') || (ptype=='int')) &&
-      (pscat=='default') && 
-      (typeof(svalue)!="undefined") && 
+      (pscat=='default') &&
+      (typeof(svalue)!="undefined") &&
       (svalue!=0) && (svalue!='')) { pscat='any'; }
 
   if (ptype=='tolerance') {
@@ -1593,7 +1722,7 @@ function init() {
      months[10]='November';
      months[11]='December';
   }
-   
+
   if (ptype=='int') {
      sopt('default','Default');
      sopt('pos','Positive Integer, Not Zero');
@@ -1633,6 +1762,22 @@ function init() {
   }
 
   selwrite('</select></form>');
+  if (ismap == 1) {
+      if ((pparm != 'hiddenresource') && (pparm != 'encrypturl')) {
+          selwrite('<form name="frec" action="">');
+          selwrite('Recursive: <label><input type="radio" name="recurse" value="1" ');
+          if (precursive == 1) {
+              selwrite('checked="checked" ');
+          }
+          selwrite('onclick="parent.recursechange();" />Yes</label>&nbsp;&nbsp;');
+          selwrite('<label><input type="radio" name="recurse" value="0" ');
+          if (precursive != 1) {
+              selwrite('checked="checked" ');
+          }
+          selwrite('onclick="parent.recursechange();" />No</label>');
+          selwrite('</form><br />');
+      }
+  }
   var targ='parent.opener';
   if (pmodal==1) {
      targ='parent.parent';
@@ -1670,10 +1815,14 @@ function init() {
   selwrite('</body></html>');
   this.window.selector.document.close();
   if (pscat == 'deeplink') {
-      document.getElementById("LCparampopup").rows="60,*";
+      if (psmap==1) {
+          document.getElementById("LCparampopup").rows="100,*";
+      } else {  
+          document.getElementById("LCparampopup").rows="60,*";
+      }
   }
   draw();
-
+ 
 }
 
 // ]]>