Changeset 5824

Timestamp:

Feb 4, 2020, 4:43:04 PM (3 years 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:

• counter/CounterService.java (modified) (1 diff)
• servlet/ExtractionServlet.java (modified) (1 diff)

extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/counter/CounterService.java

@@ -583 +583 @@
           numFfpeBlocksUnusedForSectionOrderForm++;
         }
-        if (isUsedForFfpeSection == null || !isUsedForFfpeSection)
+        else if (isUsedForFfpeSection == null || !isUsedForFfpeSection)
         {
           numFfpeBlocksUnusedForSection++;

extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/ExtractionServlet.java

@@ -1232 +1232 @@
           if (returnedDate == null)
           {
-            // Only include FFPE blocks not used for FFPE section
-            f.loadAnnotations(dc, "usedForFfpeSection", Annotationtype.USED_FOR_FFPE_SECTION, null);
-            Boolean usedFfpeBlockValue = (Boolean)f.asJSONObject().get("usedForFfpeSection");
-            if (usedFfpeBlockValue == null || !usedFfpeBlockValue)
-            {
-              f.loadAnnotations(dc, "pad", Annotationtype.PAD, null);
-              f.loadAnnotations(dc, "materialNumber", Annotationtype.MATERIAL_NUMBER, null);
-              f.loadAnnotations(dc, "yellowLabel", Annotationtype.YELLOW_LABEL, null);
-              f.loadAnnotations(dc, "operatorDeliveryComment", Annotationtype.OPERATOR_DELIVERY_COMMENT, null);
-              jsonFfpeBlock.add(f.asJSONObject());            
+            // Only include FFPE blocks with approved FFPE section order forms
+            f.loadAnnotations(dc, "usedForFfpeSectionOrderForm", Annotationtype.USED_FOR_FFPE_SECTION_ORDER_FORM, null);
+            Boolean usedForFfpeSectionOrderFormValue = (Boolean)f.asJSONObject().get("usedForFfpeSectionOrderForm");
+            //System.out.println(new Date() + " ExtractionServlet::doGet() cmd = \"" + cmd + "\" f.getName() = \"" + f.getName() + "\" usedForFfpeSectionOrderFormValue = \"" + usedForFfpeSectionOrderFormValue + "\"");
+            if (usedForFfpeSectionOrderFormValue != null && usedForFfpeSectionOrderFormValue)
+            {
+              // Only include FFPE blocks not used for FFPE section
+              f.loadAnnotations(dc, "usedForFfpeSection", Annotationtype.USED_FOR_FFPE_SECTION, null);
+              Boolean usedFfpeBlockValue = (Boolean)f.asJSONObject().get("usedForFfpeSection");
+              if (usedFfpeBlockValue == null || !usedFfpeBlockValue)
+              {
+                f.loadAnnotations(dc, "pad", Annotationtype.PAD, null);
+                f.loadAnnotations(dc, "materialNumber", Annotationtype.MATERIAL_NUMBER, null);
+                f.loadAnnotations(dc, "yellowLabel", Annotationtype.YELLOW_LABEL, null);
+                f.loadAnnotations(dc, "operatorDeliveryComment", Annotationtype.OPERATOR_DELIVERY_COMMENT, null);
+                jsonFfpeBlock.add(f.asJSONObject());            
+              }             
             }
           }