Changeset 4971

Timestamp:

Sep 14, 2018, 11:59:32 AM (5 years ago)

Author:

olle

Message:

Refs #1029. Referral form generator updated for BASE-line forms to add suffices ".b1", ".b2", and ".b3" to referral ID text and bar codes on the three rightmost sticker labels:

1. Java servlet class/file ReferralGeneratorServlet.java in src/net/sf/based/meludi/servlet/ updated in private method PdfUtil createBarcodeStickerForm(DbControl dc, PdfUtil pdfUtil, File pdfFile, String itemId, String formTemplateName, List<String> formTemplateFileList) to add suffices ".b1", ".b2", and ".b3" to referral ID text and bar codes on the three rightmost sticker labels for BASE-line forms.

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

@@ -1758 +1758 @@
     xDiffSpecArr[8] = 0.0f;
 
+    int bloodLsbelStartNo = 6;
     for (int i = 0; i < 9; i++)
     {
+      if (formTemplateName.equals(REF_FORM_TEMPLATE_WHOLE_BLOOD))
+      {
+        if (i >= bloodLsbelStartNo)
+        {
+          text = itemId + ".b";
+/*
+          if (i > bloodLsbelStartNo)
+          {
+            text = text + (i - bloodLsbelStartNo + 1);
+          }
+*/
+          text = text + (i - bloodLsbelStartNo + 1);
+        }
+      }
       float xTextLowerLeft2 = xTextLowerLeft + i*xLowerLeftDiff + xDiffSpecArr[i];
       pdfUtil.addBoldText(text, textFontSize, align, xTextLowerLeft2, yTextLowerLeft);
@@ -1768 +1783 @@
 
     // Barcode on labels
+    String labelText = itemId;
     float labelBarcodeWidth = 61.7f;
     float labelBarcodeHeight = 13.5f;
@@ -1776 +1792 @@
     for (int i = 0; i < 9; i++)
     {
+      if (formTemplateName.equals(REF_FORM_TEMPLATE_WHOLE_BLOOD))
+      {
+        if (i >= bloodLsbelStartNo)
+        {
+          labelText = itemId + ".b";
+/*
+          if (i > bloodLsbelStartNo)
+          {
+            labelText = labelText + (i - bloodLsbelStartNo + 1);
+          }
+*/
+          labelText = labelText + (i - bloodLsbelStartNo + 1);
+        }
+      }
       float xLabelBarcodeLeft2 = xLabelBarcodeLeft + i*xLowerLeftDiff + xDiffSpecArr[i];
-      pdfUtil.addBarcode(itemId, xLabelBarcodeLeft2, yLabelBarcodeLeft, labelBarcodeWidth, labelBarcodeHeight, align, rotationDegrees);
+      pdfUtil.addBarcode(labelText, xLabelBarcodeLeft2, yLabelBarcodeLeft, labelBarcodeWidth, labelBarcodeHeight, align, rotationDegrees);
       // Barcode label text
-      String labelText = itemId;
       float xLabelTextLeft = xLabelBarcodeLeft2 + 22.0f;
       float yLabelTextLeft = yLabelBarcodeLeft;