--- rat/client/parameter.html	2005/06/14 02:33:18	1.31
+++ rat/client/parameter.html	2007/06/05 20:44:14	1.44
@@ -3,7 +3,7 @@
 The LearningOnline Network with CAPA
 Parameter Input Window
 //
-// $Id: parameter.html,v 1.31 2005/06/14 02:33:18 www Exp $
+// $Id: parameter.html,v 1.44 2007/06/05 20:44:14 albertel Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -176,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; }
@@ -528,11 +529,8 @@ function draw() {
    }
 
    if (ptype=='string') {
-      if (pscat=='default') {
-         tablestart('Default value or none');
-         choicewrite('</table>');         
-      } else {
-        if ((pscat=='any') || (pscat=='') || (typeof(pscat)=='undefined')) {
+        if ((pscat=='any') || (pscat=='') || (pscat=='default') ||  
+            (typeof(pscat)=='undefined')) {
            tablestart('Text');
 	   choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan=2>');
            choicewrite('<input name="stringval" size="20" value="'+svalue+
@@ -541,58 +539,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');
@@ -603,21 +605,40 @@ 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()">');
        }
+       if (pscat=='useslots') {
+           tablestart('Slots control access');
+	   choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan=2>');
+           choicewrite('<label><input name="stringval" value="no"'+
+                  ' type="radio" '+callradiostringeval('no'));
+           if (svalue=='no') { choicewrite(' checked'); }
+           choicewrite('> No</label><br />');
+           choicewrite('<label><input name="stringval" value="resource"'+
+                  ' type="radio" '+callradiostringeval('resource'));
+           if (svalue=='resource') { choicewrite(' checked'); }
+           choicewrite('> Yes, and the scope of student selected slot is a single resource.</label><br />');
+           choicewrite('<label><input name="stringval" value="map"'+
+                  ' type="radio" '+callradiostringeval('map'));
+           if (svalue=='map') { choicewrite(' checked'); }
+           choicewrite('> Yes, and the scope of student selected slot is the enclosing map/folder. When checking in, it applies to only one resource.</label><br />');
+           choicewrite('<label><input name="stringval" value="map_map"'+
+                  ' type="radio" '+callradiostringeval('map_map'));
+           if (svalue=='map_map') { choicewrite(' 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..</label><br />');
         choicewrite('</td></table>');
       }
    }
@@ -641,7 +662,7 @@ function draw() {
       choicewrite('</table></td></table>');
    }
 
-   choicewrite('</table></form>');
+   choicewrite('</form>');
    choiceend();
 }
 
@@ -661,7 +682,7 @@ function catchange() {
 
 function assemble() {
     if ((ptype=='date') && (pscat!='interval')) {
-        svalue=Math.round(cdate.getTime()/1000);
+        svalue=Math.floor(cdate.getTime()/1000);
     }
     if (ptype=='tolerance') {
        if (pscat=='relative_sym') {
@@ -730,9 +751,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') { defhour=pair[1]; }
-     if (pair[0]=='defmin') { defmin=pair[1]; }
-     if (pair[0]=='defsec') { defsec=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;
@@ -815,7 +838,13 @@ function init() {
   }
 
   if (ptype=='string') {
-     sopt('default','Default');
+     //sopt('default','Default');
+     if (pscat == 'yesno')        { sopt('yesno','Yes/No'); }
+     if (pscat == 'examtype')     { sopt('examtype','Exam Type'); }
+     if (pscat == 'questiontype') { sopt('questiontype','Question Type'); }
+     if (pscat == 'ip')           { sopt('ip','IP Number/Name'); }
+     if (pscat == 'fileext')      { sopt('fileext','File Extension'); }
+     if (pscat == 'useslots')     { sopt('useslots','Slots control access'); }
      sopt('any','String Value');
   }
 
@@ -840,7 +869,7 @@ function init() {
   if (pcode!='') {
      selwrite('parent.opener.'+pcode+'();');
   }
-  selwrite('">Store</a>&nbsp;&nbsp;');
+  selwrite('">Save</a>&nbsp;&nbsp;');
 
   selwrite('<a href="javascript:');
      selwrite(