--- rat/client/parameter.html 2020/09/03 18:05:53 1.64.2.4 +++ rat/client/parameter.html 2016/03/15 14:25:41 1.70 @@ -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.70 2016/03/15 14:25:41 raeburn Exp $ // // Copyright Michigan State University Board of Trustees // @@ -39,6 +39,8 @@ Parameter Input Window var ptype=''; var pvalue=''; +var pmodval=''; +var pextraval=''; var preturn=''; var pcode=''; var pscat=''; @@ -268,10 +270,10 @@ function inthour() { } result += ''; return result; -} +} function intsecond() { - var thisseconds=csecs; + var thisseconds=csecs; var i; var result = ''; result += ''; return result; -} +} function intday() { @@ -309,7 +311,74 @@ 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 = ''; + if (sform.donebutton.length) { + for (var i=0; i'+intervaldis()+'', @@ -490,7 +566,27 @@ function draw() { '', '
', ].join("\n")); - } else { + tablestart('Provide a "Done" button to students?'); + choicewrite('Value:'); + choicewrite('
'); + choicewrite('
'); + choicewrite(''+ + ''); + choicewrite(' '); + choicewrite(''); + } else { choicewrite('' +cdate.toString()+ 'Date:'); @@ -571,7 +667,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 +736,7 @@ function draw() { choicewrite('
'); + choicewrite(' /> Bubblesheet Exam
'); // choicewrite('
'); + choicewrite(' /> Yes, and the scope of student selected slot is a single resource.
'); choicewrite('
'); + choicewrite(' /> Yes, and the scope of student selected slot is the enclosing map/folder. When checking in, it applies to only one resource.
'); choicewrite('
'); + choicewrite(' /> Yes, and the scope of student selected slot is the enclosing map/folder. When checking in, all resources in the map/folder are checked in.
'); choicewrite(''); } } @@ -841,6 +937,9 @@ function assemble() { function init() { var i; var subs=new Array(); + var doneRegExp = /_done/; + var doneproctorRegExp = /_done_proctor/; + var proctorkeyRegExp = /^(\d+)_(.+)$/; var namevalue=this.window.location.search.split('&'); namevalue[0]=namevalue[0].substr(1,namevalue[0].length-1); @@ -870,6 +969,27 @@ function init() { if (pair[0]=='defsec' && pair[1] >= 0 && pair[1] < 60) { defsec=pair[1]; } } + if (ptype=='date' && pscat == 'interval') { + if (doneproctorRegExp.test(pvalue)) { + pmodval = pvalue.match(doneproctorRegExp); + var intervalwithkey = pvalue.replace(doneproctorRegExp,''); + if (proctorkeyRegExp.test(intervalwithkey)) { + var currvals = intervalwithkey.match(proctorkeyRegExp); + if (currvals.length == 3) { + pvalue = currvals[1]; + pextraval = currvals[2]; + } else { + pmodval = ''; + } + } + } else { + if (doneRegExp.test(pvalue)) { + var pnumval = pvalue.replace(doneRegExp,''); + pmodval = pvalue.match(doneRegExp); + pvalue = pnumval; + } + } + } svalue=pvalue; if (((ptype=='float') || (ptype=='string') || (ptype=='int')) && (pscat=='default') && @@ -991,8 +1111,12 @@ function init() { var targ='parent.opener'; if (pmodal==1) { targ='parent.parent'; - } - selwrite('