Changeset 5783


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk/resources/sampleproc/reextract_picklist.jsp

    r5782 r5783  
    132132    BioPlate plate = well == null ? null : well.getPlate();
    133133    Hardware freezer = plate == null ? null : plate.getFreezer();
    134     String remark = "";
     134    List<String> remarks = new ArrayList<>();
     135    if (!s.getName().matches("\\d+\\.\\d.*")) remarks.add("External specimen");
    135136    List<String> freezerLocation = new ArrayList<>();
    136137    if (plate != null)
    137138    {
    138       remark = plate.getName().startsWith("PSp") ? "Paused specimen" : "";
     139      if (plate.getName().startsWith("PSp")) remarks.add("Paused specimen");
    139140      if (plate.getSection() != null) freezerLocation.add("Section " + plate.getSection());
    140141      if (plate.getTray() != null) freezerLocation.add("Tray " + plate.getTray());
     
    174175      </td>
    175176      <td class="remain"><%=reminingQuantity == null ? "<i>n/a</i>" : Values.formatNumber(reminingQuantity / 1000, 0, "mg") %></td>
    176       <td class="remark"><%=remark %></td>
     177      <td class="remark"><%=Values.getString(remarks, "; ", true) %></td>
    177178    </tr>
    178179    <%
Note: See TracChangeset for help on using the changeset viewer.