--- rat/client/parameter.html 2018/11/13 03:59:12 1.78 +++ rat/client/parameter.html 2019/01/06 04:02:19 1.79 @@ -5,7 +5,7 @@ The LearningOnline Network with CAPA Parameter Input Window // -// $Id: parameter.html,v 1.78 2018/11/13 03:59:12 raeburn Exp $ +// $Id: parameter.html,v 1.79 2019/01/06 04:02:19 raeburn Exp $ // // Copyright Michigan State University Board of Trustees // @@ -192,7 +192,7 @@ function second() { choicewrite('>'+i+''); } choicewrite(''); -} +} function date() { @@ -243,8 +243,8 @@ function month() { } choicewrite(''); } - - + + function intminute() { var thisminutes=cmins; var i; @@ -454,7 +454,7 @@ function ipstringeval() { if (items.length > 0) { for (var j=0; j'); + choicewrite(''); } else { if (pscat=='pos') { tablestart('Positive floating point number or zero'); @@ -1057,7 +1057,7 @@ function draw() { ' type="radio" '+callradiostringeval('map_map')); if (svalue=='map_map') { choicewrite(' checked="checked"'); } 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(''); + choicewrite(''); } if (pscat=='deeplink') { tablestart('Deep-linked items'); @@ -1085,7 +1085,7 @@ function draw() { choicewrite(''); } } - + if (ptype=='color') { tablestart('Choose a Color'); choicewrite(''); @@ -1100,7 +1100,7 @@ function draw() { colorfield(ir,ig,ib); } choicewrite(''); - } + } } choicewrite('
'); } @@ -1133,7 +1133,7 @@ function recursechange() { if (rform.recurse[i].value == 1) { colnum++; } - pmarker = pmarkerst+'_'+pparm+'&'+colnum; + pmarker = pmarkerst+'_'+pparm+'&'+colnum; } } } @@ -1193,7 +1193,7 @@ function init() { var doneproctorRegExp = /_done(|\:[^\:]+\:)_proctor/; var proctorkeyRegExp = /^(\d+)_(.+)$/; var donetextRegExp = /\:([^\:]+)\:/; - var markerRegExp = /^(.+)_([A-Za-z0-9]+)\&(\d+)$/; + var markerRegExp = /^(.+)_([A-Za-z0-9]+)\&(\d+)$/; var namevalue=this.window.location.search.split('&'); namevalue[0]=namevalue[0].substr(1,namevalue[0].length-1); @@ -1204,10 +1204,10 @@ function init() { if (pair[0]=='type') { subs=pair[1].split('_'); ptype=subs[0]; pscat=subs[1]; - if (typeof(subs[2])!="undefined") { - pscat+='_'+subs[2]; + if (typeof(subs[2])!="undefined") { + pscat+='_'+subs[2]; } - if ((pscat=='') || (typeof(pscat)=="undefined")) { + if ((pscat=='') || (typeof(pscat)=="undefined")) { pscat='default'; } } @@ -1223,21 +1223,21 @@ function init() { if (pair[0]=='defsec' && pair[1] >= 0 && pair[1] < 60) { defsec=pair[1]; } } - var tablecol = ''; + 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]; + tablecol = markerinfo[3]; if (tablecol == 17 || tablecol == 16) { ismap = 1; if (tablecol == 17) { precursive = 1; } pnonreccol = 16; - } else if (tablecol == 11 || tablecol == 10) { + } else if (tablecol == 11 || tablecol == 10) { ismap = 1; if (tablecol == 11) { precursive = 1; @@ -1285,7 +1285,7 @@ function init() { } } else { if (doneRegExp.test(pvalue)) { - var current = pvalue.match(doneRegExp); + var current = pvalue.match(doneRegExp); if (current.length == 2) { var textstr = current[1]; if (textstr != '') { @@ -1303,8 +1303,8 @@ function init() { } 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') { @@ -1380,7 +1380,7 @@ function init() { months[10]='November'; months[11]='December'; } - + if (ptype=='int') { sopt('default','Default'); sopt('pos','Positive Integer, Not Zero');