Changeset 5783

Timestamp:

Dec 12, 2019, 8:08:21 AM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #1214: Add support for external specimen

Display "External specimen" in the remark column.

File:

• extensions/net.sf.basedb.reggie/trunk/resources/sampleproc/reextract_picklist.jsp (modified) (2 diffs)

extensions/net.sf.basedb.reggie/trunk/resources/sampleproc/reextract_picklist.jsp

@@ -132 +132 @@
     BioPlate plate = well == null ? null : well.getPlate();
     Hardware freezer = plate == null ? null : plate.getFreezer();
-    String remark = "";
+    List<String> remarks = new ArrayList<>();
+    if (!s.getName().matches("\\d+\\.\\d.*")) remarks.add("External specimen");
     List<String> freezerLocation = new ArrayList<>();
     if (plate != null)
     {
-      remark = plate.getName().startsWith("PSp") ? "Paused specimen" : "";
+      if (plate.getName().startsWith("PSp")) remarks.add("Paused specimen");
       if (plate.getSection() != null) freezerLocation.add("Section " + plate.getSection());
       if (plate.getTray() != null) freezerLocation.add("Tray " + plate.getTray());
@@ -174 +175 @@
       </td>
       <td class="remain"><%=reminingQuantity == null ? "<i>n/a</i>" : Values.formatNumber(reminingQuantity / 1000, 0, "mg") %></td>
-      <td class="remark"><%=remark %></td>
+      <td class="remark"><%=Values.getString(remarks, "; ", true) %></td>
     </tr>
     <%