Changeset 5854

Timestamp:

Mar 6, 2020, 3:38:13 PM (3 years ago)

Author:

olle

Message:

Refs #1029. FFPE section order form generation updated have bar code and text at upper left show PAD number + "_" + material number:

1. Java servlet class/file ReferralGeneratorServlet.java in src/net/sf/basedb/meludi/servlet/ updated in private method PdfUtil createFfpeSectionOrderForm(DbControl dc, PdfUtil pdfUtil, File pdfFile, List<String> itemIdList, List<String> formTemplateFileList) to have bar code and text at upper left show PAD number + "_" + material number.

File:

• extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/ReferralGeneratorServlet.java (modified) (3 diffs)

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

@@ -2043 +2043 @@
           materialNumber = "";
         }
+        String combinedPadMaterialNumber = pad + "_" + materialNumber;
         System.out.println("ReferralGeneratorServlet::createFfpeSectionOrderForm(): i = " + i + " materialNumber = " + materialNumber + " pad = " + pad);
         String yellowLabel = (String) Annotationtype.YELLOW_LABEL.getAnnotationValue(dc, manager, ffpeBlock.getSample());
@@ -2058 +2059 @@
         float height = 16.0f;
 
+/*
         // Barcode with PAD number at upper left
         text = pad;
@@ -2066 +2068 @@
         
         // PAD number below bar code at upper left
+        float xTextUpperLeft = xBarcodeUpperLeft;
+        float yTextUpperLeft = yBarcodeUpperLeft - 10.0f;
+        pdfUtil.addBoldText(text, textFontSize, align, xTextUpperLeft, yTextUpperLeft);
+*/
+
+        // Barcode with combined PAD/Material number at upper left
+        text = combinedPadMaterialNumber;
+        float xBarcodeUpperLeft = 120.0f;
+        float yBarcodeUpperLeft = yBarcodeUpperRight;
+        align = Element.ALIGN_LEFT;
+        pdfUtil.addBarcode(text, xBarcodeUpperLeft, yBarcodeUpperLeft, width, height, align);
+        
+        // Combined PAD/Material number below bar code at upper left
         float xTextUpperLeft = xBarcodeUpperLeft;
         float yTextUpperLeft = yBarcodeUpperLeft - 10.0f;