Changeset 1400

Timestamp:

Oct 10, 2011, 3:51:24 PM (12 years ago)

Author:

Martin Svensson

Message:

References #317. Updated the functionality when selecting box and position to store the specimen tube in. Reggie now remember the box that was used the time before and it also suggest which position to choose depending on free positions in the corresponding lys-box. Operator comment field was renamed to Operator delivery comment.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/specimentube.jsp (modified) (24 diffs)
• src/net/sf/basedb/reggie/Reggie.java (modified) (1 diff)
• src/net/sf/basedb/reggie/servlet/SpecimenTubeServlet.java (modified) (9 diffs)

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

@@ -3 +3 @@
   session="false"
   import="net.sf.basedb.core.User"
-  import="net.sf.basedb.core.DbControl"
+  import="net.sf.basedb.core.BioPlate"
+  import="net.sf.basedb.core.DbControl" 
+  import="net.sf.basedb.core.Item"
+  import="net.sf.basedb.core.ItemContext"
   import="net.sf.basedb.core.SessionControl"
   import="net.sf.basedb.clients.web.Base" 
+  import="net.sf.basedb.util.Values"
+  import="java.util.List"
 %>
 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
@@ -18 +23 @@
   dc = sc.newDbControl();
   final User user = User.getById(dc, sc.getLoggedInUserId());
+  final ItemContext cc = Base.getAndSetCurrentContext(sc, Item.SAMPLE, null, null);
+  final List<BioPlate> recentBoxes = (List<BioPlate>)cc.getRecent(dc, Item.BIOPLATE, "reggie_specimentube");
+  BioPlate recentBox = null;
+  String recentBoxName = "";  
+  if (recentBoxes.size() > 0)
+  {
+    recentBox = recentBoxes.get(0);
+    int lastRow = recentBox.getRows()-1;
+    int lastColumn = recentBox.getColumns()-1;
+    // Move on to next box in order if the last position isn't empty.
+    if (!recentBox.getBioWell(lastRow, lastColumn).isEmpty())
+    {
+      Integer currentBoxNumber = Values.getInteger(recentBox.getName().substring(2), null);
+      if (currentBoxNumber != null)
+      {
+        currentBoxNumber++;
+        String nameString = ""+currentBoxNumber;        
+        while(nameString.length() < 3)
+        {
+          nameString = "0"+nameString;
+        }
+        recentBoxName = "Sp"+nameString;        
+      }     
+    }
+    else
+    {
+      recentBoxName = recentBox.getName();
+    }
+  }
 %>
 <base:page type="default" >
@@ -27 +61 @@
 <script language="JavaScript">
 var caseIsValid = false;
-var arrivalDateIsValid = false;
-var nofDeliveredTubesIsValid = true;
+var arrivalDateIsValid = true;
 var nofTubesIsValid = false;
 var lateralityIsValid = false;
@@ -34 +67 @@
 var wellsAreValidValid = null;
 var specimenTypeIsValid = false;
+var samplingDateIsValid = true;
+var rnaLaterDateIsValid = true;
 var debug = false;
 var currentStep = 1;
@@ -64 +99 @@
 {
   var frm = document.forms['reggie']; 
-  if (!nofTubesIsValid) frm.nofTubes.focus();
-  else if (lateralityIsValid) return true;
+  if (!nofTubesIsValid) 
+  {
+    frm.nofTubes.focus();
+    return false;
+  }
+  if (!arrivalDateIsValid)
+  {
+    frm.arrivalDate.focus();
+    return false;
+  }
+  if (!samplingDateIsValid)
+  {
+    frm.samplingDate.focus();
+    return false;
+  }
+  if (!rnaLaterDateIsValid)
+  {
+    frm.rnaLaterDate.focus();
+    return false;
+  }
+  if (!lateralityIsValid) return false;
+  return true;
 }
 
@@ -147 +202 @@
       if (specimen.samplingDate && !thisCaseSamplingDate) 
       {
-        thisCaseSamplingDate = specimen.samplingDate;         
+        thisCaseSamplingDate = specimen.samplingDate;
       }
       if (specimen.rnaLaterDate && !thisCaseRNALaterDate) 
@@ -267 +322 @@
   frm.samplingTime.disabled = true;
   frm.otherPathNote.disabled = true;
+  frm.specimenType.disabled = true;
+  frm.biopsyType.disabled = true;
   
   if (updateMode)
@@ -276 +333 @@
   {
     var specimen = null;
-    var boxValue = '';
+    var boxValue = '<%=recentBoxName %>';
     var rowValue = '';
     var columnValue = '';
@@ -283 +340 @@
     var allPrepWeightValue = '';
 
-    boxInfo[i] = null;  
+    boxInfo[i] = null;
+    var boxDisabled = '';
     if (caseInfo.specimen && caseInfo.specimen.length>0 && i<caseInfo.specimen.length)
     {
+      boxDisabled = 'disabled';
       specimen = caseInfo.specimen[i];
       boxValue = specimen.box == null ? '' : specimen.box;
@@ -295 +354 @@
     inputTubeHtml += '</tr>';
 
-    var box = 'box'+i;
-    var boxDisabled = boxValue == '' ? '' : 'disabled';
+    var box = 'box'+i;    
     inputTubeHtml += '<tr>';
     inputTubeHtml += '<td class="subprompt">Box</td>';
     inputTubeHtml += '<td class="input">';
-    inputTubeHtml += '<input type="text" name='+box+' value="Sp' + boxValue + '" '+ boxDisabled +' size="12" maxlength="12" onKeyUp="boxOnKeyUp('+i+')" onChange="boxOnChange('+i+')"></td>';
+    inputTubeHtml += '<input type="text" name='+box+' value="' + boxValue + '" '+ boxDisabled +' size="12" maxlength="12" onKeyUp="boxOnKeyUp('+i+')" onBlur="boxOnChange('+i+')"></td>';
     inputTubeHtml += '<td class="status" id="'+box+'.status"></td>';
     inputTubeHtml += '<td class="help"><span id="'+box+'.message" class="message" style="display: none;"></span>Box-number where the specimen tube is located in.</td>';    
@@ -314 +372 @@
     inputTubeHtml += '&nbsp;Column<input type="text" name='+column+' value="'+ columnValue + '" size="3" maxlength="3" ' + wellDisabled;
     inputTubeHtml += ' onBlur="wellOnChange('+i+')">';
+    inputTubeHtml += '&nbsp;<a href="javascript:suggestWellOnClick('+i+')" disabled>Suggest</a>'
     inputTubeHtml += '</td>';
     inputTubeHtml += '<td class="status" id="rowColumn'+i+'.status"></td>';
@@ -322 +381 @@
     var doOnTab = i==(nofTubes-1) ? 'doOnTab(event, goCreate)' : '';
     inputTubeHtml += '<tr>';
-    inputTubeHtml += '<td class="subprompt">Operator comment</td>';
+    inputTubeHtml += '<td class="subprompt">Operator delivery comment</td>';
     inputTubeHtml += '<td class="input"><textarea rows="3" cols="30" name='+operatorComment+' value="" onkeypress="'+doOnTab+'"></textarea></td>';
     inputTubeHtml += '<td class="status" id="'+operatorComment+'.status"></td>';
@@ -338 +397 @@
   else Main.show('gocreate'); 
 
-  if (frm.box0.value == 'Sp') frm.box0.focus();
-  else frm.operatorComment0.focus();
+  var textLength = frm.box0.value.length;
+  frm.box0.focus();
+  frm.box0.setSelectionRange(textLength,textLength);
 }
 
@@ -381 +441 @@
   }
   samplingDateIsValid = true;
+  rnaLaterDateTimeOnChange();
 }
 
@@ -388 +449 @@
   var boxName = 'box'+tubeIndex;
   var boxValue = frm.elements[boxName].value;
-  if (boxValue.substring(0,2) != 'Sp')
+  if (boxValue.length>0 && boxValue.substring(0,2) != 'Sp')
   {
     boxValue = 'Sp'+boxValue;
@@ -409 +470 @@
     boxValue = '0'+boxValue;
   }
-  boxValue = 'Sp'+boxValue;
+  if (boxValue.length > 0)
+  {
+    boxValue = 'Sp'+boxValue;
+  } 
   frm.elements[boxName].value = boxValue;
   
   wellsAreValid[tubeIndex] = false;
   
-  if (frm.elements[boxName].value == 'Sp')
+  if (frm.elements[boxName].value == 'Sp' || frm.elements[boxName].value == '')
   {
     boxesAreValid[tubeIndex] = true;
@@ -430 +494 @@
   var url = 'SpecimenTubeRegistration.servlet?ID=<%=ID%>&cmd=GetBoxInfo';
   url += '&boxName=' + boxValue;  
+  url += '&nofTubes=' + nofTubes;
   request.open("GET", url, false);
   request.send(null);
@@ -475 +540 @@
     }
     
-    nextWellRow = response.freeRow;
-    nextWellColumn = parseInt(response.freeColumn)+1;   
-    if( (nextWellColumn + tubeIndex) > response.columns)
-    {
-      nextWellColumn = 0;
-      nextWellRow = '';
+    if (response.freeRow != null && response.freeColumn != null)
+    {
+      nextWellRow = response.freeRow;
+      nextWellColumn = parseInt(response.freeColumn)+1;   
+      
+      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+']','');
+    if (response.message && "Warning:" == response.message.substring(0,8))
+    {
+      setInputStatus(boxName, response.message.substring(8), 'warning');
     }
     else
     {
-      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');   
+      setInputStatus(boxName, '', 'valid');
+    }       
     frm.elements[rowName].focus();    
   }   
@@ -537 +605 @@
   if (response.message)
   {
-    wellsAreValid[tubeIndex] = false;
-    setInputStatus('rowColumn'+tubeIndex, response.message, 'invalid')
-    return false;
+    if (response.message.length>8 && response.message.substring(0,8) == "Warning:")
+    {
+      setInputStatus('rowColumn'+tubeIndex, response.message.substring(8), 'warning');
+    }
+    else
+    {
+      wellsAreValid[tubeIndex] = false;
+      setInputStatus('rowColumn'+tubeIndex, response.message, 'invalid')
+      return false;
+    }   
   }
   for (var i=0;i<nofTubes;i++)
@@ -558 +633 @@
 }
 
+function suggestWellOnClick(tubeIndex)
+{
+  var frm = document.forms['reggie'];
+  var boxName = 'box'+tubeIndex;
+  var boxValue = frm.elements[boxName].value;
+  var rowName = 'row'+tubeIndex;
+  var columnName = 'column'+tubeIndex;
+  var nextWellRow = '';
+  var nextWellColumn = '';
+  var nofTubes = frm.nofTubes.value;
+  
+  if (boxValue && boxValue != 'Sp')
+  {
+    var request = Ajax.getXmlHttpRequest();
+    var url = 'SpecimenTubeRegistration.servlet?ID=<%=ID%>&cmd=GetBoxInfo';
+    url += '&boxName=' + boxValue;  
+    url += '&nofTubes=' + nofTubes;
+    request.open("GET", url, false);
+    request.send(null);
+
+    if (debug) Main.debug(request.responseText);
+
+    var response = JSON.parse(request.responseText);
+    if (response.status != 'ok')
+    {
+      boxesAreValid[tubeIndex] = false;   
+      setFatalError(response.message);
+      return false;
+    }
+    if (response.boxInfo)
+    {
+      if (response.freeRow && response.freeColumn)
+      {
+        nextWellRow = response.freeRow;
+        nextWellColumn = parseInt(response.freeColumn)+1;
+        if( (nextWellColumn + tubeIndex) > response.columns)
+        {
+          nextWellColumn = 0;
+          nextWellRow = '';
+        }
+        else
+        {
+          nextWellColumn = nextWellColumn + tubeIndex;
+        }
+        frm.elements[rowName].value = nextWellRow;    
+        frm.elements[columnName].value = nextWellColumn;
+      }     
+    }
+    wellOnChange(tubeIndex);
+    frm.elements['operatorComment'+tubeIndex].focus();
+  }
+}
+
 function rnaLaterDateTimeOnChange()
 {
@@ -596 +724 @@
     if (samplingDateIsValid && rnaLaterTimestamp)
     {
-      var samplingTimestamp = Dates.parseString(frm.samplingDate.value + ' ' + frm.samplingTime.value, 'yyyyMMdd Hmm');
-      if (samplingTimestamp && rnaLaterTimestamp.getDate() != samplingTimestamp.getDate())
-      {
-        setInputStatus('rnaLaterDate', 'Sampling and RNA later dates are different', 'warning');
-        return;
+      var samplingTimestamp = Dates.parseString(frm.samplingDate.value + ' ' + frm.samplingTime.value, 'yyyyMMdd Hmm');     
+      if (samplingTimestamp)
+      {
+        if (rnaLaterTimestamp.getDate() == samplingTimestamp.getDate() && rnaLaterTimestamp.getTime()<samplingTimestamp.getTime())
+        {
+          setInputStatus('rnaLaterDate', 'RNA-later date+time must later then Sampling date+time','invalid');
+          return;
+        }
+        if (rnaLaterTimestamp.getDate() != samplingTimestamp.getDate())
+        {
+          setInputStatus('rnaLaterDate', 'Sampling and RNA later dates are different', 'warning');
+          return;
+        }
       }
+      
     }
     setInputStatus('rnaLaterDate', '', 'valid');
@@ -634 +771 @@
     }
     setInputStatus('arrivalDate', '', 'valid');
-    arrivalDateIsValid = true;    
   }
   else
@@ -640 +776 @@
     setInputStatus('arrivalDate', 'Missing', 'warning');
   } 
+  arrivalDateIsValid = true;
 }
 
@@ -652 +789 @@
     return;
   }
-  if (nofTubes == '0')
+  if (nofTubes < '1')
   {
     setInputStatus('nofTubes', 'Must be at least 1', 'invalid');

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/Reggie.java

@@ -146 +146 @@
     for samples (Specimen tube). It is a String annotation type.
   */
-  public static final String ANNOTATION_OPERATOR_COMMENT = "OperatorComment";
+  public static final String ANNOTATION_OPERATOR_DELIVERY_COMMENT = "OperatorDeliveryComment";
   
   /**

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/SpecimenTubeServlet.java

@@ -18 +18 @@
 import net.sf.basedb.core.InvalidDataException;
 import net.sf.basedb.core.Item;
+import net.sf.basedb.core.ItemContext;
 import net.sf.basedb.core.ItemQuery;
 import net.sf.basedb.core.Sample;
@@ -40 +41 @@
 public class SpecimenTubeServlet 
   extends HttpServlet 
-{
-
-  
+{ 
   private static final long serialVersionUID = -8107161732923753803L;
 
@@ -105 +104 @@
         AnnotationType arrivalDateType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_ARRIVAL_DATE, true);        
         AnnotationType nofDeliveredTubesType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_NOF_DELIVERED_TUBES, true);
-        AnnotationType operatorCommentType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_OPERATOR_COMMENT, true);
+        AnnotationType operatorCommentType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_OPERATOR_DELIVERY_COMMENT, true);
         AnnotationType pathNoteType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_OTHER_PATH_NOTE, true);
         AnnotationType specimenType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_SPECIMEN_TYPE, true);
@@ -134 +133 @@
         dc = sc.newDbControl();
         
-        String boxName = req.getParameter("boxName");
-        ItemQuery<BioPlate> boxQuery = BioPlate.getQuery();
-        boxQuery.restrict(Restrictions.eq(Hql.property("name"), Expressions.string(boxName)));
-        List<BioPlate> boxes = boxQuery.list(dc);
-        
-        if (boxes.size() == 0)
-        {
-          json.put("message", "Box does not exist.");         
-        }
-        else if (boxes.size() > 1)
-        {
-          json.put("message", "More then one box were found.");
-        }
-        else
-        {         
-          BioPlate box = boxes.get(0);
+        // Get spBox
+        String boxName = req.getParameter("boxName");       
+        Integer spaceReq = Values.getInt(req.getParameter("nofTubes"), 1);
+        ItemQuery<BioPlate> spBoxQuery = BioPlate.getQuery();
+        spBoxQuery.restrict(Restrictions.eq(Hql.property("name"), Expressions.string(boxName)));
+        List<BioPlate> spBoxes = spBoxQuery.list(dc);
+        
+        
+        // Looking for free place in the corresponding LYS-box
+        String lysBoxName = "Lys"+boxName.substring(2);
+        ItemQuery<BioPlate> lysBoxQuery = BioPlate.getQuery();
+        lysBoxQuery.restrict(Restrictions.eq(Hql.property("name"), Expressions.string(lysBoxName)));
+        List<BioPlate> lysBoxes = lysBoxQuery.list(dc);
+        BioWell emptyWell = null;
+        
+        if (spBoxes.size() == 1)
+        {
+          BioPlate box = spBoxes.get(0);
+          if (lysBoxes.size() == 0)
+          {
+            json.put("message", "Warning:There is no corresponding Lys-box for this Sp-box.");
+          }
+          else if (lysBoxes.size() > 1)
+          {
+            json.put("message", "Warning:More then one lys-box were found.");
+          }
+          else
+          {
+            // Search for empty position in corresponding lys-box.
+            emptyWell = getFirstFreeWell(lysBoxes.get(0),spaceReq);
+          } 
+          
+          // No empty position were found in lys-box. Search for empty position in Sp-box.
+          if (emptyWell == null)
+          {
+            emptyWell = getFirstFreeWell(box, spaceReq);
+          }
+          else
+          {
+            // else control that same position is free in Sp-box or look in Sp-box.
+            if (!box.getBioWell(emptyWell.getRow(), emptyWell.getColumn()).isEmpty())
+            {
+              emptyWell = getFirstFreeWell(box, spaceReq);              
+            }
+          }
+          
+          if (emptyWell == null)
+          {
+            json.put("message", "Warning:An empty position can not be suggested.");
+          }
+          
           WellCoordinateFormatter wcfRow = new WellCoordinateFormatter(true);
-          
-          int rowIndex = box.getRows()-1;
-          boolean isLastEmpty = false;
-          BioWell emptyWell = null;
-          while (rowIndex >= 0 && !isLastEmpty)
-          {
-            int columnIndex = box.getColumns()-1;
-            while (columnIndex >= 0 && !isLastEmpty)
-            { 
-              if (box.getBioWell(rowIndex, columnIndex).isEmpty())
-              {               
-                emptyWell = box.getBioWell(rowIndex, columnIndex);
-              }
-              else
-              {
-                isLastEmpty = true;
-              }
-              columnIndex--;
-            }
-            rowIndex--;
-          }
-          
-          json.put("boxInfo", boxes.get(0).getId());
-          json.put("rows", wcfRow.format(boxes.get(0).getRows()-1));
-          json.put("columns", boxes.get(0).getColumns());
-          json.put("freeColumn", emptyWell.getColumn());
-          json.put("freeRow", wcfRow.format(emptyWell.getRow()));         
+          json.put("boxInfo", spBoxes.get(0).getId());
+          json.put("rows", wcfRow.format(spBoxes.get(0).getRows()-1));
+          json.put("columns", spBoxes.get(0).getColumns());
+          if (emptyWell != null)
+          {
+            json.put("freeColumn", emptyWell.getColumn());
+            json.put("freeRow", wcfRow.format(emptyWell.getRow()));
+          }                   
+        }
+        else if (spBoxes.size()==0)
+        {
+          json.put("message", "There is no Sp-box with name: "+boxName);
+        }
+        else 
+        {
+          json.put("message", "More then one Sp-box were found with the name: " + boxName);
         }
         
@@ -271 +294 @@
         AnnotationType rnaLaterDateType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_RNALATER_DATETIME, true);
         AnnotationType arrivalDateType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_ARRIVAL_DATE, true);        
-        AnnotationType operatorCommentType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_OPERATOR_COMMENT, true);
+        AnnotationType operatorCommentType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_OPERATOR_DELIVERY_COMMENT, true);
         AnnotationType specimenType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_SPECIMEN_TYPE, true);
         AnnotationType biopsyType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_BIOPSY_TYPE, true);
@@ -320 +343 @@
       {
         dc = sc.newDbControl();
-        
+        ItemContext cc = sc.getCurrentContext(Item.SAMPLE);
         JSONObject jsonReq = (JSONObject)new JSONParser().parse(req.getReader());       
         JSONObject jsonCase = (JSONObject)jsonReq.get("caseInfo");
@@ -340 +363 @@
         AnnotationType rnaLaterDateType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_RNALATER_DATETIME, true);
         AnnotationType arrivalDateType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_ARRIVAL_DATE, true);
-        AnnotationType operatorCommentType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_OPERATOR_COMMENT, true);
+        AnnotationType operatorCommentType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_OPERATOR_DELIVERY_COMMENT, true);
         AnnotationType specimenType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_SPECIMEN_TYPE, true);
         AnnotationType biopsyType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_BIOPSY_TYPE, true);
@@ -388 +411 @@
               {
                 specimen.setBioWell(well);
+                cc.setRecent(well.getPlate(), "reggie_specimentube", 1);                
               }
             }           
@@ -412 +436 @@
     }
   }
+  
+  private BioWell getFirstFreeWell(BioPlate box, Integer numberOfWells)
+  {
+    // First free well in the box. 
+    BioWell firstFreeWell= null;
+    
+    int rowIndex = box.getRows()-1;
+    boolean foundLastEmpty = false;         
+    while (rowIndex >= 0 && !foundLastEmpty)
+    {
+      int columnIndex = box.getColumns()-1;
+      while (columnIndex >= 0 && !foundLastEmpty)
+      { 
+        if (!box.getBioWell(rowIndex, columnIndex).isEmpty())
+        {
+          /* We past the last free well or reach the beginning of the plate, 
+             take one step forward and check if all tubes can be placed on the same row
+          */
+          int freeColumn = columnIndex;
+          int freeRow = rowIndex;
+          if (!(box.getColumns() > (freeColumn+numberOfWells)))
+          {
+            freeRow++;
+            freeColumn = 0;
+          }
+          else
+          {
+            freeColumn++;
+          }
+                    
+          if (freeRow<box.getRows() && freeColumn<box.getColumns())
+          {
+            firstFreeWell = box.getBioWell(freeRow, freeColumn);
+          }         
+          foundLastEmpty = true;
+        }
+        else if (rowIndex == 0 && columnIndex==0)
+        {
+          firstFreeWell = box.getBioWell(rowIndex, columnIndex);
+        }
+        columnIndex--;
+      }
+      rowIndex--;
+    }   
+    return firstFreeWell;
+  }
 }