From 27ecd5e99a502ce89cb0845d50cf3df940c66eb8 Mon Sep 17 00:00:00 2001
From: Adarsh Samani <samaniadarsh@gmail.com>
Date: Sat, 1 Feb 2025 21:34:09 +0530
Subject: [PATCH 1/3] Add QR Style Barcode

---
 .../components/printBarcode/BarcodeContext.js |   6 +
 .../components/printBarcode/ExistingOrder.js  |  11 +-
 frontend/src/components/printBarcode/Index.js |  52 ++-
 .../src/components/printBarcode/PrePrint.js   |  59 ++-
 pom.xml                                       |  48 +++
 .../barcode/BarcodeLabelMaker.java            | 363 ++++++++----------
 .../servlet/barcode/LabelMakerServlet.java    |  15 +
 7 files changed, 336 insertions(+), 218 deletions(-)
 create mode 100644 frontend/src/components/printBarcode/BarcodeContext.js

diff --git a/frontend/src/components/printBarcode/BarcodeContext.js b/frontend/src/components/printBarcode/BarcodeContext.js
new file mode 100644
index 0000000000..ab71e40025
--- /dev/null
+++ b/frontend/src/components/printBarcode/BarcodeContext.js
@@ -0,0 +1,6 @@
+import React from 'react';
+
+export const BarcodeContext = React.createContext({
+  format: 'barcode',
+  setFormat: () => {},
+});
\ No newline at end of file
diff --git a/frontend/src/components/printBarcode/ExistingOrder.js b/frontend/src/components/printBarcode/ExistingOrder.js
index e0d7bf1bef..19f025e9ab 100644
--- a/frontend/src/components/printBarcode/ExistingOrder.js
+++ b/frontend/src/components/printBarcode/ExistingOrder.js
@@ -19,8 +19,12 @@ import CustomLabNumberInput from "../common/CustomLabNumberInput";
 import { NotificationContext } from "../layout/Layout";
 import { AlertDialog, NotificationKinds } from "../common/CustomNotification";
 import { getFromOpenElisServer } from "../utils/Utils";
+import { BarcodeContext } from './BarcodeContext';
 
 const ExistingOrder = () => {
+  const { format } = useContext(BarcodeContext);
+  // console.log(format);
+
   const intl = useIntl();
   const componentMounted = useRef(false);
   const [accessionNumber, setAccessionNumber] = useState("");
@@ -75,21 +79,21 @@ const ExistingOrder = () => {
 
   const printLabelSets = () => {
     setSource(
-      `/LabelMakerServlet?labNo=${accessionNumber}&type=default&quantity=`,
+      `/LabelMakerServlet?labNo=${accessionNumber}&type=default&quantity=&format=${format}`,
     );
     setRenderBarcode(true);
   };
 
   const printOrderLabels = () => {
     setSource(
-      `/LabelMakerServlet?labNo=${accessionNumber}&type=order&quantity=${orderLabels}`,
+      `/LabelMakerServlet?labNo=${accessionNumber}&type=order&quantity=${orderLabels}&format=${format}`,
     );
     setRenderBarcode(true);
   };
 
   const printSpecimenLabels = (specimenAccessionNumber) => {
     setSource(
-      `/LabelMakerServlet?labNo=${specimenAccessionNumber}&type=specimen&quantity=1`,
+      `/LabelMakerServlet?labNo=${specimenAccessionNumber}&type=specimen&quantity=1&format=${format}`,
     );
     setRenderBarcode(true);
   };
@@ -279,3 +283,4 @@ const ExistingOrder = () => {
   );
 };
 export default injectIntl(ExistingOrder);
+
diff --git a/frontend/src/components/printBarcode/Index.js b/frontend/src/components/printBarcode/Index.js
index 6fa84c39df..1342da6d50 100644
--- a/frontend/src/components/printBarcode/Index.js
+++ b/frontend/src/components/printBarcode/Index.js
@@ -1,29 +1,49 @@
-import React from "react";
+import React, { useState } from "react";
 import { FormattedMessage } from "react-intl";
-import { Column, Grid, Heading, Section } from "@carbon/react";
+import { Column, Grid, Heading, Section, Select, SelectItem } from "@carbon/react";
 import ExistingOrder from "./ExistingOrder";
 import PrePrint from "./PrePrint";
 import PageBreadCrumb from "../common/PageBreadCrumb.js";
+import { BarcodeContext } from './BarcodeContext';
 
 let breadcrumbs = [{ label: "home.label", link: "/" }];
+
 const PrintBarcode = () => {
+  const [barcodeFormat, setBarcodeFormat] = useState('barcode');
+
   return (
-    <div>
-      <PageBreadCrumb breadcrumbs={breadcrumbs} />
-      <Grid fullWidth={true}>
-        <Column lg={16} md={8} sm={4}>
-          <Section>
+    <BarcodeContext.Provider value={{ format: barcodeFormat, setFormat: setBarcodeFormat }}>
+      <div>
+        <PageBreadCrumb breadcrumbs={breadcrumbs} />
+        <Grid fullWidth={true}>
+          <Column lg={16} md={8} sm={4}>
             <Section>
-              <Heading>
-                <FormattedMessage id="barcode.print.title" />
-              </Heading>
+              <Section>
+                <Heading>
+                  <FormattedMessage id="barcode.print.title" />
+                </Heading>
+              </Section>
             </Section>
-          </Section>
-        </Column>
-      </Grid>
-      <PrePrint />
-      <ExistingOrder />
-    </div>
+          </Column>
+        </Grid>
+        <Grid>
+          <Column lg={8} md={4} sm={4}>
+            <Select
+              id="barcodeFormat"
+              labelText="Barcode Format:"
+              value={barcodeFormat}
+              onChange={(e) => setBarcodeFormat(e.target.value)}
+            >
+              <SelectItem text="Barcode (Classic)" value="barcode" />
+              <SelectItem text="QR Code" value="qr" />
+            </Select>
+          </Column>
+        </Grid>
+        <PrePrint />
+        <ExistingOrder />
+      </div>
+    </BarcodeContext.Provider>
   );
 };
+
 export default PrintBarcode;
diff --git a/frontend/src/components/printBarcode/PrePrint.js b/frontend/src/components/printBarcode/PrePrint.js
index b56929ca89..f91443849e 100644
--- a/frontend/src/components/printBarcode/PrePrint.js
+++ b/frontend/src/components/printBarcode/PrePrint.js
@@ -1,4 +1,4 @@
-import { React, useState, useEffect, useRef } from "react";
+import { React, useState, useEffect, useRef, useContext } from "react";
 import { FormattedMessage, useIntl, injectIntl } from "react-intl";
 import {
   Checkbox,
@@ -14,8 +14,12 @@ import { getFromOpenElisServer } from "../utils/Utils";
 import { sampleTypeTestsStructure } from "../data/SampleEntryTestsForTypeProvider";
 import AutoComplete from "../common/AutoComplete";
 import "../Style.css";
+import { BarcodeContext } from './BarcodeContext';
 
 const PrePrint = () => {
+  const { format } = useContext(BarcodeContext);
+  // console.log(format);
+
   const intl = useIntl();
   const componentMounted = useRef(false);
   const [sampleTypes, setSampleTypes] = useState([]);
@@ -149,11 +153,30 @@ const PrePrint = () => {
     setSelectedPanels([]);
   };
 
-  const prePrintLabels = () => {
+  // const prePrintLabels = () => {
+  //   console.log(selectedPanels);
+  //   const selectedTestIds = selectedTests
+  //     .map((selectedTest) => selectedTest.id)
+  //     .join(",");
+  //   const params = new URLSearchParams({
+  //     prePrinting: "true",
+  //     numSetsOfLabels: labelSets,
+  //     numOrderLabelsPerSet: orderLabelsPerSet,
+  //     numSpecimenLabelsPerSet: specimenLabelsPerSet,
+  //     facilityName: facilityId,
+  //     testIds: selectedTestIds,
+  //     format: format,
+  //   });
+  //   setSource(`LabelMakerServlet?${params.toString()}`);
+  //   setRenderBarcode(true);
+  // };
+
+  const prePrintLabels = async () => {
     console.log(selectedPanels);
     const selectedTestIds = selectedTests
       .map((selectedTest) => selectedTest.id)
       .join(",");
+    
     const params = new URLSearchParams({
       prePrinting: "true",
       numSetsOfLabels: labelSets,
@@ -161,9 +184,36 @@ const PrePrint = () => {
       numSpecimenLabelsPerSet: specimenLabelsPerSet,
       facilityName: facilityId,
       testIds: selectedTestIds,
+      format: format,
     });
-    setSource(`LabelMakerServlet?${params.toString()}`);
-    setRenderBarcode(true);
+
+    const url = `LabelMakerServlet?${params.toString()}`;
+    console.log('Fetching labels from:', url);
+    
+    try {
+      const response = await fetch(url, {
+          // Add these options to ensure we can see the custom headers
+          credentials: 'include',
+          headers: {
+              'Accept': '*/*',
+          }
+      });
+      
+      // Log the entire headers for debugging
+      console.log('All response headers:');
+      for (const [key, value] of response.headers.entries()) {
+          console.log(`${key}: ${value}`);
+      }
+      
+      // Log the specific debug header
+      const debugLog = response.headers.get('X-Debug-Log');
+      console.log('Debug Log:', debugLog);
+      
+      setSource(url);
+      setRenderBarcode(true);
+    } catch (error) {
+        console.error('Error fetching labels:', error);
+    }
   };
 
   useEffect(() => {
@@ -387,3 +437,4 @@ const PrePrint = () => {
   );
 };
 export default injectIntl(PrePrint);
+
diff --git a/pom.xml b/pom.xml
index 765107f81f..0ce04a2519 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,40 @@
   </properties>
   <dependencies>
 
+    <!-- iText 7 Core -->
+    <dependency>
+        <groupId>com.itextpdf</groupId>
+        <artifactId>itext7-core</artifactId>
+        <version>7.2.5</version>
+        <type>pom</type>
+    </dependency>
+
+    <!-- Specific iText Modules -->
+    <dependency>
+        <groupId>com.itextpdf</groupId>
+        <artifactId>layout</artifactId>
+        <version>7.2.5</version>
+    </dependency>
+
+    <!-- If you need barcodes specifically -->
+    <dependency>
+        <groupId>com.itextpdf</groupId>
+        <artifactId>barcodes</artifactId>
+        <version>7.2.5</version>
+    </dependency>
+    
+    <!-- ZXing QR Code Generation -->
+    <dependency>
+        <groupId>com.google.zxing</groupId>
+        <artifactId>core</artifactId>
+        <version>3.5.2</version>
+    </dependency>
+    <dependency>
+        <groupId>com.google.zxing</groupId>
+        <artifactId>javase</artifactId>
+        <version>3.5.2</version>
+    </dependency>
+
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
@@ -573,6 +607,20 @@
     </dependency>
   </dependencies>
   <repositories>
+    
+    <!-- Maven Central Repository -->
+    <repository>
+        <id>central</id>
+        <name>Central Repository</name>
+        <url>https://repo.maven.apache.org/maven2</url>
+    </repository>
+    
+    <!-- iText Repository -->
+    <repository>
+        <id>itext</id>
+        <name>iText Repository - releases</name>
+        <url>https://repo.itextsupport.com/releases</url>
+    </repository>
     <repository>
         <id>jaspersoft-third-party</id>
         <url>https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts/</url>
diff --git a/src/main/java/org/openelisglobal/barcode/BarcodeLabelMaker.java b/src/main/java/org/openelisglobal/barcode/BarcodeLabelMaker.java
index 048facd24e..d363b2a06f 100644
--- a/src/main/java/org/openelisglobal/barcode/BarcodeLabelMaker.java
+++ b/src/main/java/org/openelisglobal/barcode/BarcodeLabelMaker.java
@@ -1,5 +1,11 @@
 package org.openelisglobal.barcode;
 
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.Writer;
+import com.google.zxing.qrcode.QRCodeWriter;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.encoder.QRCode;
+
 import com.lowagie.text.BadElementException;
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
@@ -15,12 +21,18 @@
 import com.lowagie.text.pdf.PdfTemplate;
 import com.lowagie.text.pdf.PdfWriter;
 import com.lowagie.text.pdf.draw.LineSeparator;
+
+import java.awt.image.BufferedImage;
+import java.awt.Graphics2D;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
+import javax.imageio.ImageIO;
+
 import org.openelisglobal.barcode.labeltype.BlankLabel;
 import org.openelisglobal.barcode.labeltype.BlockLabel;
 import org.openelisglobal.barcode.labeltype.Label;
@@ -46,28 +58,18 @@
 import org.openelisglobal.spring.util.SpringContext;
 import org.openelisglobal.test.valueholder.Test;
 
-/**
- * Class for taking lists of Label objects and turning them into a printable
- * format
- *
- * @author Caleb
- */
 public class BarcodeLabelMaker {
 
-    // number of columns for label layout grid
-    private static int NUM_COLUMNS = 20;
+    public enum BarcodeType {
+        BARCODE, QR
+    }
 
-    // stores labels between generation and creating pdf
+    private BarcodeType barcodeType;
+    private static int NUM_COLUMNS = 20;
     private ArrayList<Label> labels;
-
-    // whether max print numbers should be ignored
     private String override;
-
-    // for audit trail when incrementing num printed
     private String sysUserId;
-
     private BarcodeLabelInfoService barcodeLabelService = SpringContext.getBean(BarcodeLabelInfoService.class);
-
     private static final Set<Integer> ENTERED_STATUS_SAMPLE_LIST = new HashSet<>();
 
     static {
@@ -88,6 +90,10 @@ public BarcodeLabelMaker(ArrayList<Label> labels) {
         this.labels = labels;
     }
 
+    public void setFormat(String format) {
+        this.barcodeType = "qr".equalsIgnoreCase(format) ? BarcodeType.QR : BarcodeType.BARCODE;
+    }
+
     public void generateGenericBarcodeLabel(String code, String type) {
         if ("block".equals(type)) {
             BlockLabel label = new BlockLabel(code);
@@ -111,21 +117,11 @@ public void generatePrePrintLabels(Integer numSetsOfLabels, Integer numOrderLabe
             String accessionNumber = genNextPrePrintedAccessionNumber(accessionValidator, startingAt);
             OrderLabel orderLabel = new OrderLabel(accessionNumber, facilityName);
             orderLabel.setNumLabels(numOrderLabelsPerSet);
-            // orderLabel.linkBarcodeLabelInfo();
-            // get sysUserId from login module
-            // orderLabel.setSysUserId(sysUserId);
-            // if (orderLabel.checkIfPrintable() || "true".equals(override)) {
             labels.add(orderLabel);
-            // }
 
             SpecimenLabel specimenLabel = new SpecimenLabel(accessionNumber, facilityName, tests);
             specimenLabel.setNumLabels(numSpecimenLabelsPerSet);
-            // specimenLabel.linkBarcodeLabelInfo();
-            // get sysUserId from login module
-            // specimenLabel.setSysUserId(sysUserId);
-            // if (specimenLabel.checkIfPrintable() || "true".equals(override)) {
             labels.add(specimenLabel);
-            // }
         }
     }
 
@@ -134,49 +130,23 @@ private String genNextPrePrintedAccessionNumber(IAccessionNumberGenerator access
         if (accessionValidator == null) {
             accessionValidator = AccessionNumberUtil.getMainAccessionNumberGenerator();
         }
-        // if (GenericValidator.isBlankOrNull(startingAt)) {
         return accessionValidator.getNextAvailableAccessionNumber("", true);
-        // } else {
-        // return accessionValidator.getNextAccessionNumber("", true);
-        // }
     }
 
-    /**
-     * Create all labels that were requested and place them into the provided list
-     * of labels
-     *
-     * @param labels    A list that the generated labels should be placed into
-     * @param labNo     The labNo that should appear on the bar codes
-     * @param patientId The id belonging to the patient that should appear on the
-     *                  label
-     * @param type      The type of bar code that should be created
-     * @param quantity  The number of labels that should be printed
-     * @param request   This is used to attribute this action to a user
-     */
     public void generateLabels(String labNo, String type, String quantity, String override) {
-
-        /*
-         * LogEvent.logInfo(this.getClass().getSimpleName(), "method unkown", "labNo: "
-         * + labNo + "\n" + "patientId: " + patientId + "\n" + "type: " + type + "\n" +
-         * "quantity: " + quantity + "\n" + "override: " + override);
-         */
-
         SampleService sampleService = SpringContext.getBean(SampleService.class);
         SampleItemService sampleItemService = SpringContext.getBean(SampleItemService.class);
         if ("default".equals(type)) {
-            // add 2 order label per default
             Sample sample = sampleService.getSampleByAccessionNumber(labNo);
             OrderLabel orderLabel = new OrderLabel(sampleService.getPatient(sample), sample, labNo);
             orderLabel.setNumLabels(Integer
                     .parseInt(ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_ORDER_PRINTED)));
             orderLabel.linkBarcodeLabelInfo();
-            // get sysUserId from login module
             orderLabel.setSysUserId(sysUserId);
             if (orderLabel.checkIfPrintable() || "true".equals(override)) {
                 labels.add(orderLabel);
             }
 
-            // 1 specimen label per sampleitem
             List<SampleItem> sampleItemList = sampleItemService.getSampleItemsBySampleIdAndStatus(sample.getId(),
                     ENTERED_STATUS_SAMPLE_LIST);
             for (SampleItem sampleItem : sampleItemList) {
@@ -185,25 +155,20 @@ public void generateLabels(String labNo, String type, String quantity, String ov
                 specLabel.setNumLabels(Integer.parseInt(
                         ConfigurationProperties.getInstance().getPropertyValue(Property.DEFAULT_SPECIMEN_PRINTED)));
                 specLabel.linkBarcodeLabelInfo();
-                // get sysUserId from login module
                 specLabel.setSysUserId(sysUserId);
                 if (specLabel.checkIfPrintable() || "true".equals(override)) {
                     labels.add(specLabel);
                 }
             }
-            // order case
         } else if ("order".equals(type)) {
             Sample sample = sampleService.getSampleByAccessionNumber(labNo);
             OrderLabel orderLabel = new OrderLabel(sampleService.getPatient(sample), sample, labNo);
             orderLabel.setNumLabels(Integer.parseInt(quantity));
             orderLabel.linkBarcodeLabelInfo();
-            // get sysUserId from login module
             orderLabel.setSysUserId(sysUserId);
             if (orderLabel.checkIfPrintable() || "true".equals(override)) {
                 labels.add(orderLabel);
             }
-
-            // specimen case
         } else if ("specimen".equals(type)) {
             String specimenNumber = labNo.substring(labNo.lastIndexOf(".") + 1);
             labNo = labNo.substring(0, labNo.lastIndexOf("."));
@@ -211,25 +176,20 @@ public void generateLabels(String labNo, String type, String quantity, String ov
             List<SampleItem> sampleItemList = sampleItemService.getSampleItemsBySampleIdAndStatus(sample.getId(),
                     ENTERED_STATUS_SAMPLE_LIST);
             for (SampleItem sampleItem : sampleItemList) {
-                // get only the sample item matching the specimen number
                 if (sampleItem.getSortOrder().equals(specimenNumber)) {
                     SpecimenLabel specLabel = new SpecimenLabel(sampleService.getPatient(sample), sample, sampleItem,
                             labNo);
                     specLabel.setNumLabels(Integer.parseInt(quantity));
                     specLabel.linkBarcodeLabelInfo();
-                    // get sysUserId from login module
                     specLabel.setSysUserId(sysUserId);
                     if (specLabel.checkIfPrintable() || "true".equals(override)) {
                         labels.add(specLabel);
                     }
                 }
             }
-
-            // blank case
         } else if ("blank".equals(type)) {
             BlankLabel blankLabel = new BlankLabel(labNo);
             blankLabel.linkBarcodeLabelInfo();
-            // get sysUserId from login module
             blankLabel.setSysUserId(sysUserId);
             if (blankLabel.checkIfPrintable() || "true".equals(override)) {
                 labels.add(blankLabel);
@@ -237,11 +197,6 @@ public void generateLabels(String labNo, String type, String quantity, String ov
         }
     }
 
-    /**
-     * Creates a PDF as a stream of all the stored labels
-     *
-     * @return Stream of all labels that have been generated
-     */
     public ByteArrayOutputStream createLabelsAsStream() {
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
         if (labels.isEmpty()) {
@@ -253,13 +208,10 @@ public ByteArrayOutputStream createLabelsAsStream() {
             document.open();
             for (Label label : labels) {
                 for (int i = 0; i < label.getNumLabels(); ++i) {
-                    // a ratio is used with set width so that font size
-                    // does not need to be adjusted
                     float ratio = label.getHeight() / label.getWidth();
                     label.pdfWidth = 350;
                     label.pdfHeight = label.pdfWidth * ratio;
                     drawLabel(label, writer, document);
-                    // label.incrementNumPrinted();
                 }
             }
             document.close();
@@ -267,15 +219,9 @@ public ByteArrayOutputStream createLabelsAsStream() {
         } catch (Exception e) {
             LogEvent.logError(e);
         }
-
         return stream;
     }
 
-    /**
-     * Creates a PDF as a stream of all the stored labels
-     *
-     * @return Stream of all labels that have been generated
-     */
     public ByteArrayOutputStream createLabelsAsStreamWithMaximumPrints() {
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
         if (labels.isEmpty()) {
@@ -288,8 +234,6 @@ public ByteArrayOutputStream createLabelsAsStreamWithMaximumPrints() {
             for (Label label : labels) {
                 for (int i = 0; i < label.getNumLabels(); ++i) {
                     if (label.checkIfPrintable() || "true".equals(override)) {
-                        // a ratio is used with set width so that font size
-                        // does not need to be adjusted
                         float ratio = label.getHeight() / label.getWidth();
                         label.pdfWidth = 350;
                         label.pdfHeight = label.pdfWidth * ratio;
@@ -304,76 +248,109 @@ public ByteArrayOutputStream createLabelsAsStreamWithMaximumPrints() {
         } catch (DocumentException | IOException e) {
             LogEvent.logDebug(e);
         }
-
         return stream;
     }
 
-    // parse label info to draw label and add to document
-    /**
-     * Draws a label as a PDF page and adds the page to the document
-     *
-     * @param label    The label to draw as a pdf "page"
-     * @param writer   The writer for the pdf stream
-     * @param document The document to add the label "page" to
-     * @throws DocumentException
-     * @throws IOException
-     */
     private void drawLabel(Label label, PdfWriter writer, Document document) throws DocumentException, IOException {
-        // set up document and grid
         Rectangle rec = new Rectangle(label.pdfWidth, label.pdfHeight);
         document.setPageSize(rec);
         document.newPage();
-        PdfPTable table = new PdfPTable(NUM_COLUMNS);
-        table.getDefaultCell().setBorder(Rectangle.NO_BORDER);
-        table.setTotalWidth(label.pdfWidth - (2 * label.getMargin()));
-        table.setLockedWidth(true);
-
-        // add above fields into table
-        Iterable<LabelField> fields = label.getAboveFields();
-        if (fields != null) {
-            for (LabelField field : fields) {
-                if (field.isStartNewline()) {
-                    table.completeRow();
+
+        if (barcodeType == BarcodeType.BARCODE) {
+            // Original barcode layout logic
+            PdfPTable table = new PdfPTable(NUM_COLUMNS);
+            table.getDefaultCell().setBorder(Rectangle.NO_BORDER);
+            table.setTotalWidth(label.pdfWidth - (2 * label.getMargin()));
+            table.setLockedWidth(true);
+
+            Iterable<LabelField> fields = label.getAboveFields();
+            if (fields != null) {
+                for (LabelField field : fields) {
+                    if (field.isStartNewline()) {
+                        table.completeRow();
+                    }
+                    table.addCell(createFieldAsPDFField(label, field));
                 }
-                table.addCell(createFieldAsPDFField(label, field));
+                table.completeRow();
+            }
+
+            if (label.getScaledBarcodeSpace() != NUM_COLUMNS) {
+                table.addCell(createSpacerCell((NUM_COLUMNS - label.getScaledBarcodeSpace()) / 2));
+                table.addCell(create128Barcode(label, writer, label.getScaledBarcodeSpace()));
+                table.addCell(createSpacerCell((NUM_COLUMNS - label.getScaledBarcodeSpace()) / 2));
+            } else {
+                table.addCell(create128Barcode(label, writer, label.getScaledBarcodeSpace()));
             }
-            table.completeRow();
-        }
 
-        // add bar code
-        if (label.getScaledBarcodeSpace() != NUM_COLUMNS) {
-            table.addCell(createSpacerCell((NUM_COLUMNS - label.getScaledBarcodeSpace()) / 2));
-            table.addCell(create128Barcode(label, writer, label.getScaledBarcodeSpace()));
-            table.addCell(createSpacerCell((NUM_COLUMNS - label.getScaledBarcodeSpace()) / 2));
+            Iterable<LabelField> belowFields = label.getBelowFields();
+            if (belowFields != null) {
+                for (LabelField field : belowFields) {
+                    if (field.isStartNewline()) {
+                        table.completeRow();
+                    }
+                    table.addCell(createFieldAsPDFField(label, field));
+                }
+                table.completeRow();
+            }
+
+            document.add(scaleCentreTableAsImage(label, writer, table));
         } else {
-            table.addCell(create128Barcode(label, writer, label.getScaledBarcodeSpace()));
-        }
+            // QR code layout with QR on left, fields on right
+            PdfPTable mainTable = new PdfPTable(2); // 2 columns for QR and fields
+            mainTable.getDefaultCell().setBorder(Rectangle.NO_BORDER);
+            mainTable.setTotalWidth(label.pdfWidth - (2 * label.getMargin()));
+            mainTable.setLockedWidth(true);
+            float[] columnWidths = {0.4f, 0.6f}; // 40% for QR, 60% for fields
+            mainTable.setWidths(columnWidths);
+
+            // Left column - QR Code
+            PdfPCell qrCell = createQRCode(label, writer, 1);
+            qrCell.setHorizontalAlignment(PdfPCell.ALIGN_CENTER);
+            qrCell.setVerticalAlignment(PdfPCell.ALIGN_MIDDLE);
+            mainTable.addCell(qrCell);
+
+            // Right column - Fields Table
+            PdfPTable fieldsTable = new PdfPTable(1);
+            fieldsTable.getDefaultCell().setBorder(Rectangle.NO_BORDER);
+            fieldsTable.setWidthPercentage(100);
+
+            // Add code text in larger font and bold
+            com.lowagie.text.Font boldFont = new com.lowagie.text.Font(label.getValueFont());
+            boldFont.setSize(15); // Larger font size
+            boldFont.setStyle(com.lowagie.text.Font.BOLD);
+            
+            Paragraph codeText = new Paragraph(label.getCode(), boldFont);
+            codeText.setAlignment(Paragraph.ALIGN_CENTER);
+            PdfPCell codeCell = new PdfPCell(codeText);
+            codeCell.setBorder(Rectangle.NO_BORDER);
+            codeCell.setPadding(1);
+            fieldsTable.addCell(codeCell);
+
+            // Add above fields
+            Iterable<LabelField> fields = label.getAboveFields();
+            if (fields != null) {
+                for (LabelField field : fields) {
+                    fieldsTable.addCell(createFieldAsPDFField(label, field));
+                }
+            }
 
-        // add below fields into table
-        Iterable<LabelField> belowFields = label.getBelowFields();
-        if (belowFields != null) {
-            for (LabelField field : belowFields) {
-                if (field.isStartNewline()) {
-                    table.completeRow();
+            // Add below fields
+            Iterable<LabelField> belowFields = label.getBelowFields();
+            if (belowFields != null) {
+                for (LabelField field : belowFields) {
+                    fieldsTable.addCell(createFieldAsPDFField(label, field));
                 }
-                table.addCell(createFieldAsPDFField(label, field));
             }
-            table.completeRow();
-        }
 
-        // convert table to image, scale image, and center it on document
-        document.add(scaleCentreTableAsImage(label, writer, table));
+            PdfPCell fieldsCell = new PdfPCell(fieldsTable);
+            fieldsCell.setBorder(Rectangle.NO_BORDER);
+            fieldsCell.setPadding(5);
+            mainTable.addCell(fieldsCell);
+
+            document.add(scaleCentreTableAsImage(label, writer, mainTable));
+        }
     }
 
-    /**
-     * Converts table to a scaled, centered image
-     *
-     * @param label  The label to specify the dimensions
-     * @param writer For the stream
-     * @param table  The table to convert and scale
-     * @return An image representation of the table
-     * @throws BadElementException
-     */
     private Image scaleCentreTableAsImage(Label label, PdfWriter writer, PdfPTable table) throws BadElementException {
         PdfContentByte cb = writer.getDirectContent();
         PdfTemplate template = cb.createTemplate(table.getTotalWidth(), table.getTotalHeight());
@@ -385,24 +362,12 @@ private Image scaleCentreTableAsImage(Label label, PdfWriter writer, PdfPTable t
         return labelAsImage;
     }
 
-    /**
-     * Create code 128 bar code with bar code as text below bar code
-     *
-     * @param label   The label containing the bar code
-     * @param writer  For the stream
-     * @param colspan The number of columns the bar code will span
-     * @return Cell containing bar code with bar code text
-     * @throws DocumentException
-     * @throws IOException
-     */
     private PdfPCell create128Barcode(Label label, PdfWriter writer, int colspan)
             throws DocumentException, IOException {
-
         Barcode128 barcode = new Barcode128();
         barcode.setCodeType(Barcode.CODE128);
         barcode.setCode(label.getCode());
         barcode.setAltText(label.getCodeLabel());
-        // shrink bar code height inversely with number of text rows
         barcode.setBarHeight((10 - (label.getNumTextRowsBefore() + label.getNumTextRowsAfter())) * 30 / 10);
         PdfPCell cell = new PdfPCell(barcode.createImageWithBarcode(writer.getDirectContent(), null, null), true);
         cell.setBorder(Rectangle.NO_BORDER);
@@ -411,52 +376,74 @@ private PdfPCell create128Barcode(Label label, PdfWriter writer, int colspan)
         return cell;
     }
 
-    /**
-     * Create code 128 bar code without bar code as text below bar code Recommended
-     * for large fonts
-     *
-     * @param label   The label containing the bar code
-     * @param writer  For the stream
-     * @param colspan The number of columns the bar code will span
-     * @return Cell containing bar code
-     * @throws DocumentException
-     * @throws IOException
-     */
-    @SuppressWarnings("unused")
-    private PdfPCell create128BarcodeNoText(Label label, PdfWriter writer, int colspan)
+    private PdfPCell createQRCode(Label label, PdfWriter writer, int colspan) 
             throws DocumentException, IOException {
-        Barcode128 barcode = new Barcode128();
-        barcode.setCodeType(Barcode.CODE128);
-        barcode.setCode(label.getCode());
-        barcode.setFont(null);
-        // shrink bar code height inversely with number of text rows
-        barcode.setBarHeight((10 - (label.getNumTextRowsBefore() + label.getNumTextRowsAfter())) * 30 / 10);
-        PdfPCell cell = new PdfPCell(barcode.createImageWithBarcode(writer.getDirectContent(), null, null), true);
-        cell.setBorder(Rectangle.NO_BORDER);
-        cell.setColspan(colspan);
-        cell.setPadding(1);
-        return cell;
+        try {
+            // Increased base size for QR code
+            int qrSize = 1000; // Further increased for higher quality
+            
+            QRCodeWriter qrCodeWriter = new QRCodeWriter();
+            BitMatrix bitMatrix = qrCodeWriter.encode(
+                label.getCode(), 
+                BarcodeFormat.QR_CODE, 
+                qrSize,
+                qrSize
+            );
+
+            BufferedImage qrImage = new BufferedImage(qrSize, qrSize, BufferedImage.TYPE_INT_RGB);
+            Graphics2D graphics = qrImage.createGraphics();
+            graphics.setColor(java.awt.Color.WHITE);
+            graphics.fillRect(0, 0, qrSize, qrSize);
+            graphics.setColor(java.awt.Color.BLACK);
+
+            for (int x = 0; x < qrSize; x++) {
+                for (int y = 0; y < qrSize; y++) {
+                    if (bitMatrix.get(x, y)) {
+                        graphics.fillRect(x, y, 1, 1);
+                    }
+                }
+            }
+
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            ImageIO.write(qrImage, "png", baos);
+            Image qrCodeImage = Image.getInstance(baos.toByteArray());
+            
+            // Adjust cell to take up more space with minimal margins
+            float availableWidth = (label.pdfWidth * 0.4f) - 4; // Reduced margin from 20 to 4
+            float availableHeight = label.pdfHeight - 4; // Reduced margin from 20 to 4
+            
+            // Scale QR code to fill more space
+            qrCodeImage.scaleToFit(availableWidth, availableHeight);
+
+            PdfPCell cell = new PdfPCell(qrCodeImage, true);
+            cell.setBorder(Rectangle.NO_BORDER);
+            cell.setColspan(colspan);
+            cell.setPadding(1); // Reduced padding from 5 to 2
+            cell.setVerticalAlignment(PdfPCell.ALIGN_MIDDLE);
+            cell.setHorizontalAlignment(PdfPCell.ALIGN_CENTER);
+
+            if (label.getCodeLabel() != null && !label.getCodeLabel().isEmpty()) {
+                Paragraph textPara = new Paragraph(label.getCodeLabel(), label.getValueFont());
+                cell.addElement(textPara);
+            }
+
+            return cell;
+
+        } catch (Exception e) {
+            LogEvent.logError(e);
+            throw new DocumentException("Failed to create QR code: " + e.getMessage());
+        }
     }
 
-    /**
-     * Create a cell from a Field object
-     *
-     * @param label Contains font to use
-     * @param field To base values, and formats on
-     * @return Cell containing field
-     */
     private PdfPCell createFieldAsPDFField(Label label, LabelField field) {
         Paragraph fieldPDF = new Paragraph();
-        // add field name if applicable
         if (field.isDisplayFieldName()) {
             Chunk name = new Chunk(field.getName() + ": ");
             name.setFont(label.getValueFont());
             fieldPDF.add(name);
         }
-        // add value
         Chunk value = new Chunk(field.getValue());
         value.setFont(label.getValueFont());
-        // add underline to value if applicable
         if (field.isUnderline()) {
             Chunk underline = new Chunk(new LineSeparator(0.5f, 100, null, 0, -1));
             value.setUnderline(0.5f, -1);
@@ -465,7 +452,6 @@ private PdfPCell createFieldAsPDFField(Label label, LabelField field) {
         } else {
             fieldPDF.add(value);
         }
-        // construct and configure cell
         PdfPCell cell = new PdfPCell(fieldPDF);
         cell.setBorder(Rectangle.NO_BORDER);
         cell.setColspan(field.getColspan());
@@ -474,12 +460,6 @@ private PdfPCell createFieldAsPDFField(Label label, LabelField field) {
         return cell;
     }
 
-    /**
-     * Creates a blank cell to fill space
-     *
-     * @param colspan The number of columns cell should take up
-     * @return Cell containing nothing
-     */
     private PdfPCell createSpacerCell(int colspan) {
         PdfPCell cell = new PdfPCell();
         cell.setBorder(Rectangle.NO_BORDER);
@@ -487,12 +467,6 @@ private PdfPCell createSpacerCell(int colspan) {
         return cell;
     }
 
-    /**
-     * Get patient by id
-     *
-     * @param personKey The PK for the patient
-     * @return The corresponding patient
-     */
     private Patient getPatientForID(String personKey) {
         Patient patient = new Patient();
         patient.setId(personKey);
@@ -505,6 +479,10 @@ private Patient getPatientForID(String personKey) {
         }
     }
 
+    public void generateBlockLabel(Integer blockNumber) {
+        // Placeholder method for future implementation
+    }
+
     public String getOverride() {
         return override;
     }
@@ -520,9 +498,4 @@ public String getSysUserId() {
     public void setSysUserId(String sysUserId) {
         this.sysUserId = sysUserId;
     }
-
-    public void generateBlockLabel(Integer blockNumber) {
-        // TODO Auto-generated method stub
-
-    }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/openelisglobal/common/servlet/barcode/LabelMakerServlet.java b/src/main/java/org/openelisglobal/common/servlet/barcode/LabelMakerServlet.java
index fe33882e3e..62db618656 100644
--- a/src/main/java/org/openelisglobal/common/servlet/barcode/LabelMakerServlet.java
+++ b/src/main/java/org/openelisglobal/common/servlet/barcode/LabelMakerServlet.java
@@ -29,6 +29,7 @@
 import org.openelisglobal.test.valueholder.Test;
 import org.springframework.validation.Errors;
 import org.springframework.validation.ObjectError;
+import org.springframework.http.HttpHeaders;
 
 /**
  * Servlet for pages to send bar code label requests. Returns as pdf unless...
@@ -79,7 +80,9 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
     private void printPathologyBarcodeLabel(HttpServletRequest request, HttpServletResponse response)
             throws IOException {
         // create requested labels as pdf stream
+        // In printPathologyBarcodeLabel method:
         BarcodeLabelMaker labelMaker = new BarcodeLabelMaker();
+        labelMaker.setFormat(request.getParameter("format"));
         UserSessionData usd = (UserSessionData) request.getSession().getAttribute(USER_SESSION_DATA);
         labelMaker.setSysUserId(String.valueOf(usd.getSystemUserId()));
 
@@ -105,8 +108,13 @@ private void prePrintLabels(HttpServletRequest request, HttpServletResponse resp
             tests.add(SpringContext.getBean(TestService.class).getActiveTestById(Integer.parseInt(testId)));
         }
 
+        // create requested labels as pdf stream
+        String format = request.getParameter("format");
+        
+
         // create requested labels as pdf stream
         BarcodeLabelMaker labelMaker = new BarcodeLabelMaker();
+        labelMaker.setFormat(request.getParameter("format"));
         UserSessionData usd = (UserSessionData) request.getSession().getAttribute(USER_SESSION_DATA);
         labelMaker.setSysUserId(String.valueOf(usd.getSystemUserId()));
 
@@ -173,6 +181,7 @@ private void printExistingOrder(HttpServletRequest request, HttpServletResponse
 
         // create requested labels as pdf stream
         BarcodeLabelMaker labelMaker = new BarcodeLabelMaker();
+        labelMaker.setFormat(request.getParameter("format"));
         UserSessionData usd = (UserSessionData) request.getSession().getAttribute(USER_SESSION_DATA);
         labelMaker.setOverride(override);
         labelMaker.setSysUserId(String.valueOf(usd.getSystemUserId()));
@@ -219,6 +228,12 @@ private void printExistingOrder(HttpServletRequest request, HttpServletResponse
      */
     private Errors validate(String labNo, String programCode, String type, String quantity, String override) {
         Errors errors = new BaseErrors();
+        // String format = request.getParameter("format");
+        // if (!StringUtil.isNullorNill(format) && 
+        //     !format.equalsIgnoreCase("barcode") && 
+        //     !format.equalsIgnoreCase("qr")) {
+        //     errors.reject("barcode.label.error.format.invalid", "barcode.label.error.format.invalid");
+        // }
         // Validate quantity
         if (!org.apache.commons.validator.GenericValidator.isInt(quantity)) {
             errors.reject("barcode.label.error.quantity.invalid", "barcode.label.error.quantity.invalid");

From 264c7f3e714dcd9e3ad63704da4beb951ec4d921 Mon Sep 17 00:00:00 2001
From: Adarsh Samani <samaniadarsh@gmail.com>
Date: Mon, 3 Feb 2025 01:03:48 +0530
Subject: [PATCH 2/3] Format the source code and update pox.xml

---
 frontend/package-lock.json                    |  8 ++---
 frontend/package.json                         |  2 +-
 .../components/printBarcode/BarcodeContext.js |  6 ++--
 .../components/printBarcode/ExistingOrder.js  |  3 +-
 frontend/src/components/printBarcode/Index.js | 17 ++++++---
 .../src/components/printBarcode/PrePrint.js   | 35 +++++++++----------
 frontend/src/index.css                        |  6 ++--
 pom.xml                                       | 35 ++-----------------
 .../barcode/BarcodeLabelMaker.java            | 30 +++++-----------
 .../servlet/barcode/LabelMakerServlet.java    | 11 +++---
 10 files changed, 59 insertions(+), 94 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index e3f5f72032..75edb814c3 100755
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -61,7 +61,7 @@
         "eslint-plugin-prettier": "^5.0.0",
         "eslint-plugin-react": "^7.33.2",
         "eslint-plugin-react-hooks": "^4.6.0",
-        "prettier": "^3.3.2",
+        "prettier": "^3.4.2",
         "sass": "^1.57.1"
       }
     },
@@ -15012,9 +15012,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz",
-      "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz",
+      "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==",
       "dev": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
diff --git a/frontend/package.json b/frontend/package.json
index 21de11ac57..c8ecb33633 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -86,7 +86,7 @@
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "prettier": "^3.3.2",
+    "prettier": "^3.4.2",
     "sass": "^1.57.1"
   }
 }
diff --git a/frontend/src/components/printBarcode/BarcodeContext.js b/frontend/src/components/printBarcode/BarcodeContext.js
index ab71e40025..386a54e4e3 100644
--- a/frontend/src/components/printBarcode/BarcodeContext.js
+++ b/frontend/src/components/printBarcode/BarcodeContext.js
@@ -1,6 +1,6 @@
-import React from 'react';
+import React from "react";
 
 export const BarcodeContext = React.createContext({
-  format: 'barcode',
+  format: "barcode",
   setFormat: () => {},
-});
\ No newline at end of file
+});
diff --git a/frontend/src/components/printBarcode/ExistingOrder.js b/frontend/src/components/printBarcode/ExistingOrder.js
index 19f025e9ab..d63e988d65 100644
--- a/frontend/src/components/printBarcode/ExistingOrder.js
+++ b/frontend/src/components/printBarcode/ExistingOrder.js
@@ -19,7 +19,7 @@ import CustomLabNumberInput from "../common/CustomLabNumberInput";
 import { NotificationContext } from "../layout/Layout";
 import { AlertDialog, NotificationKinds } from "../common/CustomNotification";
 import { getFromOpenElisServer } from "../utils/Utils";
-import { BarcodeContext } from './BarcodeContext';
+import { BarcodeContext } from "./BarcodeContext";
 
 const ExistingOrder = () => {
   const { format } = useContext(BarcodeContext);
@@ -283,4 +283,3 @@ const ExistingOrder = () => {
   );
 };
 export default injectIntl(ExistingOrder);
-
diff --git a/frontend/src/components/printBarcode/Index.js b/frontend/src/components/printBarcode/Index.js
index 1342da6d50..f817758aef 100644
--- a/frontend/src/components/printBarcode/Index.js
+++ b/frontend/src/components/printBarcode/Index.js
@@ -1,18 +1,27 @@
 import React, { useState } from "react";
 import { FormattedMessage } from "react-intl";
-import { Column, Grid, Heading, Section, Select, SelectItem } from "@carbon/react";
+import {
+  Column,
+  Grid,
+  Heading,
+  Section,
+  Select,
+  SelectItem,
+} from "@carbon/react";
 import ExistingOrder from "./ExistingOrder";
 import PrePrint from "./PrePrint";
 import PageBreadCrumb from "../common/PageBreadCrumb.js";
-import { BarcodeContext } from './BarcodeContext';
+import { BarcodeContext } from "./BarcodeContext";
 
 let breadcrumbs = [{ label: "home.label", link: "/" }];
 
 const PrintBarcode = () => {
-  const [barcodeFormat, setBarcodeFormat] = useState('barcode');
+  const [barcodeFormat, setBarcodeFormat] = useState("barcode");
 
   return (
-    <BarcodeContext.Provider value={{ format: barcodeFormat, setFormat: setBarcodeFormat }}>
+    <BarcodeContext.Provider
+      value={{ format: barcodeFormat, setFormat: setBarcodeFormat }}
+    >
       <div>
         <PageBreadCrumb breadcrumbs={breadcrumbs} />
         <Grid fullWidth={true}>
diff --git a/frontend/src/components/printBarcode/PrePrint.js b/frontend/src/components/printBarcode/PrePrint.js
index f91443849e..6980fcc4ff 100644
--- a/frontend/src/components/printBarcode/PrePrint.js
+++ b/frontend/src/components/printBarcode/PrePrint.js
@@ -14,7 +14,7 @@ import { getFromOpenElisServer } from "../utils/Utils";
 import { sampleTypeTestsStructure } from "../data/SampleEntryTestsForTypeProvider";
 import AutoComplete from "../common/AutoComplete";
 import "../Style.css";
-import { BarcodeContext } from './BarcodeContext';
+import { BarcodeContext } from "./BarcodeContext";
 
 const PrePrint = () => {
   const { format } = useContext(BarcodeContext);
@@ -176,7 +176,7 @@ const PrePrint = () => {
     const selectedTestIds = selectedTests
       .map((selectedTest) => selectedTest.id)
       .join(",");
-    
+
     const params = new URLSearchParams({
       prePrinting: "true",
       numSetsOfLabels: labelSets,
@@ -188,31 +188,31 @@ const PrePrint = () => {
     });
 
     const url = `LabelMakerServlet?${params.toString()}`;
-    console.log('Fetching labels from:', url);
-    
+    console.log("Fetching labels from:", url);
+
     try {
       const response = await fetch(url, {
-          // Add these options to ensure we can see the custom headers
-          credentials: 'include',
-          headers: {
-              'Accept': '*/*',
-          }
+        // Add these options to ensure we can see the custom headers
+        credentials: "include",
+        headers: {
+          Accept: "*/*",
+        },
       });
-      
+
       // Log the entire headers for debugging
-      console.log('All response headers:');
+      console.log("All response headers:");
       for (const [key, value] of response.headers.entries()) {
-          console.log(`${key}: ${value}`);
+        console.log(`${key}: ${value}`);
       }
-      
+
       // Log the specific debug header
-      const debugLog = response.headers.get('X-Debug-Log');
-      console.log('Debug Log:', debugLog);
-      
+      const debugLog = response.headers.get("X-Debug-Log");
+      console.log("Debug Log:", debugLog);
+
       setSource(url);
       setRenderBarcode(true);
     } catch (error) {
-        console.error('Error fetching labels:', error);
+      console.error("Error fetching labels:", error);
     }
   };
 
@@ -437,4 +437,3 @@ const PrePrint = () => {
   );
 };
 export default injectIntl(PrePrint);
-
diff --git a/frontend/src/index.css b/frontend/src/index.css
index 3d6c7d3bef..ed462f2b84 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -1,8 +1,8 @@
 body {
   margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
-    "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
-    sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto",
+    "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans",
+    "Helvetica Neue", sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
diff --git a/pom.xml b/pom.xml
index a2b7c6702d..94cb767576 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,28 +32,6 @@
   </properties>
   <dependencies>
 
-    <!-- iText 7 Core -->
-    <dependency>
-        <groupId>com.itextpdf</groupId>
-        <artifactId>itext7-core</artifactId>
-        <version>7.2.5</version>
-        <type>pom</type>
-    </dependency>
-
-    <!-- Specific iText Modules -->
-    <dependency>
-        <groupId>com.itextpdf</groupId>
-        <artifactId>layout</artifactId>
-        <version>7.2.5</version>
-    </dependency>
-
-    <!-- If you need barcodes specifically -->
-    <dependency>
-        <groupId>com.itextpdf</groupId>
-        <artifactId>barcodes</artifactId>
-        <version>7.2.5</version>
-    </dependency>
-    
     <!-- ZXing QR Code Generation -->
     <dependency>
         <groupId>com.google.zxing</groupId>
@@ -607,20 +585,13 @@
     </dependency>
   </dependencies>
   <repositories>
-    
+
     <!-- Maven Central Repository -->
     <repository>
         <id>central</id>
         <name>Central Repository</name>
         <url>https://repo.maven.apache.org/maven2</url>
     </repository>
-    
-    <!-- iText Repository -->
-    <repository>
-        <id>itext</id>
-        <name>iText Repository - releases</name>
-        <url>https://repo.itextsupport.com/releases</url>
-    </repository>
     <repository>
         <id>jaspersoft-third-party</id>
         <url>https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts/</url>
@@ -630,11 +601,11 @@
         <!-- openSaml-->
         <url>https://build.shibboleth.net/maven/releases/</url>
     </repository>
-    <!-- <repository>
+    <repository>
         <id>uwdigi-repo-central</id>
         <name>DIGI Public Repository</name>
         <url>https://packages.uwdigi.org/artifactory/public</url>
-    </repository> -->
+    </repository>
 </repositories>
   <build>
     <finalName>OpenELIS-Global</finalName>
diff --git a/src/main/java/org/openelisglobal/barcode/BarcodeLabelMaker.java b/src/main/java/org/openelisglobal/barcode/BarcodeLabelMaker.java
index d363b2a06f..6d1abdd387 100644
--- a/src/main/java/org/openelisglobal/barcode/BarcodeLabelMaker.java
+++ b/src/main/java/org/openelisglobal/barcode/BarcodeLabelMaker.java
@@ -1,11 +1,8 @@
 package org.openelisglobal.barcode;
 
 import com.google.zxing.BarcodeFormat;
-import com.google.zxing.Writer;
-import com.google.zxing.qrcode.QRCodeWriter;
 import com.google.zxing.common.BitMatrix;
-import com.google.zxing.qrcode.encoder.QRCode;
-
+import com.google.zxing.qrcode.QRCodeWriter;
 import com.lowagie.text.BadElementException;
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
@@ -21,18 +18,15 @@
 import com.lowagie.text.pdf.PdfTemplate;
 import com.lowagie.text.pdf.PdfWriter;
 import com.lowagie.text.pdf.draw.LineSeparator;
-
-import java.awt.image.BufferedImage;
 import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
 import javax.imageio.ImageIO;
-
 import org.openelisglobal.barcode.labeltype.BlankLabel;
 import org.openelisglobal.barcode.labeltype.BlockLabel;
 import org.openelisglobal.barcode.labeltype.Label;
@@ -300,7 +294,7 @@ private void drawLabel(Label label, PdfWriter writer, Document document) throws
             mainTable.getDefaultCell().setBorder(Rectangle.NO_BORDER);
             mainTable.setTotalWidth(label.pdfWidth - (2 * label.getMargin()));
             mainTable.setLockedWidth(true);
-            float[] columnWidths = {0.4f, 0.6f}; // 40% for QR, 60% for fields
+            float[] columnWidths = { 0.4f, 0.6f }; // 40% for QR, 60% for fields
             mainTable.setWidths(columnWidths);
 
             // Left column - QR Code
@@ -318,7 +312,7 @@ private void drawLabel(Label label, PdfWriter writer, Document document) throws
             com.lowagie.text.Font boldFont = new com.lowagie.text.Font(label.getValueFont());
             boldFont.setSize(15); // Larger font size
             boldFont.setStyle(com.lowagie.text.Font.BOLD);
-            
+
             Paragraph codeText = new Paragraph(label.getCode(), boldFont);
             codeText.setAlignment(Paragraph.ALIGN_CENTER);
             PdfPCell codeCell = new PdfPCell(codeText);
@@ -376,19 +370,13 @@ private PdfPCell create128Barcode(Label label, PdfWriter writer, int colspan)
         return cell;
     }
 
-    private PdfPCell createQRCode(Label label, PdfWriter writer, int colspan) 
-            throws DocumentException, IOException {
+    private PdfPCell createQRCode(Label label, PdfWriter writer, int colspan) throws DocumentException, IOException {
         try {
             // Increased base size for QR code
             int qrSize = 1000; // Further increased for higher quality
-            
+
             QRCodeWriter qrCodeWriter = new QRCodeWriter();
-            BitMatrix bitMatrix = qrCodeWriter.encode(
-                label.getCode(), 
-                BarcodeFormat.QR_CODE, 
-                qrSize,
-                qrSize
-            );
+            BitMatrix bitMatrix = qrCodeWriter.encode(label.getCode(), BarcodeFormat.QR_CODE, qrSize, qrSize);
 
             BufferedImage qrImage = new BufferedImage(qrSize, qrSize, BufferedImage.TYPE_INT_RGB);
             Graphics2D graphics = qrImage.createGraphics();
@@ -407,11 +395,11 @@ private PdfPCell createQRCode(Label label, PdfWriter writer, int colspan)
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             ImageIO.write(qrImage, "png", baos);
             Image qrCodeImage = Image.getInstance(baos.toByteArray());
-            
+
             // Adjust cell to take up more space with minimal margins
             float availableWidth = (label.pdfWidth * 0.4f) - 4; // Reduced margin from 20 to 4
             float availableHeight = label.pdfHeight - 4; // Reduced margin from 20 to 4
-            
+
             // Scale QR code to fill more space
             qrCodeImage.scaleToFit(availableWidth, availableHeight);
 
diff --git a/src/main/java/org/openelisglobal/common/servlet/barcode/LabelMakerServlet.java b/src/main/java/org/openelisglobal/common/servlet/barcode/LabelMakerServlet.java
index 62db618656..3443d35a88 100644
--- a/src/main/java/org/openelisglobal/common/servlet/barcode/LabelMakerServlet.java
+++ b/src/main/java/org/openelisglobal/common/servlet/barcode/LabelMakerServlet.java
@@ -29,7 +29,6 @@
 import org.openelisglobal.test.valueholder.Test;
 import org.springframework.validation.Errors;
 import org.springframework.validation.ObjectError;
-import org.springframework.http.HttpHeaders;
 
 /**
  * Servlet for pages to send bar code label requests. Returns as pdf unless...
@@ -110,7 +109,6 @@ private void prePrintLabels(HttpServletRequest request, HttpServletResponse resp
 
         // create requested labels as pdf stream
         String format = request.getParameter("format");
-        
 
         // create requested labels as pdf stream
         BarcodeLabelMaker labelMaker = new BarcodeLabelMaker();
@@ -229,10 +227,11 @@ private void printExistingOrder(HttpServletRequest request, HttpServletResponse
     private Errors validate(String labNo, String programCode, String type, String quantity, String override) {
         Errors errors = new BaseErrors();
         // String format = request.getParameter("format");
-        // if (!StringUtil.isNullorNill(format) && 
-        //     !format.equalsIgnoreCase("barcode") && 
-        //     !format.equalsIgnoreCase("qr")) {
-        //     errors.reject("barcode.label.error.format.invalid", "barcode.label.error.format.invalid");
+        // if (!StringUtil.isNullorNill(format) &&
+        // !format.equalsIgnoreCase("barcode") &&
+        // !format.equalsIgnoreCase("qr")) {
+        // errors.reject("barcode.label.error.format.invalid",
+        // "barcode.label.error.format.invalid");
         // }
         // Validate quantity
         if (!org.apache.commons.validator.GenericValidator.isInt(quantity)) {

From 0b589c8601d9ac072df45d4ed269365e8689663f Mon Sep 17 00:00:00 2001
From: Adarsh Samani <samaniadarsh@gmail.com>
Date: Wed, 5 Feb 2025 11:55:04 +0530
Subject: [PATCH 3/3] Remove Merge Conflicts in pom.xml

---
 pom.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index ec768fb258..a31250317b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -818,9 +818,6 @@
 
 				</executions>
 			</plugin>
-
-
-
 		</plugins>
 	</build>
 </project>