From ea6701bbf31d8db4f8283b0a496e395554abf00d Mon Sep 17 00:00:00 2001 From: pedroCarvalhoCintra Date: Wed, 20 Nov 2024 18:09:48 -0300 Subject: [PATCH 01/13] add patientCode --- src/main/java/org/isf/lab/gui/LabBrowser.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/isf/lab/gui/LabBrowser.java b/src/main/java/org/isf/lab/gui/LabBrowser.java index 3e00d98f99..57ae41fbcd 100644 --- a/src/main/java/org/isf/lab/gui/LabBrowser.java +++ b/src/main/java/org/isf/lab/gui/LabBrowser.java @@ -38,6 +38,7 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTable; +import javax.swing.JTextField; import javax.swing.SpringLayout; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableColumnModel; @@ -95,6 +96,7 @@ public void labUpdated() { private JPanel jSelectionPanel; private JTable jTable; private JComboBox comboExams; + private JTextField patientCodeField; private int pfrmHeight = 100; private List pLabs; private String[] pColumns = { @@ -359,6 +361,7 @@ private JPanel getJSelectionPanel() { jSelectionPanel = new JPanel(); jSelectionPanel.setPreferredSize(new Dimension(225, pfrmHeight)); jSelectionPanel.add(new JLabel(MessageBundle.getMessage("angal.lab.selectanexam"))); + jSelectionPanel.add(getPatientCodeField()); jSelectionPanel.add(getComboExams()); jSelectionPanel.add(getDateFilterPanel()); jSelectionPanel.add(getFilterButton()); @@ -391,6 +394,22 @@ private JTable getJTable() { } return jTable; } + + /** + * This method initializes the patient code search text field. + * + * @return patientCodeField (JTextField) + */ + private JTextField getPatientCodeField() { + if (patientCodeField == null) { + patientCodeField = new JTextField(); + patientCodeField.setPreferredSize(new Dimension(215, 30)); + + + } + return patientCodeField; + } + /** * This method initializes comboExams, that allows to choose which Exam the @@ -455,7 +474,7 @@ private JButton getFilterButton() { if (typeSelected.equalsIgnoreCase(MessageBundle.getMessage("angal.common.all.txt"))) { typeSelected = null; } - model = new LabBrowsingModel(typeSelected, dateFrom.getDate(), dateTo.getDate()); + model = new LabBrowsingModel(typeSelected, dateFrom.getDate(), dateTo.getDate(), patientCodeField.getText()); model.fireTableDataChanged(); jTable.updateUI(); }); From d8259f7f642c2c9631e62ab56d6e52f708a9375e Mon Sep 17 00:00:00 2001 From: Giovanni Gama Date: Wed, 20 Nov 2024 18:16:17 -0300 Subject: [PATCH 02/13] added the patient code search text field --- src/main/java/org/isf/lab/gui/LabBrowser.java | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/isf/lab/gui/LabBrowser.java b/src/main/java/org/isf/lab/gui/LabBrowser.java index 57ae41fbcd..65fe1a2a5c 100644 --- a/src/main/java/org/isf/lab/gui/LabBrowser.java +++ b/src/main/java/org/isf/lab/gui/LabBrowser.java @@ -52,6 +52,7 @@ import org.isf.lab.gui.LabEditExtended.LabEditExtendedListener; import org.isf.lab.gui.LabNew.LabListener; import org.isf.lab.manager.LabManager; +import org.isf.patient.manager.PatientBrowserManager; import org.isf.lab.model.Laboratory; import org.isf.lab.model.LaboratoryForPrint; import org.isf.menu.gui.MainMenu; @@ -110,6 +111,7 @@ public void labUpdated() { private int[] maxWidth = {150, 200, 200, 200}; private boolean[] columnsVisible = { true, GeneralData.LABEXTENDED, true, true}; private LabManager labManager = Context.getApplicationContext().getBean(LabManager.class); + private PatientBrowserManager patManager = Context.getApplicationContext().getBean(PatientBrowserManager.class); private PrintManager printManager = Context.getApplicationContext().getBean(PrintManager.class); private ExamBrowsingManager examBrowsingManager = Context.getApplicationContext().getBean(ExamBrowsingManager.class); private LabBrowsingModel model; @@ -394,21 +396,21 @@ private JTable getJTable() { } return jTable; } - + /** - * This method initializes the patient code search text field. - * - * @return patientCodeField (JTextField) - */ - private JTextField getPatientCodeField() { - if (patientCodeField == null) { - patientCodeField = new JTextField(); - patientCodeField.setPreferredSize(new Dimension(215, 30)); - - - } - return patientCodeField; - } + * This method initializes the patient code search text field. + * + * @return patientCodeField (JTextField) + */ + private JTextField getPatientCodeField() { + if (patientCodeField == null) { + patientCodeField = new JTextField(); + patientCodeField.setPreferredSize(new Dimension(215, 30)); + + + } + return patientCodeField; + } /** From ec8ff557ef6de81fe195c972f3a5dd1560f25e6e Mon Sep 17 00:00:00 2001 From: nox <170282499+noxq@users.noreply.github.com> Date: Wed, 20 Nov 2024 18:21:10 -0300 Subject: [PATCH 03/13] change LabBrowsingModel --- src/main/java/org/isf/lab/gui/LabBrowser.java | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/isf/lab/gui/LabBrowser.java b/src/main/java/org/isf/lab/gui/LabBrowser.java index 65fe1a2a5c..0833108ffd 100644 --- a/src/main/java/org/isf/lab/gui/LabBrowser.java +++ b/src/main/java/org/isf/lab/gui/LabBrowser.java @@ -494,14 +494,25 @@ class LabBrowsingModel extends DefaultTableModel { private static final long serialVersionUID = 1L; - public LabBrowsingModel(String exam, LocalDate dateFrom, LocalDate dateTo) { - try { - pLabs = labManager.getLaboratory(exam, dateFrom.atStartOfDay(), dateTo.atStartOfDay()); - } catch (OHServiceException e) { - pLabs = new ArrayList<>(); - OHServiceExceptionUtil.showMessages(e); - } - } + public LabBrowsingModel(String exam, LocalDate dateFrom, LocalDate dateTo, String patid) { + try { + Patient pat; + if (patid.isEmpty()) { + pat = null; + } else { + try { + pat = patManager.getPatientById(Integer.parseInt(patid)); + } catch (NumberFormatException e) { + MessageDialog.error(null, "angal.patient.insertvalidage.msg"); + pat = null; + } + } + pLabs = labManager.getLaboratory(exam, dateFrom.atStartOfDay(), dateTo.atStartOfDay(), pat); + } catch (OHServiceException e) { + pLabs = new ArrayList<>(); + OHServiceExceptionUtil.showMessages(e); + } + } public LabBrowsingModel() { try { From e9069e92ff3c44c37ccbb5da06df89216289880f Mon Sep 17 00:00:00 2001 From: ra247362 Date: Wed, 20 Nov 2024 18:23:20 -0300 Subject: [PATCH 04/13] Fix critical issue regarding nullable exam types --- src/main/java/org/isf/lab/gui/LabBrowser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/isf/lab/gui/LabBrowser.java b/src/main/java/org/isf/lab/gui/LabBrowser.java index 0833108ffd..9b81ed59c5 100644 --- a/src/main/java/org/isf/lab/gui/LabBrowser.java +++ b/src/main/java/org/isf/lab/gui/LabBrowser.java @@ -474,7 +474,7 @@ private JButton getFilterButton() { filterButton.addActionListener(actionEvent -> { typeSelected = comboExams.getSelectedItem().toString(); if (typeSelected.equalsIgnoreCase(MessageBundle.getMessage("angal.common.all.txt"))) { - typeSelected = null; + typeSelected = ""; } model = new LabBrowsingModel(typeSelected, dateFrom.getDate(), dateTo.getDate(), patientCodeField.getText()); model.fireTableDataChanged(); From 00e2c9ae325b7e8eedcec130a7cd5ef2600a8d27 Mon Sep 17 00:00:00 2001 From: ra247362 Date: Thu, 28 Nov 2024 13:41:20 -0300 Subject: [PATCH 05/13] Add listener to code field --- src/main/java/org/isf/lab/gui/LabBrowser.java | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/src/main/java/org/isf/lab/gui/LabBrowser.java b/src/main/java/org/isf/lab/gui/LabBrowser.java index 9b81ed59c5..79960b5795 100644 --- a/src/main/java/org/isf/lab/gui/LabBrowser.java +++ b/src/main/java/org/isf/lab/gui/LabBrowser.java @@ -26,6 +26,8 @@ import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; import java.time.LocalDate; import java.util.ArrayList; import java.util.List; @@ -406,8 +408,25 @@ private JTextField getPatientCodeField() { if (patientCodeField == null) { patientCodeField = new JTextField(); patientCodeField.setPreferredSize(new Dimension(215, 30)); + patientCodeField.addKeyListener(new KeyListener() { + @Override + public void keyPressed(KeyEvent e) { + int key = e.getKeyCode(); + if (key == KeyEvent.VK_ENTER) { + model = new LabBrowsingModel(patientCodeField.getText()); + model.fireTableDataChanged(); + jTable.updateUI(); + } + } + @Override + public void keyReleased(KeyEvent e) { + } + @Override + public void keyTyped(KeyEvent e) { + } + }); } return patientCodeField; } @@ -514,6 +533,30 @@ public LabBrowsingModel(String exam, LocalDate dateFrom, LocalDate dateTo, Strin } } + public LabBrowsingModel(String patid) { + try { + Patient pat; + if (patid.isEmpty()) { + pat = null; + } else { + try { + pat = patManager.getPatientById(Integer.parseInt(patid)); + } catch (NumberFormatException e) { + MessageDialog.error(null, "angal.patient.insertvalidage.msg"); + pat = null; + } + } + if (pat == null) { + pLabs = new ArrayList<>(); + } else { + pLabs = labManager.getLaboratory(pat); + } + } catch (OHServiceException e) { + pLabs = new ArrayList<>(); + OHServiceExceptionUtil.showMessages(e); + } + } + public LabBrowsingModel() { try { pLabs = labManager.getLaboratory(); From 11e4d33b383a0e31b5fa8c2bd35ca93dd2922a07 Mon Sep 17 00:00:00 2001 From: ra247362 Date: Fri, 29 Nov 2024 16:51:45 -0300 Subject: [PATCH 06/13] Add final label and correct messages. --- bundle/language_en.properties | 1 + src/main/java/org/isf/lab/gui/LabBrowser.java | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bundle/language_en.properties b/bundle/language_en.properties index 378aa69e9a..a80230247d 100644 --- a/bundle/language_en.properties +++ b/bundle/language_en.properties @@ -677,6 +677,7 @@ angal.lab.exam angal.lab.film.txt = Film angal.lab.in = In angal.lab.insertvalidage.msg = Insert a valid age. +angal.lab.insertvalidpatientid.msg = Insert a valid patient code. angal.lab.laboratorybrowser.title = Laboratory Browser angal.lab.material = Material angal.lab.multipleresults.txt = Multiple results diff --git a/src/main/java/org/isf/lab/gui/LabBrowser.java b/src/main/java/org/isf/lab/gui/LabBrowser.java index 79960b5795..37733c84d3 100644 --- a/src/main/java/org/isf/lab/gui/LabBrowser.java +++ b/src/main/java/org/isf/lab/gui/LabBrowser.java @@ -364,8 +364,9 @@ private JPanel getJSelectionPanel() { if (jSelectionPanel == null) { jSelectionPanel = new JPanel(); jSelectionPanel.setPreferredSize(new Dimension(225, pfrmHeight)); - jSelectionPanel.add(new JLabel(MessageBundle.getMessage("angal.lab.selectanexam"))); + jSelectionPanel.add(new JLabel(MessageBundle.getMessage("angal.lab.selectapatient"))); jSelectionPanel.add(getPatientCodeField()); + jSelectionPanel.add(new JLabel(MessageBundle.getMessage("angal.lab.selectanexam"))); jSelectionPanel.add(getComboExams()); jSelectionPanel.add(getDateFilterPanel()); jSelectionPanel.add(getFilterButton()); @@ -522,7 +523,7 @@ public LabBrowsingModel(String exam, LocalDate dateFrom, LocalDate dateTo, Strin try { pat = patManager.getPatientById(Integer.parseInt(patid)); } catch (NumberFormatException e) { - MessageDialog.error(null, "angal.patient.insertvalidage.msg"); + MessageDialog.error(null, "angal.lab.insertvalidpatientid.msg"); pat = null; } } @@ -542,7 +543,7 @@ public LabBrowsingModel(String patid) { try { pat = patManager.getPatientById(Integer.parseInt(patid)); } catch (NumberFormatException e) { - MessageDialog.error(null, "angal.patient.insertvalidage.msg"); + MessageDialog.error(null, "angal.lab.insertvalidpatientid.msg"); pat = null; } } From d8d288064761fd131a22ccfb2b0956fc8f3bb887 Mon Sep 17 00:00:00 2001 From: ra247362 Date: Fri, 29 Nov 2024 17:41:06 -0300 Subject: [PATCH 07/13] Small fix to ensure expected behavior for non existant patient code. --- src/main/java/org/isf/lab/gui/LabBrowser.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/isf/lab/gui/LabBrowser.java b/src/main/java/org/isf/lab/gui/LabBrowser.java index 37733c84d3..ff2db0de73 100644 --- a/src/main/java/org/isf/lab/gui/LabBrowser.java +++ b/src/main/java/org/isf/lab/gui/LabBrowser.java @@ -515,6 +515,7 @@ class LabBrowsingModel extends DefaultTableModel { private static final long serialVersionUID = 1L; public LabBrowsingModel(String exam, LocalDate dateFrom, LocalDate dateTo, String patid) { + boolean exists = true; try { Patient pat; if (patid.isEmpty()) { @@ -522,12 +523,17 @@ public LabBrowsingModel(String exam, LocalDate dateFrom, LocalDate dateTo, Strin } else { try { pat = patManager.getPatientById(Integer.parseInt(patid)); + exists = pat == null ? false : true; } catch (NumberFormatException e) { MessageDialog.error(null, "angal.lab.insertvalidpatientid.msg"); pat = null; } } - pLabs = labManager.getLaboratory(exam, dateFrom.atStartOfDay(), dateTo.atStartOfDay(), pat); + if (exists) { + pLabs = labManager.getLaboratory(exam, dateFrom.atStartOfDay(), dateTo.atStartOfDay(), pat); + } else { + pLabs = new ArrayList<>(); + } } catch (OHServiceException e) { pLabs = new ArrayList<>(); OHServiceExceptionUtil.showMessages(e); From 0bbdfbcb2d9025ed9da8b5fee701f92f7327c97b Mon Sep 17 00:00:00 2001 From: ra247362 Date: Fri, 6 Dec 2024 10:48:16 -0300 Subject: [PATCH 08/13] Finish issue implementation. --- bundle/language_en.properties | 36 ++++--------------- src/main/java/org/isf/lab/gui/LabBrowser.java | 2 +- 2 files changed, 7 insertions(+), 31 deletions(-) diff --git a/bundle/language_en.properties b/bundle/language_en.properties index a80230247d..b3560d1d79 100644 --- a/bundle/language_en.properties +++ b/bundle/language_en.properties @@ -8,7 +8,6 @@ angal.admission.admissionanddischarge.title angal.admission.admissiondate.border = Admission Date * angal.admission.admissiondate.txt = Admission Date * angal.admission.admissiondatecannotbeempty.msg = Admission date cannot be empty. -angal.admission.admissionpatientcannotbeempty.msg = Admission patient cannot be empty. angal.admission.admissionstatus.border = Admission Status angal.admission.admissiontype.border = Admission Type * angal.admission.admissionwardcannotbeempty.msg = Admission ward cannot be empty. @@ -372,9 +371,6 @@ angal.common.days.txt angal.common.delete = Delete angal.common.delete.btn = Delete angal.common.delete.btn.key = D -angal.common.deleted.col = Deleted -angal.common.deleted.label = Deleted -angal.common.denied.msg = This operation is not allowed. angal.common.description.txt = Description angal.common.discharge.txt = Discharge angal.common.documenthasnopages.msg = The document has no pages. @@ -635,7 +631,6 @@ angal.exatype.examtypebrowser.title angal.exatype.newexamtype.title = New Exam Type angal.genericreportbill.doyouwanttoprintreceipt.msg = Do you want to print a receipt? angal.groupsbrowser.deletegroup.fmt.msg = Delete group: {0}? -angal.groupsbrowser.softdeletegroup.fmt.msg = Could not delete the group '{0}' because it is used somewhere. Do you want to mark it as deleted ? angal.groupsbrowser.description.label = Description: angal.groupsbrowser.editgroup.title = Edit Group angal.groupsbrowser.groupmenu.btn = GroupMenu @@ -645,7 +640,6 @@ angal.groupsbrowser.mainmenu.txt angal.groupsbrowser.menuitembrowser.title = Menu Item Browser angal.groupsbrowser.newgroup.title = New Group angal.groupsbrowser.pleaseinsertavalidusergroupname.msg = Please insert a valid user group name. -angal.groupsbrowser.alreadysoftdeleted.msg = The group is already set as deleted. angal.groupsbrowser.theadmingroupcannotbedeleted.msg = The "admin" group cannot be deleted. angal.groupsbrowser.thegroupalreadyexists.fmt.msg = The group "{0}" already exists. angal.groupsbrowser.thisgrouphasusersandcannotbedeleted.msg = This group has users and cannot be deleted. @@ -677,7 +671,6 @@ angal.lab.exam angal.lab.film.txt = Film angal.lab.in = In angal.lab.insertvalidage.msg = Insert a valid age. -angal.lab.insertvalidpatientid.msg = Insert a valid patient code. angal.lab.laboratorybrowser.title = Laboratory Browser angal.lab.material = Material angal.lab.multipleresults.txt = Multiple results @@ -699,6 +692,7 @@ angal.lab.printtable.btn angal.lab.printtable.btn.key = P angal.lab.selectanexam = Select an exam angal.lab.selectapatient = Select a patient +angal.lab.searchbycodepatientpressenter = Search by Code (Press ENTER) angal.lab.sexmf = Sex (M/F) angal.lab.sputum.txt = Sputum angal.lab.stool.txt = Stool @@ -753,14 +747,11 @@ angal.malnutrition.nodate.msg angal.malnutrition.nonameselected = No name selected angal.malnutrition.pleaseinsertavalidcontroldate.msg = Please insert a valid control date. angal.malnutrition.pleaseinsertavalidvisitdate.msg = Please insert a valid visit date. -angal.medicals.active.txt = Active -angal.medicals.activeonly.txt = Active only angal.medicals.averagemonthlyconsumption.btn = AMC angal.medicals.averagemonthlyconsumption.btn.key = M -angal.medicals.criticallevel.txt = Critical level +angal.medicals.criticallevel = Critical level angal.medicals.critlevel.col = Crit. Level angal.medicals.deletemedical.fmt.msg = Delete medical: {0}? -angal.medicals.disabledonly.txt = Disabled only angal.medicals.editmedical.title = Edit Medical angal.medicals.expiring.btn = Expiring angal.medicals.expiring.btn.key = P @@ -779,7 +770,7 @@ angal.medicals.order.btn.key angal.medicals.othermonth = Other month... angal.medicals.outofstock.col = Out of Stock angal.medicals.pcsperpck.col = PcsXPck -angal.medicals.pcsperpck.txt = Pieces per Packet +angal.medicals.pcsperpckExt = Pieces per Packet angal.medicals.pharmaceuticalbrowser.title = Pharmaceutical Browser angal.medicals.pleaseselectareport.msg = Please select a report: angal.medicals.pleaseselectperiod.msg = Please select a period: @@ -797,7 +788,6 @@ angal.medicals.type angal.medicals.withlot = With lots angal.medicalstock.allcharges.txt = All charges angal.medicalstock.alldischarges.txt = All discharges -angal.medicalstock.category.col = Category angal.medicalstock.charge.btn = Charge angal.medicalstock.charge.btn.key = H angal.medicalstock.chooseamedical.msg = Choose a medical. @@ -829,19 +819,16 @@ angal.medicalstock.lotpreparationdate angal.medicalstock.medtype.col = Med Type angal.medicalstock.movement = Movement angal.medicalstock.movementdatefromcannotbelaterthanmovementdateto = Movement Date From cannot be later than movement Date To -angal.medicalstock.movementquantityisgreaterthanthequantityof.fmt.msg = Movement quantity ({0}) is greater than the quantity of the lot selected ({1}); split the movement or adjust Units/Packets. +angal.medicalstock.movementquantityisgreaterthanthequantityof.msg = Movement quantity is greater than the quantity of the lot selected; split the movement. angal.medicalstock.multiplecharging.adateinthefutureisnotallowed.msg = A date in the future is not allowed. angal.medicalstock.multiplecharging.chargetype = Charge Type angal.medicalstock.multiplecharging.chooseamedical = Choose a Medical angal.medicalstock.multiplecharging.cost = Cost angal.medicalstock.multiplecharging.datecannotbebeforelastmovementdate.msg = Date cannot be before last movement date. -angal.medicalstock.multiplecharging.empty = Empty angal.medicalstock.multiplecharging.existinglot = Existing Lots -angal.medicalstock.multiplecharging.expired = Expired angal.medicalstock.multiplecharging.expiringdate = Expiring angal.medicalstock.multiplecharging.expiringdateinthepastnotallowed = Expiring date in the past not allowed angal.medicalstock.multiplecharging.expirydatebeforepreparationdate = Expiring date before Preparation date not allowed -angal.medicalstock.multiplecharging.hideemptylots = Hide empty lots angal.medicalstock.multiplecharging.lotid = Lot id angal.medicalstock.multiplecharging.lotinformations = Lot Information angal.medicalstock.multiplecharging.lotnumberabb = Lot No. @@ -855,10 +842,8 @@ angal.medicalstock.multiplecharging.preparationdate angal.medicalstock.multiplecharging.qtypacket = Qty/Packet angal.medicalstock.multiplecharging.referencenumberabb = Reference No. angal.medicalstock.multiplecharging.selectedlot = Selected Lot -angal.medicalstock.multiplecharging.selectedlotwithoutcostpleasespecify = Selected Lot {0} has no cost information, please specify... angal.medicalstock.multiplecharging.supplier = Supplier angal.medicalstock.multiplecharging.theinsertedreferencenumberalreadyexists.msg = The inserted reference number already exists. -angal.medicalstock.multiplecharging.theinsertedlotcodealreaedyexists.msg = The inserted lot code already exists. angal.medicalstock.multiplecharging.totalcost = Total cost angal.medicalstock.multiplecharging.unitcost = Unit cost angal.medicalstock.multiplecharging.unitpack = Unit/Pack @@ -875,9 +860,7 @@ angal.medicalstock.multipledischarging.isabouttoend angal.medicalstock.multipledischarging.lotinformations = Lot Information angal.medicalstock.multipledischarging.lotnumberabb = Lot No. angal.medicalstock.multipledischarging.lyinginstock = Lying in stock: -angal.medicalstock.multipledischarging.movementexceedstheavailablequantityformedical.fmt.msg = Movement exceeds the available quantity ({0}) for medical {1}. angal.medicalstock.multipledischarging.noelementtosave = No elements to save -angal.medicalstock.multipledischarging.nolotswithavailablequantityfoundformedicalpleasereport.fmt.msg = No lots with available quantity found for medical {0}; please report to system administrator. angal.medicalstock.multipledischarging.outofstock = Out of stock! angal.medicalstock.multipledischarging.packets = Packets angal.medicalstock.multipledischarging.pleaseinsertavalidvalue = Insert a valid value @@ -995,10 +978,6 @@ angal.medicalstockwardedit.selectpatient.btn.key angal.medicalstockwardedit.title = New / Edit angal.medicalstockwardedit.tooltip.associateapatientwiththismovement = Associate a Patient with this movement angal.medicalstockwardedit.tooltip.removepatientassociationwiththismovement = Remove Patient association with this movement -angal.medstockmovtype.allowedcategoriesare.fmt.msg = Allowed categories are: {0} -angal.medstockmovtype.category.txt = Category -angal.medstockmovtype.category.operational.txt = Operational -angal.medstockmovtype.category.nonoperational.txt = Non-Operational angal.medstockmovtype.deletemovementtype.fmt.msg = Delete movement type: {0}? angal.medstockmovtype.editmedicalstockmovementtype.title = Edit Medical Stock Movement Type angal.medstockmovtype.medicalstockmovementtypebrowser.title = Medical Stock Movement Type Browser @@ -1211,7 +1190,7 @@ angal.newbill.selectamedical.txt angal.newbill.selectanexam.txt = Select an exam: angal.newbill.selectanoperation.txt = Select an operation: angal.newbill.selectapricelist.title = Select a PriceList -angal.newbill.somepriceshavebeenchangeddoyouwanttoupdatetheitemsprices.fmt.msg = Some prices have been changed : {0}\n\nDo you want to update the items' prices? +angal.newbill.somepriceshavebeenchangeddoyouwanttoupdatetheitemsprices.fmg.msg = Some prices have been changed : {0}\n\nDo you want to update the items' prices? angal.newbill.somepricesnotfound.fmt.msg = Some prices not found: {0} angal.newbill.somepricesnotfoundandsomeotherchangeddoyouwanttoupdatetheitemsprices.fmt.msg = Some prices not found and some other changed:\nNot found: {0}\nChanged: {1}\n\nDo you want to update the existing items' prices? angal.newbill.thedateisbeforethelastpayment.msg = The date is before the last payment. @@ -1611,6 +1590,7 @@ angal.stat.weeklyepidemsurveilover5 angal.stat.weeklyepidemsurveilunder5 = HMIS 33b - Weekly epidem. surveil. under 5 y.o. angal.stat.year = Year angal.supplier.deleted = Deleted +angal.supplier.deleted.col = Deleted angal.supplier.deletesupplier.fmt.msg = Delete supplier: {0}? angal.supplier.editsupplier.title = Edit Supplier angal.supplier.email = E-mail @@ -1702,7 +1682,6 @@ angal.therapy.worksheet.btn angal.therapy.worksheet.btn.key = W angal.userbrowser.addnewuser.title = Add New User angal.userbrowser.deleteuser.fmt.msg = Delete user: {0}? -angal.userbrowser.softdeleteuser.fmt.msg = Could not delete the user '{0}' because it is used somewhere. Do you want to mark it as deleted ? angal.userbrowser.description.label = Description: angal.userbrowser.edituser.title = Edit User angal.userbrowser.group.label = Group: @@ -1725,14 +1704,12 @@ angal.userbrowser.resetpassword.btn.key angal.userbrowser.resetpassword.title = Reset Password angal.userbrowser.retype.password.label = Retype Password: angal.userbrowser.selectgroup.label = Select group: -angal.userbrowser.alreadysoftdeleted.msg = The user is already set as deleted. angal.userbrowser.step1.pleaseinsertanew.password.msg = Please insert a new password. angal.userbrowser.step1.pleaseinsertanew.password.fmt.msg = Please insert a new password (minimum of {0} characters). angal.userbrowser.step2.pleaserepeatthenewpassword.label = Please repeat the new password. angal.userbrowser.theadminusercannotbedeleted.msg = The "admin" user cannot be deleted. angal.userbrowser.thepasswordhasbeenchanged.msg = The password has been changed. angal.userbrowser.theuseralreadyexists.fmt.msg = The user "{0}" already exists. -angal.userbrowser.theusernamecontainsinvalidcharacters.msg = The user name must contain only a-z, 0-9, dash, period and underscore characters. angal.userbrowser.title = User Browser angal.userbrowser.user.col = User angal.vaccine.deletevaccine.fmt.msg = Delete vaccine: {0}? @@ -1809,7 +1786,6 @@ angal.ward.newward.title angal.ward.nurses.col = Nurses angal.ward.nursesedit = Number of nurses * angal.ward.opd.txt = OPD -angal.ward.opdwardmusthaveopdservicechecked.msg = OPD ward must have OPD service checked. angal.ward.pleasecheckinadmissionpatients.msg = Please check in admission / patients. angal.ward.requiredfields = * Required fields angal.ward.theemailmustbevalid.msg = The email must be valid. diff --git a/src/main/java/org/isf/lab/gui/LabBrowser.java b/src/main/java/org/isf/lab/gui/LabBrowser.java index ff2db0de73..1869e57fa2 100644 --- a/src/main/java/org/isf/lab/gui/LabBrowser.java +++ b/src/main/java/org/isf/lab/gui/LabBrowser.java @@ -364,7 +364,7 @@ private JPanel getJSelectionPanel() { if (jSelectionPanel == null) { jSelectionPanel = new JPanel(); jSelectionPanel.setPreferredSize(new Dimension(225, pfrmHeight)); - jSelectionPanel.add(new JLabel(MessageBundle.getMessage("angal.lab.selectapatient"))); + jSelectionPanel.add(new JLabel(MessageBundle.getMessage("angal.lab.searchbycodepatientpressenter"))); jSelectionPanel.add(getPatientCodeField()); jSelectionPanel.add(new JLabel(MessageBundle.getMessage("angal.lab.selectanexam"))); jSelectionPanel.add(getComboExams()); From aeae08ea886e233dd3b101e2669d3ff9e9dca702 Mon Sep 17 00:00:00 2001 From: ra247362 Date: Thu, 26 Dec 2024 11:44:39 -0300 Subject: [PATCH 09/13] Refactor one of the LabBrowsingModel to streamline overall logic. --- src/main/java/org/isf/lab/gui/LabBrowser.java | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/isf/lab/gui/LabBrowser.java b/src/main/java/org/isf/lab/gui/LabBrowser.java index 1869e57fa2..fa0ce50628 100644 --- a/src/main/java/org/isf/lab/gui/LabBrowser.java +++ b/src/main/java/org/isf/lab/gui/LabBrowser.java @@ -515,29 +515,24 @@ class LabBrowsingModel extends DefaultTableModel { private static final long serialVersionUID = 1L; public LabBrowsingModel(String exam, LocalDate dateFrom, LocalDate dateTo, String patid) { - boolean exists = true; try { - Patient pat; - if (patid.isEmpty()) { - pat = null; - } else { - try { - pat = patManager.getPatientById(Integer.parseInt(patid)); - exists = pat == null ? false : true; - } catch (NumberFormatException e) { - MessageDialog.error(null, "angal.lab.insertvalidpatientid.msg"); - pat = null; - } - } - if (exists) { - pLabs = labManager.getLaboratory(exam, dateFrom.atStartOfDay(), dateTo.atStartOfDay(), pat); + if (!patid.isEmpty()) { + Patient pat = patManager.getPatientById(Integer.parseInt(patid)); + if (pat == null) { + pLabs = new ArrayList<>();; + } else { + pLabs = labManager.getLaboratory(exam, dateFrom.atStartOfDay(), dateTo.atStartOfDay(), pat); + } } else { - pLabs = new ArrayList<>(); + pLabs = labManager.getLaboratory(exam, dateFrom.atStartOfDay(), dateTo.atStartOfDay(), null); } } catch (OHServiceException e) { pLabs = new ArrayList<>(); OHServiceExceptionUtil.showMessages(e); - } + } catch (NumberFormatException e) { + pLabs = new ArrayList<>(); + MessageDialog.error(null, "angal.lab.insertvalidpatientid.msg"); + } } public LabBrowsingModel(String patid) { @@ -644,4 +639,4 @@ public void laboratoryInserted() { } } -} +} \ No newline at end of file From 553005f17da501bbc8944405d26a4f6916bc0d00 Mon Sep 17 00:00:00 2001 From: Pedro Carvalho Cintra <101885748+pedroCarvalhoCintra@users.noreply.github.com> Date: Fri, 3 Jan 2025 10:10:24 -0300 Subject: [PATCH 10/13] Refactor LabBrowsingModel --- src/main/java/org/isf/lab/gui/LabBrowser.java | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/isf/lab/gui/LabBrowser.java b/src/main/java/org/isf/lab/gui/LabBrowser.java index fa0ce50628..946790f594 100644 --- a/src/main/java/org/isf/lab/gui/LabBrowser.java +++ b/src/main/java/org/isf/lab/gui/LabBrowser.java @@ -537,26 +537,23 @@ public LabBrowsingModel(String exam, LocalDate dateFrom, LocalDate dateTo, Strin public LabBrowsingModel(String patid) { try { - Patient pat; - if (patid.isEmpty()) { - pat = null; - } else { - try { - pat = patManager.getPatientById(Integer.parseInt(patid)); - } catch (NumberFormatException e) { - MessageDialog.error(null, "angal.lab.insertvalidpatientid.msg"); - pat = null; - } - } - if (pat == null) { - pLabs = new ArrayList<>(); + if (!patid.isEmpty()) { + Patient pat = patManager.getPatientById(Integer.parseInt(patid)); + if (pat == null) { + pLabs = new ArrayList<>(); + } else { + pLabs = labManager.getLaboratory(pat); + } } else { - pLabs = labManager.getLaboratory(pat); + pLabs = new ArrayList<>(); } } catch (OHServiceException e) { pLabs = new ArrayList<>(); OHServiceExceptionUtil.showMessages(e); - } + } catch (NumberFormatException e) { + pLabs = new ArrayList<>(); + MessageDialog.error(null, "angal.lab.insertvalidpatientid.msg"); + } } public LabBrowsingModel() { From 90608aebd4202a4cd87cf19ad854996b963b4b05 Mon Sep 17 00:00:00 2001 From: Riccardo Sofer <102068958+ra247362@users.noreply.github.com> Date: Fri, 3 Jan 2025 10:25:42 -0300 Subject: [PATCH 11/13] Fix double semicolon in LabBrowser Co-authored-by: David B Malkovsky --- src/main/java/org/isf/lab/gui/LabBrowser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/isf/lab/gui/LabBrowser.java b/src/main/java/org/isf/lab/gui/LabBrowser.java index 946790f594..6596e56dea 100644 --- a/src/main/java/org/isf/lab/gui/LabBrowser.java +++ b/src/main/java/org/isf/lab/gui/LabBrowser.java @@ -519,7 +519,7 @@ public LabBrowsingModel(String exam, LocalDate dateFrom, LocalDate dateTo, Strin if (!patid.isEmpty()) { Patient pat = patManager.getPatientById(Integer.parseInt(patid)); if (pat == null) { - pLabs = new ArrayList<>();; + pLabs = new ArrayList<>(); } else { pLabs = labManager.getLaboratory(exam, dateFrom.atStartOfDay(), dateTo.atStartOfDay(), pat); } From 718cd3fea5e1ed6ec02c6c77ce8ee99e5fcf8a47 Mon Sep 17 00:00:00 2001 From: ra247362 Date: Fri, 3 Jan 2025 10:37:34 -0300 Subject: [PATCH 12/13] Fix for language bundle issue. --- bundle/language_en.properties | 37 +++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/bundle/language_en.properties b/bundle/language_en.properties index b3560d1d79..2844df0f4a 100644 --- a/bundle/language_en.properties +++ b/bundle/language_en.properties @@ -8,6 +8,7 @@ angal.admission.admissionanddischarge.title angal.admission.admissiondate.border = Admission Date * angal.admission.admissiondate.txt = Admission Date * angal.admission.admissiondatecannotbeempty.msg = Admission date cannot be empty. +angal.admission.admissionpatientcannotbeempty.msg = Admission patient cannot be empty. angal.admission.admissionstatus.border = Admission Status angal.admission.admissiontype.border = Admission Type * angal.admission.admissionwardcannotbeempty.msg = Admission ward cannot be empty. @@ -371,6 +372,9 @@ angal.common.days.txt angal.common.delete = Delete angal.common.delete.btn = Delete angal.common.delete.btn.key = D +angal.common.deleted.col = Deleted +angal.common.deleted.label = Deleted +angal.common.denied.msg = This operation is not allowed. angal.common.description.txt = Description angal.common.discharge.txt = Discharge angal.common.documenthasnopages.msg = The document has no pages. @@ -631,6 +635,7 @@ angal.exatype.examtypebrowser.title angal.exatype.newexamtype.title = New Exam Type angal.genericreportbill.doyouwanttoprintreceipt.msg = Do you want to print a receipt? angal.groupsbrowser.deletegroup.fmt.msg = Delete group: {0}? +angal.groupsbrowser.softdeletegroup.fmt.msg = Could not delete the group '{0}' because it is used somewhere. Do you want to mark it as deleted ? angal.groupsbrowser.description.label = Description: angal.groupsbrowser.editgroup.title = Edit Group angal.groupsbrowser.groupmenu.btn = GroupMenu @@ -640,6 +645,7 @@ angal.groupsbrowser.mainmenu.txt angal.groupsbrowser.menuitembrowser.title = Menu Item Browser angal.groupsbrowser.newgroup.title = New Group angal.groupsbrowser.pleaseinsertavalidusergroupname.msg = Please insert a valid user group name. +angal.groupsbrowser.alreadysoftdeleted.msg = The group is already set as deleted. angal.groupsbrowser.theadmingroupcannotbedeleted.msg = The "admin" group cannot be deleted. angal.groupsbrowser.thegroupalreadyexists.fmt.msg = The group "{0}" already exists. angal.groupsbrowser.thisgrouphasusersandcannotbedeleted.msg = This group has users and cannot be deleted. @@ -671,6 +677,7 @@ angal.lab.exam angal.lab.film.txt = Film angal.lab.in = In angal.lab.insertvalidage.msg = Insert a valid age. +angal.lab.insertvalidpatientid.msg = Insert a valid patient ID. angal.lab.laboratorybrowser.title = Laboratory Browser angal.lab.material = Material angal.lab.multipleresults.txt = Multiple results @@ -690,9 +697,9 @@ angal.lab.positive.txt angal.lab.positiveabbr.btn = P angal.lab.printtable.btn = Print Table angal.lab.printtable.btn.key = P +angal.lab.searchbycodepatientpressenter = Search by Code (Press ENTER) angal.lab.selectanexam = Select an exam angal.lab.selectapatient = Select a patient -angal.lab.searchbycodepatientpressenter = Search by Code (Press ENTER) angal.lab.sexmf = Sex (M/F) angal.lab.sputum.txt = Sputum angal.lab.stool.txt = Stool @@ -747,11 +754,14 @@ angal.malnutrition.nodate.msg angal.malnutrition.nonameselected = No name selected angal.malnutrition.pleaseinsertavalidcontroldate.msg = Please insert a valid control date. angal.malnutrition.pleaseinsertavalidvisitdate.msg = Please insert a valid visit date. +angal.medicals.active.txt = Active +angal.medicals.activeonly.txt = Active only angal.medicals.averagemonthlyconsumption.btn = AMC angal.medicals.averagemonthlyconsumption.btn.key = M -angal.medicals.criticallevel = Critical level +angal.medicals.criticallevel.txt = Critical level angal.medicals.critlevel.col = Crit. Level angal.medicals.deletemedical.fmt.msg = Delete medical: {0}? +angal.medicals.disabledonly.txt = Disabled only angal.medicals.editmedical.title = Edit Medical angal.medicals.expiring.btn = Expiring angal.medicals.expiring.btn.key = P @@ -770,7 +780,7 @@ angal.medicals.order.btn.key angal.medicals.othermonth = Other month... angal.medicals.outofstock.col = Out of Stock angal.medicals.pcsperpck.col = PcsXPck -angal.medicals.pcsperpckExt = Pieces per Packet +angal.medicals.pcsperpck.txt = Pieces per Packet angal.medicals.pharmaceuticalbrowser.title = Pharmaceutical Browser angal.medicals.pleaseselectareport.msg = Please select a report: angal.medicals.pleaseselectperiod.msg = Please select a period: @@ -788,6 +798,7 @@ angal.medicals.type angal.medicals.withlot = With lots angal.medicalstock.allcharges.txt = All charges angal.medicalstock.alldischarges.txt = All discharges +angal.medicalstock.category.col = Category angal.medicalstock.charge.btn = Charge angal.medicalstock.charge.btn.key = H angal.medicalstock.chooseamedical.msg = Choose a medical. @@ -819,16 +830,19 @@ angal.medicalstock.lotpreparationdate angal.medicalstock.medtype.col = Med Type angal.medicalstock.movement = Movement angal.medicalstock.movementdatefromcannotbelaterthanmovementdateto = Movement Date From cannot be later than movement Date To -angal.medicalstock.movementquantityisgreaterthanthequantityof.msg = Movement quantity is greater than the quantity of the lot selected; split the movement. +angal.medicalstock.movementquantityisgreaterthanthequantityof.fmt.msg = Movement quantity ({0}) is greater than the quantity of the lot selected ({1}); split the movement or adjust Units/Packets. angal.medicalstock.multiplecharging.adateinthefutureisnotallowed.msg = A date in the future is not allowed. angal.medicalstock.multiplecharging.chargetype = Charge Type angal.medicalstock.multiplecharging.chooseamedical = Choose a Medical angal.medicalstock.multiplecharging.cost = Cost angal.medicalstock.multiplecharging.datecannotbebeforelastmovementdate.msg = Date cannot be before last movement date. +angal.medicalstock.multiplecharging.empty = Empty angal.medicalstock.multiplecharging.existinglot = Existing Lots +angal.medicalstock.multiplecharging.expired = Expired angal.medicalstock.multiplecharging.expiringdate = Expiring angal.medicalstock.multiplecharging.expiringdateinthepastnotallowed = Expiring date in the past not allowed angal.medicalstock.multiplecharging.expirydatebeforepreparationdate = Expiring date before Preparation date not allowed +angal.medicalstock.multiplecharging.hideemptylots = Hide empty lots angal.medicalstock.multiplecharging.lotid = Lot id angal.medicalstock.multiplecharging.lotinformations = Lot Information angal.medicalstock.multiplecharging.lotnumberabb = Lot No. @@ -842,8 +856,10 @@ angal.medicalstock.multiplecharging.preparationdate angal.medicalstock.multiplecharging.qtypacket = Qty/Packet angal.medicalstock.multiplecharging.referencenumberabb = Reference No. angal.medicalstock.multiplecharging.selectedlot = Selected Lot +angal.medicalstock.multiplecharging.selectedlotwithoutcostpleasespecify = Selected Lot {0} has no cost information, please specify... angal.medicalstock.multiplecharging.supplier = Supplier angal.medicalstock.multiplecharging.theinsertedreferencenumberalreadyexists.msg = The inserted reference number already exists. +angal.medicalstock.multiplecharging.theinsertedlotcodealreaedyexists.msg = The inserted lot code already exists. angal.medicalstock.multiplecharging.totalcost = Total cost angal.medicalstock.multiplecharging.unitcost = Unit cost angal.medicalstock.multiplecharging.unitpack = Unit/Pack @@ -860,7 +876,9 @@ angal.medicalstock.multipledischarging.isabouttoend angal.medicalstock.multipledischarging.lotinformations = Lot Information angal.medicalstock.multipledischarging.lotnumberabb = Lot No. angal.medicalstock.multipledischarging.lyinginstock = Lying in stock: +angal.medicalstock.multipledischarging.movementexceedstheavailablequantityformedical.fmt.msg = Movement exceeds the available quantity ({0}) for medical {1}. angal.medicalstock.multipledischarging.noelementtosave = No elements to save +angal.medicalstock.multipledischarging.nolotswithavailablequantityfoundformedicalpleasereport.fmt.msg = No lots with available quantity found for medical {0}; please report to system administrator. angal.medicalstock.multipledischarging.outofstock = Out of stock! angal.medicalstock.multipledischarging.packets = Packets angal.medicalstock.multipledischarging.pleaseinsertavalidvalue = Insert a valid value @@ -978,6 +996,10 @@ angal.medicalstockwardedit.selectpatient.btn.key angal.medicalstockwardedit.title = New / Edit angal.medicalstockwardedit.tooltip.associateapatientwiththismovement = Associate a Patient with this movement angal.medicalstockwardedit.tooltip.removepatientassociationwiththismovement = Remove Patient association with this movement +angal.medstockmovtype.allowedcategoriesare.fmt.msg = Allowed categories are: {0} +angal.medstockmovtype.category.txt = Category +angal.medstockmovtype.category.operational.txt = Operational +angal.medstockmovtype.category.nonoperational.txt = Non-Operational angal.medstockmovtype.deletemovementtype.fmt.msg = Delete movement type: {0}? angal.medstockmovtype.editmedicalstockmovementtype.title = Edit Medical Stock Movement Type angal.medstockmovtype.medicalstockmovementtypebrowser.title = Medical Stock Movement Type Browser @@ -1190,7 +1212,7 @@ angal.newbill.selectamedical.txt angal.newbill.selectanexam.txt = Select an exam: angal.newbill.selectanoperation.txt = Select an operation: angal.newbill.selectapricelist.title = Select a PriceList -angal.newbill.somepriceshavebeenchangeddoyouwanttoupdatetheitemsprices.fmg.msg = Some prices have been changed : {0}\n\nDo you want to update the items' prices? +angal.newbill.somepriceshavebeenchangeddoyouwanttoupdatetheitemsprices.fmt.msg = Some prices have been changed : {0}\n\nDo you want to update the items' prices? angal.newbill.somepricesnotfound.fmt.msg = Some prices not found: {0} angal.newbill.somepricesnotfoundandsomeotherchangeddoyouwanttoupdatetheitemsprices.fmt.msg = Some prices not found and some other changed:\nNot found: {0}\nChanged: {1}\n\nDo you want to update the existing items' prices? angal.newbill.thedateisbeforethelastpayment.msg = The date is before the last payment. @@ -1590,7 +1612,6 @@ angal.stat.weeklyepidemsurveilover5 angal.stat.weeklyepidemsurveilunder5 = HMIS 33b - Weekly epidem. surveil. under 5 y.o. angal.stat.year = Year angal.supplier.deleted = Deleted -angal.supplier.deleted.col = Deleted angal.supplier.deletesupplier.fmt.msg = Delete supplier: {0}? angal.supplier.editsupplier.title = Edit Supplier angal.supplier.email = E-mail @@ -1682,6 +1703,7 @@ angal.therapy.worksheet.btn angal.therapy.worksheet.btn.key = W angal.userbrowser.addnewuser.title = Add New User angal.userbrowser.deleteuser.fmt.msg = Delete user: {0}? +angal.userbrowser.softdeleteuser.fmt.msg = Could not delete the user '{0}' because it is used somewhere. Do you want to mark it as deleted ? angal.userbrowser.description.label = Description: angal.userbrowser.edituser.title = Edit User angal.userbrowser.group.label = Group: @@ -1704,12 +1726,14 @@ angal.userbrowser.resetpassword.btn.key angal.userbrowser.resetpassword.title = Reset Password angal.userbrowser.retype.password.label = Retype Password: angal.userbrowser.selectgroup.label = Select group: +angal.userbrowser.alreadysoftdeleted.msg = The user is already set as deleted. angal.userbrowser.step1.pleaseinsertanew.password.msg = Please insert a new password. angal.userbrowser.step1.pleaseinsertanew.password.fmt.msg = Please insert a new password (minimum of {0} characters). angal.userbrowser.step2.pleaserepeatthenewpassword.label = Please repeat the new password. angal.userbrowser.theadminusercannotbedeleted.msg = The "admin" user cannot be deleted. angal.userbrowser.thepasswordhasbeenchanged.msg = The password has been changed. angal.userbrowser.theuseralreadyexists.fmt.msg = The user "{0}" already exists. +angal.userbrowser.theusernamecontainsinvalidcharacters.msg = The user name must contain only a-z, 0-9, dash, period and underscore characters. angal.userbrowser.title = User Browser angal.userbrowser.user.col = User angal.vaccine.deletevaccine.fmt.msg = Delete vaccine: {0}? @@ -1786,6 +1810,7 @@ angal.ward.newward.title angal.ward.nurses.col = Nurses angal.ward.nursesedit = Number of nurses * angal.ward.opd.txt = OPD +angal.ward.opdwardmusthaveopdservicechecked.msg = OPD ward must have OPD service checked. angal.ward.pleasecheckinadmissionpatients.msg = Please check in admission / patients. angal.ward.requiredfields = * Required fields angal.ward.theemailmustbevalid.msg = The email must be valid. From f08e2b3eda906bd59f626ea9904c165d5c60648b Mon Sep 17 00:00:00 2001 From: Riccardo Sofer <102068958+ra247362@users.noreply.github.com> Date: Fri, 3 Jan 2025 11:06:58 -0300 Subject: [PATCH 13/13] Fix indentation in language_en.properties --- bundle/language_en.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundle/language_en.properties b/bundle/language_en.properties index 2844df0f4a..6dbcfceb77 100644 --- a/bundle/language_en.properties +++ b/bundle/language_en.properties @@ -677,7 +677,7 @@ angal.lab.exam angal.lab.film.txt = Film angal.lab.in = In angal.lab.insertvalidage.msg = Insert a valid age. -angal.lab.insertvalidpatientid.msg = Insert a valid patient ID. +angal.lab.insertvalidpatientid.msg = Insert a valid patient ID. angal.lab.laboratorybrowser.title = Laboratory Browser angal.lab.material = Material angal.lab.multipleresults.txt = Multiple results @@ -697,7 +697,7 @@ angal.lab.positive.txt angal.lab.positiveabbr.btn = P angal.lab.printtable.btn = Print Table angal.lab.printtable.btn.key = P -angal.lab.searchbycodepatientpressenter = Search by Code (Press ENTER) +angal.lab.searchbycodepatientpressenter = Search by Code (Press ENTER) angal.lab.selectanexam = Select an exam angal.lab.selectapatient = Select a patient angal.lab.sexmf = Sex (M/F)