--- rat/client/parameter.html 2015/11/21 00:16:09 1.69 +++ rat/client/parameter.html 2017/07/13 15:30:01 1.76 @@ -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.76 2017/07/13 15:30:01 raeburn Exp $ // // Copyright Michigan State University Board of Trustees // @@ -40,12 +40,18 @@ 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 precursive=''; +var pnonreccol=''; +var pmarkerst=''; +var pparm=''; var defhour=0; var defmin=0; @@ -269,7 +275,7 @@ function inthour() { } result += ''; return result; -} +} function intsecond() { var thisseconds=csecs; @@ -312,25 +318,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 0) { + for (var j=0; j'+ + 'Remove'; + 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'+intervaldis()+'', @@ -514,14 +702,29 @@ function draw() { ].join("\n")); tablestart('Provide a "Done" button to students?'); choicewrite('Value:'); + choicewrite('
'); choicewrite('
'); - choicewrite(''); + choicewrite(' 
'+ + '
'+ + '
'+ + 'Button text:'+ + '
'); choicewrite(''); } else { choicewrite('' @@ -708,20 +911,50 @@ function draw() { choicewrite(' /> Library
'); } 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('Value:'); choicewrite('
'); choicewrite('
'); choicewrite('
'); + choicewrite('

'+ + '
'+ + ''+ + ''); + var lenienttypes = ['Correct (checked)','Correct (unchecked)','Incorrect (checked)','Incorrect (unchecked)']; + for (var i=0; i'+ + ''); + } + choicewrite('
Foil submission statusPoints
'+lenienttypes[i]+'
'); } if (pscat=='discussvote') { tablestart('Discussion Voting'); @@ -740,10 +973,51 @@ function draw() { choicewrite(' /> No
'); } if (pscat=='ip') { - tablestart('IP Number/Name'); - choicewrite('Value:'); - choicewrite(''); + 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; iAllow fromDeny from'); + var acctypes = ['allow','deny']; + for (var i=0; i'+ + '
'+ + '
'); + for (var j=0; j'); + choicewrite('Remove'); + choicewrite('
'); + } + choicewrite('
'); + } + choicewrite(''); } if (pscat=='fileext') { tablestart('Allowed File Extensions'); @@ -824,6 +1098,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= 0 && pair[1] < 60) { defsec=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; + } + } + } + + 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; @@ -1029,11 +1394,31 @@ function init() { } selwrite(''); + if (ismap = 1) { + if ((pparm != 'hiddenresource') && (pparm != 'encrypturl')) { + selwrite('
'); + selwrite('Recursive:   '); + selwrite(''); + selwrite('

'); + } + } var targ='parent.opener'; if (pmodal==1) { targ='parent.parent'; - } - selwrite(' +