Changeset 1638

Timestamp:

May 7, 2012, 1:41:31 PM (10 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #389: The partition wizard should not allow missing weights in some cases

File:

• extensions/net.sf.basedb.reggie/trunk/resources/partitionform.jsp (modified) (9 diffs)

extensions/net.sf.basedb.reggie/trunk/resources/partitionform.jsp

@@ -40 +40 @@
 var apWeightsAreValid;
 var hisWeightsAreValid;
-var oneOrMoreWeightsAreSet;
+var allWeightsAreValid;
 var nofPiecesAreValid;
 var isRestoringFromLocalStorage = false; // A flag to keep track of what is happening
@@ -104 +104 @@
       return false;
     }
-    if (oneOrMoreWeightsAreSet[i] == false)
+    if (allWeightsAreValid[i] == false)
     {
       return false;
@@ -183 +183 @@
     hisWeightsAreValid = Array();
     nofPiecesAreValid = Array();
-    oneOrMoreWeightsAreSet = Array();
+    allWeightsAreValid = Array();
     
     for (var i=0;i<selectedTubes.length;i++)
@@ -191 +191 @@
       hisWeightsAreValid[i] = true;
       nofPiecesAreValid[i] = false;
-      oneOrMoreWeightsAreSet[i] = false;      
+      allWeightsAreValid[i] = false;      
     }
     
@@ -315 +315 @@
 function isNumberKey(evt)
 {
+  return true;
   evt = (evt) ? evt : ((window.event) ? event : null);
     if (evt) {
@@ -458 +459 @@
   var apWeightValue = frm.elements['apWeight'+tubeIndex].value;
   var hisWeightValue = frm.elements['hisWeight'+tubeIndex].value; 
-  if (spWeightValue == '' && apWeightValue == '' && hisWeightValue == '')
-  {
-    oneOrMoreWeightsAreSet[tubeIndex] = false;
-    setInputStatus(tubeIndex, 'No weight is defined.', 'invalid');
-    return;
-  }
-  oneOrMoreWeightsAreSet[tubeIndex] = true; 
-  setInputStatus(tubeIndex, '', 'valid');
-}
-
+  
+  if (apWeightValue == '')
+  {
+    allWeightsAreValid[tubeIndex] = false;
+    setInputStatus(tubeIndex, 'No ApWeight is defined.', 'invalid');
+  }
+  else if (hisWeightValue == '' && spWeightValue != '')
+  {
+    allWeightsAreValid[tubeIndex] = false;
+    setInputStatus(tubeIndex, 'SpWeight is set but not HisWeight', 'invalid');
+    
+  }
+  else
+  {
+    allWeightsAreValid[tubeIndex] = true;
+    if (apWeightValue == '0')
+    {
+      setInputStatus(tubeIndex, 'No Lysate item will be created!', 'warning');
+    }
+    else if (hisWeightValue == '0')
+    {
+      setInputStatus(tubeIndex, 'No Histology item will be created!', 'warning');
+    }
+    else
+    {
+      setInputStatus(tubeIndex, '', 'valid');
+    }
+  }
+  
+}
+
+//Check the SpWeight value -- empty or >= 0 are ok.
 function spWeightOnChange(tubeIndex)
 {
@@ -473 +496 @@
   var frm = document.forms['reggie'];
   var weightInput = frm.elements[inputName].value;
-  if (weightInput != '')
-  {
-    if (weightInput < 0)
-    {
-      spWeightsAreValid[tubeIndex] = false;
-      updateInputStatus(tubeIndex);
-      return;
-    }
-    if (weightInput == '0')
-    {
-      frm.elements[inputName].value = '';
-    }
-  } 
-  spWeightsAreValid[tubeIndex] = true;
+  if (weightInput == '' || parseFloat(weightInput) >= 0)
+  {
+    spWeightsAreValid[tubeIndex] = true;
+  }
+  else
+  {
+    spWeightsAreValid[tubeIndex] = false;
+  }
   updateInputStatus(tubeIndex);
 }
 
+// Check the ApWeight value -- empty or >= 0 are ok.
 function apWeightOnChange(tubeIndex)
 {
@@ -495 +513 @@
   var frm = document.forms['reggie'];
   var weightInput = frm.elements[inputName].value;
-  if (weightInput != '')
-  {
-    if (weightInput < 0)
-    {
-      apWeightsAreValid[tubeIndex] = false;
-      updateInputStatus(tubeIndex);
-      return;
-    } 
-    if (weightInput == '0')
-    {
-      frm.elements[inputName].value = '';
-    } 
-  }
-  apWeightsAreValid[tubeIndex] = true;
+  if (weightInput == '' || parseFloat(weightInput) >= 0)
+  {
+    apWeightsAreValid[tubeIndex] = true;
+  }
+  else
+  {
+    apWeightsAreValid[tubeIndex] = false;
+  }
   updateInputStatus(tubeIndex);
 }
 
+//Check the HisWeight value -- empty or >= 0 are ok.
 function hisWeightOnChange(tubeIndex)
 {
@@ -517 +530 @@
   var frm = document.forms['reggie'];
   var weightInput = frm.elements[inputName].value;
-  if (weightInput != '')
-  {
-    if (weightInput < 0)
-    {
-      hisWeightsAreValid[tubeIndex] = false;
-      updateInputStatus(tubeIndex);
-      return;
-    }
-    if (weightInput == '0')
-    {
-      frm.elements[inputName].value = '';
-    }   
-  } 
-  hisWeightsAreValid[tubeIndex] = true;
+  if (weightInput == '' || parseFloat(weightInput) >= 0)
+  {
+    hisWeightsAreValid[tubeIndex] = true;
+  }
+  else
+  {
+    hisWeightsAreValid[tubeIndex] = false;
+  }
   updateInputStatus(tubeIndex);
 }