From 6155fc0895e754ff4b59c01665bd1af724bd5101 Mon Sep 17 00:00:00 2001 From: JantBogard Date: Tue, 12 Nov 2024 10:13:15 +0100 Subject: [PATCH] Applying suggestion for change --- rpt_base/Inventory.jasper | Bin 39869 -> 39863 bytes rpt_base/Inventory.jrxml | 10 +++++----- rpt_base/Inventory.properties | 4 ++-- rpt_base/Inventory_en.properties | 4 ++-- .../medicalinventory/gui/InventoryEdit.java | 6 +++--- .../GenericReportPharmaceuticalInventory.java | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/rpt_base/Inventory.jasper b/rpt_base/Inventory.jasper index 0416e0ffaa1ec6ec0da45f52393672c7d4d2063f..367887dabed9085922612b0438b5dcce6d6a562e 100644 GIT binary patch delta 318 zcmdnHooV}arVW!7IM{viOPuplQYSO2ifrDX5GKSPl$w|mSW>x}*O*rt&QbK+!opa% z`C3pR<7SVL9fG1FzKNN6!6o@csh)Xdsd+#~rKihg@w6=IxTB~3?b^q{z+l3#pPhk; zk--bDB0j}DIWaZW(8MSy(ZtNqFwNY;$k@QZ!on!oJk7wu&^XE1AlW=I+0-!EBFV_Y zEXgo2H96VL(!#{l(8R(b#ekiGWwK(M+GN(IM{uXTYvN>vbN;oaG2w7qb;oUf2TC2V JdD;whW&oBaXRH7K delta 320 zcmdnKooVlOrVW!7I61--i&C8PQ&K0Xifmr55GKSPSW+33nwYbh$Cy_d#+l6MBR+Yx z2mfX_zdjbmqRm%>3K=)MhU^p+7YiuL%uCKJNX!8lrjn%u_9ljm!;9 zEK*DpO;VFnk_=OmO%fB6%*@#tSQr^}CO>48nQYg@KAExU5zJ|uUo~+u!#TfN)0l9% TX>)1EZGHzzU9x$?40UDz0(oi; diff --git a/rpt_base/Inventory.jrxml b/rpt_base/Inventory.jrxml index 1a887aa6d8..6ad492fef2 100644 --- a/rpt_base/Inventory.jrxml +++ b/rpt_base/Inventory.jrxml @@ -25,7 +25,7 @@ - + @@ -34,7 +34,7 @@ FROM ((`oh_medicaldsrinventoryrow` join `oh_medicaldsrinventory` ON MINVTR_INVT_ID=MINVT_ID) join `oh_medicaldsr` on MINVTR_MDSR_ID=MDSR_ID) left join `oh_medicaldsrlot` on MINVTR_LT_ID_A=LT_ID_A - where MINVTR_INVT_ID = $P{inventoryId} ORDER BY MDSR_DESC asc]]> + where MINVTR_INVT_ID = $P{inventoryId} ORDER BY MDSR_DESC asc]]> @@ -135,7 +135,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -282,7 +282,7 @@ - + diff --git a/rpt_base/Inventory.properties b/rpt_base/Inventory.properties index 6202d31391..32fe3f6bf9 100644 --- a/rpt_base/Inventory.properties +++ b/rpt_base/Inventory.properties @@ -10,11 +10,11 @@ Reference = Reference InventoryDate = Inventory Date -PrincipalWardInventory = PRINCIPAL WARD INVENTORY +MainStoreInventoryID = MAIN STORE INVENTORY ID Designation = Designation -WardCode = Ward Code +LotCode= Lot Code DueDate = Due Date diff --git a/rpt_base/Inventory_en.properties b/rpt_base/Inventory_en.properties index 6202d31391..32fe3f6bf9 100644 --- a/rpt_base/Inventory_en.properties +++ b/rpt_base/Inventory_en.properties @@ -10,11 +10,11 @@ Reference = Reference InventoryDate = Inventory Date -PrincipalWardInventory = PRINCIPAL WARD INVENTORY +MainStoreInventoryID = MAIN STORE INVENTORY ID Designation = Designation -WardCode = Ward Code +LotCode= Lot Code DueDate = Due Date diff --git a/src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java b/src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java index a9c3afcdc4..64eb0b88eb 100644 --- a/src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java +++ b/src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java @@ -934,12 +934,12 @@ private JButton getPrintButton() { printButton.setEnabled(true); printButton.addActionListener(e -> { - int printQtyReal = 0; + int printRealQty = 0; int response = MessageDialog.yesNo(this, "angal.inventory.askforrealquantityempty.msg"); if (response == JOptionPane.YES_OPTION) { - printQtyReal = 1; + printRealQty = 1; } - new GenericReportPharmaceuticalInventory(inventory, "Inventory", printQtyReal); + new GenericReportPharmaceuticalInventory(inventory, "Inventory", printRealQty); }); return printButton; diff --git a/src/main/java/org/isf/stat/gui/report/GenericReportPharmaceuticalInventory.java b/src/main/java/org/isf/stat/gui/report/GenericReportPharmaceuticalInventory.java index 5c8dda7918..d8a96fff68 100644 --- a/src/main/java/org/isf/stat/gui/report/GenericReportPharmaceuticalInventory.java +++ b/src/main/java/org/isf/stat/gui/report/GenericReportPharmaceuticalInventory.java @@ -34,9 +34,9 @@ public class GenericReportPharmaceuticalInventory extends DisplayReport { private static final Logger LOGGER = LoggerFactory.getLogger(GenericReportPharmaceuticalInventory.class); private JasperReportsManager jasperReportsManager = Context.getApplicationContext().getBean(JasperReportsManager.class); - public GenericReportPharmaceuticalInventory(MedicalInventory medicalInventory, String jasperFileName, int printQtyReal) { + public GenericReportPharmaceuticalInventory(MedicalInventory medicalInventory, String jasperFileName, int printRealQty) { try { - JasperReportResultDto jasperReportResultDto = jasperReportsManager.getInventoryReportPdf(medicalInventory, jasperFileName, printQtyReal); + JasperReportResultDto jasperReportResultDto = jasperReportsManager.getInventoryReportPdf(medicalInventory, jasperFileName, printRealQty); showReport(jasperReportResultDto); } catch (Exception e) { LOGGER.error("", e);