--- rat/client/parameter.html 2019/03/02 16:25:56 1.71.2.2 +++ rat/client/parameter.html 2017/07/15 02:19:00 1.77 @@ -5,7 +5,7 @@ The LearningOnline Network with CAPA Parameter Input Window // -// $Id: parameter.html,v 1.71.2.2 2019/03/02 16:25:56 raeburn Exp $ +// $Id: parameter.html,v 1.77 2017/07/15 02:19:00 raeburn Exp $ // // Copyright Michigan State University Board of Trustees // @@ -48,6 +48,10 @@ var pscat=''; var pmarker=''; var pmodal=''; var pname=''; +var precursive=''; +var pnonreccol=''; +var pmarkerst=''; +var pparm=''; var defhour=0; var defmin=0; @@ -447,10 +451,10 @@ function ipstringeval() { svalue = ''; for (var i=0; i 0) { + if (items.length > 0) { for (var j=0; j'+ 'Remove'; @@ -504,6 +508,45 @@ 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; + if ((sform.lenientrelwt.length != 'undefined') && (sform.lenientrelwt.length) != 'null') { + for (var i=0; i Exam
'); + 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'); @@ -900,17 +973,17 @@ function draw() { choicewrite(' /> No
'); } if (pscat=='ip') { - var currallow = new Array; + 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)) { + if (patternComma.test(svalue)) { current = svalue.split(','); } else { - current = [svalue]; + current = (svalue); } for (var i=0; i 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 (doneproctorRegExp.test(pvalue)) { var current = pvalue.match(doneproctorRegExp); @@ -1267,6 +1394,22 @@ 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'; @@ -1309,7 +1452,7 @@ function init() { - +