--- rat/client/parameter.html	2004/11/10 20:32:19	1.29
+++ rat/client/parameter.html	2006/03/02 18:02:16	1.36
@@ -3,7 +3,7 @@
 The LearningOnline Network with CAPA
 Parameter Input Window
 //
-// $Id: parameter.html,v 1.29 2004/11/10 20:32:19 www Exp $
+// $Id: parameter.html,v 1.36 2006/03/02 18:02:16 albertel Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -42,6 +42,10 @@ var pscat='';
 var pmarker='';
 var pname='';
 
+var defhour=0;
+var defmin=0;
+var defsec=0;
+
 var svalue;
 var stype;
 var smarker;
@@ -172,6 +176,7 @@ function year() {
    var thisyear=cdate.getFullYear();
    var nowdate=new Date();
    var nowyear=nowdate.getFullYear();
+   if ( !thisyear ) { thisyear=nowyear; }
    var loweryear=thisyear-2;
    var upperyear=thisyear+5;
    if (thisyear>nowyear) { loweryear=nowyear-2; }
@@ -537,58 +542,62 @@ function draw() {
         if (pscat=='yesno') {
            tablestart('Yes/No');
 	   choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan=2>');
-           choicewrite('<input name="stringval" value="yes"'+
+           choicewrite('<label><input name="stringval" value="yes"'+
                   ' type="radio" '+callradiostringeval('yes'));
            if (svalue=='yes') { choicewrite(' checked'); }
-           choicewrite('> Yes<br />');
-           choicewrite('<input name="stringval" value="no"'+
+           choicewrite('> Yes</label><br />');
+           choicewrite('<label><input name="stringval" value="no"'+
                   ' type="radio" '+callradiostringeval('no'));
            if (svalue=='no') { choicewrite(' checked'); }
-           choicewrite('> No<br />');
+           choicewrite('> No</label><br />');
         }
         if (pscat=='examtype') {
            tablestart('Exam Type');
 	   choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan=2>');
-           choicewrite('<input name="stringval" value="online"'+
+           choicewrite('<label><input name="stringval" value="online"'+
                 ' type="radio" '+callradiostringeval('online'));
            if (svalue=='online') { choicewrite(' checked'); }
-           choicewrite('> Online<br />');
-           choicewrite('<input name="stringval" value="checkout"'+
+           choicewrite('> Online</label><br />');
+           choicewrite('<label><input name="stringval" value="checkout"'+
               ' type="radio" '+callradiostringeval('checkout'));
            if (svalue=='checkout') { choicewrite(' checked'); }
-           choicewrite('> Check out<br />');
+           choicewrite('> Check out</label><br />');
        }
         if (pscat=='questiontype') {
            tablestart('Question Type');
 	   choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan=2>');
-           choicewrite('<input name="stringval" value="problem"'+
+           choicewrite('<label><input name="stringval" value="problem"'+
                ' type="radio" '+callradiostringeval('problem'));
            if (svalue=='problem') { choicewrite(' checked'); }
-           choicewrite('> Standard Problem<br />');
-           choicewrite('<input name="stringval" value="quiz"'+
-                  ' type="radio" '+callradiostringeval('quiz'));
-           if (svalue=='quiz') { choicewrite(' checked'); }
-           choicewrite('> Quiz<br />');
-           choicewrite('<input name="stringval" value="exam"'+
+           choicewrite('> Standard Problem</label><br />');
+//	   choicewrite('<label><input name="stringval" value="quiz"'+
+//                ' type="radio" '+callradiostringeval('quiz'));
+//         if (svalue=='quiz') { choicewrite(' checked'); }
+//         choicewrite('> Quiz</label><br />');
+           choicewrite('<label><input name="stringval" value="practice"'+
+                  ' type="radio" '+callradiostringeval('practice'));
+           if (svalue=='practice') { choicewrite(' checked'); }
+           choicewrite('> Practice</label><br />');
+           choicewrite('<label><input name="stringval" value="exam"'+
                   ' type="radio" '+callradiostringeval('exam'));
            if (svalue=='exam') { choicewrite(' checked'); }
-           choicewrite('> Exam<br />');
-           choicewrite('<input name="stringval" value="assess"'+
-                ' type="radio" '+callradiostringeval('assess'));
-           if (svalue=='assess') { choicewrite(' checked'); }
-           choicewrite('> Assessment<br />');
-           choicewrite('<input name="stringval" value="survey"'+
+           choicewrite('> Exam</label><br />');
+//         choicewrite('<label><input name="stringval" value="assess"'+
+//              ' type="radio" '+callradiostringeval('assess'));
+//         if (svalue=='assess') { choicewrite(' checked'); }
+//         choicewrite('> Assessment</label><br />');
+           choicewrite('<label><input name="stringval" value="survey"'+
                 ' type="radio" '+callradiostringeval('survey'));
            if (svalue=='survey') { choicewrite(' checked'); }
-           choicewrite('> Survey<br />');
-           choicewrite('<input name="stringval" value="form"'+
-                  ' type="radio" '+callradiostringeval('form'));
-           if (svalue=='form') { choicewrite(' checked'); }
-           choicewrite('> Input Form<br />');
-           choicewrite('<input name="stringval" value="library"'+
+           choicewrite('> Survey</label><br />');
+//         choicewrite('<label><input name="stringval" value="form"'+
+//                ' type="radio" '+callradiostringeval('form'));
+//         if (svalue=='form') { choicewrite(' checked'); }
+//         choicewrite('> Input Form</label><br />');
+           choicewrite('<label><input name="stringval" value="library"'+
                ' type="radio" '+callradiostringeval('library'));
            if (svalue=='library') { choicewrite(' checked'); }
-           choicewrite('> Library<br />');
+           choicewrite('> Library</label><br />');
         }
         if (pscat=='ip') {
            tablestart('IP Number/Name');
@@ -599,18 +608,18 @@ function draw() {
         if (pscat=='fileext') {
             tablestart('Allowed File Extensions');
 	   choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan=2>');
-           choicewrite('<input name="radstringval" value="txt"'+
+           choicewrite('<label><input name="radstringval" value="txt"'+
                ' type="radio" '+callradiostringeval('txt'));
            if (svalue=='txt') { choicewrite(' checked'); }
-           choicewrite('> Plain Text<br />');
-           choicewrite('<input name="radstringval" value="png,jpg,jpeg,gif"'+
+           choicewrite('> Plain Text</label><br />');
+           choicewrite('<label><input name="radstringval" value="png,jpg,jpeg,gif"'+
                ' type="radio" '+callradiostringeval('png,jpg,jpeg,gif'));
            if (svalue=='png,jpg,jpeg,gif') { choicewrite(' checked'); }
-           choicewrite('> Picture File<br />');
-           choicewrite('<input name="radstringval" value="doc,xls,ppt"'+
+           choicewrite('> Picture File</label><br />');
+           choicewrite('<label><input name="radstringval" value="doc,xls,ppt"'+
                ' type="radio" '+callradiostringeval('doc,xls,ppt'));
            if (svalue=='doc,xls,ppt') { choicewrite(' checked'); }
-           choicewrite('> Office Document<br />');
+           choicewrite('> Office Document</label><br />');
            choicewrite('<input name="stringval" size="20" value="'+svalue+
                     '" onChange="parent.stringeval()">');
        }
@@ -726,6 +735,11 @@ 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]=='defhour' && pair[1] >= 0 && pair[1] < 24 ) {
+         defhour=pair[1];
+     }
+     if (pair[0]=='defmin' && pair[1] >= 0 && pair[1] < 60) { defmin=pair[1]; }
+     if (pair[0]=='defsec' && pair[1] >= 0 && pair[1] < 60) { defsec=pair[1]; }
   }
 
   svalue=pvalue;
@@ -770,6 +784,10 @@ function init() {
      
      if ((pvalue!='') && (typeof(pvalue)!="undefined")) {
         cdate.setTime(pvalue*1000);
+     } else {        
+        cdate.setSeconds(defsec);
+        cdate.setMinutes(defmin);
+        cdate.setHours(defhour);
      }
  
      months[0]='January';