--- rat/client/parameter.html 2015/11/21 00:16:09 1.69 +++ rat/client/parameter.html 2020/07/19 22:02:14 1.71.6.2 @@ -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.6.2 2020/07/19 22:02: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 += ''; 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 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 +659,29 @@ function draw() { ].join("\n")); tablestart('Provide a "Done" button to students?'); choicewrite('Value:'); + choicewrite('
'); choicewrite('
'); - choicewrite(''); + choicewrite(' 
'+ + '
'+ + '
'+ + 'Button text:'+ + '
'); choicewrite(''); } else { choicewrite('' @@ -604,7 +764,7 @@ function draw() { } if (ptype=='string') { - if ((pscat=='any') || (pscat=='') || (pscat=='default') || + if ((pscat=='any') || (pscat=='') || (pscat=='default') || (typeof(pscat)=='undefined')) { tablestart('Text'); choicewrite('Value:'); @@ -673,7 +833,7 @@ function draw() { choicewrite('
'); + choicewrite(' /> Exam
'); // choicewrite('
'); } 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'); @@ -774,15 +975,15 @@ function draw() { choicewrite('
'); + choicewrite(' /> Yes, and the scope of the slot is a single resource.
'); choicewrite('
'); + choicewrite(' /> Yes, and the scope of the slot is the enclosing map/folder. When checking in, it applies to only one resource.
'); choicewrite('
'); + 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.
'); choicewrite(''); } } @@ -874,7 +1075,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 +1109,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 +1270,12 @@ function init() { var targ='parent.opener'; if (pmodal==1) { targ='parent.parent'; - } - selwrite('