--- rat/client/parameter.html 2020/09/03 18:05:53 1.64.2.4 +++ rat/client/parameter.html 2020/06/03 12:38:01 1.82 @@ -5,7 +5,7 @@ The LearningOnline Network with CAPA Parameter Input Window // -// $Id: parameter.html,v 1.64.2.4 2020/09/03 18:05:53 raeburn Exp $ +// $Id: parameter.html,v 1.82 2020/06/03 12:38:01 raeburn Exp $ // // Copyright Michigan State University Board of Trustees // @@ -39,12 +39,20 @@ 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 pextra=''; var defhour=0; var defmin=0; @@ -185,7 +193,7 @@ function second() { choicewrite('>'+i+''); } choicewrite(''); -} +} function date() { @@ -236,8 +244,8 @@ function month() { } choicewrite(''); } - - + + function intminute() { var thisminutes=cmins; var i; @@ -271,7 +279,7 @@ function inthour() { } function intsecond() { - var thisseconds=csecs; + var thisseconds=csecs; var i; var result = ''; result += ''; return result; -} +} function intday() { @@ -309,7 +317,163 @@ 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 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; iX"; } choicewrite(''+selection+''); - -} +} function draw() { choicestart(); @@ -391,7 +651,11 @@ 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=""'); @@ -478,6 +742,15 @@ 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( [ ''+intervaldis()+'', @@ -490,7 +763,33 @@ function draw() { '', '
', ].join("\n")); - } else { + tablestart('Provide a "Done" button to students?'); + choicewrite('Value:'); + choicewrite('
'); + choicewrite('
'); + choicewrite(''+ + ''); + choicewrite(' 
'+ + '
'+ + '
'+ + 'Button text:'+ + '
'); + choicewrite(''); + } else { choicewrite('' +cdate.toString()+ 'Date:'); @@ -552,7 +851,7 @@ function draw() { if (ptype=='float') { if (pscat=='default') { tablestart('Default value or none'); - choicewrite(''); + choicewrite(''); } else { if (pscat=='pos') { tablestart('Positive floating point number or zero'); @@ -571,7 +870,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:'); @@ -640,7 +939,7 @@ function draw() { choicewrite('
'); + choicewrite(' /> Bubblesheet Exam
'); // choicewrite('
'); } 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'); @@ -707,10 +1036,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'); @@ -750,10 +1120,127 @@ 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.
'); - choicewrite(''); - } + choicewrite(''); + } + if (pscat=='deeplink') { + var deeplinkvals = new Array(); + var linktypeparts = new Array(); + var ltikeyRegExp = /^(lti|key):(\w+)$/; + var dlinkkeysty = 'hidden'; + var dlinkltidivsty = 'none'; + var dlinkkeyval = ''; + if ((svalue != '') && (svalue != null)) { + deeplinkvals = svalue.split(','); + if (ltikeyRegExp.test(deeplinkvals[2])) { + linktypeparts = deeplinkvals[2].split(':'); + deeplinkvals[2] = linktypeparts[0]; + if (linktypeparts[0] == 'key') { + dlinkkeysty = 'text'; + dlinkkeyval = linktypeparts[1]; + } else if (linktypeparts[0] == 'lti') { + dlinkltidivsty = 'inline-block'; + } + } + } else { + deeplinkvals = ['full','res','any']; + } + var deeplinklisting = new Array(); + deeplinklisting = ['full','absent','grades','details','datestatus']; + var deeplinklisttxt = new Array(); + deeplinklisttxt = ['Listed (linked) in both','Not listed','Listed in grades only','Listed (unlinked) in both','Listed (unlinked) inc. status in both']; + var deeplinkscopes = new Array(); + deeplinkscopes = ['res','map','rec']; + var deeplinkscopetxt = new Array(); + deeplinkscopetxt = ['resource only','enclosing map/folder','recursive map/folder']; + var deeplinkurls = new Array(); + deeplinkurls = ['any','only','key','lti']; + tablestart('Deep-linked items'); + choicewrite('In Contents or Gradebook?'); + choicewrite(''); + choicewrite('Access scope via deep-link'); + choicewrite(''); + choicewrite('Supported Link Types'); + choicewrite('
'); + choicewrite('
'); + choicewrite(''); + choicewrite(''); + choicewrite('
'); + if ((pextra != '') && (pextra != null)) { + var ltiRegExp = /^lti_/; + if (ltiRegExp.test(pextra)) { + pextra = pextra.replace(ltiRegExp,''); + var posslti = pextra.split(','); + if (posslti.length >= 1) { + var ltinums = new Array(); + var ltititles = new Array(); + for (var i=0; i'); + choicewrite('
'); + choicewrite('

'); + } + } + } + } + choicewrite(''); + } } - + if (ptype=='color') { tablestart('Choose a Color'); choicewrite(''); @@ -768,7 +1255,7 @@ function draw() { colorfield(ir,ig,ib); } choicewrite(''); - } + } } choicewrite('
'); } @@ -791,6 +1278,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) { defmin=pair[1]; } if (pair[0]=='defsec' && pair[1] >= 0 && pair[1] < 60) { defsec=pair[1]; } + 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; + } + } + } + + + 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') && - (typeof(svalue)!="undefined") && + (pscat=='default') && + (typeof(svalue)!="undefined") && (svalue!=0) && (svalue!='')) { pscat='any'; } if (ptype=='tolerance') { @@ -949,7 +1536,7 @@ function init() { months[10]='November'; months[11]='December'; } - + if (ptype=='int') { sopt('default','Default'); sopt('pos','Positive Integer, Not Zero'); @@ -978,8 +1565,9 @@ function init() { 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'); } + else if (pscat == 'deeplink') { sopt('deeplink','Deep-linked items'); } else { pscat = 'any'; } - sopt('any','String Value'); + if (pscat != 'deeplink') { sopt('any','String Value'); } } if (ptype=='color') { @@ -988,11 +1576,33 @@ 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(''); this.window.selector.document.close(); draw(); - + } // ]]> - +