Changeset 5727


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/ReferralGeneratorServlet.java

    r5703 r5727  
    22242224      return pdfUtil;
    22252225    }
    2226    
     2226
     2227    // Whole blood form flag
     2228    Boolean wholeBloodFormFlag = false;
     2229    if (formTemplateName.equals(REF_FORM_TEMPLATE_WHOLE_BLOOD))
     2230    {
     2231      wholeBloodFormFlag = true;
     2232    }
     2233    if (projectName.equals("NordicTrip") && (pdfFile.getName().indexOf("_blood") > -1))
     2234    {
     2235      wholeBloodFormFlag = true;
     2236    }
     2237
    22272238    String text;
    22282239    float textFontSize;
     
    22852296    {
    22862297      text = itemId;
    2287       if (formTemplateName.equals(REF_FORM_TEMPLATE_WHOLE_BLOOD))
     2298      if (wholeBloodFormFlag)
    22882299      {
    22892300        if (i >= bloodLabelStartNo && i <= bloodLabelStopNo)
     
    23102321    {
    23112322      labelText = itemId;
    2312       if (formTemplateName.equals(REF_FORM_TEMPLATE_WHOLE_BLOOD))
     2323      if (wholeBloodFormFlag)
    23132324      {
    23142325        if (i >= bloodLabelStartNo && i <= bloodLabelStopNo)
Note: See TracChangeset for help on using the changeset viewer.