Changeset 5813


Ignore:
Timestamp:
Jan 22, 2020, 12:53:40 PM (2 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:
3 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk/resources/sampleproc/partitionform.js

    r5782 r5813  
    560560    url += '&cmd=GetLabelFile';
    561561    url += '&specimen='+ids.join(',');
     562    url += '&includeHisLabels='+(Doc.element('includeHisLabels').checked ? 1 : 0);
    562563    url += '&includeAllHisLabels='+(Doc.element('includeAllHisLabels').checked ? 1 : 0);
    563564    url += '&format='+encodeURIComponent(format);
  • extensions/net.sf.basedb.reggie/trunk/resources/sampleproc/partitionform.jsp

    r5782 r5813  
    161161        <td class="prompt">Download label file</td>
    162162        <td class="input">
     163          <label id="includeHisLabelsLbl"><input type="checkbox" name="includeHisLabels" checked
     164            id="includeHisLabels">Include Histology labels</label><br>
    163165          <label id="includeAllHisLabelsLbl" style="display: none;"><input type="checkbox" name="includeAllHisLabels"
    164166            id="includeAllHisLabels">Include Histology labels for re-extraction</label>
     
    168170          <base:icon subclass="link" id="downloadLabelsXlsx" image="<%=home + "/images/download.png"%>"
    169171            data-format="xlsx" title="Download lables as an Excel worksheet file (xlsx)">Excel</base:icon>
     172          </div>
    170173        </td>
    171174        <td class="status" id="downloadfile.status"></td>
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/PartitionRegistrationServlet.java

    r5791 r5813  
    9494        String format = Values.getString(req.getParameter("format"), "csv");
    9595       
     96        boolean includeHisLabels = Values.getBoolean(req.getParameter("includeHisLabels"));
    9697        boolean includeAllHisLabels = Values.getBoolean(req.getParameter("includeAllHisLabels"));
    9798        for (Integer specimenId : ids)
     
    106107         
    107108          if (firstExtraction) firstPart.add(spName);
    108           if (firstExtraction || includeAllHisLabels)
     109          if (firstExtraction && includeHisLabels || !firstExtraction && includeAllHisLabels)
    109110          {
    110111            String hisName = sp.getNextHistologyName(dc);
Note: See TracChangeset for help on using the changeset viewer.