Changeset 5824


Ignore:
Timestamp:
Feb 4, 2020, 4:43:04 PM (22 months ago)
Author:
olle
Message:

Refs #1029. FFPE section (specimen) registration wizard updated in selection list to only be extended with new items after FFPE section order form has been approved:

  1. Java class/file CounterServlet.java in src/net/sf/basedb/meludi/counter/ updated in private method void countFfpeBlocks(DbControl dc, JSONObject json) to only include FFPE block items with approved FFPE section order form in number of FFPE blocks unused for section.
  2. Java servlet class/file ExtractionServlet.java in src/net/sf/basedb/meludi/servlet/ updated in protected method void doGet(HttpServletRequest req, HttpServletResponse resp) for command "GetFfpeBlocksUnusedForSection" to only include FFPE blocks with approved FFPE section order form.
Location:
extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/counter/CounterService.java

    r5243 r5824  
    583583          numFfpeBlocksUnusedForSectionOrderForm++;
    584584        }
    585         if (isUsedForFfpeSection == null || !isUsedForFfpeSection)
     585        else if (isUsedForFfpeSection == null || !isUsedForFfpeSection)
    586586        {
    587587          numFfpeBlocksUnusedForSection++;
  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/ExtractionServlet.java

    r5823 r5824  
    12321232          if (returnedDate == null)
    12331233          {
    1234             // Only include FFPE blocks not used for FFPE section
    1235             f.loadAnnotations(dc, "usedForFfpeSection", Annotationtype.USED_FOR_FFPE_SECTION, null);
    1236             Boolean usedFfpeBlockValue = (Boolean)f.asJSONObject().get("usedForFfpeSection");
    1237             if (usedFfpeBlockValue == null || !usedFfpeBlockValue)
    1238             {
    1239               f.loadAnnotations(dc, "pad", Annotationtype.PAD, null);
    1240               f.loadAnnotations(dc, "materialNumber", Annotationtype.MATERIAL_NUMBER, null);
    1241               f.loadAnnotations(dc, "yellowLabel", Annotationtype.YELLOW_LABEL, null);
    1242               f.loadAnnotations(dc, "operatorDeliveryComment", Annotationtype.OPERATOR_DELIVERY_COMMENT, null);
    1243               jsonFfpeBlock.add(f.asJSONObject());           
     1234            // Only include FFPE blocks with approved FFPE section order forms
     1235            f.loadAnnotations(dc, "usedForFfpeSectionOrderForm", Annotationtype.USED_FOR_FFPE_SECTION_ORDER_FORM, null);
     1236            Boolean usedForFfpeSectionOrderFormValue = (Boolean)f.asJSONObject().get("usedForFfpeSectionOrderForm");
     1237            //System.out.println(new Date() + " ExtractionServlet::doGet() cmd = \"" + cmd + "\" f.getName() = \"" + f.getName() + "\" usedForFfpeSectionOrderFormValue = \"" + usedForFfpeSectionOrderFormValue + "\"");
     1238            if (usedForFfpeSectionOrderFormValue != null && usedForFfpeSectionOrderFormValue)
     1239            {
     1240              // Only include FFPE blocks not used for FFPE section
     1241              f.loadAnnotations(dc, "usedForFfpeSection", Annotationtype.USED_FOR_FFPE_SECTION, null);
     1242              Boolean usedFfpeBlockValue = (Boolean)f.asJSONObject().get("usedForFfpeSection");
     1243              if (usedFfpeBlockValue == null || !usedFfpeBlockValue)
     1244              {
     1245                f.loadAnnotations(dc, "pad", Annotationtype.PAD, null);
     1246                f.loadAnnotations(dc, "materialNumber", Annotationtype.MATERIAL_NUMBER, null);
     1247                f.loadAnnotations(dc, "yellowLabel", Annotationtype.YELLOW_LABEL, null);
     1248                f.loadAnnotations(dc, "operatorDeliveryComment", Annotationtype.OPERATOR_DELIVERY_COMMENT, null);
     1249                jsonFfpeBlock.add(f.asJSONObject());           
     1250              }             
    12441251            }
    12451252          }
Note: See TracChangeset for help on using the changeset viewer.