--- rat/client/parameter.html	2013/01/28 18:17:21	1.65
+++ 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.65 2013/01/28 18:17:21 bisitz Exp $
+// $Id: parameter.html,v 1.69 2015/11/21 00:16:09 musolffc 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,58 +242,66 @@ function month() {
 function intminute() {
    var thisminutes=cmins;
     var i;
-    choicewrite('<select name="minutes" onchange="parent.intcalc();">');
+    var result = '';
+    result += '<select name="minutes" onchange="parent.intcalc();">';
     for (i=0;i<=59;i++) {
-        choicewrite('<option value="'+i+'"');
+        result += '<option value="'+i+'"';
         if (i==thisminutes) {
-            choicewrite(' selected="selected"');
+            result += ' selected="selected"';
         }
-        choicewrite('>'+i+'</option>');
+        result += '>'+i+'</option>';
     }
-    choicewrite('</select>');
+    result += '</select>';
+    return result;
 } 
 
 function inthour() {
    var thishours=chours;
     var i;
-    choicewrite('<select name="hours" onchange="parent.intcalc();">');
+    var result = '';
+    result += '<select name="hours" onchange="parent.intcalc();">';
     for (i=0;i<=23;i++) {
-        choicewrite('<option value="'+i+'"');
+        result += '<option value="'+i+'"';
         if (i==thishours) {
-            choicewrite(' selected="selected"');
+            result += ' selected="selected"';
         }
-        choicewrite('>'+i+'</option>');
+        result += '>'+i+'</option>';
     }
-    choicewrite('</select>');
+    result += '</select>';
+    return result;
 } 
 
 function intsecond() {
-   var thisseconds=csecs;
+    var thisseconds=csecs;
     var i;
-    choicewrite('<select name="seconds" onchange="parent.intcalc();">');
+    var result = '';
+    result += '<select name="seconds" onchange="parent.intcalc();">';
     for (i=0;i<=59;i++) {
-        choicewrite('<option value="'+i+'"');
+        result += '<option value="'+i+'"';
         if (i==thisseconds) {
-            choicewrite(' selected="selected"');
+            result += ' selected="selected"';
         }
-        choicewrite('>'+i+'</option>');
+        result += '>'+i+'</option>';
     }
-    choicewrite('</select>');
+    result += '</select>';
+    return result;
 } 
 
 
 function intday() {
    var thisdate=cdays;
     var i;
-    choicewrite('<select name="date" onchange="parent.intcalc();">');
+    var result ='';
+    result += '<select name="date" onchange="parent.intcalc();">';
     for (i=0;i<=31;i++) {
-        choicewrite('<option value="'+i+'"');
+        result += '<option value="'+i+'"';
         if (i==thisdate) {
-            choicewrite(' selected="selected"');
+            result += ' selected="selected"';
         }
-        choicewrite('>'+i+'</option>');
+        result += '>'+i+'</option>';
     }
-    choicewrite('</select>');
+    result += '</select>';
+    return result;
 }
 
 function intcalc() {
@@ -301,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<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() {
@@ -342,11 +369,13 @@ function radiostringeval(newval) {
 }
 
 function callradiostringeval(newval) {
-   return 'onchange="parent.radiostringeval(\''
-          +newval+'\')" onclick="parent.radiostringeval(\''
-          +newval+'\')"';
+    return 'onclick="parent.radiostringeval(\''+newval+'\')"';
 }
 
+function callintervalpmodval() {
+    return 'onclick="parent.intcalc()"';
+} 
+
 function intervaldis() {
     csecs=svalue;
     cdays=Math.floor(csecs/86400);
@@ -355,8 +384,7 @@ function intervaldis() {
     csecs-=chours*3600;
     cmins=Math.floor(csecs/60);
     csecs-=cmins*60;
-    choicewrite(cdays+' days '+chours+' hours '
-               +cmins+' mins '+csecs+' secs');
+    return cdays+' days '+chours+' hours '+cmins+' mins '+csecs+' secs';
 }
 
 function pickcolor(picked) {
@@ -473,15 +501,29 @@ function draw() {
       }
       if (pscat=='interval') {
          tablestart('Time interval');
-         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>');         
-      } else { 
+         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"));
+         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">');
@@ -832,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);
 
@@ -861,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') && 
@@ -900,7 +950,7 @@ function init() {
   selwrite('</head>');
   selwrite('<body>');
   selwrite('<form name="fsel" action=""><b>'+pname+'</b><br />');
-  selwrite('<select name="fcat" onchange="parent.catchange();">');
+  selwrite('Format of Value(s): <select name="fcat" onchange="parent.catchange();">');
 
   if (ptype=='tolerance') {
      sopt('default','Default');