Changeset 5727

Timestamp:

Nov 14, 2019, 4:14:40 PM (3 years ago)

Author:

olle

Message:

Refs #1029. Referral form generation updated to add suffix ".b1" and ".b2" to the bar code text of label stickers 7 and 8 from the left (the referral form sheet contains 9 label stickers) for whole blood referral forms, with the exception of the form for clinical testing in the NordicTrip project.:

1. Java servlet class/file ReferralGeneratorServlet.java in src/net/sf/basedb/meludi/servlet/ updated in private method PdfUtil createBarcodeStickerForm(DbControl dc, PdfUtil pdfUtil, File pdfFile, String itemId, String formTemplateName, List<String> formTemplateFileList) to add suffix ".b1" and ".b2" to the bar code text of label stickers 7 and 8 from the left (the referral form sheet contains 9 label stickers) for whole blood referral forms, with the exception of the form for clinical testing in the NordicTrip project.

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

@@ -2224 +2224 @@
       return pdfUtil;
     }
-    
+
+    // Whole blood form flag
+    Boolean wholeBloodFormFlag = false;
+    if (formTemplateName.equals(REF_FORM_TEMPLATE_WHOLE_BLOOD))
+    {
+      wholeBloodFormFlag = true;
+    }
+    if (projectName.equals("NordicTrip") && (pdfFile.getName().indexOf("_blood") > -1))
+    {
+      wholeBloodFormFlag = true;
+    }
+
     String text;
     float textFontSize;
@@ -2285 +2296 @@
     {
       text = itemId;
-      if (formTemplateName.equals(REF_FORM_TEMPLATE_WHOLE_BLOOD))
+      if (wholeBloodFormFlag)
       {
         if (i >= bloodLabelStartNo && i <= bloodLabelStopNo)
@@ -2310 +2321 @@
     {
       labelText = itemId;
-      if (formTemplateName.equals(REF_FORM_TEMPLATE_WHOLE_BLOOD))
+      if (wholeBloodFormFlag)
       {
         if (i >= bloodLabelStartNo && i <= bloodLabelStopNo)