Changeset 1390 for extensions

Timestamp:

Sep 12, 2011, 10:46:12 AM (12 years ago)

Author:

Martin Svensson

Message:

References #317. Added warning if different boxes are used.

File:

• extensions/net.sf.basedb.reggie/trunk/resources/specimentube.jsp (modified) (7 diffs)

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

@@ -36 +36 @@
 var debug = false;
 var currentStep = 1;
+var usedBox = '';
 
 var caseInfo = null;
@@ -201 +202 @@
   }
   lateralityOnChange();
+  specimenTypeOnClick();
+  biopsyTypeOnClick();
   if (thisCasePad != null)
   {
@@ -401 +404 @@
   var nofTubes = frm.nofTubes.value;
   
-  boxValue = boxValue.substring(2);
-  while (boxValue.length < 3)
+  boxValue = boxValue.substring(2); 
+  while (boxValue.length > 0 && boxValue.length < 3)
   {   
     boxValue = '0'+boxValue;
@@ -411 +414 @@
   wellsAreValid[tubeIndex] = false;
   
-  if (frm.elements[boxName].value == '')
+  if (frm.elements[boxName].value == 'Sp')
   {
     boxesAreValid[tubeIndex] = true;
@@ -449 +452 @@
     return false;
   }   
-  else
-  {
+  else 
+  {
+    setInputStatus('rowColumn'+tubeIndex,'Row[A-'+response.rows+'], Columns[1-'+response.columns+']','');
     boxesAreValid[tubeIndex] = true;
     boxInfo[tubeIndex] = response.boxInfo;  
@@ -456 +460 @@
     frm.elements[columnName].disabled = false;
     
-    var nextWellRow = response.freeRow;
-    var nextWellColumn = parseInt(response.freeColumn)+1;
-    
+    var nextWellRow = '';
+    var nextWellColumn = '';
+    
+    if (tubeIndex==0)
+    {
+      usedBox = boxValue;     
+    }
+    
+    if (usedBox != boxValue)
+    {     
+      setInputStatus(boxName, 'More then one box is used','warning');
+      frm.elements[rowName].focus();
+      return;
+    }
+    
+    nextWellRow = response.freeRow;
+    nextWellColumn = parseInt(response.freeColumn)+1;   
     if( (nextWellColumn + tubeIndex) > response.columns)
     {
-      
+      nextWellColumn = 0;
+      nextWellRow = '';
     }
     else
     {
-      nextWellColumn + tubeIndex;
-    }
-    
-    frm.elements[rowName].value = nextWellRow
-    frm.elements[columnName].value = nextWellColumn;
+      nextWellColumn = nextWellColumn + tubeIndex;
+    }   
+    
+    if (frm.elements[rowName].value == '' && 
+        frm.elements[columnName].value == '')
+    {
+      frm.elements[rowName].value = nextWellRow;    
+      frm.elements[columnName].value = nextWellColumn;
+    }     
     setInputStatus('rowColumn'+tubeIndex,'Row[A-'+response.rows+'], Columns[1-'+response.columns+']','');
     setInputStatus(boxName, '', 'valid');   
@@ -519 +542 @@
   }
   for (var i=0;i<nofTubes;i++)
-  {
+  {   
     if (i != tubeIndex && frm.elements['box'+i].value == boxValue)
     {