--- rat/client/parameter.html	2001/08/08 15:40:52	1.12
+++ rat/client/parameter.html	2001/12/19 17:22:29	1.16
@@ -2,6 +2,31 @@
 <!--
 The LearningOnline Network with CAPA
 Parameter Input Window
+//
+// $Id: parameter.html,v 1.16 2001/12/19 17:22:29 albertel Exp $
+//
+// Copyright Michigan State University Board of Trustees
+//
+// This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+//
+// LON-CAPA is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// LON-CAPA is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with LON-CAPA; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// /home/httpd/html/adm/gpl.txt
+//
+// http://www.lon-capa.org/
+//
 06/16/00,06/17,11/17,11/18,11/23,11/27,11/28,12/15,12/16,
 03/21/01,03/24,06/26 Gerd Kortemeyer
 07/24/01 Scott Harrison
@@ -301,18 +326,20 @@ function draw() {
    choicewrite('>');
    if (ptype=='tolerance') {
 // 0: pscat
-// 1: after processing
       if (pscat=='default') {
          tablestart('Use default value or algorithm of resource');
       }
-      if (pscat=='exact') {
-         tablestart('Accept only exact value, zero tolerance');
-      }
       if (pscat=='relative_sym') {
 // 2: percentage
 // 3: open
          tablestart('Percentage error, symmetric around value');
          valline('Percentage',2,3);
+         if ((svalue!='') && (typeof(svalue)!="undefined")) {
+            choices.document.forms.sch.val2.value=parseInt(svalue);
+            if (svalue.indexOf('+')!=-1) {
+               choices.document.forms.sch.val3.checked=true;
+            }
+         }
       }
       if (pscat=='relative') {
 // 2: left
@@ -322,24 +349,47 @@ function draw() {
          tablestart('Percentage error, asymmetric around value');
          valline('Upper percentage',2,3);
          valline('Lower percentage',4,5);
+         var range=new Array;
+         if ((svalue!='') && (typeof(svalue)!="undefined")) {
+            range=svalue.split(',');
+            if (typeof(range[1])=='undefined') { range[1]=range[0]; }
+            choices.document.forms.sch.val2.value=parseFloat(range[0]);
+            if (range[0].indexOf('+')!=-1) {
+               choices.document.forms.sch.val3.checked=true;
+            }
+            choices.document.forms.sch.val4.value=parseFloat(range[1]);
+            if (range[1].indexOf('+')!=-1) {
+               choices.document.forms.sch.val5.checked=true;
+            }
+         }
       }
       if (pscat=='absolute_sym') {
          tablestart('Absolute error, symmetric around value');
          valline('Value',2,3);
+         if ((svalue!='') && (typeof(svalue)!="undefined")) {
+            choices.document.forms.sch.val2.value=parseFloat(svalue);
+            if (svalue.indexOf('+')!=-1) {
+               choices.document.forms.sch.val3.checked=true;
+            }
+         }
       }
       if (pscat=='absolute') {
          tablestart('Absolute error, asymmetric around value');
          valline('Upper value',2,3);
          valline('Lower value',4,5);
-      }
-      if (pscat=='sigdigits') {
-         tablestart('Agreement on significant digits');
-  choicewrite('<tr bgcolor="#AAFFAA"><td colspan=3>Number of digits: '
-             +'<input type=text size=4 name=val2></td></tr>');
-
-choicewrite('<tr bgcolor="#AAFFAA"><td colspan=3>Accept if more digits given: '
-             +'<input type=checkbox name=val3></td></tr>');
-         
+         var range=new Array;
+         if ((svalue!='') && (typeof(svalue)!="undefined")) {
+            range=svalue.split(',');
+            if (typeof(range[1])=='undefined') { range[1]=range[0]; }
+            choices.document.forms.sch.val2.value=parseFloat(range[0]);
+            if (range[0].indexOf('+')!=-1) {
+               choices.document.forms.sch.val3.checked=true;
+            }
+            choices.document.forms.sch.val4.value=parseFloat(range[1]);
+            if (range[1].indexOf('+')!=-1) {
+               choices.document.forms.sch.val5.checked=true;
+            }
+         }
       }
    }
 
@@ -380,8 +430,24 @@ choicewrite('<tr bgcolor="#AAFFAA"><td c
    if (ptype=='int') {
       if (pscat=='default') {
          tablestart('Default value or none');
-         choicewrite('</table>');         
+         choicewrite('</table>');
       } else {
+       if (pscat=='range') {
+         tablestart('Integer range');      
+         choicewrite('<tr bgcolor="#AAFFAA"><td>Lower Value:'+
+              '</td><td colspan=2><input type=text size=4 name=val2'+
+              '></td></tr>');
+         choicewrite('<tr bgcolor="#AAFFAA"><td>Upper Value:'+
+              '</td><td colspan=2><input type=text size=4 name=val4'+
+              '></td></tr></table>');
+         var range=new Array;
+         if ((svalue!='') && (typeof(svalue)!="undefined")) {
+            range=svalue.split(',');
+            if (typeof(range[1])=='undefined') { range[1]=range[0]; }
+            choices.document.forms.sch.val2.value=parseInt(range[0]);
+            choices.document.forms.sch.val4.value=parseInt(range[1]);
+         }
+       } else {
         if (pscat=='pos') {
            tablestart('Positive (non-zero) integer');
         }
@@ -393,9 +459,6 @@ choicewrite('<tr bgcolor="#AAFFAA"><td c
            rangeparts=split(',',pscat);
            tablestart('Integer in the range ['+rangeparts[1]+']');
         }
-        if (pscat=='range') {
-           tablestart('Integer range');      
-        }
         if (pscat=='any') {
            tablestart('Integer');
         }
@@ -404,6 +467,7 @@ choicewrite('<tr bgcolor="#AAFFAA"><td c
                     '" name=intval onChange="parent.integereval()">');
         choicewrite('</td></table>');
       }
+     }
    }
 
    if (ptype=='float') {
@@ -498,9 +562,12 @@ function assemble() {
           }
        }
     }
+    if ((ptype=='int') && (pscat=='range')) {
+          svalue=choices.document.forms.sch.val2.value+','+
+                 choices.document.forms.sch.val4.value;
+    }
     if (pscat=='default') { svalue=''; }
     stype=ptype+'_'+pscat;
-//    prompt(stype+' - '+svalue);
 }
 
 
@@ -536,6 +603,20 @@ function init() {
       (typeof(svalue)!="undefined") && 
       (svalue!=0) && (svalue!='')) { pscat='any'; }
 
+  if (ptype=='tolerance') {
+     var tperc=0;
+     var trange=0;
+     if (typeof(svalue)!='undefined') {
+        if (svalue.indexOf('%')!=-1) { tperc=1;  }
+        if (svalue.indexOf(',')!=-1) { trange=1; }
+        if (trange) {
+           if (tperc) { pscat='relative'; } else { pscat='absolute'; }
+        } else {
+           if (tperc) { pscat='relative_sym'; } else { pscat='absolute_sym'; }
+        }
+     }
+  }
+
   this.window.selector.document.clear();
   selwrite('<html><body bgcolor="#FFFFFF">');
 
@@ -544,12 +625,10 @@ function init() {
 
   if (ptype=='tolerance') {
      sopt('default','Default');
-     sopt('exact','Exact Value (no tolerance)');
      sopt('relative_sym','Relative Tolerance, Symmetric (percent)');
      sopt('relative','Relative Tolerance (percentages)');
      sopt('absolute_sym','Absolute Tolerance, Symmetric (value)');
      sopt('absolute','Absolute Tolerance (values)');
-     sopt('sigdigits','Significant Digits (number)');
   }
 
   if (ptype=='date') {
@@ -580,7 +659,8 @@ function init() {
      sopt('default','Default');
      sopt('pos','Positive Integer, Not Zero');
      sopt('zeropos','Positive Integer or Zero');
-     sopt('range','Integer Range');
+     sopt('inrange','Integer in Range');
+     sopt('range','Range of Integers');
      sopt('any','Integer');
   }
 
@@ -655,4 +735,4 @@ function init() {
 
 
 
-</html>
\ No newline at end of file
+</html>