--- rat/client/parameter.html	2016/08/05 17:39:45	1.64.2.3
+++ rat/client/parameter.html	2015/09/13 21:48:37	1.68
@@ -5,7 +5,7 @@
 The LearningOnline Network with CAPA
 Parameter Input Window
 //
-// $Id: parameter.html,v 1.64.2.3 2016/08/05 17:39:45 raeburn Exp $
+// $Id: parameter.html,v 1.68 2015/09/13 21:48:37 raeburn Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -39,6 +39,7 @@ Parameter Input Window
 
 var ptype='';
 var pvalue='';
+var pmodval='';
 var preturn='';
 var pcode='';
 var pscat='';
@@ -241,66 +242,58 @@ function month() {
 function intminute() {
    var thisminutes=cmins;
     var i;
-    var result = '';
-    result += '<select name="minutes" onchange="parent.intcalc();">';
+    choicewrite('<select name="minutes" onchange="parent.intcalc();">');
     for (i=0;i<=59;i++) {
-        result += '<option value="'+i+'"';
+        choicewrite('<option value="'+i+'"');
         if (i==thisminutes) {
-            result += ' selected="selected"';
+            choicewrite(' selected="selected"');
         }
-        result += '>'+i+'</option>';
+        choicewrite('>'+i+'</option>');
     }
-    result += '</select>';
-    return result;
+    choicewrite('</select>');
 } 
 
 function inthour() {
    var thishours=chours;
     var i;
-    var result = '';
-    result += '<select name="hours" onchange="parent.intcalc();">';
+    choicewrite('<select name="hours" onchange="parent.intcalc();">');
     for (i=0;i<=23;i++) {
-        result += '<option value="'+i+'"';
+        choicewrite('<option value="'+i+'"');
         if (i==thishours) {
-            result += ' selected="selected"';
+            choicewrite(' selected="selected"');
         }
-        result += '>'+i+'</option>';
+        choicewrite('>'+i+'</option>');
     }
-    result += '</select>';
-    return result;
-}
+    choicewrite('</select>');
+} 
 
 function intsecond() {
    var thisseconds=csecs;
     var i;
-    var result = '';
-    result += '<select name="seconds" onchange="parent.intcalc();">';
+    choicewrite('<select name="seconds" onchange="parent.intcalc();">');
     for (i=0;i<=59;i++) {
-        result += '<option value="'+i+'"';
+        choicewrite('<option value="'+i+'"');
         if (i==thisseconds) {
-            result += ' selected="selected"';
+            choicewrite(' selected="selected"');
         }
-        result += '>'+i+'</option>';
+        choicewrite('>'+i+'</option>');
     }
-    result += '</select>';
-    return result;
-}
+    choicewrite('</select>');
+} 
 
 
 function intday() {
    var thisdate=cdays;
     var i;
-    var result ='';
-    result += '<select name="date" onchange="parent.intcalc();">';
+    choicewrite('<select name="date" onchange="parent.intcalc();">');
     for (i=0;i<=31;i++) {
-        result += '<option value="'+i+'"';
+        choicewrite('<option value="'+i+'"');
         if (i==thisdate) {
-            result += ' selected="selected"';
+            choicewrite(' selected="selected"');
         }
-        result += '>'+i+'</option>';
+        choicewrite('>'+i+'</option>');
     }
-    result += '</select>';
-    return result;
+    choicewrite('</select>');
 }
 
 function intcalc() {
@@ -309,7 +302,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<sform.donebutton.length; i++) {
+                if (sform.donebutton[i].checked) {
+                    if (sform.donebutton[i].value == '_done') {
+                        newpmodval = sform.donebutton[i].value;
+                    }
+                }
+            }
+        }
+        pmodval = newpmodval;
+        draw();
+        if (pmodval) {
+            svalue += pmodval;
+        }
+    } else {
+        draw();
+    }
 }
 
 function integereval() {
@@ -353,6 +364,10 @@ function callradiostringeval(newval) {
     return 'onclick="parent.radiostringeval(\''+newval+'\')"';
 }
 
+function callintervalpmodval() {
+    return 'onclick="parent.intcalc()"';
+} 
+
 function intervaldis() {
     csecs=svalue;
     cdays=Math.floor(csecs/86400);
@@ -479,18 +494,27 @@ function draw() {
       }
       if (pscat=='interval') {
          tablestart('Time interval');
-         choicewrite( [
-            '<tr><td colspan="3">'+intervaldis()+'</td></tr>',
-            '<tr><td>Time:</td><td colspan="2">',
-                '<span style="white-space:nowrap">'+intday()+' days </span>',
-                '<span style="white-space:nowrap">'+inthour()+' hours</span>',
-                '<span style="white-space:nowrap">'+intminute()+' mins</span>',
-                '<span style="white-space:nowrap">'+intsecond()+' secs</span>',
-            '</td></tr>',
-            '</table>',
-            '<br />',
-            ].join("\n"));
-      } else { 
+         choicewrite('<tr><td colspan="3">');
+         intervaldis();
+         choicewrite('</td></tr><tr><td>Time:'
+         +'</td><td colspan="2">');
+         intday();choicewrite('days ');
+         inthour();choicewrite('hours ');
+         intminute(); choicewrite('mins '); intsecond();
+         choicewrite('secs</td></tr></table>');
+         choicewrite('<br />');
+         tablestart('Provide a "Done" button to students?');
+         choicewrite('<tr><td>Value:</td><td colspan="2">');
+         choicewrite('<label><input name="donebutton" value="_done"'+
+                     ' type="radio" '+callintervalpmodval());
+         if (pmodval =='_done') { choicewrite(' checked="checked"'); }
+         choicewrite(' /> Yes</label><br />');
+         choicewrite('<label><input name="donebutton" value=""'+
+                     ' type="radio" '+callintervalpmodval());
+         if (pmodval != '_done') { choicewrite(' checked="checked"'); }
+         choicewrite(' /> No</label><br />');
+         choicewrite('</td></tr></table>');
+      } else {
          choicewrite('<tr><td colspan="3">'
          +cdate.toString()+
          '</td></tr><tr><td>Date:</td><td colspan="2">');
@@ -640,7 +664,7 @@ function draw() {
            choicewrite('<label><input name="stringval" value="exam"'+
                   ' type="radio" '+callradiostringeval('exam'));
            if (svalue=='exam') { choicewrite(' checked="checked"'); }
-           choicewrite(' /> Exam</label><br />');
+           choicewrite(' /> Bubblesheet Exam</label><br />');
 //         choicewrite('<label><input name="stringval" value="assess"'+
 //              ' type="radio" '+callradiostringeval('assess'));
 //         if (svalue=='assess') { choicewrite(' checked="checked"'); }
@@ -841,6 +865,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);
 
@@ -870,6 +895,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') &&