Changeset 1493

Timestamp:

Dec 2, 2011, 2:56:39 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #344: Exception when trying to register more than one specimen tube for a case

The root of the problem seems to be that box information (eg. the id) is not loaded until the "Box" field in question is losing the input focus. If we never step through that field the wizard will later on (when "Column" field loses focus) try to check well information. This check fails since the box id is not loaded.

This fix consists of three parts:

• If a recent box has been used and it has free wells, it's id is used for the boxes
• If the 'suggest' link is used, the id is updated using data from the result of the suggestion
• Otherwise, we simulate a 'losing focus' event on the "Box" field (eg. we call 'boxOnChange').

File:

• extensions/net.sf.basedb.reggie/branches/2.0-stable/resources/specimentube.jsp (modified) (6 diffs)

extensions/net.sf.basedb.reggie/branches/2.0-stable/resources/specimentube.jsp

@@ -27 +27 @@
   BioPlate recentBox = null;
   String recentBoxName = "";  
+  int recentBoxId = 0;
   if (recentBoxes.size() > 0)
   {
@@ -44 +45 @@
           nameString = "0"+nameString;
         }
-        recentBoxName = "Sp"+nameString;        
+        recentBoxName = "Sp"+nameString;
       }     
     }
@@ -50 +51 @@
     {
       recentBoxName = recentBox.getName();
+      recentBoxId = recentBox.getId();
     }
   }
@@ -190 +192 @@
     var allPrepWeightValue = '';
 
-    boxInfo[i] = null;
+    boxInfo[i] = <%=recentBoxId == 0 ? "null" : recentBoxId %>;
     var boxDisabled = '';
     
@@ -426 +428 @@
     setInputStatus('rowColumn'+tubeIndex, 'Row or column cannot be empty when the box is specified.', 'invalid');
     return false;
-  } 
+  }
+  
+  if (boxInfo[tubeIndex] == null)
+  {
+    boxOnChange(tubeIndex);
+    if (boxInfo[tubeIndex] == null) return;
+  }
   
   var request = Ajax.getXmlHttpRequest();
@@ -506 +514 @@
     if (response.boxInfo)
     {
+      boxInfo[tubeIndex] = response.boxInfo;
       if (response.freeRow && response.freeColumn)
       {