Changeset 5813

Timestamp:

Jan 22, 2020, 12:53:40 PM (4 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1223: Implement an option to skip labels for the Histology specimen in the partitioning wizard

Added a checkbox "Include Histology labels" to the partitioning wizard. The checkbox is enabled by default but can be unchecked to skip the Histology labels.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/sampleproc/partitionform.js (modified) (1 diff)
• resources/sampleproc/partitionform.jsp (modified) (2 diffs)
• src/net/sf/basedb/reggie/servlet/PartitionRegistrationServlet.java (modified) (2 diffs)

extensions/net.sf.basedb.reggie/trunk/resources/sampleproc/partitionform.js

@@ -560 +560 @@
     url += '&cmd=GetLabelFile';
     url += '&specimen='+ids.join(',');
+    url += '&includeHisLabels='+(Doc.element('includeHisLabels').checked ? 1 : 0);
     url += '&includeAllHisLabels='+(Doc.element('includeAllHisLabels').checked ? 1 : 0);
     url += '&format='+encodeURIComponent(format);

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

@@ -161 +161 @@
         <td class="prompt">Download label file</td>
         <td class="input">
+          <label id="includeHisLabelsLbl"><input type="checkbox" name="includeHisLabels" checked
+            id="includeHisLabels">Include Histology labels</label><br>
           <label id="includeAllHisLabelsLbl" style="display: none;"><input type="checkbox" name="includeAllHisLabels" 
             id="includeAllHisLabels">Include Histology labels for re-extraction</label>
@@ -168 +170 @@
           <base:icon subclass="link" id="downloadLabelsXlsx" image="<%=home + "/images/download.png"%>" 
             data-format="xlsx" title="Download lables as an Excel worksheet file (xlsx)">Excel</base:icon>
+          </div>
         </td>
         <td class="status" id="downloadfile.status"></td>

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

@@ -94 +94 @@
         String format = Values.getString(req.getParameter("format"), "csv");
         
+        boolean includeHisLabels = Values.getBoolean(req.getParameter("includeHisLabels"));
         boolean includeAllHisLabels = Values.getBoolean(req.getParameter("includeAllHisLabels"));
         for (Integer specimenId : ids)
@@ -106 +107 @@
           
           if (firstExtraction) firstPart.add(spName);
-          if (firstExtraction || includeAllHisLabels)
+          if (firstExtraction && includeHisLabels || !firstExtraction && includeAllHisLabels)
           {
             String hisName = sp.getNextHistologyName(dc);