--- rat/client/parameter.html 2011/10/08 19:03:11 1.60 +++ rat/client/parameter.html 2015/11/21 00:16:09 1.69 @@ -5,7 +5,7 @@ The LearningOnline Network with CAPA Parameter Input Window // -// $Id: parameter.html,v 1.60 2011/10/08 19:03:11 raeburn Exp $ +// $Id: parameter.html,v 1.69 2015/11/21 00:16:09 musolffc Exp $ // // Copyright Michigan State University Board of Trustees // @@ -39,10 +39,12 @@ Parameter Input Window var ptype=''; var pvalue=''; +var pmodval=''; var preturn=''; var pcode=''; var pscat=''; var pmarker=''; +var pmodal=''; var pname=''; var defhour=0; @@ -70,9 +72,12 @@ function selwrite(text) { } function choicestart() { - this.window.choices.document.clear(); - choicewrite(''); + this.window.choices.document.open(); + choicewrite(''); + choicewrite(''); choicewrite(''); + choicewrite(''); + choicewrite('LON-CAPA'); choicewrite(''); choicewrite(''); + choicewrite(''); } function choiceend() { @@ -236,58 +242,66 @@ function month() { function intminute() { var thisminutes=cmins; var i; - choicewrite(''; for (i=0;i<=59;i++) { - choicewrite(''); + result += '>'+i+''; } - choicewrite(''); + result += ''; + return result; } function inthour() { var thishours=chours; var i; - choicewrite(''; for (i=0;i<=23;i++) { - choicewrite(''); + result += '>'+i+''; } - choicewrite(''); + result += ''; + return result; } function intsecond() { - var thisseconds=csecs; + var thisseconds=csecs; var i; - choicewrite(''; for (i=0;i<=59;i++) { - choicewrite(''); + result += '>'+i+''; } - choicewrite(''); + result += ''; + return result; } function intday() { var thisdate=cdays; var i; - choicewrite(''; for (i=0;i<=31;i++) { - choicewrite(''); + result += '>'+i+''; } - choicewrite(''); + result += ''; + return result; } function intcalc() { @@ -296,7 +310,25 @@ 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 = ''; + if (sform.donebutton.length) { + for (var i=0; i'); if (ptype=='tolerance') { // 0: pscat @@ -465,15 +501,29 @@ function draw() { } if (pscat=='interval') { tablestart('Time interval'); - choicewrite(''); - intervaldis(); - choicewrite('Time:' - +''); - intday();choicewrite('days '); - inthour();choicewrite('hours '); - intminute(); choicewrite('mins '); intsecond(); - choicewrite('secs'); - } else { + choicewrite( [ + ''+intervaldis()+'', + 'Time:', + ''+intday()+' days ', + ''+inthour()+' hours', + ''+intminute()+' mins', + ''+intsecond()+' secs', + '', + '', + '
', + ].join("\n")); + tablestart('Provide a "Done" button to students?'); + choicewrite('Value:'); + choicewrite('
'); + choicewrite('
'); + choicewrite(''); + } else { choicewrite('' +cdate.toString()+ 'Date:'); @@ -623,7 +673,7 @@ function draw() { choicewrite('
'); + choicewrite(' /> Bubblesheet Exam
'); // choicewrite('
'); } + if (pscat=='discussvote') { + tablestart('Discussion Voting'); + choicewrite('Value:'); + choicewrite('
'); + choicewrite('
'); + choicewrite('
'); + } if (pscat=='ip') { tablestart('IP Number/Name'); choicewrite('Value:'); @@ -808,6 +874,7 @@ function assemble() { function init() { var i; var subs=new Array(); + var doneRegExp = /_done/; var namevalue=this.window.location.search.split('&'); namevalue[0]=namevalue[0].substr(1,namevalue[0].length-1); @@ -829,6 +896,7 @@ function init() { if (pair[0]=='call') { pcode=pair[1]; } if (pair[0]=='marker') { pmarker=pair[1]; } if (pair[0]=='name') { pname=pair[1]; } + if (pair[0]=='modal') { pmodal=pair[1]; } if (pair[0]=='defhour' && pair[1] >= 0 && pair[1] < 24 ) { defhour=pair[1]; } @@ -836,6 +904,13 @@ function init() { if (pair[0]=='defsec' && pair[1] >= 0 && pair[1] < 60) { defsec=pair[1]; } } + if (ptype=='date' && pscat == 'interval') { + 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') && @@ -856,9 +931,12 @@ function init() { } } - this.window.selector.document.clear(); - selwrite(''); + this.window.selector.document.open(); + selwrite(''); + selwrite(''); selwrite(''); + selwrite(''); + selwrite('LON-CAPA'); selwrite(''); selwrite(''); - selwrite('
'+pname+'
'); - selwrite(''); if (ptype=='tolerance') { sopt('default','Default'); @@ -936,6 +1015,7 @@ function init() { else if (pscat == 'examtype') { sopt('examtype','Exam Type'); } else if (pscat == 'questiontype') { sopt('questiontype','Question Type'); } else if (pscat == 'lenient') { sopt('lenient','Lenient Grading (Partial Credit)'); } + else if (pscat == 'discussvote') { sopt('discussvote','Discussion Voting'); } 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'); } @@ -949,56 +1029,34 @@ function init() { } selwrite('
'); - + var targ='parent.opener'; + if (pmodal==1) { + targ='parent.parent'; + } selwrite('Save  '); selwrite('Delete  '); - selwrite('Cancel'); - selwrite(''); this.window.selector.document.close(); draw();