Changeset 6285

Timestamp:

Jun 10, 2021, 3:52:27 PM (2 years ago)

Author:

Nicklas Nordborg

Message:

References #1315: Support more item types in the outtake wizard

The final registration of an outtake and delivery data file should now work with the item types.

Location:

extensions/net.sf.basedb.reggie/branches/4.31-stable

Files:

• resources/outtake/delivery_export.js (modified) (1 diff)
• resources/outtake/register.js (modified) (2 diffs)
• src/net/sf/basedb/reggie/servlet/OuttakeServlet.java (modified) (4 diffs)

extensions/net.sf.basedb.reggie/branches/4.31-stable/resources/outtake/delivery_export.js

@@ -38 +38 @@
       {
         var list = workLists[i];
-        var name = list.name + ' (' + list.size + ')';
+        var name = list.name + ' (' + list.size+(list.parentType?' '+list.parentType : '') + ')';
         var option = new Option(name, list.id);
         option.workList = list;

extensions/net.sf.basedb.reggie/branches/4.31-stable/resources/outtake/register.js

@@ -49 +49 @@
       {
         var list = workLists[i];
-        var name = list.name + ' (' + list.size + ')';
+        var name = list.name + ' (' + list.size+(list.parentType?' '+list.parentType : '') + ')';
         var option = new Option(name, list.id);
         option.workList = list;
@@ -193 +193 @@
     {
       submitInfo.sampleConsumed = Doc.element('sampleConsumedYes').checked;
-      var except = [];
       submitInfo.except = Link.getIdsInList(frm.except, workList.itemType);
     }

extensions/net.sf.basedb.reggie/branches/4.31-stable/src/net/sf/basedb/reggie/servlet/OuttakeServlet.java

@@ -342 +342 @@
         
         ItemList workList = ItemList.getById(dc, workListId);
-        
+        Float targetAmount = (Float)Annotationtype.OUTTAKE_TARGET_AMOUNT.getAnnotationValue(dc, workList);
+        Float targetVolume = (Float)Annotationtype.OUTTAKE_TARGET_VOLUME.getAnnotationValue(dc, workList);
+      
         ItemQuery<Extract> memberQuery = (ItemQuery<Extract>)workList.getMembers();
         memberQuery.setIncludes(Reggie.INCLUDE_IN_CURRENT_PROJECT);
@@ -360 +362 @@
         
         TableWriter tw = new TableWriter(out);
-        tw.tablePrintData("Name", "Box", "Position", "Quantity (µg)", "Concentration (ng/µl)");
-        Object[] data = new Object[5];
+        Object[] data = null;
+        if (targetAmount != null && targetVolume != null)
+        {
+          tw.tablePrintData("Name", "Box", "Position", "Quantity (µg)", "Concentration (ng/µl)");
+          data = new Object[5];
+        }
+        else
+        {
+          tw.tablePrintData("Name", "Box", "Position", "Quantity (µl)");
+          data = new Object[4];
+        }
         
         Iterator<Extract> it = memberQuery.iterate(dc);
@@ -377 +388 @@
           data[2] = well.getCoordinate();
           data[3] = Values.formatNumber(aliquot.getRemainingQuantity(), 1);
-          data[4] = Values.formatNumber((Float)Annotationtype.DILUTION_CONC.getAnnotationValue(dc, aliquot), 1);
+          if (data.length > 4)
+          {
+            data[4] = Values.formatNumber((Float)Annotationtype.DILUTION_CONC.getAnnotationValue(dc, aliquot), 1);
+          }
           tw.tablePrintData(data);
         }
@@ -604 +618 @@
           Float ndConc = (Float)Annotationtype.ND_CONC.getAnnotationValue(dc, parent);
           
-          if (remain != null && ndConc != null)
-          {
-            boolean isException = except.contains(aliquot.getId());
-            if (isException) numExceptions++;
-            
-            if (sampleConsumed != isException)
+          if (targetAmount != null && targetVolume != null)
+          {
+            if (remain != null && ndConc != null)
             {
-              Dilution d = new Dilution(targetAmount, targetVolume, ndConc, remain);
-              creationEvent.getEventSource(parent).setUsedQuantity(d.amount);
-              aliquot.setOriginalQuantity(d.amount);
-              Annotationtype.DILUTION_CONC.setAnnotationValue(dc, aliquot, d.getDilutedConc());
-              //jsonMessages.add(aliquot.getId() + ":" + aliquot.getName() + ": " + ndConc + "--" + d.getDilutedConc() + ":"+isException);
+              boolean isException = except.contains(aliquot.getId());
+              if (isException) numExceptions++;
+              
+              if (sampleConsumed != isException)
+              {
+                Dilution d = new Dilution(targetAmount, targetVolume, ndConc, remain);
+                creationEvent.getEventSource(parent).setUsedQuantity(d.amount);
+                aliquot.setOriginalQuantity(d.amount);
+                Annotationtype.DILUTION_CONC.setAnnotationValue(dc, aliquot, d.getDilutedConc());
+                //jsonMessages.add(aliquot.getId() + ":" + aliquot.getName() + ": " + ndConc + "--" + d.getDilutedConc() + ":"+isException);
+              }
+              else
+              {
+                // jsonMessages.add(aliquot.getId() + ":" + aliquot.getName() + " not consumed: " + isException);
+              }
             }
-            else
+          }
+          else if (targetVolume != null)
+          {
+            if (remain != null)
             {
-              // jsonMessages.add(aliquot.getId() + ":" + aliquot.getName() + " not consumed: " + isException);
+              boolean isException = except.contains(aliquot.getId());
+              if (isException) numExceptions++;
+              if (sampleConsumed != isException)
+              {
+                Dilution d = new Dilution(targetVolume, remain);
+                creationEvent.getEventSource(parent).setUsedQuantity(d.volume);
+                aliquot.setOriginalQuantity(d.volume);
+                //jsonMessages.add(aliquot.getId() + ":" + aliquot.getName() + ": " + d.volume + ":"+isException);
+              }
+              else
+              {
+                //jsonMessages.add(aliquot.getId() + ":" + aliquot.getName() + " not consumed: " + isException);
+              }
             }
           }