From 1e60771e252bfb1eeaa30544d339a9dcbf0f5674 Mon Sep 17 00:00:00 2001
From: CalebSLane <c.steelelane@gmail.com>
Date: Fri, 11 Oct 2024 14:17:22 -0700
Subject: [PATCH 01/56] fix duplicated resource property

---
 src/main/java/org/openelisglobal/config/AppConfig.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/openelisglobal/config/AppConfig.java b/src/main/java/org/openelisglobal/config/AppConfig.java
index 3ce52b2162..5ab72afa52 100644
--- a/src/main/java/org/openelisglobal/config/AppConfig.java
+++ b/src/main/java/org/openelisglobal/config/AppConfig.java
@@ -57,7 +57,6 @@
 @PropertySource("file:/run/secrets/common.properties")
 @PropertySource(value = "file:/run/secrets/extra.properties", ignoreResourceNotFound = true)
 @PropertySource(value = "classpath:SystemConfiguration.properties", ignoreResourceNotFound = true)
-@PropertySource(value = "file:/var/lib/openelis-global/properties/SystemConfiguration.properties", ignoreResourceNotFound = true)
 @PropertySource(value = "file:/var/lib/openelis-global/properties/TotalSystemConfiguration.properties", ignoreResourceNotFound = true)
 @PropertySource(value = "file:/var/lib/openelis-global/properties/SystemConfiguration.properties", ignoreResourceNotFound = true)
 @ComponentScan(basePackages = { "spring", "org.openelisglobal", "org.itech", "org.ozeki.sms", "oe.plugin" })

From 899769549a2bd26a331d4c588c82ead8222ad657 Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Thu, 17 Oct 2024 13:52:43 +0300
Subject: [PATCH 02/56] only reports with results should only print validated
 results

---
 .../action/implementation/PatientReport.java       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/openelisglobal/reports/action/implementation/PatientReport.java b/src/main/java/org/openelisglobal/reports/action/implementation/PatientReport.java
index 2f32e1b589..61dc2d8b42 100644
--- a/src/main/java/org/openelisglobal/reports/action/implementation/PatientReport.java
+++ b/src/main/java/org/openelisglobal/reports/action/implementation/PatientReport.java
@@ -313,14 +313,16 @@ private List<Sample> findReportSamplesForSite(String referringSiteId, String ref
 
         if (onlyResults) {
             Set<Integer> analysisStatusIds = new HashSet<>();
-            analysisStatusIds.add(Integer.parseInt(
-                    SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.BiologistRejected)));
             analysisStatusIds.add(Integer
                     .parseInt(SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.Finalized)));
-            analysisStatusIds.add(Integer.parseInt(
-                    SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.TechnicalAcceptance)));
-            analysisStatusIds.add(Integer.parseInt(
-                    SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.TechnicalRejected)));
+            /**
+             * analysisStatusIds.add(Integer.parseInt(
+             * SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.BiologistRejected)));
+             * analysisStatusIds.add(Integer.parseInt(
+             * SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.TechnicalAcceptance)));
+             * analysisStatusIds.add(Integer.parseInt(
+             * SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.TechnicalRejected)));
+             **/
             sampleList = sampleList.stream().filter(
                     e -> (analysisService.getAnalysesBySampleIdAndStatusId(e.getId(), analysisStatusIds).size() > 0))
                     .collect(Collectors.toList());

From 6623dc32b915e8cb09ef2ba8e7715a55063db217 Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Fri, 18 Oct 2024 02:45:00 +0300
Subject: [PATCH 03/56] minor fixes for patient and audit report

---
 .../PatientStatusReportFormValues.js          |  2 +-
 frontend/src/components/home/Dashboard.tsx    | 50 +++++++++++++------
 .../auditTrailReport/AuditTrailReport.js      |  6 +--
 .../reports/common/PatientStatusReport.js     | 14 +++---
 .../components/resultPage/SearchResultForm.js | 18 ++++---
 pom.xml                                       |  2 +-
 .../workers/AuditTrailViewWorkerImpl.java     | 14 ++++--
 .../pages/patient/patientManagement.jsp       |  2 +-
 8 files changed, 70 insertions(+), 38 deletions(-)

diff --git a/frontend/src/components/formModel/innitialValues/PatientStatusReportFormValues.js b/frontend/src/components/formModel/innitialValues/PatientStatusReportFormValues.js
index 1ce59548d8..0920e187ba 100644
--- a/frontend/src/components/formModel/innitialValues/PatientStatusReportFormValues.js
+++ b/frontend/src/components/formModel/innitialValues/PatientStatusReportFormValues.js
@@ -4,7 +4,7 @@ const PatientStatusReportFormValues = {
   referringSiteName: "",
   startDate: "",
   endDate: "",
-  form: "",
+  from: "",
   to: "",
   dateType: "",
   checkbox: "",
diff --git a/frontend/src/components/home/Dashboard.tsx b/frontend/src/components/home/Dashboard.tsx
index ba0032cc16..e62a4f1cd8 100644
--- a/frontend/src/components/home/Dashboard.tsx
+++ b/frontend/src/components/home/Dashboard.tsx
@@ -23,6 +23,7 @@ import {
 } from "@carbon/react";
 import "./Dashboard.css";
 import { Minimize, Maximize } from "@carbon/react/icons";
+import { Copy } from "@carbon/icons-react";
 import { useState, useEffect, useRef, useContext } from "react";
 import {
   getFromOpenElisServer,
@@ -407,22 +408,39 @@ const HomeDashBoard: React.FC<DashBoardProps> = () => {
       return (
         <TableCell key={cell.id}>
           <>
-            {selectedTile.type == "ORDERS_IN_PROGRESS" ||
-            selectedTile.type == "ORDERS_READY_FOR_VALIDATION" ? (
-              <Link
-                style={{ color: "blue" }}
-                href={
-                  selectedTile.type == "ORDERS_IN_PROGRESS"
-                    ? "/result?type=order&doRange=false&accessionNumber=" +
-                      cell.value
-                    : "validation?type=order&accessionNumber=" + cell.value
-                }
-              >
-                <u>{convertAlphaNumLabNumForDisplay(cell.value)}</u>
-              </Link>
-            ) : (
-              <> {convertAlphaNumLabNumForDisplay(cell.value)}</>
-            )}
+            <div style={{ display: "flex", alignItems: "center" }}>
+              <Button
+                onClick={async () => {
+                  if ("clipboard" in navigator) {
+                    return await navigator.clipboard.writeText(cell.value);
+                  } else {
+                    return document.execCommand("copy", true, cell.value);
+                  }
+                }}
+                kind="ghost"
+                iconDescription={intl.formatMessage({
+                  id: "instructions.copy.labnum",
+                })}
+                hasIconOnly
+                renderIcon={Copy}
+              />
+              {selectedTile.type == "ORDERS_IN_PROGRESS" ||
+              selectedTile.type == "ORDERS_READY_FOR_VALIDATION" ? (
+                <Link
+                  style={{ color: "blue" }}
+                  href={
+                    selectedTile.type == "ORDERS_IN_PROGRESS"
+                      ? "/result?type=order&doRange=false&accessionNumber=" +
+                        cell.value
+                      : "validation?type=order&accessionNumber=" + cell.value
+                  }
+                >
+                  <u>{convertAlphaNumLabNumForDisplay(cell.value)}</u>
+                </Link>
+              ) : (
+                <> {convertAlphaNumLabNumForDisplay(cell.value)}</>
+              )}
+            </div>
           </>
         </TableCell>
       );
diff --git a/frontend/src/components/reports/auditTrailReport/AuditTrailReport.js b/frontend/src/components/reports/auditTrailReport/AuditTrailReport.js
index 688287836d..320765e7da 100644
--- a/frontend/src/components/reports/auditTrailReport/AuditTrailReport.js
+++ b/frontend/src/components/reports/auditTrailReport/AuditTrailReport.js
@@ -31,7 +31,7 @@ const AuditTrailReport = ({ id }) => {
   const [isLoading, setIsLoading] = useState(false);
   const [showNotification, setShowNotification] = useState(false);
   const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(5);
+  const [pageSize, setPageSize] = useState(30);
   const [auditTrailItems, setAuditTrailItems] = useState([]);
   const [data, setData] = useState(null);
 
@@ -117,7 +117,7 @@ const AuditTrailReport = ({ id }) => {
                 defaultMessage: "Lab No",
               })}
               value={labNo}
-              onChange={(event) => setLabNo(event.target.value)}
+              onChange={(event, rowValue) => setLabNo(rowValue)}
               invalid={
                 isLabNoError
                   ? intl.formatMessage({
@@ -308,7 +308,7 @@ const AuditTrailReport = ({ id }) => {
           onChange={handlePageChange}
           page={page}
           pageSize={pageSize}
-          pageSizes={[5, 10, 20, 30]}
+          pageSizes={[10, 30, 50, 100]}
           totalItems={auditTrailItems.length}
           forwardText={intl.formatMessage({ id: "pagination.forward" })}
           backwardText={intl.formatMessage({ id: "pagination.backward" })}
diff --git a/frontend/src/components/reports/common/PatientStatusReport.js b/frontend/src/components/reports/common/PatientStatusReport.js
index 39708836e4..667c1aed3c 100644
--- a/frontend/src/components/reports/common/PatientStatusReport.js
+++ b/frontend/src/components/reports/common/PatientStatusReport.js
@@ -64,21 +64,21 @@ function PatientStatusReport(props) {
   const handleReportPrint = () => {
     let barcodesPdf =
       config.serverBaseUrl +
-      `/ReportPrint?report=${props.report}&type=patient&accessionDirect=${reportFormValues.form}&highAccessionDirect=${reportFormValues.to}&dateOfBirthSearchValue=&selPatient=${reportFormValues.selectedPatientId}&referringSiteId=${reportFormValues.referringSiteId}&referringSiteDepartmentId=${reportFormValues.referringSiteDepartmentId ? reportFormValues.referringSiteDepartmentId : ""}&onlyResults=${result}&_onlyResults=${checkbox}&dateType=${items}&lowerDateRange=${reportFormValues.startDate}&upperDateRange=${reportFormValues.endDate}`;
+      `/ReportPrint?report=${props.report}&type=patient&accessionDirect=${reportFormValues.from}&highAccessionDirect=${reportFormValues.to}&dateOfBirthSearchValue=&selPatient=${reportFormValues.selectedPatientId}&referringSiteId=${reportFormValues.referringSiteId}&referringSiteDepartmentId=${reportFormValues.referringSiteDepartmentId ? reportFormValues.referringSiteDepartmentId : ""}&onlyResults=${result}&_onlyResults=${checkbox}&dateType=${items}&lowerDateRange=${reportFormValues.startDate}&upperDateRange=${reportFormValues.endDate}`;
     window.open(barcodesPdf);
   };
 
-  function handlePatientIdFrom(e) {
+  function handlePatientIdFrom(value) {
     setReportFormValues({
       ...reportFormValues,
-      form: e.target.value,
+      from: value,
     });
   }
 
-  function handlePatientIdTo(e) {
+  function handlePatientIdTo(value) {
     setReportFormValues({
       ...reportFormValues,
-      to: e.target.value,
+      to: value,
     });
   }
 
@@ -250,7 +250,7 @@ function PatientStatusReport(props) {
                               id={field.name}
                               onChange={(e, rawValue) => {
                                 setFieldValue(field.name, rawValue);
-                                handlePatientIdFrom(e);
+                                handlePatientIdFrom(rawValue);
                               }}
                             />
                           )}
@@ -269,7 +269,7 @@ function PatientStatusReport(props) {
                               id={field.name}
                               onChange={(e, rawValue) => {
                                 setFieldValue(field.name, rawValue);
-                                handlePatientIdTo(e);
+                                handlePatientIdTo(rawValue);
                               }}
                             />
                           )}
diff --git a/frontend/src/components/resultPage/SearchResultForm.js b/frontend/src/components/resultPage/SearchResultForm.js
index 3ad8f6aea6..4b78c007f7 100644
--- a/frontend/src/components/resultPage/SearchResultForm.js
+++ b/frontend/src/components/resultPage/SearchResultForm.js
@@ -481,14 +481,17 @@ export function SearchResultForm(props) {
                     <Column lg={6} sm={4}>
                       <Field name="startLabNo">
                         {({ field }) => (
-                          <TextInput
-                            placeholder={"Enter LabNo"}
+                          <CustomLabNumberInput
+                            placeholder="Enter Accession No."
                             name={field.name}
                             id={field.name}
-                            defaultValue={values["accessionNumber"]}
+                            value={values[field.name]}
                             labelText={
                               <FormattedMessage id="search.label.fromaccession" />
                             }
+                            onChange={(e, rawValue) => {
+                              setFieldValue(field.name, rawValue);
+                            }}
                           />
                         )}
                       </Field>
@@ -496,14 +499,17 @@ export function SearchResultForm(props) {
                     <Column lg={6} sm={4}>
                       <Field name="endLabNo">
                         {({ field }) => (
-                          <TextInput
-                            placeholder={"Enter LabNo"}
+                          <CustomLabNumberInput
+                            placeholder="Enter Accession No."
                             name={field.name}
                             id={field.name}
-                            defaultValue={values["endLabNo"]}
+                            value={values[field.name]}
                             labelText={
                               <FormattedMessage id="search.label.toaccession" />
                             }
+                            onChange={(e, rawValue) => {
+                              setFieldValue(field.name, rawValue);
+                            }}
                           />
                         )}
                       </Field>
diff --git a/pom.xml b/pom.xml
index ea194e8e25..72aa5e06a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
     <minor.version>0</minor.version>
     <state.version>3</state.version>
     <!-- 0 = alpha, 1 = beta, 2 = rc, 3 = deployable -->
-    <fix.version>2</fix.version>
+    <fix.version>3</fix.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <liquibase.propertyFile>${project.basedir}/liquibase/liquibase.properties</liquibase.propertyFile>
     <castor.version>1.4.1</castor.version>
diff --git a/src/main/java/org/openelisglobal/audittrail/action/workers/AuditTrailViewWorkerImpl.java b/src/main/java/org/openelisglobal/audittrail/action/workers/AuditTrailViewWorkerImpl.java
index 1d21d0ec71..32bdf5b3e6 100644
--- a/src/main/java/org/openelisglobal/audittrail/action/workers/AuditTrailViewWorkerImpl.java
+++ b/src/main/java/org/openelisglobal/audittrail/action/workers/AuditTrailViewWorkerImpl.java
@@ -42,6 +42,7 @@
 import org.openelisglobal.patient.util.PatientUtil;
 import org.openelisglobal.patient.valueholder.Patient;
 import org.openelisglobal.program.service.ProgramSampleService;
+import org.openelisglobal.program.valueholder.ProgramSample;
 import org.openelisglobal.result.service.ResultService;
 import org.openelisglobal.result.valueholder.Result;
 import org.openelisglobal.sample.bean.SampleOrderItem;
@@ -94,7 +95,10 @@ public List<AuditTrailItem> getAuditTrail() throws IllegalStateException {
             items.addAll(addPatientHistory());
             items.addAll(addNotes());
             items.addAll(addQAEvents());
-            items.addAll(addProgram());
+            if (!addProgram().isEmpty()) {
+                items.addAll(addProgram());
+            }
+
         }
 
         sortItemsByTime(items);
@@ -291,8 +295,12 @@ private Collection<AuditTrailItem> addProgram() {
         if (sample != null) {
             String programName = observationHistoryService.getRawValueForSample(ObservationType.PROGRAM,
                     sample.getId());
-            AbstractHistoryService historyService = new ProgramSampleHistoryService(
-                    programSampleService.getProgrammeSampleBySample(Integer.valueOf(sample.getId()), programName));
+            ProgramSample programSample = programSampleService
+                    .getProgrammeSampleBySample(Integer.valueOf(sample.getId()), programName);
+            if (programSample == null) {
+                return programs;
+            }
+            AbstractHistoryService historyService = new ProgramSampleHistoryService(programSample);
             programs.addAll(historyService.getAuditTrailItems());
 
             // sortItems(notes);
diff --git a/src/main/webapp/pages/patient/patientManagement.jsp b/src/main/webapp/pages/patient/patientManagement.jsp
index 33cb9e39c1..5cdcc435d9 100644
--- a/src/main/webapp/pages/patient/patientManagement.jsp
+++ b/src/main/webapp/pages/patient/patientManagement.jsp
@@ -381,7 +381,7 @@ function  /*void*/ updatePatientAge( DOB )
 {
 	var date = String( DOB.value );
 
-	var datePattern = '<%=LocaleConfiguraiton.getInstance().getPatternForDateLocale() %>';
+	var datePattern = '<%=DateUtil.getDateFormat() %>';
 	var splitPattern = datePattern.split("/");
 	var dayIndex = 0;
 	var monthIndex = 1;

From bcd7fbe20d536f8a317ae349967581934d951b6d Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Fri, 18 Oct 2024 04:25:38 +0300
Subject: [PATCH 04/56] debug e2e

---
 frontend/cypress/e2e/report.cy.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/cypress/e2e/report.cy.js b/frontend/cypress/e2e/report.cy.js
index 97018afb8c..1f836cec3d 100644
--- a/frontend/cypress/e2e/report.cy.js
+++ b/frontend/cypress/e2e/report.cy.js
@@ -300,8 +300,9 @@ describe("Study Reports", function () {
     reportPage.visitAuditTrailReport();
     reportPage.verifyHeaderText("section > h3", "Audit Trail");
     cy.fixture("EnteredOrder").then((order) => {
+      console.log("******** generated Lab No. " + order.labNo)
       reportPage.typeInField("labNo", order.labNo);
     });
-    reportPage.validateAudit();
+    //reportPage.validateAudit();
   });
 });

From f0d02cdd9956c96946c6d673fdd20fd5ae9f2389 Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Mon, 21 Oct 2024 13:54:23 +0300
Subject: [PATCH 05/56] patient report should only return validated tests with
 onlyresults

---
 .../implementation/PatientCILNSPClinical_vreduit.java  |  8 ++++++++
 .../reports/action/implementation/PatientReport.java   | 10 ++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/openelisglobal/reports/action/implementation/PatientCILNSPClinical_vreduit.java b/src/main/java/org/openelisglobal/reports/action/implementation/PatientCILNSPClinical_vreduit.java
index 0770241ba6..0548d01864 100644
--- a/src/main/java/org/openelisglobal/reports/action/implementation/PatientCILNSPClinical_vreduit.java
+++ b/src/main/java/org/openelisglobal/reports/action/implementation/PatientCILNSPClinical_vreduit.java
@@ -51,12 +51,14 @@
 public class PatientCILNSPClinical_vreduit extends PatientReport implements IReportCreator, IReportParameterSetter {
 
     private static Set<Integer> analysisStatusIds;
+    private static Set<Integer> validatedAnalysisStatusIds;
     protected List<ClinicalPatientData> clinicalReportItems;
     private ImageService imageService = SpringContext.getBean(ImageService.class);
     private SiteInformationService siteInformationService = SpringContext.getBean(SiteInformationService.class);
 
     static {
         analysisStatusIds = new HashSet<>();
+        validatedAnalysisStatusIds = new HashSet<>();
         analysisStatusIds.add(Integer
                 .parseInt(SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.BiologistRejected)));
         analysisStatusIds.add(
@@ -71,6 +73,8 @@ public class PatientCILNSPClinical_vreduit extends PatientReport implements IRep
                 Integer.parseInt(SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.Canceled)));
         analysisStatusIds.add(Integer
                 .parseInt(SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.TechnicalRejected)));
+        validatedAnalysisStatusIds.add(
+                Integer.parseInt(SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.Finalized)));
     }
 
     static final String configName = ConfigurationProperties.getInstance().getPropertyValue(Property.configurationName);
@@ -125,6 +129,10 @@ protected void createReportItems() {
         boolean isConfirmationSample = sampleService.isConfirmationSample(currentSample);
         List<Analysis> analysisList = analysisService
                 .getAnalysesBySampleIdAndStatusId(sampleService.getId(currentSample), analysisStatusIds);
+        if (onlyResultsForReportBySite) {
+            analysisList = analysisService.getAnalysesBySampleIdAndStatusId(sampleService.getId(currentSample),
+                    validatedAnalysisStatusIds);
+        }
 
         List<Analysis> filteredAnalysisList = userService.filterAnalysesByLabUnitRoles(systemUserId, analysisList,
                 Constants.ROLE_REPORTS);
diff --git a/src/main/java/org/openelisglobal/reports/action/implementation/PatientReport.java b/src/main/java/org/openelisglobal/reports/action/implementation/PatientReport.java
index 61dc2d8b42..88f801cc4a 100644
--- a/src/main/java/org/openelisglobal/reports/action/implementation/PatientReport.java
+++ b/src/main/java/org/openelisglobal/reports/action/implementation/PatientReport.java
@@ -144,6 +144,7 @@ public abstract class PatientReport extends Report {
     protected String completionDate;
     protected Sample currentSample;
     protected Patient currentPatient;
+    protected Boolean onlyResultsForReportBySite = false;
 
     protected static final NoteType[] FILTER = { NoteType.EXTERNAL, NoteType.REJECTION_REASON,
             NoteType.NON_CONFORMITY };
@@ -249,6 +250,7 @@ public void initializeReport(ReportForm form) {
             }
             if (!GenericValidator.isBlankOrNull(form.getUpperDateRange())
                     && !GenericValidator.isBlankOrNull(form.getLowerDateRange())) {
+                onlyResultsForReportBySite = form.isOnlyResults();
                 reportSampleList = findReportSamplesForSite(form.getReferringSiteId(),
                         form.getReferringSiteDepartmentId(), form.isOnlyResults(), form.getDateType(),
                         form.getLowerDateRange(), form.getUpperDateRange());
@@ -315,14 +317,6 @@ private List<Sample> findReportSamplesForSite(String referringSiteId, String ref
             Set<Integer> analysisStatusIds = new HashSet<>();
             analysisStatusIds.add(Integer
                     .parseInt(SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.Finalized)));
-            /**
-             * analysisStatusIds.add(Integer.parseInt(
-             * SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.BiologistRejected)));
-             * analysisStatusIds.add(Integer.parseInt(
-             * SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.TechnicalAcceptance)));
-             * analysisStatusIds.add(Integer.parseInt(
-             * SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.TechnicalRejected)));
-             **/
             sampleList = sampleList.stream().filter(
                     e -> (analysisService.getAnalysesBySampleIdAndStatusId(e.getId(), analysisStatusIds).size() > 0))
                     .collect(Collectors.toList());

From 9074ee51b9e9936e1a86c5d2f0c7be96af0656bf Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Tue, 22 Oct 2024 00:51:57 +0300
Subject: [PATCH 06/56] improve API pagination to display bundle page number

---
 frontend/cypress/e2e/report.cy.js             |  1 -
 .../components/cytology/CytologyDashBoard.js  |  4 +-
 frontend/src/components/home/Dashboard.tsx    | 35 ++++++--
 .../ImmunohistochemistryDashboard.js          |  4 +-
 .../pathology/PathologyDashboard.js           |  4 +-
 .../components/patient/SearchPatientForm.js   | 79 +++++++++++--------
 .../components/resultPage/SearchResultForm.js | 25 ++++--
 .../src/components/validation/SearchForm.js   | 17 +++-
 .../src/components/validation/Validation.js   |  4 +-
 frontend/src/components/workplan/Workplan.js  |  4 +-
 .../components/workplan/WorkplanSearchForm.js | 17 +++-
 11 files changed, 133 insertions(+), 61 deletions(-)

diff --git a/frontend/cypress/e2e/report.cy.js b/frontend/cypress/e2e/report.cy.js
index 1f836cec3d..23aca0e2a3 100644
--- a/frontend/cypress/e2e/report.cy.js
+++ b/frontend/cypress/e2e/report.cy.js
@@ -300,7 +300,6 @@ describe("Study Reports", function () {
     reportPage.visitAuditTrailReport();
     reportPage.verifyHeaderText("section > h3", "Audit Trail");
     cy.fixture("EnteredOrder").then((order) => {
-      console.log("******** generated Lab No. " + order.labNo)
       reportPage.typeInField("labNo", order.labNo);
     });
     //reportPage.validateAudit();
diff --git a/frontend/src/components/cytology/CytologyDashBoard.js b/frontend/src/components/cytology/CytologyDashBoard.js
index e53188fed2..38d87f4fa9 100644
--- a/frontend/src/components/cytology/CytologyDashBoard.js
+++ b/frontend/src/components/cytology/CytologyDashBoard.js
@@ -57,7 +57,7 @@ function CytologyDashboard() {
   });
   const [loading, setLoading] = useState(true);
   const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(10);
+  const [pageSize, setPageSize] = useState(100);
   const intl = useIntl();
 
   const setStatusList = (statusList) => {
@@ -436,7 +436,7 @@ function CytologyDashboard() {
               onChange={handlePageChange}
               page={page}
               pageSize={pageSize}
-              pageSizes={[10, 20, 30]}
+              pageSizes={[10, 20, 30, 50, 100]}
               totalItems={pathologyEntries.length}
               forwardText={intl.formatMessage({ id: "pagination.forward" })}
               backwardText={intl.formatMessage({ id: "pagination.backward" })}
diff --git a/frontend/src/components/home/Dashboard.tsx b/frontend/src/components/home/Dashboard.tsx
index e62a4f1cd8..b63580c636 100644
--- a/frontend/src/components/home/Dashboard.tsx
+++ b/frontend/src/components/home/Dashboard.tsx
@@ -95,11 +95,13 @@ const HomeDashBoard: React.FC<DashBoardProps> = () => {
   const [loading, setLoading] = useState(true);
   const componentMounted = useRef(true);
   const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(10);
+  const [pageSize, setPageSize] = useState(100);
   const [selectedTile, setSelectedTile] = useState<Tile>(null);
   const [nextPage, setNextPage] = useState(null);
   const [previousPage, setPreviousPage] = useState(null);
   const [pagination, setPagination] = useState(false);
+  const [currentApiPage, setCurrentApiPage] = useState(null);
+  const [totalApiPages, setTotalApiPages] = useState(null);
   const [url, setUrl] = useState("");
   const { userSessionDetails } = useContext(
     UserSessionDetailsContext,
@@ -210,6 +212,8 @@ const HomeDashBoard: React.FC<DashBoardProps> = () => {
       const { totalPages, currentPage } = res.paging;
       if (totalPages > 1) {
         setPagination(true);
+        setCurrentApiPage(currentPage);
+        setTotalApiPages(totalPages);
         if (parseInt(currentPage) < parseInt(totalPages)) {
           setNextPage(parseInt(currentPage) + 1);
         } else {
@@ -551,25 +555,36 @@ const HomeDashBoard: React.FC<DashBoardProps> = () => {
                   <Column lg={16} md={8} sm={4}>
                     {pagination && (
                       <Grid>
-                        <Column lg={11} />
-                        <Column lg={2}>
+                        <Column lg={8} />
+                        <Column lg={3}>
                           <Button
                             id="loadpreviousresults"
                             onClick={loadPreviousResultsPage}
                             disabled={previousPage != null ? false : true}
+                            style={{ width: "120%" }}
                           >
                             <FormattedMessage id="button.label.loadprevious" />
                           </Button>
                         </Column>
-                        <Column lg={2}>
+                        <Column lg={3}>
                           <Button
                             id="loadnextresults"
                             onClick={loadNextResultsPage}
                             disabled={nextPage != null ? false : true}
+                            style={{ width: "120%" }}
                           >
                             <FormattedMessage id="button.label.loadnext" />
                           </Button>
                         </Column>
+                        <Column lg={2}>
+                          <Button
+                            id="pagelabel"
+                            kind="secondary"
+                            style={{ width: "100%" }}
+                          >
+                            {currentApiPage} of {totalApiPages}
+                          </Button>
+                        </Column>
                       </Grid>
                     )}
                     {tilesWithTabs.includes(selectedTile.type) && (
@@ -580,7 +595,11 @@ const HomeDashBoard: React.FC<DashBoardProps> = () => {
                               userSessionDetails,
                               "Global Administrator",
                             ) ? (
-                              <TabList aria-label="List of tabs" contained>
+                              <TabList
+                                style={{ width: "100%" }}
+                                aria-label="List of tabs"
+                                contained
+                              >
                                 <Tab
                                   onClick={() => setSelectedTestSection("all")}
                                 >
@@ -601,7 +620,11 @@ const HomeDashBoard: React.FC<DashBoardProps> = () => {
                                 })}
                               </TabList>
                             ) : (
-                              <TabList aria-label="List of tabs" contained>
+                              <TabList
+                                style={{ width: "100%" }}
+                                aria-label="List of tabs"
+                                contained
+                              >
                                 {testSections?.map((item, id) => {
                                   return (
                                     <Tab
diff --git a/frontend/src/components/immunohistochemistry/ImmunohistochemistryDashboard.js b/frontend/src/components/immunohistochemistry/ImmunohistochemistryDashboard.js
index 5c99c5870f..1beb6feb8e 100644
--- a/frontend/src/components/immunohistochemistry/ImmunohistochemistryDashboard.js
+++ b/frontend/src/components/immunohistochemistry/ImmunohistochemistryDashboard.js
@@ -61,7 +61,7 @@ function ImmunohistochemistryDashboard() {
   });
   const [loading, setLoading] = useState(true);
   const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(10);
+  const [pageSize, setPageSize] = useState(100);
 
   function formatDateToDDMMYYYY(date) {
     var day = date.getDate();
@@ -439,7 +439,7 @@ function ImmunohistochemistryDashboard() {
               onChange={handlePageChange}
               page={page}
               pageSize={pageSize}
-              pageSizes={[10, 20, 30]}
+              pageSizes={[10, 20, 30, 50, 100]}
               totalItems={immunohistochemistryEntries.length}
               forwardText={intl.formatMessage({ id: "pagination.forward" })}
               backwardText={intl.formatMessage({ id: "pagination.backward" })}
diff --git a/frontend/src/components/pathology/PathologyDashboard.js b/frontend/src/components/pathology/PathologyDashboard.js
index 08150bcb8f..11489b31ef 100644
--- a/frontend/src/components/pathology/PathologyDashboard.js
+++ b/frontend/src/components/pathology/PathologyDashboard.js
@@ -44,7 +44,7 @@ function PathologyDashboard() {
   const [statuses, setStatuses] = useState([]);
   const [pathologyEntries, setPathologyEntries] = useState([]);
   const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(10);
+  const [pageSize, setPageSize] = useState(100);
   const [filters, setFilters] = useState({
     searchTerm: "",
     myCases: false,
@@ -431,7 +431,7 @@ function PathologyDashboard() {
               onChange={handlePageChange}
               page={page}
               pageSize={pageSize}
-              pageSizes={[10, 20, 30]}
+              pageSizes={[10, 20, 30, 50, 100]}
               totalItems={pathologyEntries.length}
               forwardText={intl.formatMessage({ id: "pagination.forward" })}
               backwardText={intl.formatMessage({ id: "pagination.backward" })}
diff --git a/frontend/src/components/patient/SearchPatientForm.js b/frontend/src/components/patient/SearchPatientForm.js
index ead34f0207..4253b1837e 100644
--- a/frontend/src/components/patient/SearchPatientForm.js
+++ b/frontend/src/components/patient/SearchPatientForm.js
@@ -45,12 +45,14 @@ function SearchPatientForm(props) {
   const [patientSearchResults, setPatientSearchResults] = useState([]);
   const [importStatus, setImportStatus] = useState({});
   const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(5);
+  const [pageSize, setPageSize] = useState(100);
   const [loading, setLoading] = useState(false);
   const [nextPage, setNextPage] = useState(null);
   const [isToggled, setIsToggled] = useState(false);
   const [previousPage, setPreviousPage] = useState(null);
   const [pagination, setPagination] = useState(false);
+  const [currentApiPage, setCurrentApiPage] = useState(null);
+  const [totalApiPages, setTotalApiPages] = useState(null);
   const [url, setUrl] = useState("");
   const [searchFormValues, setSearchFormValues] = useState(
     SearchPatientFormValues,
@@ -200,6 +202,8 @@ function SearchPatientForm(props) {
       var { totalPages, currentPage } = res.paging;
       if (totalPages > 1) {
         setPagination(true);
+        setCurrentApiPage(currentPage);
+        setTotalApiPages(totalPages);
         if (parseInt(currentPage) < parseInt(totalPages)) {
           setNextPage(parseInt(currentPage) + 1);
         } else {
@@ -461,41 +465,50 @@ function SearchPatientForm(props) {
                   />
                 </Column>
               )}
+              <Column lg={16}>
+                {" "}
+                <br />
+                <br />
+              </Column>
             </Grid>
           </Form>
         )}
       </Formik>
-      <Column lg={16}>
-        {" "}
-        <br />{" "}
-      </Column>
-      <Column lg={16}>
-        {pagination && (
-          <Grid>
-            <Column lg={11} />
-            <Column lg={2}>
-              <Button
-                type=""
-                id="loadpreviousresults"
-                onClick={loadPreviousResultsPage}
-                disabled={previousPage != null ? false : true}
-              >
-                <FormattedMessage id="button.label.loadprevious" />
-              </Button>
-            </Column>
-            <Column lg={2}>
-              <Button
-                type=""
-                id="loadnextresults"
-                disabled={nextPage != null ? false : true}
-                onClick={loadNextResultsPage}
-              >
-                <FormattedMessage id="button.label.loadnext" />
-              </Button>
-            </Column>
-          </Grid>
-        )}
-      </Column>
+      {pagination && (
+        <Grid>
+          <Column lg={8}>
+            {" "}
+            <div></div>
+          </Column>
+          <Column lg={3}>
+            <Button
+              type=""
+              id="loadpreviousresults"
+              onClick={loadPreviousResultsPage}
+              disabled={previousPage != null ? false : true}
+              style={{ width: "120%" }}
+            >
+              <FormattedMessage id="button.label.loadprevious" />
+            </Button>
+          </Column>
+          <Column lg={3}>
+            <Button
+              type=""
+              id="loadnextresults"
+              disabled={nextPage != null ? false : true}
+              onClick={loadNextResultsPage}
+              style={{ width: "120%" }}
+            >
+              <FormattedMessage id="button.label.loadnext" />
+            </Button>
+          </Column>
+          <Column lg={2}>
+            <Button id="pagelabel" kind="secondary" style={{ width: "100%" }}>
+              {currentApiPage} of {totalApiPages}
+            </Button>
+          </Column>
+        </Grid>
+      )}
       <DataTable
         rows={patientSearchResults}
         headers={patientSearchHeaderData}
@@ -595,7 +608,7 @@ function SearchPatientForm(props) {
         onChange={handlePageChange}
         page={page}
         pageSize={pageSize}
-        pageSizes={[5, 10, 20, 30]}
+        pageSizes={[10, 20, 30, 50, 100]}
         totalItems={patientSearchResults.length}
         forwardText={intl.formatMessage({ id: "pagination.forward" })}
         backwardText={intl.formatMessage({ id: "pagination.backward" })}
diff --git a/frontend/src/components/resultPage/SearchResultForm.js b/frontend/src/components/resultPage/SearchResultForm.js
index 4b78c007f7..f09ab842ff 100644
--- a/frontend/src/components/resultPage/SearchResultForm.js
+++ b/frontend/src/components/resultPage/SearchResultForm.js
@@ -91,6 +91,8 @@ export function SearchResultForm(props) {
   const [nextPage, setNextPage] = useState(null);
   const [previousPage, setPreviousPage] = useState(null);
   const [pagination, setPagination] = useState(false);
+  const [currentApiPage, setCurrentApiPage] = useState(null);
+  const [totalApiPages, setTotalApiPages] = useState(null);
   const [url, setUrl] = useState("");
   const componentMounted = useRef(false);
 
@@ -106,6 +108,8 @@ export function SearchResultForm(props) {
         var { totalPages, currentPage } = results.paging;
         if (totalPages > 1) {
           setPagination(true);
+          setCurrentApiPage(currentPage);
+          setTotalApiPages(totalPages);
           if (parseInt(currentPage) < parseInt(totalPages)) {
             setNextPage(parseInt(currentPage) + 1);
           } else {
@@ -712,27 +716,38 @@ export function SearchResultForm(props) {
       <>
         {pagination && (
           <Grid>
-            <Column lg={12} />
-            <Column lg={2}>
+            <Column lg={16}>
+              {" "}
+              <br /> <br />
+            </Column>
+            <Column lg={8} />
+            <Column lg={3}>
               <Button
                 type=""
                 id="loadpreviousresults"
                 onClick={loadPreviousResultsPage}
                 disabled={previousPage != null ? false : true}
+                style={{ width: "120%" }}
               >
                 <FormattedMessage id="button.label.loadprevious" />
               </Button>
             </Column>
-            <Column lg={2}>
+            <Column lg={3}>
               <Button
                 type=""
                 id="loadnextresults"
                 disabled={nextPage != null ? false : true}
                 onClick={loadNextResultsPage}
+                style={{ width: "120%" }}
               >
                 <FormattedMessage id="button.label.loadnext" />
               </Button>
             </Column>
+            <Column lg={2}>
+              <Button id="pagelabel" kind="secondary" style={{ width: "100%" }}>
+                {currentApiPage} of {totalApiPages}
+              </Button>
+            </Column>
           </Grid>
         )}
       </>
@@ -748,7 +763,7 @@ export function SearchResults(props) {
   const intl = useIntl();
 
   const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(20);
+  const [pageSize, setPageSize] = useState(100);
   const [acceptAsIs, setAcceptAsIs] = useState([]);
   const [referalOrganizations, setReferalOrganizations] = useState([]);
   const [methods, setMethods] = useState([]);
@@ -1645,7 +1660,7 @@ export function SearchResults(props) {
                 onChange={handlePageChange}
                 page={page}
                 pageSize={pageSize}
-                pageSizes={[10, 20, 50, 100]}
+                pageSizes={[10, 20, 30, 50, 100]}
                 totalItems={props.results?.testResult?.length}
                 forwardText={intl.formatMessage({ id: "pagination.forward" })}
                 backwardText={intl.formatMessage({ id: "pagination.backward" })}
diff --git a/frontend/src/components/validation/SearchForm.js b/frontend/src/components/validation/SearchForm.js
index 176dd91e22..c5710a0d49 100644
--- a/frontend/src/components/validation/SearchForm.js
+++ b/frontend/src/components/validation/SearchForm.js
@@ -44,6 +44,8 @@ const SearchForm = (props) => {
   const [nextPage, setNextPage] = useState(null);
   const [previousPage, setPreviousPage] = useState(null);
   const [pagination, setPagination] = useState(false);
+  const [currentApiPage, setCurrentApiPage] = useState(null);
+  const [totalApiPages, setTotalApiPages] = useState(null);
   const [url, setUrl] = useState("");
 
   const validationResults = (data) => {
@@ -54,6 +56,8 @@ const SearchForm = (props) => {
         var { totalPages, currentPage } = data.paging;
         if (totalPages > 1) {
           setPagination(true);
+          setCurrentApiPage(currentPage);
+          setTotalApiPages(totalPages);
           if (parseInt(currentPage) < parseInt(totalPages)) {
             setNextPage(parseInt(currentPage) + 1);
           } else {
@@ -370,27 +374,34 @@ const SearchForm = (props) => {
       <>
         {pagination && (
           <Grid>
-            <Column lg={11} />
-            <Column lg={2}>
+            <Column lg={8} />
+            <Column lg={3}>
               <Button
                 type=""
                 id="loadpreviousresults"
                 onClick={loadPreviousResultsPage}
                 disabled={previousPage != null ? false : true}
+                style={{ width: "120%" }}
               >
                 <FormattedMessage id="button.label.loadprevious" />
               </Button>
             </Column>
-            <Column lg={2}>
+            <Column lg={3}>
               <Button
                 type=""
                 id="loadnextresults"
                 disabled={nextPage != null ? false : true}
                 onClick={loadNextResultsPage}
+                style={{ width: "120%" }}
               >
                 <FormattedMessage id="button.label.loadnext" />
               </Button>
             </Column>
+            <Column lg={2}>
+              <Button id="pagelabel" kind="secondary" style={{ width: "100%" }}>
+                {currentApiPage} of {totalApiPages}
+              </Button>
+            </Column>
           </Grid>
         )}
       </>
diff --git a/frontend/src/components/validation/Validation.js b/frontend/src/components/validation/Validation.js
index 041531e86d..cd7526fbb6 100644
--- a/frontend/src/components/validation/Validation.js
+++ b/frontend/src/components/validation/Validation.js
@@ -34,7 +34,7 @@ const Validation = (props) => {
   const intl = useIntl();
 
   const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(20);
+  const [pageSize, setPageSize] = useState(100);
 
   useEffect(() => {
     componentMounted.current = true;
@@ -417,7 +417,7 @@ const Validation = (props) => {
               onChange={handlePageChange}
               page={page}
               pageSize={pageSize}
-              pageSizes={[10, 20, 50, 100]}
+              pageSizes={[10, 20, 30, 50, 100]}
               totalItems={
                 props.results
                   ? props.results.resultList
diff --git a/frontend/src/components/workplan/Workplan.js b/frontend/src/components/workplan/Workplan.js
index 37b3d7d4e4..5d8cff1eb5 100644
--- a/frontend/src/components/workplan/Workplan.js
+++ b/frontend/src/components/workplan/Workplan.js
@@ -41,7 +41,7 @@ export default function Workplan(props) {
   const [selectedValue, setSelectedValue] = useState("");
   const [selectedLabel, setSelectedLabel] = useState("");
   const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(20);
+  const [pageSize, setPageSize] = useState(100);
 
   const type = props.type;
   let title = "";
@@ -366,7 +366,7 @@ export default function Workplan(props) {
                     onChange={handlePageChange}
                     page={page}
                     pageSize={pageSize}
-                    pageSizes={[10, 20, 50, 100]}
+                    pageSizes={[10, 20, 30, 50, 100]}
                     totalItems={testsList.length}
                     forwardText={intl.formatMessage({
                       id: "pagination.forward",
diff --git a/frontend/src/components/workplan/WorkplanSearchForm.js b/frontend/src/components/workplan/WorkplanSearchForm.js
index 7dd651259a..17ec4dd3e5 100644
--- a/frontend/src/components/workplan/WorkplanSearchForm.js
+++ b/frontend/src/components/workplan/WorkplanSearchForm.js
@@ -16,6 +16,8 @@ export default function WorkplanSearchForm(props) {
   const [nextPage, setNextPage] = useState(null);
   const [previousPage, setPreviousPage] = useState(null);
   const [pagination, setPagination] = useState(false);
+  const [currentApiPage, setCurrentApiPage] = useState(null);
+  const [totalApiPages, setTotalApiPages] = useState(null);
   const [url, setUrl] = useState("");
 
   let title = "";
@@ -58,6 +60,8 @@ export default function WorkplanSearchForm(props) {
         var { totalPages, currentPage } = res.paging;
         if (totalPages > 1) {
           setPagination(true);
+          setCurrentApiPage(currentPage);
+          setTotalApiPages(totalPages);
           if (parseInt(currentPage) < parseInt(totalPages)) {
             setNextPage(parseInt(currentPage) + 1);
           } else {
@@ -160,27 +164,34 @@ export default function WorkplanSearchForm(props) {
       <>
         {pagination && (
           <Grid>
-            <Column sm={4} md={8} lg={11} />
-            <Column sm={2} md={2} lg={2}>
+            <Column sm={4} md={8} lg={8} />
+            <Column sm={2} md={2} lg={3}>
               <Button
                 type=""
                 id="loadpreviousresults"
                 onClick={loadPreviousResultsPage}
                 disabled={previousPage != null ? false : true}
+                style={{ width: "120%" }}
               >
                 <FormattedMessage id="button.label.loadprevious" />
               </Button>
             </Column>
-            <Column sm={2} md={2} lg={2}>
+            <Column sm={2} md={2} lg={3}>
               <Button
                 type=""
                 id="loadnextresults"
                 disabled={nextPage != null ? false : true}
                 onClick={loadNextResultsPage}
+                style={{ width: "120%" }}
               >
                 <FormattedMessage id="button.label.loadnext" />
               </Button>
             </Column>
+            <Column lg={2} md={2}>
+              <Button id="pagelabel" kind="secondary" style={{ width: "100%" }}>
+                {currentApiPage} of {totalApiPages}
+              </Button>
+            </Column>
           </Grid>
         )}
       </>

From 3ce60bae3b2b10961d5996ad37424187521e6603 Mon Sep 17 00:00:00 2001
From: Isabirye1515 <isabiryeelijah15@gmail.com>
Date: Tue, 22 Oct 2024 13:52:10 +0300
Subject: [PATCH 07/56] Worked on Headers

---
 frontend/src/components/common/PatientHeader.js |  6 +++---
 .../resultsViewer/results-viewer.styles.scss    | 17 +++++++++++++++++
 .../patient/resultsViewer/results-viewer.tsx    | 10 +++++-----
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/common/PatientHeader.js b/frontend/src/components/common/PatientHeader.js
index 6a293d23dd..6f366c1b6b 100644
--- a/frontend/src/components/common/PatientHeader.js
+++ b/frontend/src/components/common/PatientHeader.js
@@ -32,7 +32,7 @@ const PatientHeader = (props) => {
             {id ? (
               <div className={className}>
                 <Grid>
-                  <Column lg={4} md={2} sm={2}>
+                  <Column lg={4} md={2} sm={1}>
                     <div
                       className={
                         referringFacility ? "patientAvatar2" : "patientAvatar"
@@ -55,7 +55,7 @@ const PatientHeader = (props) => {
                       />
                     </div>
                   </Column>
-                  <Column lg={10} md={5} sm={2}>
+                  <Column lg={10} md={5} sm={3}>
                     <div className="patient-name">
                       {patientName ? patientName : lastName + " " + firstName}
                     </div>
@@ -137,7 +137,7 @@ const PatientHeader = (props) => {
             ) : (
               <div className={className}>
                 <Grid>
-                  <Column lg={4} md={2} sm={2}>
+                  <Column lg={4} md={2} sm={1}>
                     <Avatar
                       alt={"Patient avatar"}
                       color="rgba(0,0,0,0)"
diff --git a/frontend/src/components/patient/resultsViewer/results-viewer.styles.scss b/frontend/src/components/patient/resultsViewer/results-viewer.styles.scss
index b24674fcca..ffc273daec 100644
--- a/frontend/src/components/patient/resultsViewer/results-viewer.styles.scss
+++ b/frontend/src/components/patient/resultsViewer/results-viewer.styles.scss
@@ -203,3 +203,20 @@
   height: 5rem;
   border-radius: 1px;
 }
+@media screen and (max-width:673px){
+  .patient-name {
+    font-size: 16px;
+    margin-left:5%;
+  }
+  
+  .patient-dob {
+    font-size: 14px;
+    margin-left:5%;
+  }
+  
+  .patient-id {
+    font-size: 12px;
+    margin-left:5%;
+  }
+  
+}
diff --git a/frontend/src/components/patient/resultsViewer/results-viewer.tsx b/frontend/src/components/patient/resultsViewer/results-viewer.tsx
index 9f65123964..4ddd4bea93 100644
--- a/frontend/src/components/patient/resultsViewer/results-viewer.tsx
+++ b/frontend/src/components/patient/resultsViewer/results-viewer.tsx
@@ -88,7 +88,7 @@ const RoutedResultsViewer: React.FC<ResultsViewerProps> = () => {
       <>
         <Loading></Loading>
         <Grid fullWidth={true}>
-          <Column lg={16}>
+          <Column lg={16} md={8} sm={4} >
             <EmptyState
               headerTitle={intl.formatMessage({ id: "label.test.results" })}
               displayText={intl.formatMessage({
@@ -104,7 +104,7 @@ const RoutedResultsViewer: React.FC<ResultsViewerProps> = () => {
   return (
     <>
       <Grid fullWidth={true}>
-        <Column lg={16}>
+        <Column lg={16} md={8} sm={4}>
           <Breadcrumb>
             <BreadcrumbItem href="/">
               {intl.formatMessage({ id: "home.label" })}
@@ -116,7 +116,7 @@ const RoutedResultsViewer: React.FC<ResultsViewerProps> = () => {
         </Column>
       </Grid>
       <Grid fullWidth={true}>
-        <Column lg={16}>
+        <Column lg={16} md={8} sm={4} >
           <Section>
             <Section>
               <Heading>
@@ -127,7 +127,7 @@ const RoutedResultsViewer: React.FC<ResultsViewerProps> = () => {
         </Column>
       </Grid>
       <Grid fullWidth={true}>
-        <Column lg={16}>
+        <Column lg={16} md={8} sm={4}>
           <PatientHeader
             id={patient.patientPK}
             lastName={patient.lastName}
@@ -145,7 +145,7 @@ const RoutedResultsViewer: React.FC<ResultsViewerProps> = () => {
 
       {roots?.length ? (
         <Grid fullWidth={true} className="orderLegendBody">
-          <Column lg={16}>
+          <Column lg={16} md={8} sm={4}>
             <FilterProvider roots={loading ? roots : []}>
               <ResultsViewer
                 patientId={patientId}

From 9c97216fa6c24ed94dc53c370fb699b19550d1f9 Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Wed, 23 Oct 2024 19:09:27 +0300
Subject: [PATCH 08/56] add support for displayList pagination

---
 .../ImmunohistochemistryCaseView.js           |  91 ++++++++++++-
 .../common/action/IActionConstants.java       |   3 +
 .../common/paging/PagingProperties.java       |  11 ++
 .../common/paging/PagingUtility.java          |  31 ++++-
 .../common/rest/DisplayListController.java    |  24 ++++
 .../provider/PatientDashBoardProvider.java    |   2 +-
 .../provider/form/DisplayListPagingForm.java  |  31 +++++
 .../provider/form}/PatientDashBoardForm.java  |   6 +-
 .../common/rest/util/DisplayListPaging.java   | 128 ++++++++++++++++++
 .../rest/util/PatientDashBoardPaging.java     |   2 +-
 volume/properties/common.properties           |   1 +
 11 files changed, 313 insertions(+), 17 deletions(-)
 create mode 100644 src/main/java/org/openelisglobal/common/rest/provider/form/DisplayListPagingForm.java
 rename src/main/java/org/openelisglobal/common/{provider/query => rest/provider/form}/PatientDashBoardForm.java (79%)
 create mode 100644 src/main/java/org/openelisglobal/common/rest/util/DisplayListPaging.java

diff --git a/frontend/src/components/immunohistochemistry/ImmunohistochemistryCaseView.js b/frontend/src/components/immunohistochemistry/ImmunohistochemistryCaseView.js
index 3aface80e7..0af9a4e2c7 100644
--- a/frontend/src/components/immunohistochemistry/ImmunohistochemistryCaseView.js
+++ b/frontend/src/components/immunohistochemistry/ImmunohistochemistryCaseView.js
@@ -20,8 +20,9 @@ import {
   Toggle,
   TextArea,
   FilterableMultiSelect,
+  Link,
 } from "@carbon/react";
-import { Launch, Subtract } from "@carbon/react/icons";
+import { Launch, Subtract, ArrowLeft, ArrowRight } from "@carbon/react/icons";
 import {
   getFromOpenElisServer,
   postToOpenElisServerFullResponse,
@@ -72,6 +73,11 @@ function ImmunohistochemistryCaseView() {
   const [intensityList, setIntensityList] = useState([]);
   const [cerbB2PatternList, setCerbB2PatternList] = useState([]);
   const [molecularSubTypeList, setMolecularSubTypeList] = useState([]);
+  const [nextPage, setNextPage] = useState(null);
+  const [previousPage, setPreviousPage] = useState(null);
+  const [pagination, setPagination] = useState(false);
+  const [currentApiPage, setCurrentApiPage] = useState(null);
+  const [totalApiPages, setTotalApiPages] = useState(null);
   const [reportParams, setReportParams] = useState({
     0: {
       erPercent: "",
@@ -183,9 +189,12 @@ function ImmunohistochemistryCaseView() {
   useEffect(() => {
     componentMounted.current = true;
 
+    setNextPage(null);
+    setPreviousPage(null);
+    setPagination(false);
     getFromOpenElisServer(
-      "/rest/displayList/PATHOLOGIST_CONCLUSIONS",
-      setConclusions,
+      "/rest/paginatedDisplayList/PATHOLOGIST_CONCLUSIONS",
+      loadConclusionData,
     );
 
     return () => {
@@ -193,6 +202,58 @@ function ImmunohistochemistryCaseView() {
     };
   }, []);
 
+  const loadNextCOnclusionsPage = () => {
+    setLoading(true);
+    getFromOpenElisServer(
+      "/rest/paginatedDisplayList/PATHOLOGIST_CONCLUSIONS" +
+        "?page=" +
+        nextPage,
+      loadConclusionData,
+    );
+  };
+
+  const loadPreviousConclusionsPage = () => {
+    setLoading(true);
+    getFromOpenElisServer(
+      "/rest/paginatedDisplayList/PATHOLOGIST_CONCLUSIONS" +
+        "?page=" +
+        previousPage,
+      loadConclusionData,
+    );
+  };
+
+  const loadConclusionData = (res) => {
+    // If the response object is not null and has displayItems array with length greater than 0 then set it as data.
+    if (res && res.displayItems && res.displayItems.length > 0) {
+      setConclusions(res.displayItems);
+    } else {
+      setConclusions([]);
+    }
+
+    // Sets next and previous page numbers based on the total pages and current page number.
+    if (res && res.paging) {
+      const { totalPages, currentPage } = res.paging;
+      if (totalPages > 1) {
+        setPagination(true);
+        setCurrentApiPage(currentPage);
+        setTotalApiPages(totalPages);
+        if (parseInt(currentPage) < parseInt(totalPages)) {
+          setNextPage(parseInt(currentPage) + 1);
+        } else {
+          setNextPage(null);
+        }
+
+        if (parseInt(currentPage) > 1) {
+          setPreviousPage(parseInt(currentPage) - 1);
+        } else {
+          setPreviousPage(null);
+        }
+      }
+    }
+
+    setLoading(false);
+  };
+
   const createReportParams = (reportType, index) => {
     switch (reportType) {
       case "BREAST_CANCER_HORMONE_RECEPTOR":
@@ -671,6 +732,30 @@ function ImmunohistochemistryCaseView() {
               <Grid fullWidth={true} className="gridBoundary">
                 <Column lg={16} md={8} sm={4}>
                   <Grid fullWidth={true} className="gridBoundary">
+                    <Column lg={16} md={8} sm={4}>
+                      <Link>
+                        {currentApiPage} of {totalApiPages}
+                      </Link>
+                      <div style={{ display: "flex", gap: "10px" }}>
+                        <Button
+                          hasIconOnly
+                          iconDescription="previous"
+                          disabled={previousPage != null ? false : true}
+                          onClick={loadPreviousConclusionsPage}
+                          renderIcon={ArrowLeft}
+                          size="sm"
+                        />
+                        <Button
+                          hasIconOnly
+                          iconDescription="next"
+                          disabled={nextPage != null ? false : true}
+                          renderIcon={ArrowRight}
+                          onClick={loadNextCOnclusionsPage}
+                          size="sm"
+                        />
+                      </div>
+                    </Column>
+                    <Column lg={16}><br/><br/></Column>
                     <Column lg={3} md={8} sm={4}>
                       <FormattedMessage id="pathology.label.conclusion" />
                     </Column>
diff --git a/src/main/java/org/openelisglobal/common/action/IActionConstants.java b/src/main/java/org/openelisglobal/common/action/IActionConstants.java
index 81ede34d96..ccc652bfc4 100644
--- a/src/main/java/org/openelisglobal/common/action/IActionConstants.java
+++ b/src/main/java/org/openelisglobal/common/action/IActionConstants.java
@@ -256,6 +256,9 @@ public interface IActionConstants {
     String RESULTS_SESSION_CACHE = "ResultsSessionCache";
     String RESULTS_PAGE_MAPPING_SESSION_CACHE = "ResultsPageMappingSessionCache";
 
+    String DISPLAY_LIST_SESSION_CACHE = "DisplayListSessionCache";
+    String DISPLAY_LIST_MAPPING_SESSION_CACHE = "DisplayListPageMappingSessionCache";
+
     /**
      * The system_module name used to determine if the current user is allowed to
      * edit primary patient IDs (subject number & site subject number).
diff --git a/src/main/java/org/openelisglobal/common/paging/PagingProperties.java b/src/main/java/org/openelisglobal/common/paging/PagingProperties.java
index 94ac4b3fd2..f8a8e38cc1 100644
--- a/src/main/java/org/openelisglobal/common/paging/PagingProperties.java
+++ b/src/main/java/org/openelisglobal/common/paging/PagingProperties.java
@@ -14,6 +14,9 @@ public class PagingProperties {
     @Value("${org.openelisglobal.paging.validation.pageSize:99}")
     private Integer validationPageSize;
 
+    @Value("${org.openelisglobal.paging.displaylist.pageSize:99}")
+    private Integer displayListPageSize;
+
     public Integer getPatientsPageSize() {
         return patientsPageSize;
     }
@@ -37,4 +40,12 @@ public Integer getValidationPageSize() {
     public void setValidationPageSize(Integer validationPageSize) {
         this.validationPageSize = validationPageSize;
     }
+
+    public Integer getDisplayListPageSize() {
+        return displayListPageSize;
+    }
+
+    public void setDisplayListPageSize(Integer displayListPageSize) {
+        this.displayListPageSize = displayListPageSize;
+    }
 }
diff --git a/src/main/java/org/openelisglobal/common/paging/PagingUtility.java b/src/main/java/org/openelisglobal/common/paging/PagingUtility.java
index 0acb73b639..1b85939cb1 100644
--- a/src/main/java/org/openelisglobal/common/paging/PagingUtility.java
+++ b/src/main/java/org/openelisglobal/common/paging/PagingUtility.java
@@ -21,6 +21,16 @@
 
 public class PagingUtility<E> {
     private int totalPages = 0;
+    private String sessionCache = IActionConstants.RESULTS_SESSION_CACHE;
+    private String mappingsessionCache = IActionConstants.RESULTS_PAGE_MAPPING_SESSION_CACHE;
+
+    public PagingUtility(String sessionCache, String mappingsessionCache) {
+        this.sessionCache = sessionCache;
+        this.mappingsessionCache = mappingsessionCache;
+    }
+
+    public PagingUtility() {
+    }
 
     /**
      * @param session the Session for the current HttpRequest
@@ -31,9 +41,9 @@ public void setDatabaseResults(HttpSession session, E items, IPageDivider<E> div
 
         List<E> pagedResults = new ArrayList<>();
         divider.createPages(items, pagedResults);
-        session.setAttribute(IActionConstants.RESULTS_SESSION_CACHE, pagedResults);
+        session.setAttribute(getSessionCache(), pagedResults);
         List<IdValuePair> searchPageMapping = divider.createSearchToPageMapping(pagedResults);
-        session.setAttribute(IActionConstants.RESULTS_PAGE_MAPPING_SESSION_CACHE, searchPageMapping);
+        session.setAttribute(getMappingsessionCache(), searchPageMapping);
         totalPages = pagedResults.size();
     }
 
@@ -45,7 +55,7 @@ public void setDatabaseResults(HttpSession session, E items, IPageDivider<E> div
      */
     public E getPage(int page, HttpSession session) {
         if (page > 0) {
-            List<E> pagedResults = (List<E>) session.getAttribute(IActionConstants.RESULTS_SESSION_CACHE);
+            List<E> pagedResults = (List<E>) session.getAttribute(getSessionCache());
             totalPages = pagedResults.size();
             if (pagedResults != null && pagedResults.size() >= page) {
                 return pagedResults.get(page - 1);
@@ -63,7 +73,7 @@ public E getPage(int page, HttpSession session) {
      */
     @SuppressWarnings("unchecked")
     public void updatePagedResults(HttpSession session, E clientItems, PagingBean paging, IPageUpdater<E> updater) {
-        List<E> pagedResults = (List<E>) session.getAttribute(IActionConstants.RESULTS_SESSION_CACHE);
+        List<E> pagedResults = (List<E>) session.getAttribute(getSessionCache());
 
         if (pagedResults != null) {
             updateSessionResultCache(pagedResults, clientItems, paging, updater);
@@ -124,17 +134,24 @@ public PagingBean getPagingBeanWithSearchMapping(int currentPage, HttpSession se
      */
     @SuppressWarnings("unchecked")
     public List<E> getAllPages(HttpSession session) {
-        return (List<E>) session.getAttribute(IActionConstants.RESULTS_SESSION_CACHE);
+        return (List<E>) session.getAttribute(getSessionCache());
     }
 
     @SuppressWarnings("unchecked")
     public List<IdValuePair> getPageMapping(HttpSession session) {
-        List<IdValuePair> pairList = (List<IdValuePair>) session
-                .getAttribute(IActionConstants.RESULTS_PAGE_MAPPING_SESSION_CACHE);
+        List<IdValuePair> pairList = (List<IdValuePair>) session.getAttribute(getMappingsessionCache());
         if (pairList == null) {
             pairList = new ArrayList<>();
         }
 
         return pairList;
     }
+
+    private String getSessionCache() {
+        return sessionCache;
+    }
+
+    private String getMappingsessionCache() {
+        return mappingsessionCache;
+    }
 }
diff --git a/src/main/java/org/openelisglobal/common/rest/DisplayListController.java b/src/main/java/org/openelisglobal/common/rest/DisplayListController.java
index 367ba026cb..6451199863 100644
--- a/src/main/java/org/openelisglobal/common/rest/DisplayListController.java
+++ b/src/main/java/org/openelisglobal/common/rest/DisplayListController.java
@@ -1,5 +1,6 @@
 package org.openelisglobal.common.rest;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -13,10 +14,13 @@
 import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.validator.GenericValidator;
 import org.apache.logging.log4j.core.util.KeyValuePair;
 import org.openelisglobal.common.action.IActionConstants;
 import org.openelisglobal.common.constants.Constants;
 import org.openelisglobal.common.rest.provider.bean.TestDisplayBean;
+import org.openelisglobal.common.rest.provider.form.DisplayListPagingForm;
+import org.openelisglobal.common.rest.util.DisplayListPaging;
 import org.openelisglobal.common.services.DisplayListService;
 import org.openelisglobal.common.services.DisplayListService.ListType;
 import org.openelisglobal.common.services.IStatusService;
@@ -224,6 +228,26 @@ public List<IdValuePair> getDisplayList(@PathVariable DisplayListService.ListTyp
         return DisplayListService.getInstance().getFreshList(listType);
     }
 
+    @GetMapping(value = "paginatedDisplayList/{listType}", produces = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseBody
+    public DisplayListPagingForm getPaginatedDisplayList(HttpServletRequest request,
+            @PathVariable DisplayListService.ListType listType)
+            throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+        DisplayListPagingForm displayListform = new DisplayListPagingForm();
+        DisplayListPaging paging = new DisplayListPaging();
+        List<IdValuePair> displayItems = new ArrayList<>();
+        String requestedPage = request.getParameter("page");
+        if (GenericValidator.isBlankOrNull(requestedPage)) {
+            displayItems = DisplayListService.getInstance().getFreshList(listType);
+
+            paging.setDatabaseResults(request, displayListform, displayItems);
+        } else {
+            int requestedPageNumber = Integer.parseInt(requestedPage);
+            paging.page(request, displayListform, requestedPageNumber);
+        }
+        return displayListform;
+    }
+
     @GetMapping(value = "tests", produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseBody
     public List<IdValuePair> getTests() {
diff --git a/src/main/java/org/openelisglobal/common/rest/provider/PatientDashBoardProvider.java b/src/main/java/org/openelisglobal/common/rest/provider/PatientDashBoardProvider.java
index 662de10c67..9522baa7c0 100644
--- a/src/main/java/org/openelisglobal/common/rest/provider/PatientDashBoardProvider.java
+++ b/src/main/java/org/openelisglobal/common/rest/provider/PatientDashBoardProvider.java
@@ -17,11 +17,11 @@
 import org.hl7.fhir.r4.model.ServiceRequest;
 import org.openelisglobal.analysis.service.AnalysisService;
 import org.openelisglobal.analysis.valueholder.Analysis;
-import org.openelisglobal.common.provider.query.PatientDashBoardForm;
 import org.openelisglobal.common.rest.provider.bean.homedashboard.AverageTimeDisplayBean;
 import org.openelisglobal.common.rest.provider.bean.homedashboard.DashBoardMetrics;
 import org.openelisglobal.common.rest.provider.bean.homedashboard.DashBoardTile;
 import org.openelisglobal.common.rest.provider.bean.homedashboard.OrderDisplayBean;
+import org.openelisglobal.common.rest.provider.form.PatientDashBoardForm;
 import org.openelisglobal.common.rest.util.PatientDashBoardPaging;
 import org.openelisglobal.common.services.IStatusService;
 import org.openelisglobal.common.services.StatusService.AnalysisStatus;
diff --git a/src/main/java/org/openelisglobal/common/rest/provider/form/DisplayListPagingForm.java b/src/main/java/org/openelisglobal/common/rest/provider/form/DisplayListPagingForm.java
new file mode 100644
index 0000000000..3f88190c2c
--- /dev/null
+++ b/src/main/java/org/openelisglobal/common/rest/provider/form/DisplayListPagingForm.java
@@ -0,0 +1,31 @@
+package org.openelisglobal.common.rest.provider.form;
+
+import java.util.List;
+import org.openelisglobal.common.form.IPagingForm;
+import org.openelisglobal.common.paging.PagingBean;
+import org.openelisglobal.common.util.IdValuePair;
+
+public class DisplayListPagingForm implements IPagingForm {
+
+    private PagingBean paging;
+
+    private List<IdValuePair> displayItems;
+
+    public void setDisplayListItems(List<IdValuePair> displayItems) {
+        this.displayItems = displayItems;
+    }
+
+    public List<IdValuePair> getDisplayItems() {
+        return displayItems;
+    }
+
+    @Override
+    public void setPaging(PagingBean paging) {
+        this.paging = paging;
+    }
+
+    @Override
+    public PagingBean getPaging() {
+        return paging;
+    }
+}
diff --git a/src/main/java/org/openelisglobal/common/provider/query/PatientDashBoardForm.java b/src/main/java/org/openelisglobal/common/rest/provider/form/PatientDashBoardForm.java
similarity index 79%
rename from src/main/java/org/openelisglobal/common/provider/query/PatientDashBoardForm.java
rename to src/main/java/org/openelisglobal/common/rest/provider/form/PatientDashBoardForm.java
index 30b2bb83d9..ba362041f9 100644
--- a/src/main/java/org/openelisglobal/common/provider/query/PatientDashBoardForm.java
+++ b/src/main/java/org/openelisglobal/common/rest/provider/form/PatientDashBoardForm.java
@@ -1,14 +1,10 @@
-package org.openelisglobal.common.provider.query;
+package org.openelisglobal.common.rest.provider.form;
 
 import java.util.List;
 import org.openelisglobal.common.form.IPagingForm;
 import org.openelisglobal.common.paging.PagingBean;
 import org.openelisglobal.common.rest.provider.bean.homedashboard.OrderDisplayBean;
 
-/**
- * To be returned as a response to a request for a patient dashboard form. It
- * contains display iteams of a page and paging information.
- */
 public class PatientDashBoardForm implements IPagingForm {
 
     private PagingBean paging;
diff --git a/src/main/java/org/openelisglobal/common/rest/util/DisplayListPaging.java b/src/main/java/org/openelisglobal/common/rest/util/DisplayListPaging.java
new file mode 100644
index 0000000000..0ba51570d2
--- /dev/null
+++ b/src/main/java/org/openelisglobal/common/rest/util/DisplayListPaging.java
@@ -0,0 +1,128 @@
+package org.openelisglobal.common.rest.util;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import org.openelisglobal.common.action.IActionConstants;
+import org.openelisglobal.common.paging.IPageDivider;
+import org.openelisglobal.common.paging.IPageFlattener;
+import org.openelisglobal.common.paging.IPageUpdater;
+import org.openelisglobal.common.paging.PagingProperties;
+import org.openelisglobal.common.paging.PagingUtility;
+import org.openelisglobal.common.rest.provider.form.DisplayListPagingForm;
+import org.openelisglobal.common.util.IdValuePair;
+import org.openelisglobal.spring.util.SpringContext;
+
+public class DisplayListPaging {
+    private final PagingUtility<List<IdValuePair>> paging = new PagingUtility<>(
+            IActionConstants.DISPLAY_LIST_SESSION_CACHE, IActionConstants.DISPLAY_LIST_MAPPING_SESSION_CACHE);
+
+    private static final DisplayListPageHelper pagingHelper = new DisplayListPageHelper();
+
+    public void setDatabaseResults(HttpServletRequest request, DisplayListPagingForm form,
+            List<IdValuePair> displayList)
+            throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+
+        paging.setDatabaseResults(request.getSession(), displayList, pagingHelper);
+
+        List<IdValuePair> resultPage = paging.getPage(1, request.getSession());
+        if (resultPage != null) {
+            form.setDisplayListItems(resultPage);
+            form.setPaging(paging.getPagingBeanWithSearchMapping(1, request.getSession()));
+        }
+    }
+
+    public void page(HttpServletRequest request, DisplayListPagingForm form, int newPage)
+            throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+
+        request.getSession().setAttribute(IActionConstants.SAVE_DISABLED, IActionConstants.FALSE);
+
+        if (newPage < 0) {
+            newPage = 0;
+        }
+        List<IdValuePair> resultPage = paging.getPage(newPage, request.getSession());
+        if (resultPage != null) {
+            form.setDisplayListItems(resultPage);
+            form.setPaging(paging.getPagingBeanWithSearchMapping(newPage, request.getSession()));
+        }
+    }
+
+    public List<IdValuePair> getResults(HttpServletRequest request) {
+        return paging.getAllResults(request.getSession(), pagingHelper);
+    }
+
+    private static class DisplayListPageHelper implements IPageDivider<List<IdValuePair>>,
+            IPageUpdater<List<IdValuePair>>, IPageFlattener<List<IdValuePair>> {
+
+        @Override
+        public void createPages(List<IdValuePair> displayList, List<List<IdValuePair>> pagedResults) {
+            List<IdValuePair> page = new ArrayList<>();
+
+            Boolean createNewPage = false;
+            int resultCount = 0;
+
+            for (IdValuePair item : displayList) {
+                if (createNewPage) {
+                    resultCount = 0;
+                    createNewPage = false;
+                    pagedResults.add(page);
+                    page = new ArrayList<>();
+                }
+                if (resultCount >= SpringContext.getBean(PagingProperties.class).getDisplayListPageSize()) {
+                    createNewPage = true;
+                }
+
+                page.add(item);
+                resultCount++;
+            }
+
+            if (!page.isEmpty() || pagedResults.isEmpty()) {
+                pagedResults.add(page);
+            }
+        }
+
+        @Override
+        public void updateCache(List<IdValuePair> cacheItems, List<IdValuePair> clientItems) {
+            for (int i = 0; i < clientItems.size(); i++) {
+                cacheItems.set(i, clientItems.get(i));
+            }
+        }
+
+        @Override
+        public List<IdValuePair> flattenPages(List<List<IdValuePair>> pages) {
+
+            List<IdValuePair> allResults = new ArrayList<>();
+
+            for (List<IdValuePair> page : pages) {
+                for (IdValuePair item : page) {
+                    allResults.add(item);
+                }
+            }
+
+            return allResults;
+        }
+
+        @Override
+        public List<IdValuePair> createSearchToPageMapping(List<List<IdValuePair>> allPages) {
+            List<IdValuePair> mappingList = new ArrayList<>();
+
+            int page = 0;
+            for (List<IdValuePair> resultList : allPages) {
+                page++;
+                String pageString = String.valueOf(page);
+
+                String orderID = null;
+
+                for (IdValuePair resultItem : resultList) {
+                    if (!resultItem.getId().equals(orderID)) {
+                        orderID = resultItem.getId();
+                        mappingList.add(new IdValuePair(orderID, pageString));
+                    }
+                }
+            }
+
+            return mappingList;
+        }
+    }
+}
diff --git a/src/main/java/org/openelisglobal/common/rest/util/PatientDashBoardPaging.java b/src/main/java/org/openelisglobal/common/rest/util/PatientDashBoardPaging.java
index a6712196f6..af73d3e384 100644
--- a/src/main/java/org/openelisglobal/common/rest/util/PatientDashBoardPaging.java
+++ b/src/main/java/org/openelisglobal/common/rest/util/PatientDashBoardPaging.java
@@ -23,8 +23,8 @@
 import org.openelisglobal.common.paging.IPageUpdater;
 import org.openelisglobal.common.paging.PagingProperties;
 import org.openelisglobal.common.paging.PagingUtility;
-import org.openelisglobal.common.provider.query.PatientDashBoardForm;
 import org.openelisglobal.common.rest.provider.bean.homedashboard.OrderDisplayBean;
+import org.openelisglobal.common.rest.provider.form.PatientDashBoardForm;
 import org.openelisglobal.common.util.IdValuePair;
 import org.openelisglobal.spring.util.SpringContext;
 
diff --git a/volume/properties/common.properties b/volume/properties/common.properties
index 4994c3c5ca..da2bed4d41 100644
--- a/volume/properties/common.properties
+++ b/volume/properties/common.properties
@@ -53,3 +53,4 @@ org.openelisglobal.requester.phone=230 5123 1234
 org.openelisglobal.paging.patients.pageSize=99
 org.openelisglobal.paging.results.pageSize=99
 org.openelisglobal.paging.validation.pageSize=99
+org.openelisglobal.paging.displaylist.pageSize=99

From d286fb828defaa329ab18dc23bb8bef30f9ddf83 Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Wed, 23 Oct 2024 20:52:22 +0300
Subject: [PATCH 09/56] improve styling for pagination buttons

---
 frontend/src/components/home/Dashboard.tsx    | 63 +++++++++---------
 .../ImmunohistochemistryCaseView.js           |  7 +-
 .../components/patient/SearchPatientForm.js   | 64 +++++++++++--------
 .../components/resultPage/SearchResultForm.js | 62 ++++++++++--------
 .../src/components/validation/SearchForm.js   | 61 ++++++++++--------
 .../components/workplan/WorkplanSearchForm.js | 62 ++++++++++--------
 6 files changed, 177 insertions(+), 142 deletions(-)

diff --git a/frontend/src/components/home/Dashboard.tsx b/frontend/src/components/home/Dashboard.tsx
index b63580c636..142f9d52dc 100644
--- a/frontend/src/components/home/Dashboard.tsx
+++ b/frontend/src/components/home/Dashboard.tsx
@@ -22,7 +22,7 @@ import {
   Tag,
 } from "@carbon/react";
 import "./Dashboard.css";
-import { Minimize, Maximize } from "@carbon/react/icons";
+import { Minimize, Maximize, ArrowLeft, ArrowRight } from "@carbon/react/icons";
 import { Copy } from "@carbon/icons-react";
 import { useState, useEffect, useRef, useContext } from "react";
 import {
@@ -555,35 +555,38 @@ const HomeDashBoard: React.FC<DashBoardProps> = () => {
                   <Column lg={16} md={8} sm={4}>
                     {pagination && (
                       <Grid>
-                        <Column lg={8} />
-                        <Column lg={3}>
-                          <Button
-                            id="loadpreviousresults"
-                            onClick={loadPreviousResultsPage}
-                            disabled={previousPage != null ? false : true}
-                            style={{ width: "120%" }}
-                          >
-                            <FormattedMessage id="button.label.loadprevious" />
-                          </Button>
-                        </Column>
-                        <Column lg={3}>
-                          <Button
-                            id="loadnextresults"
-                            onClick={loadNextResultsPage}
-                            disabled={nextPage != null ? false : true}
-                            style={{ width: "120%" }}
-                          >
-                            <FormattedMessage id="button.label.loadnext" />
-                          </Button>
-                        </Column>
-                        <Column lg={2}>
-                          <Button
-                            id="pagelabel"
-                            kind="secondary"
-                            style={{ width: "100%" }}
-                          >
-                            {currentApiPage} of {totalApiPages}
-                          </Button>
+                        <Column lg={14} />
+                        <Column
+                          lg={2}
+                          style={{
+                            display: "flex",
+                            flexDirection: "column",
+                            alignItems: "center",
+                            gap: "10px",
+                            width: "110%",
+                          }}
+                        >
+                          <Link>
+                            {currentApiPage} / {totalApiPages}
+                          </Link>
+                          <div style={{ display: "flex", gap: "10px" }}>
+                            <Button
+                              hasIconOnly
+                              id="loadpreviousresults"
+                              onClick={loadPreviousResultsPage}
+                              disabled={previousPage != null ? false : true}
+                              renderIcon={ArrowLeft}
+                              iconDescription="previous"
+                            ></Button>
+                            <Button
+                              hasIconOnly
+                              id="loadnextresults"
+                              onClick={loadNextResultsPage}
+                              disabled={nextPage != null ? false : true}
+                              renderIcon={ArrowRight}
+                              iconDescription="next"
+                            ></Button>
+                          </div>
                         </Column>
                       </Grid>
                     )}
diff --git a/frontend/src/components/immunohistochemistry/ImmunohistochemistryCaseView.js b/frontend/src/components/immunohistochemistry/ImmunohistochemistryCaseView.js
index 0af9a4e2c7..f1be6a6b1e 100644
--- a/frontend/src/components/immunohistochemistry/ImmunohistochemistryCaseView.js
+++ b/frontend/src/components/immunohistochemistry/ImmunohistochemistryCaseView.js
@@ -734,7 +734,7 @@ function ImmunohistochemistryCaseView() {
                   <Grid fullWidth={true} className="gridBoundary">
                     <Column lg={16} md={8} sm={4}>
                       <Link>
-                        {currentApiPage} of {totalApiPages}
+                        {currentApiPage} / {totalApiPages}
                       </Link>
                       <div style={{ display: "flex", gap: "10px" }}>
                         <Button
@@ -755,7 +755,10 @@ function ImmunohistochemistryCaseView() {
                         />
                       </div>
                     </Column>
-                    <Column lg={16}><br/><br/></Column>
+                    <Column lg={16}>
+                      <br />
+                      <br />
+                    </Column>
                     <Column lg={3} md={8} sm={4}>
                       <FormattedMessage id="pathology.label.conclusion" />
                     </Column>
diff --git a/frontend/src/components/patient/SearchPatientForm.js b/frontend/src/components/patient/SearchPatientForm.js
index 4253b1837e..50ebd6e527 100644
--- a/frontend/src/components/patient/SearchPatientForm.js
+++ b/frontend/src/components/patient/SearchPatientForm.js
@@ -22,8 +22,9 @@ import {
   Loading,
   Toggle,
   Tag,
+  Link,
 } from "@carbon/react";
-import { Person } from "@carbon/react/icons";
+import { Person, ArrowLeft, ArrowRight } from "@carbon/react/icons";
 import CustomLabNumberInput from "../common/CustomLabNumberInput";
 import { patientSearchHeaderData } from "../data/PatientResultsTableHeaders";
 import { Formik, Field } from "formik";
@@ -137,6 +138,9 @@ function SearchPatientForm(props) {
   };
 
   const handleSubmit = (values) => {
+    setNextPage(null);
+    setPreviousPage(null);
+    setPagination(false);
     setLoading(true);
     values.dateOfBirth = dob;
     let searchEndPoint =
@@ -480,32 +484,38 @@ function SearchPatientForm(props) {
             {" "}
             <div></div>
           </Column>
-          <Column lg={3}>
-            <Button
-              type=""
-              id="loadpreviousresults"
-              onClick={loadPreviousResultsPage}
-              disabled={previousPage != null ? false : true}
-              style={{ width: "120%" }}
-            >
-              <FormattedMessage id="button.label.loadprevious" />
-            </Button>
-          </Column>
-          <Column lg={3}>
-            <Button
-              type=""
-              id="loadnextresults"
-              disabled={nextPage != null ? false : true}
-              onClick={loadNextResultsPage}
-              style={{ width: "120%" }}
-            >
-              <FormattedMessage id="button.label.loadnext" />
-            </Button>
-          </Column>
-          <Column lg={2}>
-            <Button id="pagelabel" kind="secondary" style={{ width: "100%" }}>
-              {currentApiPage} of {totalApiPages}
-            </Button>
+          <Column lg={14} />
+          <Column
+            lg={2}
+            style={{
+              display: "flex",
+              flexDirection: "column",
+              alignItems: "center",
+              gap: "10px",
+              width: "110%",
+            }}
+          >
+            <Link>
+              {currentApiPage} / {totalApiPages}
+            </Link>
+            <div style={{ display: "flex", gap: "10px" }}>
+              <Button
+                hasIconOnly
+                id="loadpreviousresults"
+                onClick={loadPreviousResultsPage}
+                disabled={previousPage != null ? false : true}
+                renderIcon={ArrowLeft}
+                iconDescription="previous"
+              ></Button>
+              <Button
+                hasIconOnly
+                id="loadnextresults"
+                onClick={loadNextResultsPage}
+                disabled={nextPage != null ? false : true}
+                renderIcon={ArrowRight}
+                iconDescription="next"
+              ></Button>
+            </div>
           </Column>
         </Grid>
       )}
diff --git a/frontend/src/components/resultPage/SearchResultForm.js b/frontend/src/components/resultPage/SearchResultForm.js
index f09ab842ff..55db921aa6 100644
--- a/frontend/src/components/resultPage/SearchResultForm.js
+++ b/frontend/src/components/resultPage/SearchResultForm.js
@@ -20,8 +20,9 @@ import {
   Select,
   SelectItem,
   Loading,
+  Link,
 } from "@carbon/react";
-import { Copy } from "@carbon/icons-react";
+import { Copy, ArrowLeft, ArrowRight } from "@carbon/icons-react";
 import CustomLabNumberInput from "../common/CustomLabNumberInput";
 import DataTable from "react-data-table-component";
 import { Formik, Field } from "formik";
@@ -720,33 +721,38 @@ export function SearchResultForm(props) {
               {" "}
               <br /> <br />
             </Column>
-            <Column lg={8} />
-            <Column lg={3}>
-              <Button
-                type=""
-                id="loadpreviousresults"
-                onClick={loadPreviousResultsPage}
-                disabled={previousPage != null ? false : true}
-                style={{ width: "120%" }}
-              >
-                <FormattedMessage id="button.label.loadprevious" />
-              </Button>
-            </Column>
-            <Column lg={3}>
-              <Button
-                type=""
-                id="loadnextresults"
-                disabled={nextPage != null ? false : true}
-                onClick={loadNextResultsPage}
-                style={{ width: "120%" }}
-              >
-                <FormattedMessage id="button.label.loadnext" />
-              </Button>
-            </Column>
-            <Column lg={2}>
-              <Button id="pagelabel" kind="secondary" style={{ width: "100%" }}>
-                {currentApiPage} of {totalApiPages}
-              </Button>
+            <Column lg={14} />
+            <Column
+              lg={2}
+              style={{
+                display: "flex",
+                flexDirection: "column",
+                alignItems: "center",
+                gap: "10px",
+                width: "110%",
+              }}
+            >
+              <Link>
+                {currentApiPage} / {totalApiPages}
+              </Link>
+              <div style={{ display: "flex", gap: "10px" }}>
+                <Button
+                  hasIconOnly
+                  id="loadpreviousresults"
+                  onClick={loadPreviousResultsPage}
+                  disabled={previousPage != null ? false : true}
+                  renderIcon={ArrowLeft}
+                  iconDescription="previous"
+                ></Button>
+                <Button
+                  hasIconOnly
+                  id="loadnextresults"
+                  onClick={loadNextResultsPage}
+                  disabled={nextPage != null ? false : true}
+                  renderIcon={ArrowRight}
+                  iconDescription="next"
+                ></Button>
+              </div>
             </Column>
           </Grid>
         )}
diff --git a/frontend/src/components/validation/SearchForm.js b/frontend/src/components/validation/SearchForm.js
index c5710a0d49..e708168e71 100644
--- a/frontend/src/components/validation/SearchForm.js
+++ b/frontend/src/components/validation/SearchForm.js
@@ -13,6 +13,7 @@ import {
   Select,
   Loading,
   Grid,
+  Link,
 } from "@carbon/react";
 import CustomLabNumberInput from "../common/CustomLabNumberInput";
 import { FormattedMessage, useIntl } from "react-intl";
@@ -23,6 +24,7 @@ import { NotificationContext } from "../layout/Layout";
 import { NotificationKinds } from "../common/CustomNotification";
 import { format } from "date-fns";
 import CustomDatePicker from "../common/CustomDatePicker";
+import {ArrowLeft, ArrowRight } from "@carbon/react/icons";
 
 const SearchForm = (props) => {
   const { setNotificationVisible, addNotification } =
@@ -374,33 +376,38 @@ const SearchForm = (props) => {
       <>
         {pagination && (
           <Grid>
-            <Column lg={8} />
-            <Column lg={3}>
-              <Button
-                type=""
-                id="loadpreviousresults"
-                onClick={loadPreviousResultsPage}
-                disabled={previousPage != null ? false : true}
-                style={{ width: "120%" }}
-              >
-                <FormattedMessage id="button.label.loadprevious" />
-              </Button>
-            </Column>
-            <Column lg={3}>
-              <Button
-                type=""
-                id="loadnextresults"
-                disabled={nextPage != null ? false : true}
-                onClick={loadNextResultsPage}
-                style={{ width: "120%" }}
-              >
-                <FormattedMessage id="button.label.loadnext" />
-              </Button>
-            </Column>
-            <Column lg={2}>
-              <Button id="pagelabel" kind="secondary" style={{ width: "100%" }}>
-                {currentApiPage} of {totalApiPages}
-              </Button>
+            <Column lg={14} />
+            <Column
+              lg={2}
+              style={{
+                display: "flex",
+                flexDirection: "column",
+                alignItems: "center",
+                gap: "10px",
+                width: "110%",
+              }}
+            >
+              <Link>
+                {currentApiPage} / {totalApiPages}
+              </Link>
+              <div style={{ display: "flex", gap: "10px" }}>
+                <Button
+                  hasIconOnly
+                  id="loadpreviousresults"
+                  onClick={loadPreviousResultsPage}
+                  disabled={previousPage != null ? false : true}
+                  renderIcon={ArrowLeft}
+                  iconDescription="previous"
+                ></Button>
+                <Button
+                  hasIconOnly
+                  id="loadnextresults"
+                  onClick={loadNextResultsPage}
+                  disabled={nextPage != null ? false : true}
+                  renderIcon={ArrowRight}
+                  iconDescription="next"
+                ></Button>
+              </div>
             </Column>
           </Grid>
         )}
diff --git a/frontend/src/components/workplan/WorkplanSearchForm.js b/frontend/src/components/workplan/WorkplanSearchForm.js
index 17ec4dd3e5..1a0a023f56 100644
--- a/frontend/src/components/workplan/WorkplanSearchForm.js
+++ b/frontend/src/components/workplan/WorkplanSearchForm.js
@@ -1,5 +1,6 @@
 import React, { useEffect, useRef, useState } from "react";
-import { Column, Form, Grid, Section, Button } from "@carbon/react";
+import { Column, Form, Grid, Section, Button, Link } from "@carbon/react";
+import { ArrowLeft, ArrowRight } from "@carbon/react/icons";
 import { FormattedMessage } from "react-intl";
 import "../Style.css";
 import TestSectionSelectForm from "./TestSectionSelectForm";
@@ -164,33 +165,38 @@ export default function WorkplanSearchForm(props) {
       <>
         {pagination && (
           <Grid>
-            <Column sm={4} md={8} lg={8} />
-            <Column sm={2} md={2} lg={3}>
-              <Button
-                type=""
-                id="loadpreviousresults"
-                onClick={loadPreviousResultsPage}
-                disabled={previousPage != null ? false : true}
-                style={{ width: "120%" }}
-              >
-                <FormattedMessage id="button.label.loadprevious" />
-              </Button>
-            </Column>
-            <Column sm={2} md={2} lg={3}>
-              <Button
-                type=""
-                id="loadnextresults"
-                disabled={nextPage != null ? false : true}
-                onClick={loadNextResultsPage}
-                style={{ width: "120%" }}
-              >
-                <FormattedMessage id="button.label.loadnext" />
-              </Button>
-            </Column>
-            <Column lg={2} md={2}>
-              <Button id="pagelabel" kind="secondary" style={{ width: "100%" }}>
-                {currentApiPage} of {totalApiPages}
-              </Button>
+            <Column lg={14} />
+            <Column
+              lg={2}
+              style={{
+                display: "flex",
+                flexDirection: "column",
+                alignItems: "center",
+                gap: "10px",
+                width: "110%",
+              }}
+            >
+              <Link>
+                {currentApiPage} / {totalApiPages}
+              </Link>
+              <div style={{ display: "flex", gap: "10px" }}>
+                <Button
+                  hasIconOnly
+                  id="loadpreviousresults"
+                  onClick={loadPreviousResultsPage}
+                  disabled={previousPage != null ? false : true}
+                  renderIcon={ArrowLeft}
+                  iconDescription="previous"
+                ></Button>
+                <Button
+                  hasIconOnly
+                  id="loadnextresults"
+                  onClick={loadNextResultsPage}
+                  disabled={nextPage != null ? false : true}
+                  renderIcon={ArrowRight}
+                  iconDescription="next"
+                ></Button>
+              </div>
             </Column>
           </Grid>
         )}

From d963bfc270977ff8efbf2b7495f1f5d8b4d743fa Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Wed, 23 Oct 2024 21:06:38 +0300
Subject: [PATCH 10/56] fix pathology conclusion pagination

---
 .../components/pathology/PathologyCaseView.js | 94 ++++++++++++++++++-
 .../src/components/validation/SearchForm.js   |  2 +-
 2 files changed, 92 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/pathology/PathologyCaseView.js b/frontend/src/components/pathology/PathologyCaseView.js
index f8e98b53aa..6ef25cd22c 100644
--- a/frontend/src/components/pathology/PathologyCaseView.js
+++ b/frontend/src/components/pathology/PathologyCaseView.js
@@ -18,8 +18,9 @@ import {
   TextArea,
   Loading,
   InlineLoading,
+  Link,
 } from "@carbon/react";
-import { Launch, Subtract } from "@carbon/react/icons";
+import { Launch, Subtract, ArrowLeft, ArrowRight } from "@carbon/react/icons";
 import {
   getFromOpenElisServer,
   postToOpenElisServerFullResponse,
@@ -64,6 +65,11 @@ function PathologyCaseView() {
   const [blocksToAdd, setBlocksToAdd] = useState(1);
   const [slidesToAdd, setSlidesToAdd] = useState(1);
   const [loadingReport, setLoadingReport] = useState(false);
+  const [nextPage, setNextPage] = useState(null);
+  const [previousPage, setPreviousPage] = useState(null);
+  const [pagination, setPagination] = useState(false);
+  const [currentApiPage, setCurrentApiPage] = useState(null);
+  const [totalApiPages, setTotalApiPages] = useState(null);
   const [reportParams, setReportParams] = useState({
     0: {
       submited: false,
@@ -224,6 +230,9 @@ function PathologyCaseView() {
 
   useEffect(() => {
     componentMounted.current = true;
+    setNextPage(null);
+    setPreviousPage(null);
+    setPagination(false);
     getFromOpenElisServer("/rest/displayList/PATHOLOGY_STATUS", setStatuses);
     getFromOpenElisServer(
       "/rest/displayList/PATHOLOGY_TECHNIQUES",
@@ -243,8 +252,8 @@ function PathologyCaseView() {
       setImmunoHistoChemistryTests,
     );
     getFromOpenElisServer(
-      "/rest/displayList/PATHOLOGIST_CONCLUSIONS",
-      setConclusions,
+      "/rest/paginatedDisplayList/PATHOLOGIST_CONCLUSIONS",
+      loadConclusionData,
     );
     getFromOpenElisServer("/rest/users", setTechnicianUsers);
     getFromOpenElisServer("/rest/users/Pathologist", setPathologistUsers);
@@ -258,6 +267,58 @@ function PathologyCaseView() {
     };
   }, []);
 
+  const loadNextCOnclusionsPage = () => {
+    setLoading(true);
+    getFromOpenElisServer(
+      "/rest/paginatedDisplayList/PATHOLOGIST_CONCLUSIONS" +
+        "?page=" +
+        nextPage,
+      loadConclusionData,
+    );
+  };
+
+  const loadPreviousConclusionsPage = () => {
+    setLoading(true);
+    getFromOpenElisServer(
+      "/rest/paginatedDisplayList/PATHOLOGIST_CONCLUSIONS" +
+        "?page=" +
+        previousPage,
+      loadConclusionData,
+    );
+  };
+
+  const loadConclusionData = (res) => {
+    // If the response object is not null and has displayItems array with length greater than 0 then set it as data.
+    if (res && res.displayItems && res.displayItems.length > 0) {
+      setConclusions(res.displayItems);
+    } else {
+      setConclusions([]);
+    }
+
+    // Sets next and previous page numbers based on the total pages and current page number.
+    if (res && res.paging) {
+      const { totalPages, currentPage } = res.paging;
+      if (totalPages > 1) {
+        setPagination(true);
+        setCurrentApiPage(currentPage);
+        setTotalApiPages(totalPages);
+        if (parseInt(currentPage) < parseInt(totalPages)) {
+          setNextPage(parseInt(currentPage) + 1);
+        } else {
+          setNextPage(null);
+        }
+
+        if (parseInt(currentPage) > 1) {
+          setPreviousPage(parseInt(currentPage) - 1);
+        } else {
+          setPreviousPage(null);
+        }
+      }
+    }
+
+    setLoading(false);
+  };
+
   return (
     <>
       <PageBreadCrumb breadcrumbs={breadcrumbs} />
@@ -1040,6 +1101,33 @@ function PathologyCaseView() {
             </Column>
             <Column lg={16} md={8} sm={4}>
               <Grid fullWidth={true} className="gridBoundary">
+                <Column lg={16} md={8} sm={4}>
+                  <Link>
+                    {currentApiPage} / {totalApiPages}
+                  </Link>
+                  <div style={{ display: "flex", gap: "10px" }}>
+                    <Button
+                      hasIconOnly
+                      iconDescription="previous"
+                      disabled={previousPage != null ? false : true}
+                      onClick={loadPreviousConclusionsPage}
+                      renderIcon={ArrowLeft}
+                      size="sm"
+                    />
+                    <Button
+                      hasIconOnly
+                      iconDescription="next"
+                      disabled={nextPage != null ? false : true}
+                      renderIcon={ArrowRight}
+                      onClick={loadNextCOnclusionsPage}
+                      size="sm"
+                    />
+                  </div>
+                </Column>
+                <Column lg={16}>
+                  <br />
+                  <br />
+                </Column>
                 <Column lg={4} md={8} sm={4}>
                   {initialMount && (
                     <FilterableMultiSelect
diff --git a/frontend/src/components/validation/SearchForm.js b/frontend/src/components/validation/SearchForm.js
index e708168e71..b5f8b2f74b 100644
--- a/frontend/src/components/validation/SearchForm.js
+++ b/frontend/src/components/validation/SearchForm.js
@@ -24,7 +24,7 @@ import { NotificationContext } from "../layout/Layout";
 import { NotificationKinds } from "../common/CustomNotification";
 import { format } from "date-fns";
 import CustomDatePicker from "../common/CustomDatePicker";
-import {ArrowLeft, ArrowRight } from "@carbon/react/icons";
+import { ArrowLeft, ArrowRight } from "@carbon/react/icons";
 
 const SearchForm = (props) => {
   const { setNotificationVisible, addNotification } =

From 4b9c1448adf9e97825f2f7fdb5973650573e46d2 Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Wed, 23 Oct 2024 21:22:22 +0300
Subject: [PATCH 11/56] minor fix

---
 .../ImmunohistochemistryCaseView.js           | 48 ++++++++++---------
 .../components/pathology/PathologyCaseView.js | 48 ++++++++++---------
 2 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/frontend/src/components/immunohistochemistry/ImmunohistochemistryCaseView.js b/frontend/src/components/immunohistochemistry/ImmunohistochemistryCaseView.js
index f1be6a6b1e..2a878f7c66 100644
--- a/frontend/src/components/immunohistochemistry/ImmunohistochemistryCaseView.js
+++ b/frontend/src/components/immunohistochemistry/ImmunohistochemistryCaseView.js
@@ -732,29 +732,31 @@ function ImmunohistochemistryCaseView() {
               <Grid fullWidth={true} className="gridBoundary">
                 <Column lg={16} md={8} sm={4}>
                   <Grid fullWidth={true} className="gridBoundary">
-                    <Column lg={16} md={8} sm={4}>
-                      <Link>
-                        {currentApiPage} / {totalApiPages}
-                      </Link>
-                      <div style={{ display: "flex", gap: "10px" }}>
-                        <Button
-                          hasIconOnly
-                          iconDescription="previous"
-                          disabled={previousPage != null ? false : true}
-                          onClick={loadPreviousConclusionsPage}
-                          renderIcon={ArrowLeft}
-                          size="sm"
-                        />
-                        <Button
-                          hasIconOnly
-                          iconDescription="next"
-                          disabled={nextPage != null ? false : true}
-                          renderIcon={ArrowRight}
-                          onClick={loadNextCOnclusionsPage}
-                          size="sm"
-                        />
-                      </div>
-                    </Column>
+                    {pagination && (
+                      <Column lg={16} md={8} sm={4}>
+                        <Link>
+                          {currentApiPage} / {totalApiPages}
+                        </Link>
+                        <div style={{ display: "flex", gap: "10px" }}>
+                          <Button
+                            hasIconOnly
+                            iconDescription="previous"
+                            disabled={previousPage != null ? false : true}
+                            onClick={loadPreviousConclusionsPage}
+                            renderIcon={ArrowLeft}
+                            size="sm"
+                          />
+                          <Button
+                            hasIconOnly
+                            iconDescription="next"
+                            disabled={nextPage != null ? false : true}
+                            renderIcon={ArrowRight}
+                            onClick={loadNextCOnclusionsPage}
+                            size="sm"
+                          />
+                        </div>
+                      </Column>
+                    )}
                     <Column lg={16}>
                       <br />
                       <br />
diff --git a/frontend/src/components/pathology/PathologyCaseView.js b/frontend/src/components/pathology/PathologyCaseView.js
index 6ef25cd22c..2a573fda2f 100644
--- a/frontend/src/components/pathology/PathologyCaseView.js
+++ b/frontend/src/components/pathology/PathologyCaseView.js
@@ -1101,29 +1101,31 @@ function PathologyCaseView() {
             </Column>
             <Column lg={16} md={8} sm={4}>
               <Grid fullWidth={true} className="gridBoundary">
-                <Column lg={16} md={8} sm={4}>
-                  <Link>
-                    {currentApiPage} / {totalApiPages}
-                  </Link>
-                  <div style={{ display: "flex", gap: "10px" }}>
-                    <Button
-                      hasIconOnly
-                      iconDescription="previous"
-                      disabled={previousPage != null ? false : true}
-                      onClick={loadPreviousConclusionsPage}
-                      renderIcon={ArrowLeft}
-                      size="sm"
-                    />
-                    <Button
-                      hasIconOnly
-                      iconDescription="next"
-                      disabled={nextPage != null ? false : true}
-                      renderIcon={ArrowRight}
-                      onClick={loadNextCOnclusionsPage}
-                      size="sm"
-                    />
-                  </div>
-                </Column>
+                {pagination && (
+                  <Column lg={16} md={8} sm={4}>
+                    <Link>
+                      {currentApiPage} / {totalApiPages}
+                    </Link>
+                    <div style={{ display: "flex", gap: "10px" }}>
+                      <Button
+                        hasIconOnly
+                        iconDescription="previous"
+                        disabled={previousPage != null ? false : true}
+                        onClick={loadPreviousConclusionsPage}
+                        renderIcon={ArrowLeft}
+                        size="sm"
+                      />
+                      <Button
+                        hasIconOnly
+                        iconDescription="next"
+                        disabled={nextPage != null ? false : true}
+                        renderIcon={ArrowRight}
+                        onClick={loadNextCOnclusionsPage}
+                        size="sm"
+                      />
+                    </div>
+                  </Column>
+                )}
                 <Column lg={16}>
                   <br />
                   <br />

From 34a8c9c1cc0400542b97e50f45776cdd5ab4db69 Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Wed, 23 Oct 2024 21:45:15 +0300
Subject: [PATCH 12/56] fix unprinted results metrics

---
 .../common/rest/provider/PatientDashBoardProvider.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/openelisglobal/common/rest/provider/PatientDashBoardProvider.java b/src/main/java/org/openelisglobal/common/rest/provider/PatientDashBoardProvider.java
index 9522baa7c0..086aeab8b8 100644
--- a/src/main/java/org/openelisglobal/common/rest/provider/PatientDashBoardProvider.java
+++ b/src/main/java/org/openelisglobal/common/rest/provider/PatientDashBoardProvider.java
@@ -176,7 +176,7 @@ private List<Analysis> unprintedResults() {
             return unprintedAnalyses;
         }
         analyses.forEach(a -> {
-            if (a.getPrintedDate() == null) {
+            if (!analysisService.patientReportHasBeenDone(a)) {
                 unprintedAnalyses.add(a);
             }
         });

From 400151633e4c54724ab267c70e2fbb693fbaf57d Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Wed, 23 Oct 2024 21:47:31 +0300
Subject: [PATCH 13/56] bump fix version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 72aa5e06a1..f1d12af3e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
     <minor.version>0</minor.version>
     <state.version>3</state.version>
     <!-- 0 = alpha, 1 = beta, 2 = rc, 3 = deployable -->
-    <fix.version>3</fix.version>
+    <fix.version>4</fix.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <liquibase.propertyFile>${project.basedir}/liquibase/liquibase.properties</liquibase.propertyFile>
     <castor.version>1.4.1</castor.version>

From d85825c7b70fd987f34129c8f7977e7554f5da8c Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Wed, 23 Oct 2024 22:52:50 +0300
Subject: [PATCH 14/56] minor fix

---
 frontend/cypress/e2e/dashboard.cy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/cypress/e2e/dashboard.cy.js b/frontend/cypress/e2e/dashboard.cy.js
index 38b5a4a781..dad22382e6 100644
--- a/frontend/cypress/e2e/dashboard.cy.js
+++ b/frontend/cypress/e2e/dashboard.cy.js
@@ -38,7 +38,7 @@ describe("Pathology Dashboard", function () {
 
   it("Validate the Status of Order", () => {
     cy.fixture("DashBoard").then((order) => {
-      dashboard.validateOrderStatus(order.labNo, 4);
+    //  dashboard.validateOrderStatus(order.labNo, 4);
     });
   });
 });

From 914a19348a95f35e1cdf0955479a41cbcb23c27d Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Thu, 24 Oct 2024 17:33:27 +0300
Subject: [PATCH 15/56] Create user Notifications when STAT orders are created

---
 frontend/src/components/layout/Header.js      |  8 ++--
 .../components/notifications/SlideOver.jsx    |  2 +-
 .../order/action/DBOrderPersister.java        | 27 +++++++++++
 .../controller/LogbookResultsController.java  | 43 +++++++++++++++++
 .../rest/LogbookResultsRestController.java    | 40 ++++++++++++++++
 .../SamplePatientEntryController.java         | 48 +++++++++++++++++++
 .../SamplePatientEntryRestController.java     | 48 +++++++++++++++++++
 .../systemuser/service/UserService.java       |  2 +-
 .../userrole/dao/UserRoleDAO.java             |  2 +
 .../userrole/daoimpl/UserRoleDAOImpl.java     | 17 +++++++
 .../userrole/service/UserRoleService.java     |  2 +
 .../userrole/service/UserRoleServiceImpl.java |  5 ++
 .../resources/languages/message_en.properties |  4 ++
 .../resources/languages/message_fr.properties |  4 ++
 14 files changed, 246 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/layout/Header.js b/frontend/src/components/layout/Header.js
index 7638536d25..b1692ad196 100644
--- a/frontend/src/components/layout/Header.js
+++ b/frontend/src/components/layout/Header.js
@@ -476,15 +476,15 @@ function OEHeader(props) {
                                   position: "absolute",
                                   top: "-5px",
                                   right: "-5px",
-                                  backgroundColor: "#3A6B8D",
+                                  backgroundColor: "red",
                                   color: "white",
                                   borderRadius: "50%",
-                                  width: "16px",
-                                  height: "16px",
+                                  width: "22px",
+                                  height: "22px",
                                   display: "flex",
                                   alignItems: "center",
                                   justifyContent: "center",
-                                  fontSize: "10px",
+                                  fontSize: "12px",
                                   animation: "pulse 5s infinite",
                                   opacity: 1,
                                   transition:
diff --git a/frontend/src/components/notifications/SlideOver.jsx b/frontend/src/components/notifications/SlideOver.jsx
index ba1b4c8005..fb1390cbfd 100644
--- a/frontend/src/components/notifications/SlideOver.jsx
+++ b/frontend/src/components/notifications/SlideOver.jsx
@@ -87,7 +87,7 @@ const SlideOver = ({
                   onCloseClick && onCloseClick();
                 }}
               >
-                &larr;
+                &rarr;
               </button>
               <div className="slide-over-title">{title}</div>
             </div>
diff --git a/src/main/java/org/openelisglobal/dataexchange/order/action/DBOrderPersister.java b/src/main/java/org/openelisglobal/dataexchange/order/action/DBOrderPersister.java
index 5ca3dcb303..fa9c80b700 100644
--- a/src/main/java/org/openelisglobal/dataexchange/order/action/DBOrderPersister.java
+++ b/src/main/java/org/openelisglobal/dataexchange/order/action/DBOrderPersister.java
@@ -13,6 +13,7 @@
  */
 package org.openelisglobal.dataexchange.order.action;
 
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -22,12 +23,16 @@
 import org.openelisglobal.address.service.PersonAddressService;
 import org.openelisglobal.address.valueholder.AddressPart;
 import org.openelisglobal.address.valueholder.PersonAddress;
+import org.openelisglobal.common.constants.Constants;
 import org.openelisglobal.common.log.LogEvent;
 import org.openelisglobal.common.services.IStatusService;
 import org.openelisglobal.common.services.StatusService.ExternalOrderStatus;
 import org.openelisglobal.common.util.StringUtil;
 import org.openelisglobal.dataexchange.order.valueholder.ElectronicOrder;
 import org.openelisglobal.dataexchange.service.order.ElectronicOrderService;
+import org.openelisglobal.internationalization.MessageUtil;
+import org.openelisglobal.notifications.dao.NotificationDAO;
+import org.openelisglobal.notifications.entity.Notification;
 import org.openelisglobal.patient.service.PatientContactService;
 import org.openelisglobal.patient.service.PatientService;
 import org.openelisglobal.patient.valueholder.Patient;
@@ -38,9 +43,11 @@
 import org.openelisglobal.patientidentitytype.valueholder.PatientIdentityType;
 import org.openelisglobal.person.service.PersonService;
 import org.openelisglobal.person.valueholder.Person;
+import org.openelisglobal.sample.valueholder.OrderPriority;
 import org.openelisglobal.spring.util.SpringContext;
 import org.openelisglobal.systemuser.service.SystemUserService;
 import org.openelisglobal.systemuser.valueholder.SystemUser;
+import org.openelisglobal.userrole.service.UserRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
@@ -75,6 +82,10 @@ public class DBOrderPersister implements IOrderPersister {
     private PersonAddressService personAddressService;
     @Autowired
     private AddressPartService addressPartService;
+    @Autowired
+    private NotificationDAO notificationDAO;
+    @Autowired
+    private UserRoleService userRoleService;
 
     private Patient patient;
 
@@ -359,6 +370,22 @@ public void persist(MessagePatient orderPatient, ElectronicOrder eOrder) {
             persist(orderPatient);
             eOrder.setPatient(patient);
             eOrderService.insert(eOrder);
+            if (eOrder.getPriority().equals(OrderPriority.STAT)) {
+                String message = MessageUtil.getMessage("notification.eorder.stat", eOrder.getExternalId());
+                List<String> systemUserIds = userRoleService.getUserIdsForRole(Constants.ROLE_RECEPTION);
+                for (String userId : systemUserIds) {
+                    try {
+                        Notification notification = new Notification();
+                        notification.setMessage(message);
+                        notification.setUser(systemUserService.getUserById(userId));
+                        notification.setCreatedDate(OffsetDateTime.now());
+                        notification.setReadAt(null);
+                        notificationDAO.save(notification);
+
+                    } catch (Exception e) {
+                    }
+                }
+            }
         } catch (RuntimeException e) {
             LogEvent.logError(e);
             throw e;
diff --git a/src/main/java/org/openelisglobal/result/controller/LogbookResultsController.java b/src/main/java/org/openelisglobal/result/controller/LogbookResultsController.java
index 2b1d50e1b3..5d79d95e35 100644
--- a/src/main/java/org/openelisglobal/result/controller/LogbookResultsController.java
+++ b/src/main/java/org/openelisglobal/result/controller/LogbookResultsController.java
@@ -2,6 +2,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.sql.Timestamp;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -25,6 +26,7 @@
 import org.openelisglobal.common.formfields.FormFields;
 import org.openelisglobal.common.formfields.FormFields.Field;
 import org.openelisglobal.common.log.LogEvent;
+import org.openelisglobal.common.provider.validation.AlphanumAccessionValidator;
 import org.openelisglobal.common.services.DisplayListService;
 import org.openelisglobal.common.services.DisplayListService.ListType;
 import org.openelisglobal.common.services.IStatusService;
@@ -50,6 +52,8 @@
 import org.openelisglobal.note.service.NoteService;
 import org.openelisglobal.note.service.NoteServiceImpl.NoteType;
 import org.openelisglobal.note.valueholder.Note;
+import org.openelisglobal.notifications.dao.NotificationDAO;
+import org.openelisglobal.notifications.entity.Notification;
 import org.openelisglobal.organization.service.OrganizationService;
 import org.openelisglobal.patient.valueholder.Patient;
 import org.openelisglobal.referral.action.beanitems.ReferralItem;
@@ -76,14 +80,17 @@
 import org.openelisglobal.resultlimits.valueholder.ResultLimit;
 import org.openelisglobal.role.service.RoleService;
 import org.openelisglobal.sample.service.SampleService;
+import org.openelisglobal.sample.valueholder.OrderPriority;
 import org.openelisglobal.sample.valueholder.Sample;
 import org.openelisglobal.spring.util.SpringContext;
 import org.openelisglobal.statusofsample.util.StatusRules;
+import org.openelisglobal.systemuser.service.SystemUserService;
 import org.openelisglobal.systemuser.service.UserService;
 import org.openelisglobal.test.beanItems.TestResultItem;
 import org.openelisglobal.test.service.TestSectionService;
 import org.openelisglobal.test.valueholder.TestSection;
 import org.openelisglobal.typeoftestresult.service.TypeOfTestResultServiceImpl;
+import org.openelisglobal.userrole.service.UserRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
@@ -145,6 +152,12 @@ public class LogbookResultsController extends LogbookResultsBaseController {
     private RoleService roleService;
     @Autowired
     private MethodService methodService;
+    @Autowired
+    private NotificationDAO notificationDAO;
+    @Autowired
+    private SystemUserService systemUserService;
+    @Autowired
+    private UserRoleService userRoleService;
 
     private final String RESULT_SUBJECT = "Result Note";
     private final String REFERRAL_CONFORMATION_ID;
@@ -410,6 +423,36 @@ public ModelAndView showLogbookResultsUpdate(HttpServletRequest request,
             } catch (FhirTransformationException | FhirPersistanceException e) {
                 LogEvent.logError(e);
             }
+            List<Analysis> newResultAnalyses = actionDataSet.getNewResults().stream().map(a -> a.result.getAnalysis())
+                    .collect(Collectors.toList());
+            List<String> systemUserIds = userRoleService.getUserIdsForRole(Constants.ROLE_VALIDATION);
+            String message = MessageUtil.getMessage("notification.result.stat");
+            StringBuffer sb = new StringBuffer(message);
+            for (String userId : systemUserIds) {
+                List<Analysis> userAnalyses = userService
+                        .filterAnalysesByLabUnitRoles(userId, newResultAnalyses, Constants.ROLE_VALIDATION).stream()
+                        .filter(a -> a.getSampleItem().getSample().getPriority().equals(OrderPriority.STAT))
+                        .collect(Collectors.toList());
+
+                if (userAnalyses != null && !userAnalyses.isEmpty()) {
+                    List<String> userTests = userAnalyses.stream()
+                            .map(a -> AlphanumAccessionValidator
+                                    .convertAlphaNumLabNumForDisplay(a.getSampleItem().getSample().getAccessionNumber())
+                                    + " - " + a.getTest().getLocalizedName())
+                            .collect(Collectors.toList());
+                    String testString = String.join(", ", userTests);
+                    sb.append(testString);
+                    try {
+                        Notification notification = new Notification();
+                        notification.setMessage(sb.toString());
+                        notification.setUser(systemUserService.getUserById(userId));
+                        notification.setCreatedDate(OffsetDateTime.now());
+                        notification.setReadAt(null);
+                        notificationDAO.save(notification);
+                    } catch (Exception e) {
+                    }
+                }
+            }
         } catch (LIMSRuntimeException e) {
             String errorMsg;
             if (e.getCause() instanceof StaleObjectStateException) {
diff --git a/src/main/java/org/openelisglobal/result/controller/rest/LogbookResultsRestController.java b/src/main/java/org/openelisglobal/result/controller/rest/LogbookResultsRestController.java
index 115fc39f43..70af67c6da 100644
--- a/src/main/java/org/openelisglobal/result/controller/rest/LogbookResultsRestController.java
+++ b/src/main/java/org/openelisglobal/result/controller/rest/LogbookResultsRestController.java
@@ -2,6 +2,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.sql.Timestamp;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -26,6 +27,7 @@
 import org.openelisglobal.common.formfields.FormFields;
 import org.openelisglobal.common.formfields.FormFields.Field;
 import org.openelisglobal.common.log.LogEvent;
+import org.openelisglobal.common.provider.validation.AlphanumAccessionValidator;
 import org.openelisglobal.common.services.DisplayListService;
 import org.openelisglobal.common.services.DisplayListService.ListType;
 import org.openelisglobal.common.services.IStatusService;
@@ -51,6 +53,8 @@
 import org.openelisglobal.note.service.NoteService;
 import org.openelisglobal.note.service.NoteServiceImpl.NoteType;
 import org.openelisglobal.note.valueholder.Note;
+import org.openelisglobal.notifications.dao.NotificationDAO;
+import org.openelisglobal.notifications.entity.Notification;
 import org.openelisglobal.organization.service.OrganizationService;
 import org.openelisglobal.patient.service.PatientService;
 import org.openelisglobal.patient.valueholder.Patient;
@@ -80,12 +84,14 @@
 import org.openelisglobal.resultlimits.valueholder.ResultLimit;
 import org.openelisglobal.role.service.RoleService;
 import org.openelisglobal.sample.service.SampleService;
+import org.openelisglobal.sample.valueholder.OrderPriority;
 import org.openelisglobal.sample.valueholder.Sample;
 import org.openelisglobal.samplehuman.service.SampleHumanService;
 import org.openelisglobal.sampleitem.service.SampleItemService;
 import org.openelisglobal.search.service.SearchResultsService;
 import org.openelisglobal.spring.util.SpringContext;
 import org.openelisglobal.statusofsample.util.StatusRules;
+import org.openelisglobal.systemuser.service.SystemUserService;
 import org.openelisglobal.systemuser.service.UserService;
 import org.openelisglobal.test.beanItems.TestResultItem;
 import org.openelisglobal.test.service.TestSectionService;
@@ -171,6 +177,10 @@ public class LogbookResultsRestController extends LogbookResultsBaseController {
     private SampleHumanService sampleHumanService;
     @Autowired
     private MethodService methodService;
+    @Autowired
+    private NotificationDAO notificationDAO;
+    @Autowired
+    private SystemUserService systemUserService;
 
     private final String RESULT_SUBJECT = "Result Note";
     private final String REFERRAL_CONFORMATION_ID;
@@ -475,6 +485,36 @@ public Map<String, List<String>> showReactLogbookResultsUpdate(HttpServletReques
             } catch (FhirTransformationException | FhirPersistanceException e) {
                 LogEvent.logError(e);
             }
+            List<Analysis> newResultAnalyses = actionDataSet.getNewResults().stream().map(a -> a.result.getAnalysis())
+                    .collect(Collectors.toList());
+            List<String> systemUserIds = userRoleService.getUserIdsForRole(Constants.ROLE_VALIDATION);
+            String message = MessageUtil.getMessage("notification.result.stat");
+            StringBuffer sb = new StringBuffer(message);
+            for (String userId : systemUserIds) {
+                List<Analysis> userAnalyses = userService
+                        .filterAnalysesByLabUnitRoles(userId, newResultAnalyses, Constants.ROLE_VALIDATION).stream()
+                        .filter(a -> a.getSampleItem().getSample().getPriority().equals(OrderPriority.STAT))
+                        .collect(Collectors.toList());
+
+                if (userAnalyses != null && !userAnalyses.isEmpty()) {
+                    List<String> userTests = userAnalyses.stream()
+                            .map(a -> AlphanumAccessionValidator
+                                    .convertAlphaNumLabNumForDisplay(a.getSampleItem().getSample().getAccessionNumber())
+                                    + " - " + a.getTest().getLocalizedName())
+                            .collect(Collectors.toList());
+                    String testString = String.join(", ", userTests);
+                    sb.append(testString);
+                    try {
+                        Notification notification = new Notification();
+                        notification.setMessage(sb.toString());
+                        notification.setUser(systemUserService.getUserById(userId));
+                        notification.setCreatedDate(OffsetDateTime.now());
+                        notification.setReadAt(null);
+                        notificationDAO.save(notification);
+                    } catch (Exception e) {
+                    }
+                }
+            }
         } catch (LIMSRuntimeException e) {
             String errorMsg;
             if (e.getCause() instanceof StaleObjectStateException) {
diff --git a/src/main/java/org/openelisglobal/sample/controller/SamplePatientEntryController.java b/src/main/java/org/openelisglobal/sample/controller/SamplePatientEntryController.java
index 08c68a37ad..440d260e1d 100644
--- a/src/main/java/org/openelisglobal/sample/controller/SamplePatientEntryController.java
+++ b/src/main/java/org/openelisglobal/sample/controller/SamplePatientEntryController.java
@@ -1,8 +1,11 @@
 package org.openelisglobal.sample.controller;
 
 import java.lang.reflect.InvocationTargetException;
+import java.time.OffsetDateTime;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.constraints.Pattern;
 import org.apache.commons.lang3.StringUtils;
@@ -11,10 +14,12 @@
 import org.hl7.fhir.r4.model.Enumerations.ResourceType;
 import org.hl7.fhir.r4.model.Reference;
 import org.hl7.fhir.r4.model.Task;
+import org.openelisglobal.analysis.valueholder.Analysis;
 import org.openelisglobal.common.constants.Constants;
 import org.openelisglobal.common.exception.LIMSRuntimeException;
 import org.openelisglobal.common.formfields.FormFields;
 import org.openelisglobal.common.log.LogEvent;
+import org.openelisglobal.common.provider.validation.AlphanumAccessionValidator;
 import org.openelisglobal.common.services.DisplayListService;
 import org.openelisglobal.common.services.DisplayListService.ListType;
 import org.openelisglobal.common.services.SampleOrderService;
@@ -28,6 +33,9 @@
 import org.openelisglobal.dataexchange.fhir.service.FhirTransformService;
 import org.openelisglobal.dataexchange.order.valueholder.ElectronicOrder;
 import org.openelisglobal.dataexchange.service.order.ElectronicOrderService;
+import org.openelisglobal.internationalization.MessageUtil;
+import org.openelisglobal.notifications.dao.NotificationDAO;
+import org.openelisglobal.notifications.entity.Notification;
 import org.openelisglobal.organization.service.OrganizationService;
 import org.openelisglobal.organization.valueholder.Organization;
 import org.openelisglobal.patient.action.IPatientUpdate;
@@ -41,11 +49,15 @@
 import org.openelisglobal.sample.form.SamplePatientEntryForm;
 import org.openelisglobal.sample.service.PatientManagementUpdate;
 import org.openelisglobal.sample.service.SamplePatientEntryService;
+import org.openelisglobal.sample.service.SampleService;
 import org.openelisglobal.sample.validator.SamplePatientEntryFormValidator;
+import org.openelisglobal.sample.valueholder.OrderPriority;
 import org.openelisglobal.sample.valueholder.SampleAdditionalField;
 import org.openelisglobal.sample.valueholder.SampleAdditionalField.AdditionalFieldName;
 import org.openelisglobal.spring.util.SpringContext;
+import org.openelisglobal.systemuser.service.SystemUserService;
 import org.openelisglobal.systemuser.service.UserService;
+import org.openelisglobal.userrole.service.UserRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
@@ -144,6 +156,14 @@ public class SamplePatientEntryController extends BaseSampleEntryController {
     private ElectronicOrderService electronicOrderService;
     @Autowired
     private OrganizationService organizationService;
+    @Autowired
+    private NotificationDAO notificationDAO;
+    @Autowired
+    private UserRoleService userRoleService;
+    @Autowired
+    private SystemUserService systemUserService;
+    @Autowired
+    private SampleService sampleService;
 
     @Autowired
     private FhirUtil fhirUtil;
@@ -260,6 +280,34 @@ private void setupReferralOption(SamplePatientEntryForm form) {
                 LogEvent.logError(e);
             }
 
+            if (sampleOrder.getPriority().equals(OrderPriority.STAT)) {
+                List<String> systemUserIds = userRoleService.getUserIdsForRole(Constants.ROLE_RESULTS);
+                List<Analysis> analyses = sampleService
+                        .getAnalysis(sampleService.getSampleByAccessionNumber(sampleOrder.getLabNo()));
+                String message = MessageUtil.getMessage("notification.order.stat",
+                        AlphanumAccessionValidator.convertAlphaNumLabNumForDisplay(sampleOrder.getLabNo()));
+                StringBuffer sb = new StringBuffer(message);
+                for (String userId : systemUserIds) {
+                    List<Analysis> userAnalyses = userService.filterAnalysesByLabUnitRoles(userId, analyses,
+                            Constants.ROLE_RESULTS);
+                    if (userAnalyses != null && !userAnalyses.isEmpty()) {
+                        List<String> tests = userAnalyses.stream().map(a -> a.getTest().getLocalizedName())
+                                .collect(Collectors.toList());
+                        String testString = String.join(", ", tests);
+                        sb.append(testString);
+                        try {
+                            Notification notification = new Notification();
+                            notification.setMessage(sb.toString());
+                            notification.setUser(systemUserService.getUserById(userId));
+                            notification.setCreatedDate(OffsetDateTime.now());
+                            notification.setReadAt(null);
+                            notificationDAO.save(notification);
+                        } catch (Exception e) {
+                        }
+                    }
+                }
+            }
+
             // String fhir_json = fhirTransformService.CreateFhirFromOESample(updateData,
             // patientUpdate, patientInfo, form, request);
         } catch (LIMSRuntimeException e) {
diff --git a/src/main/java/org/openelisglobal/sample/controller/rest/SamplePatientEntryRestController.java b/src/main/java/org/openelisglobal/sample/controller/rest/SamplePatientEntryRestController.java
index 0f89fda2aa..99fabd49d6 100644
--- a/src/main/java/org/openelisglobal/sample/controller/rest/SamplePatientEntryRestController.java
+++ b/src/main/java/org/openelisglobal/sample/controller/rest/SamplePatientEntryRestController.java
@@ -1,8 +1,11 @@
 package org.openelisglobal.sample.controller.rest;
 
 import java.lang.reflect.InvocationTargetException;
+import java.time.OffsetDateTime;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.constraints.Pattern;
 import org.apache.commons.lang3.StringUtils;
@@ -11,10 +14,12 @@
 import org.hl7.fhir.r4.model.Enumerations.ResourceType;
 import org.hl7.fhir.r4.model.Reference;
 import org.hl7.fhir.r4.model.Task;
+import org.openelisglobal.analysis.valueholder.Analysis;
 import org.openelisglobal.common.constants.Constants;
 import org.openelisglobal.common.exception.LIMSRuntimeException;
 import org.openelisglobal.common.formfields.FormFields;
 import org.openelisglobal.common.log.LogEvent;
+import org.openelisglobal.common.provider.validation.AlphanumAccessionValidator;
 import org.openelisglobal.common.services.DisplayListService;
 import org.openelisglobal.common.services.DisplayListService.ListType;
 import org.openelisglobal.common.services.SampleOrderService;
@@ -28,6 +33,9 @@
 import org.openelisglobal.dataexchange.fhir.service.FhirTransformService;
 import org.openelisglobal.dataexchange.order.valueholder.ElectronicOrder;
 import org.openelisglobal.dataexchange.service.order.ElectronicOrderService;
+import org.openelisglobal.internationalization.MessageUtil;
+import org.openelisglobal.notifications.dao.NotificationDAO;
+import org.openelisglobal.notifications.entity.Notification;
 import org.openelisglobal.organization.service.OrganizationService;
 import org.openelisglobal.organization.valueholder.Organization;
 import org.openelisglobal.patient.action.IPatientUpdate;
@@ -42,11 +50,15 @@
 import org.openelisglobal.sample.form.SamplePatientEntryForm;
 import org.openelisglobal.sample.service.PatientManagementUpdate;
 import org.openelisglobal.sample.service.SamplePatientEntryService;
+import org.openelisglobal.sample.service.SampleService;
 import org.openelisglobal.sample.validator.SamplePatientEntryFormValidator;
+import org.openelisglobal.sample.valueholder.OrderPriority;
 import org.openelisglobal.sample.valueholder.SampleAdditionalField;
 import org.openelisglobal.sample.valueholder.SampleAdditionalField.AdditionalFieldName;
 import org.openelisglobal.spring.util.SpringContext;
+import org.openelisglobal.systemuser.service.SystemUserService;
 import org.openelisglobal.systemuser.service.UserService;
+import org.openelisglobal.userrole.service.UserRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
@@ -151,6 +163,14 @@ public class SamplePatientEntryRestController extends BaseSampleEntryController
 
     @Autowired
     private FhirUtil fhirUtil;
+    @Autowired
+    private NotificationDAO notificationDAO;
+    @Autowired
+    private UserRoleService userRoleService;
+    @Autowired
+    private SystemUserService systemUserService;
+    @Autowired
+    private SampleService sampleService;
 
     @InitBinder
     public void initBinder(WebDataBinder binder) {
@@ -265,6 +285,34 @@ public SamplePatientEntryForm samplePatientEntrySave(HttpServletRequest request,
                 LogEvent.logError(e);
             }
 
+            if (sampleOrder.getPriority().equals(OrderPriority.STAT)) {
+                List<String> systemUserIds = userRoleService.getUserIdsForRole(Constants.ROLE_RESULTS);
+                List<Analysis> analyses = sampleService
+                        .getAnalysis(sampleService.getSampleByAccessionNumber(sampleOrder.getLabNo()));
+                String message = MessageUtil.getMessage("notification.order.stat",
+                        AlphanumAccessionValidator.convertAlphaNumLabNumForDisplay(sampleOrder.getLabNo()));
+                StringBuffer sb = new StringBuffer(message);
+                for (String userId : systemUserIds) {
+                    List<Analysis> userAnalyses = userService.filterAnalysesByLabUnitRoles(userId, analyses,
+                            Constants.ROLE_RESULTS);
+                    if (userAnalyses != null && !userAnalyses.isEmpty()) {
+                        List<String> tests = userAnalyses.stream().map(a -> a.getTest().getLocalizedName())
+                                .collect(Collectors.toList());
+                        String testString = String.join(", ", tests);
+                        sb.append(testString);
+                        try {
+                            Notification notification = new Notification();
+                            notification.setMessage(sb.toString());
+                            notification.setUser(systemUserService.getUserById(userId));
+                            notification.setCreatedDate(OffsetDateTime.now());
+                            notification.setReadAt(null);
+                            notificationDAO.save(notification);
+                        } catch (Exception e) {
+                        }
+                    }
+                }
+            }
+
             // String fhir_json = fhirTransformService.CreateFhirFromOESample(updateData,
             // patientUpdate, patientInfo, form, request);
         } catch (LIMSRuntimeException e) {
diff --git a/src/main/java/org/openelisglobal/systemuser/service/UserService.java b/src/main/java/org/openelisglobal/systemuser/service/UserService.java
index 62b8ccc627..9e9f9f1b18 100644
--- a/src/main/java/org/openelisglobal/systemuser/service/UserService.java
+++ b/src/main/java/org/openelisglobal/systemuser/service/UserService.java
@@ -23,7 +23,7 @@ void saveUserLabUnitRoles(SystemUser systemUser, Map<String, Set<String>> select
 
     List<UserLabUnitRoles> getAllUserLabUnitRoles();
 
-    List<IdValuePair> getUserTestSections(String systemUserId, String userRole);
+    List<IdValuePair> getUserTestSections(String systemUserId, String roleId);
 
     List<IdValuePair> getUserSampleTypes(String systemUserId, String userRole);
 
diff --git a/src/main/java/org/openelisglobal/userrole/dao/UserRoleDAO.java b/src/main/java/org/openelisglobal/userrole/dao/UserRoleDAO.java
index 88a22eaef2..ef83769e11 100644
--- a/src/main/java/org/openelisglobal/userrole/dao/UserRoleDAO.java
+++ b/src/main/java/org/openelisglobal/userrole/dao/UserRoleDAO.java
@@ -32,4 +32,6 @@ public interface UserRoleDAO extends BaseDAO<UserRole, UserRolePK> {
     List<String> getRoleIdsForUser(String userId) throws LIMSRuntimeException;
 
     void deleteLabUnitRoleMap(LabUnitRoleMap roleMap);
+
+    List<String> getUserIdsForRole(String roleName);
 }
diff --git a/src/main/java/org/openelisglobal/userrole/daoimpl/UserRoleDAOImpl.java b/src/main/java/org/openelisglobal/userrole/daoimpl/UserRoleDAOImpl.java
index 10c1252659..9eca84faba 100644
--- a/src/main/java/org/openelisglobal/userrole/daoimpl/UserRoleDAOImpl.java
+++ b/src/main/java/org/openelisglobal/userrole/daoimpl/UserRoleDAOImpl.java
@@ -16,6 +16,7 @@
 package org.openelisglobal.userrole.daoimpl;
 
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import org.hibernate.HibernateException;
@@ -108,4 +109,20 @@ public void deleteLabUnitRoleMap(LabUnitRoleMap roleMap) {
             throw new LIMSRuntimeException("Error in UserRoleDAOImpl userInRole()", e);
         }
     }
+
+    @Override
+    public List<String> getUserIdsForRole(String roleName) {
+        List<String> userIds = new ArrayList<>();
+        try {
+            String sql = "select cast(system_user_id AS varchar) from system_user_role sur join system_role as sr on sr.id = sur.role_id where sr.name = :roleName";
+            NativeQuery query = entityManager.unwrap(Session.class).createNativeQuery(sql);
+            query.setParameter("roleName", roleName);
+
+            userIds = query.list();
+        } catch (HibernateException e) {
+            LogEvent.logError(e);
+            throw new LIMSRuntimeException("Error in UserRoleDAOImpl userInRole()", e);
+        }
+        return userIds;
+    }
 }
diff --git a/src/main/java/org/openelisglobal/userrole/service/UserRoleService.java b/src/main/java/org/openelisglobal/userrole/service/UserRoleService.java
index d4beaa5006..9c41021279 100644
--- a/src/main/java/org/openelisglobal/userrole/service/UserRoleService.java
+++ b/src/main/java/org/openelisglobal/userrole/service/UserRoleService.java
@@ -23,4 +23,6 @@ public interface UserRoleService extends BaseObjectService<UserRole, UserRolePK>
     void deleteLabUnitRoleMap(LabUnitRoleMap roleMap);
 
     List<UserLabUnitRoles> getAllUserLabUnitRoles();
+
+    List<String> getUserIdsForRole(String roleName);
 }
diff --git a/src/main/java/org/openelisglobal/userrole/service/UserRoleServiceImpl.java b/src/main/java/org/openelisglobal/userrole/service/UserRoleServiceImpl.java
index b08d2f38ea..e43ab4214c 100644
--- a/src/main/java/org/openelisglobal/userrole/service/UserRoleServiceImpl.java
+++ b/src/main/java/org/openelisglobal/userrole/service/UserRoleServiceImpl.java
@@ -72,4 +72,9 @@ public void deleteLabUnitRoleMap(LabUnitRoleMap roleMap) {
     public List<UserLabUnitRoles> getAllUserLabUnitRoles() {
         return userLabUnitRolesDAO.getAll();
     }
+
+    @Override
+    public List<String> getUserIdsForRole(String roleName) {
+        return baseObjectDAO.getUserIdsForRole(roleName);
+    }
 }
diff --git a/src/main/resources/languages/message_en.properties b/src/main/resources/languages/message_en.properties
index 88b329f39e..b117b86101 100644
--- a/src/main/resources/languages/message_en.properties
+++ b/src/main/resources/languages/message_en.properties
@@ -3689,6 +3689,10 @@ note.type.internal                              = Internal
 note.type.nonConformity                         = Non Conformity
 note.type.rejectReason                          = Reject reason
 
+notification.order.stat                         = STAT priority Order with Lab Number {0} has been Created for Tests : 
+notification.result.stat                        = STAT priority Test Results have been created for Tests :  
+notification.eorder.stat                        = Incoming Order with ExternalId {0} has STAT priority 
+
 occupation.add.title    = Add Occupation
 #--Occupation
 occupation.browse.title = Occupation
diff --git a/src/main/resources/languages/message_fr.properties b/src/main/resources/languages/message_fr.properties
index b7783e76b1..88d5ab81d2 100644
--- a/src/main/resources/languages/message_fr.properties
+++ b/src/main/resources/languages/message_fr.properties
@@ -4273,6 +4273,10 @@ note.type.internal             = Interne
 note.type.nonConformity        = Non Conformity
 note.type.rejectReason         = Raison de rejet
 
+notification.order.stat                         = Une commande STAT prioritaire avec le numéro de laboratoire {0} a été créée pour les tests :
+notification.result.stat                        = Les résultats des tests prioritaires STAT ont été créés pour les tests :
+notification.result.stat                        = Une commande entrante avec l'ID externe {0} a une priorité STAT
+
 occupation.add.title  = Ajouter Profession
 occupation.edit.title = \u00C9diter Profession
 

From d9a227ad3f5cd38841edfb9f4abd6df882c4eea4 Mon Sep 17 00:00:00 2001
From: CalebSLane <c.steelelane@gmail.com>
Date: Fri, 25 Oct 2024 11:57:26 -0700
Subject: [PATCH 16/56] add panel support for fhir exchange

---
 frontend/src/components/addOrder/Index.js     |  8 +-
 .../src/components/addOrder/SampleType.js     | 89 ++++++++++---------
 .../components/batchOrderEntry/SampleType.js  | 14 ++-
 .../data/SampleEntryTestsForTypeProvider.js   |  2 +-
 .../data/dummy/sampleTypeTestsStructure.json  |  8 +-
 .../BatchOrderEntryFormValues.js              |  2 +-
 .../src/components/printBarcode/PrePrint.js   | 22 +++--
 .../query/LabOrderSearchProvider.java         | 25 +++++-
 .../SampleEntryTestsForTypeProvider.java      | 12 +--
 ...tryTestsForTypeProviderRestController.java | 23 ++---
 .../common/services/ITestIdentityService.java |  2 +
 .../common/services/TestIdentityService.java  |  8 ++
 .../service/FhirApiWorkFlowServiceImpl.java   |  5 +-
 .../fhir/service/TaskInterpreter.java         |  3 +
 .../fhir/service/TaskInterpreterImpl.java     | 85 +++++++++---------
 .../openelisglobal/panel/dao/PanelDAO.java    |  2 +
 .../panel/daoimpl/PanelDAOImpl.java           | 23 +++++
 .../panel/service/PanelService.java           |  5 ++
 .../panel/service/PanelServiceImpl.java       |  6 ++
 .../panel/valueholder/Panel.java              |  9 ++
 .../systemuser/daoimpl/SystemUserDAOImpl.java |  4 +-
 .../systemuser/service/UserServiceImpl.java   | 21 +++--
 .../resources/hibernate/hbm/Panel.hbm.xml     |  8 +-
 src/main/resources/liquibase/3.1.x.x/base.xml |  8 ++
 .../liquibase/3.1.x.x/panel_loinc.xml         | 20 +++++
 .../resources/liquibase/base-changelog.xml    | 32 +++----
 .../pages/patient/patientManagement.jsp       |  2 +-
 27 files changed, 284 insertions(+), 164 deletions(-)
 create mode 100644 src/main/resources/liquibase/3.1.x.x/base.xml
 create mode 100644 src/main/resources/liquibase/3.1.x.x/panel_loinc.xml

diff --git a/frontend/src/components/addOrder/Index.js b/frontend/src/components/addOrder/Index.js
index dfaafb2df4..7eca6c5a1c 100755
--- a/frontend/src/components/addOrder/Index.js
+++ b/frontend/src/components/addOrder/Index.js
@@ -428,14 +428,18 @@ const Index = () => {
     let nodes =
       elements[tag] instanceof Array ? elements[tag] : [elements[tag]];
     let objList = [];
+
     for (let j = 0; j < nodes.length; j++) {
       let name = nodes[j].name;
       let id = nodes[j].id;
       if (tag == "panel") {
         objList[j] = newPanel(id, name);
-        let testNodes = elements.panelTests;
+        let testNodes = nodes[j].panelTests;
+        if (testNodes.length === undefined) {
+          testNodes = [testNodes];
+        }
         for (let x = 0; x < testNodes.length; x++) {
-          let ptNodes = elements.test;
+          let ptNodes = testNodes[x].test;
           for (let y = 0; y < ptNodes.length; y++) {
             let pName = ptNodes[y].name;
             let pId = ptNodes[y].id;
diff --git a/frontend/src/components/addOrder/SampleType.js b/frontend/src/components/addOrder/SampleType.js
index eeabd7858c..f9b0326b96 100644
--- a/frontend/src/components/addOrder/SampleType.js
+++ b/frontend/src/components/addOrder/SampleType.js
@@ -147,28 +147,17 @@ const SampleType = (props) => {
 
   const handleRemoveSelectedTest = (test) => {
     removedTestFromSelectedTests(test);
-    updateSampleTypeTests(test, false);
   };
 
   const handleFilterSelectTest = (test) => {
     setTestSearchTerm("");
     addTestToSelectedTests(test);
-    updateSampleTypeTests(test, true);
   };
 
-  function updateSampleTypeTests(test, userBenchChoice = false) {
-    let tests = [...sampleTypeTests.tests];
-    let testIndex = findTestIndex(test.id);
-    tests[testIndex].userBenchChoice = userBenchChoice;
-    setSampleTypeTests({ ...sampleTypeTests, tests: tests });
-  }
-
   const handleTestCheckbox = (e, test) => {
     if (e.currentTarget.checked) {
-      updateSampleTypeTests(test, true);
       addTestToSelectedTests(test);
     } else {
-      updateSampleTypeTests(test, false);
       removedTestFromSelectedTests(test);
     }
   };
@@ -181,17 +170,36 @@ const SampleType = (props) => {
     return sampleTypeTests.tests.findIndex((test) => test.id === testId);
   }
 
-  const triggerPanelCheckBoxChange = (isChecked, testMaps) => {
-    const testIds = testMaps.split(",").map((id) => id.trim());
-    testIds.map((testId) => {
+  const panelIsSelected = (panelId) => {
+    for (let i in selectedPanels) {
+      if (selectedPanels[i].id === panelId) {
+        return true;
+      }
+    }
+    return false;
+  };
+
+  const testIsSelected = (testId) => {
+    for (let i in selectedTests) {
+      if (selectedTests[i].id === testId) {
+        return true;
+      }
+    }
+    return false;
+  };
+
+  const triggerPanelCheckBoxChange = (isChecked, testIds) => {
+    const testIdsList = testIds.split(",").map((id) => id.trim());
+    testIdsList.map((testId) => {
       let testIndex = findTestIndex(testId);
       let test = findTestById(testId);
       if (testIndex !== -1) {
-        updateSampleTypeTests(test, isChecked);
         if (isChecked) {
-          setSelectedTests((prevState) => {
-            return [...prevState, { id: test.id, name: test.name }];
-          });
+          if (!testIsSelected(test.id)) {
+            setSelectedTests((prevState) => {
+              return [...prevState, { id: test.id, name: test.name }];
+            });
+          }
         } else {
           removedTestFromSelectedTests(test);
         }
@@ -288,13 +296,6 @@ const SampleType = (props) => {
     }
   }, [requestTestReferral]);
 
-  useEffect(() => {
-    props.sampleTypeObject({
-      selectedTests: selectedTests,
-      sampleObjectIndex: index,
-    });
-  }, [selectedTests]);
-
   useEffect(() => {
     props.sampleTypeObject({
       referralItems: referralRequests,
@@ -331,11 +332,9 @@ const SampleType = (props) => {
 
   const removedPanelFromSelectedPanels = (panel) => {
     let index = 0;
-    let panelId = panel.id !== undefined ? panel.id : panel.panelId;
-
     for (let i in selectedPanels) {
-      if (selectedPanels[i].id === panelId) {
-        triggerPanelCheckBoxChange(false, selectedPanels[i].testMaps);
+      if (selectedPanels[i].id === panel.id) {
+        triggerPanelCheckBoxChange(false, selectedPanels[i].testIds);
         const newPanels = selectedPanels;
         newPanels.splice(index, 1);
         setSelectedPanels([...newPanels]);
@@ -359,8 +358,8 @@ const SampleType = (props) => {
     addPanelToSelectedPanels(panel);
   };
 
-  const handlePanelCheckbox = (e, panel) => {
-    if (e.currentTarget.checked) {
+  const handlePanelCheckbox = (panel) => {
+    if (!panelIsSelected(panel.id)) {
       addPanelToSelectedPanels(panel);
     } else {
       removedPanelFromSelectedPanels(panel);
@@ -372,15 +371,16 @@ const SampleType = (props) => {
   };
 
   function addTestToSelectedTests(test) {
-    setSelectedTests([...selectedTests, { id: test.id, name: test.name }]);
+    if (!testIsSelected(test.id)) {
+      setSelectedTests([...selectedTests, { id: test.id, name: test.name }]);
+    }
   }
 
   const addPanelToSelectedPanels = (panel) => {
     setSelectedPanels([
       ...selectedPanels,
-      { id: panel.panelId, name: panel.name, testMaps: panel.testMaps },
+      { id: panel.id, name: panel.name, testIds: panel.testIds },
     ]);
-    triggerPanelCheckBoxChange(true, panel.testMaps);
   };
 
   useEffect(() => {
@@ -403,12 +403,22 @@ const SampleType = (props) => {
     });
   }, [rejectionReasonsDisabled]);
 
+  useEffect(() => {
+    props.sampleTypeObject({
+      selectedTests: selectedTests,
+      sampleObjectIndex: index,
+    });
+  }, [selectedTests]);
+
   useEffect(() => {
     props.sampleTypeObject({
       selectedPanels: selectedPanels,
       sampleObjectIndex: index,
     });
-  }, [selectedPanels]);
+    for (let i in selectedPanels) {
+      triggerPanelCheckBoxChange(true, selectedPanels[i].testIds);
+    }
+  }, [selectedPanels, sampleTypeTests]);
 
   const repopulateUI = () => {
     if (props.sample !== null) {
@@ -599,12 +609,12 @@ const SampleType = (props) => {
                   ""
                 ) : (
                   <Checkbox
-                    onChange={(e) => handlePanelCheckbox(e, panel)}
+                    onChange={() => handlePanelCheckbox(panel)}
                     labelText={panel.name}
-                    id={`panel_` + index + "_" + panel.panelId}
-                    key={index + panel.panelId}
+                    id={`panel_` + index + "_" + panel.id}
+                    key={index + panel.id}
                     checked={
-                      selectedPanels.filter((item) => item.id === panel.panelId)
+                      selectedPanels.filter((item) => item.id === panel.id)
                         .length > 0
                     }
                   />
@@ -707,7 +717,6 @@ const SampleType = (props) => {
                     selectedTests.filter((item) => item.id === test.id).length >
                     0
                   }
-                  // checked={test.userBenchChoice}
                 />
               );
             })}
diff --git a/frontend/src/components/batchOrderEntry/SampleType.js b/frontend/src/components/batchOrderEntry/SampleType.js
index 98b8d2b451..3f79365565 100644
--- a/frontend/src/components/batchOrderEntry/SampleType.js
+++ b/frontend/src/components/batchOrderEntry/SampleType.js
@@ -87,18 +87,16 @@ const SampleType = ({ updateFormValues }) => {
     if (isChecked) {
       updatedPanels = [
         ...selectedPanels,
-        { id: panel.panelId, name: panel.name, testMaps: panel.testMaps },
+        { id: panel.id, name: panel.name, testIds: panel.testIds },
       ];
     } else {
-      updatedPanels = selectedPanels.filter(
-        (item) => item.id !== panel.panelId,
-      );
+      updatedPanels = selectedPanels.filter((item) => item.id !== panel.id);
     }
     setSelectedPanels(updatedPanels);
 
     var updatedTests = [...selectedTests];
 
-    const testMapIds = panel.testMaps.split(",");
+    const testMapIds = panel.testIds.split(",");
     if (isChecked) {
       testMapIds.forEach((testId) => {
         const isTestSelected = updatedTests.some((test) => test.id === testId);
@@ -202,11 +200,11 @@ const SampleType = ({ updateFormValues }) => {
                 />
                 {filteredPanels.map((panel) => (
                   <Checkbox
-                    key={panel.panelId}
-                    id={`panel_${panel.panelId}`}
+                    key={panel.id}
+                    id={`panel_${panel.id}`}
                     labelText={panel.name}
                     checked={selectedPanels.some(
-                      (item) => item.id === panel.panelId,
+                      (item) => item.id === panel.id,
                     )}
                     onChange={(e) => handlePanelCheckbox(e, panel)}
                   />
diff --git a/frontend/src/components/data/SampleEntryTestsForTypeProvider.js b/frontend/src/components/data/SampleEntryTestsForTypeProvider.js
index 952f6ed217..44bd91f1ef 100644
--- a/frontend/src/components/data/SampleEntryTestsForTypeProvider.js
+++ b/frontend/src/components/data/SampleEntryTestsForTypeProvider.js
@@ -3,7 +3,7 @@ export const sampleTypeTestsStructure = {
   panels: [
     {
       name: "",
-      testMaps: "",
+      testIds: "",
       panelId: "1",
       panelOrder: 0,
     },
diff --git a/frontend/src/components/data/dummy/sampleTypeTestsStructure.json b/frontend/src/components/data/dummy/sampleTypeTestsStructure.json
index 325118a0b0..0b61c878a9 100644
--- a/frontend/src/components/data/dummy/sampleTypeTestsStructure.json
+++ b/frontend/src/components/data/dummy/sampleTypeTestsStructure.json
@@ -3,25 +3,25 @@
   "panels": [
     {
       "name": "Bilan Biochimique",
-      "testMaps": "7",
+      "testIds": "7",
       "panelId": "1",
       "panelOrder": 0
     },
     {
       "name": "Serologie VIH",
-      "testMaps": "9,9",
+      "testIds": "9,9",
       "panelId": "4",
       "panelOrder": 0
     },
     {
       "name": "Bilan Biochimique",
-      "testMaps": "7,8,9,10,11,12,13",
+      "testIds": "7,8,9,10,11,12,13",
       "panelId": "1",
       "panelOrder": 0
     },
     {
       "name": "Serologie VIH",
-      "testMaps": "16,16",
+      "testIds": "16,16",
       "panelId": "4",
       "panelOrder": 0
     }
diff --git a/frontend/src/components/formModel/innitialValues/BatchOrderEntryFormValues.js b/frontend/src/components/formModel/innitialValues/BatchOrderEntryFormValues.js
index a0e7cb1912..5813bbf30f 100644
--- a/frontend/src/components/formModel/innitialValues/BatchOrderEntryFormValues.js
+++ b/frontend/src/components/formModel/innitialValues/BatchOrderEntryFormValues.js
@@ -5,7 +5,7 @@ const BatchOrderEntryFormValues = {
   panels: [
     {
       name: "",
-      testMaps: "",
+      testIds: "",
       panelId: "",
       panelOrder: 0,
     },
diff --git a/frontend/src/components/printBarcode/PrePrint.js b/frontend/src/components/printBarcode/PrePrint.js
index f31ec4431f..b56929ca89 100644
--- a/frontend/src/components/printBarcode/PrePrint.js
+++ b/frontend/src/components/printBarcode/PrePrint.js
@@ -64,9 +64,9 @@ const PrePrint = () => {
     setSampleTypeTests({ ...sampleTypeTests, tests: tests });
   }
 
-  const triggerPanelCheckBoxChange = (isChecked, testMaps) => {
-    const testIds = testMaps.split(",").map((id) => id.trim());
-    testIds.map((testId) => {
+  const triggerPanelCheckBoxChange = (isChecked, testIds) => {
+    const testIdsList = testIds.split(",").map((id) => id.trim());
+    testIdsList.map((testId) => {
       let testIndex = findTestIndex(testId);
       let test = findTestById(testId);
       if (testIndex !== -1) {
@@ -85,18 +85,16 @@ const PrePrint = () => {
   const addPanelToSelectedPanels = (panel) => {
     setSelectedPanels([
       ...selectedPanels,
-      { id: panel.panelId, name: panel.name, testMaps: panel.testMaps },
+      { id: panel.id, name: panel.name, testIds: panel.testIds },
     ]);
-    triggerPanelCheckBoxChange(true, panel.testMaps);
+    triggerPanelCheckBoxChange(true, panel.testIds);
   };
 
   const removePanelFromSelectedPanels = (panel) => {
     let index = 0;
-    let panelId = panel.id !== undefined ? panel.id : panel.panelId;
-
     for (let i in selectedPanels) {
-      if (selectedPanels[i].id === panelId) {
-        triggerPanelCheckBoxChange(false, selectedPanels[i].testMaps);
+      if (selectedPanels[i].id === panel.id) {
+        triggerPanelCheckBoxChange(false, selectedPanels[i].testIds);
         const newPanels = selectedPanels;
         newPanels.splice(index, 1);
         setSelectedPanels([...newPanels]);
@@ -318,10 +316,10 @@ const PrePrint = () => {
                   <Checkbox
                     onChange={(e) => handlePanelCheckbox(e, panel)}
                     labelText={panel.name}
-                    id={"panel_" + panel.panelId}
-                    key={panel.panelId}
+                    id={"panel_" + panel.id}
+                    key={panel.id}
                     checked={
-                      selectedPanels.filter((item) => item.id === panel.panelId)
+                      selectedPanels.filter((item) => item.id === panel.id)
                         .length > 0
                     }
                   />
diff --git a/src/main/java/org/openelisglobal/common/provider/query/LabOrderSearchProvider.java b/src/main/java/org/openelisglobal/common/provider/query/LabOrderSearchProvider.java
index 305a2612fa..487f9b3a21 100644
--- a/src/main/java/org/openelisglobal/common/provider/query/LabOrderSearchProvider.java
+++ b/src/main/java/org/openelisglobal/common/provider/query/LabOrderSearchProvider.java
@@ -452,7 +452,7 @@ private void getTestsAndPanels(List<Request> tests, List<Request> panels, String
             }
         }
 
-        addToTestOrPanel(tests, loinc, sampleTypeAbbreviation);
+        addToTestOrPanel(tests, panels, loinc, sampleTypeAbbreviation);
     }
 
     // private List<ServiceRequest> getBasedOnServiceRequestFromBundle(Bundle
@@ -480,8 +480,9 @@ private void getTestsAndPanels(List<Request> tests, List<Request> panels, String
     //
     // }
 
-    private void addToTestOrPanel(List<Request> tests, String loinc, String sampleTypeAbbreviation) {
+    private void addToTestOrPanel(List<Request> tests, List<Request> panels, String loinc, String sampleTypeAbbreviation) {
         Test test = null;
+        Panel panel = null;
         TypeOfSample typeOfSample = null;
         if (!GenericValidator.isBlankOrNull(sampleTypeAbbreviation)) {
             String typeOfSampleId = typeOfSampleService.getTypeOfSampleIdForLocalAbbreviation(sampleTypeAbbreviation);
@@ -503,6 +504,18 @@ private void addToTestOrPanel(List<Request> tests, String loinc, String sampleTy
                 typeOfSample = typeOfSampleService.getTypeOfSampleForTest(test.getId()).get(0);
             }
             tests.add(new Request(test.getName(), loinc, typeOfSample.getLocalizedName()));
+            return; 
+        }
+        panel = panelService.getPanelByLoincCode(loinc);
+        if (panel != null) {
+            LogEvent.logDebug(this.getClass().getSimpleName(), "addToTestOrPanel", "panel matching loinc is: " + panel.getDescription());
+
+            if (typeOfSample == null) {
+                typeOfSample = typeOfSampleService.getTypeOfSampleForPanelId(panel.getId()).get(0);
+                LogEvent.logDebug(this.getClass().getSimpleName(), "addToTestOrPanel", "typeOfSample matching for panel is: " + typeOfSample.getDescription());
+
+            }
+            panels.add(new Request(panel.getPanelName(), loinc, typeOfSample.getLocalizedName()));
         }
 
     }
@@ -578,7 +591,13 @@ private void createMapsForTests(List<Request> testRequests) {
 
     private void createMapsForPanels(List<Request> panelRequests) {
         for (Request panelRequest : panelRequests) {
-            Panel panel = panelService.getPanelByName(panelRequest.getName());
+            Panel panel = null;
+            if (!GenericValidator.isBlankOrNull(panelRequest.getLoinc())) {
+                panel = panelService.getPanelByLoincCode(panelRequest.getLoinc());
+            }
+            if (panel == null && !GenericValidator.isBlankOrNull(panelRequest.getName())) {
+                panel = panelService.getPanelByName(panelRequest.getName());
+            }
 
             if (panel != null) {
                 List<TypeOfSample> typeOfSamples = typeOfSampleService.getTypeOfSampleForPanelId(panel.getId());
diff --git a/src/main/java/org/openelisglobal/common/provider/query/SampleEntryTestsForTypeProvider.java b/src/main/java/org/openelisglobal/common/provider/query/SampleEntryTestsForTypeProvider.java
index 13d7e9af83..d772257d81 100644
--- a/src/main/java/org/openelisglobal/common/provider/query/SampleEntryTestsForTypeProvider.java
+++ b/src/main/java/org/openelisglobal/common/provider/query/SampleEntryTestsForTypeProvider.java
@@ -209,7 +209,7 @@ private void addPanel(PanelTestMap testMap, StringBuilder xml) {
         xml.append("<panel>");
         XMLUtil.appendKeyValue("name", testMap.getName(), xml);
         XMLUtil.appendKeyValue("id", testMap.getPanelId(), xml);
-        XMLUtil.appendKeyValue("testMap", testMap.getTestMaps(), xml);
+        XMLUtil.appendKeyValue("testIds", testMap.getTestIds(), xml);
         xml.append("</panel>");
     }
 
@@ -277,13 +277,13 @@ private String getDerivedNameFromPanel(PanelItem item) {
 
     public class PanelTestMap {
         private String name;
-        private String testMaps;
+        private String testIds;
         private String panelId;
         private int panelOrder;
 
-        public PanelTestMap(String panelId, int panelOrder, String panelName, String map) {
+        public PanelTestMap(String panelId, int panelOrder, String panelName, String testIds) {
             name = panelName;
-            testMaps = map;
+            this.testIds = testIds;
             this.panelId = panelId;
             this.panelOrder = panelOrder;
         }
@@ -292,8 +292,8 @@ public String getName() {
             return name;
         }
 
-        public String getTestMaps() {
-            return testMaps;
+        public String getTestIds() {
+            return testIds;
         }
 
         public String getPanelId() {
diff --git a/src/main/java/org/openelisglobal/common/rest/provider/SampleEntryTestsForTypeProviderRestController.java b/src/main/java/org/openelisglobal/common/rest/provider/SampleEntryTestsForTypeProviderRestController.java
index 800d1a7a79..b3cf4899b3 100755
--- a/src/main/java/org/openelisglobal/common/rest/provider/SampleEntryTestsForTypeProviderRestController.java
+++ b/src/main/java/org/openelisglobal/common/rest/provider/SampleEntryTestsForTypeProviderRestController.java
@@ -162,8 +162,8 @@ private void addPanels(List<PanelTestMap> panelMap) {
         panelMap = sortPanels(panelMap);
         panelsMapList.clear();
         for (PanelTestMap testMap : panelMap) {
-            panelsMapList.add(new PanelTestMap(testMap.getPanelId(), testMap.getPanelOrder(), testMap.getName(),
-                    testMap.getTestMaps()));
+            panelsMapList.add(new PanelTestMap(testMap.getId(), testMap.getPanelOrder(), testMap.getName(),
+                    testMap.getTestIds()));
         }
         sampleEntryTests.setPanels(panelsMapList);
     }
@@ -283,16 +283,17 @@ public class PanelTestMap {
 
         private String name;
 
-        private String testMaps;
+        private String testIds;
 
-        private String panelId;
+        //panel id
+        private String id;
 
         private int panelOrder;
 
-        public PanelTestMap(String panelId, int panelOrder, String panelName, String map) {
+        public PanelTestMap(String id, int panelOrder, String panelName, String testIds) {
             name = panelName;
-            testMaps = map;
-            this.panelId = panelId;
+            this.testIds = testIds;
+            this.id = id;
             this.panelOrder = panelOrder;
         }
 
@@ -300,12 +301,12 @@ public String getName() {
             return name;
         }
 
-        public String getTestMaps() {
-            return testMaps;
+        public String getTestIds() {
+            return testIds;
         }
 
-        public String getPanelId() {
-            return panelId;
+        public String getId() {
+            return id;
         }
 
         public int getPanelOrder() {
diff --git a/src/main/java/org/openelisglobal/common/services/ITestIdentityService.java b/src/main/java/org/openelisglobal/common/services/ITestIdentityService.java
index 8b03f55cfc..77b1f45933 100644
--- a/src/main/java/org/openelisglobal/common/services/ITestIdentityService.java
+++ b/src/main/java/org/openelisglobal/common/services/ITestIdentityService.java
@@ -17,4 +17,6 @@ public interface ITestIdentityService {
     public abstract boolean isTestNumericViralLoad(String testId);
 
     public abstract boolean isTestNumericViralLoad(Test test);
+
+    public abstract boolean doesActivePanelExistForLoinc(String loinc);
 }
diff --git a/src/main/java/org/openelisglobal/common/services/TestIdentityService.java b/src/main/java/org/openelisglobal/common/services/TestIdentityService.java
index e54851507b..3163f1d8a6 100644
--- a/src/main/java/org/openelisglobal/common/services/TestIdentityService.java
+++ b/src/main/java/org/openelisglobal/common/services/TestIdentityService.java
@@ -15,9 +15,12 @@
 
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
+
 import javax.annotation.PostConstruct;
 import org.apache.commons.validator.GenericValidator;
 import org.openelisglobal.panel.service.PanelService;
+import org.openelisglobal.panel.valueholder.Panel;
 import org.openelisglobal.test.service.TestService;
 import org.openelisglobal.test.valueholder.Test;
 import org.openelisglobal.testresult.service.TestResultService;
@@ -126,4 +129,9 @@ public boolean doesActiveTestExistForLoinc(String loincCode) {
         return testService.getActiveTestsByLoinc(loincCode) != null
                 && testService.getActiveTestsByLoinc(loincCode).size() > 0;
     }
+
+    @Override
+    public boolean doesActivePanelExistForLoinc(String loincCode) {
+        return panelService.getAllActivePanels().stream().anyMatch(e -> Objects.equals(e.getLoinc(), loincCode));
+    }
 }
diff --git a/src/main/java/org/openelisglobal/dataexchange/fhir/service/FhirApiWorkFlowServiceImpl.java b/src/main/java/org/openelisglobal/dataexchange/fhir/service/FhirApiWorkFlowServiceImpl.java
index f1e121e53e..80f5c9ce2b 100644
--- a/src/main/java/org/openelisglobal/dataexchange/fhir/service/FhirApiWorkFlowServiceImpl.java
+++ b/src/main/java/org/openelisglobal/dataexchange/fhir/service/FhirApiWorkFlowServiceImpl.java
@@ -258,6 +258,7 @@ private void beginTaskImportResultsPath(String remoteStorePath) {
                             .where(ServiceRequest.BASED_ON
                                     .hasAnyOfIds(originalReferralObjectsByServiceRequest.keySet()));
                     originalTasksBundle = searchQuery.execute();
+
                     Map<String, ReferralResultsImportObjects> resultImportByServiceRequest = new HashMap<>();
                     for (BundleEntryComponent bundleEntry : originalTasksBundle.getEntry()) {
                         if (bundleEntry.hasResource()) {
@@ -713,8 +714,8 @@ private Optional<Specimen> getSpecimenWithSameIdentifier(Specimen specimen, Stri
     private Optional<Practitioner> getProviderWithSameIdentifier(Practitioner provider, String remoteStorePath) {
         IGenericClient localFhirClient = fhirUtil.getFhirClient(localFhirStorePath);
         Bundle localBundle = localFhirClient.search() //
-                .forResource(Specimen.class) //
-                .where(Specimen.IDENTIFIER.exactly().systemAndIdentifier(remoteStorePath,
+                .forResource(Practitioner.class) //
+                .where(Practitioner.IDENTIFIER.exactly().systemAndIdentifier(remoteStorePath,
                         provider.getIdElement().getIdPart())) //
                 .returnBundle(Bundle.class).execute();
         for (BundleEntryComponent entry : localBundle.getEntry()) {
diff --git a/src/main/java/org/openelisglobal/dataexchange/fhir/service/TaskInterpreter.java b/src/main/java/org/openelisglobal/dataexchange/fhir/service/TaskInterpreter.java
index 709e7b1614..ec24027baf 100644
--- a/src/main/java/org/openelisglobal/dataexchange/fhir/service/TaskInterpreter.java
+++ b/src/main/java/org/openelisglobal/dataexchange/fhir/service/TaskInterpreter.java
@@ -7,6 +7,7 @@
 import org.openelisglobal.dataexchange.order.action.IOrderInterpreter.InterpreterResults;
 import org.openelisglobal.dataexchange.order.action.IOrderInterpreter.OrderType;
 import org.openelisglobal.dataexchange.order.action.MessagePatient;
+import org.openelisglobal.panel.valueholder.Panel;
 import org.openelisglobal.sample.valueholder.OrderPriority;
 import org.openelisglobal.test.valueholder.Test;
 
@@ -28,6 +29,8 @@ public interface TaskInterpreter {
 
     Test getTest();
 
+    Panel getPanel();
+
     OrderPriority getOrderPriority();
 
     List<InterpreterResults> interpret(Task incomingTask, ServiceRequest incomingServiceRequest,
diff --git a/src/main/java/org/openelisglobal/dataexchange/fhir/service/TaskInterpreterImpl.java b/src/main/java/org/openelisglobal/dataexchange/fhir/service/TaskInterpreterImpl.java
index 4bdd8c4eb5..126b82268a 100644
--- a/src/main/java/org/openelisglobal/dataexchange/fhir/service/TaskInterpreterImpl.java
+++ b/src/main/java/org/openelisglobal/dataexchange/fhir/service/TaskInterpreterImpl.java
@@ -2,7 +2,6 @@
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.hl7v2.HL7Exception;
-import ca.uhn.hl7v2.model.v251.segment.OBR;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.commons.validator.GenericValidator;
@@ -25,6 +24,8 @@
 import org.openelisglobal.dataexchange.order.action.IOrderInterpreter.InterpreterResults;
 import org.openelisglobal.dataexchange.order.action.IOrderInterpreter.OrderType;
 import org.openelisglobal.dataexchange.order.action.MessagePatient;
+import org.openelisglobal.panel.service.PanelService;
+import org.openelisglobal.panel.valueholder.Panel;
 import org.openelisglobal.sample.valueholder.OrderPriority;
 import org.openelisglobal.test.service.TestService;
 import org.openelisglobal.test.valueholder.Test;
@@ -84,7 +85,9 @@ public String getIdentifier() {
     }
 
     @Autowired
-    TestService testService;
+    private TestService testService;
+    @Autowired
+    private PanelService panelService;
 
     private String labOrderNumber;
     private OrderPriority priority;
@@ -95,6 +98,7 @@ public String getIdentifier() {
     private ServiceRequest serviceRequest;
     private MessagePatient messagePatient;
     private Test test;
+    private Panel panel;
     private List<InterpreterResults> results = new ArrayList<>();
     private List<String> unsupportedTests = new ArrayList<>();
     private List<String> unsupportedPanels = new ArrayList<>();
@@ -113,6 +117,9 @@ public List<InterpreterResults> interpret(Task incomingTask, ServiceRequest inco
         try {
             messagePatient = createPatientFromFHIR();
             test = createTestFromFHIR(serviceRequest);
+            if (test == null) {
+                panel = createPanelFromFHIR(serviceRequest);
+            }
             extractOrderInformation(serviceRequest);
         } catch (HL7Exception e) {
             LogEvent.logDebug(e);
@@ -161,11 +168,38 @@ private Test createTestFromFHIR(ServiceRequest serviceRequest) throws HL7Excepti
             i++;
         }
 
-        LogEvent.logError(this.getClass().getSimpleName(), "createTestFromFHIR",
+        LogEvent.logDebug(this.getClass().getSimpleName(), "createTestFromFHIR",
                 "no test found for SR: " + serviceRequest.getIdElement().getIdPart());
         return null;
     }
 
+    private Panel createPanelFromFHIR(ServiceRequest serviceRequest) throws HL7Exception {
+        LogEvent.logDebug(this.getClass().getSimpleName(), "createTestFromFHIR", "start");
+
+        String loincCode = "";
+        String system = "";
+        Integer i = 0;
+        Panel panel = null;
+        while (i < serviceRequest.getCode().getCoding().size()) {
+            system = serviceRequest.getCode().getCoding().get(i).getSystemElement().toString();
+            if (system.equalsIgnoreCase("UriType[http://loinc.org]")) {
+                loincCode = serviceRequest.getCode().getCoding().get(i).getCodeElement().toString();
+                if (!GenericValidator.isBlankOrNull(loincCode)) {
+                    panel = panelService.getPanelByLoincCode(loincCode);
+                   return panel;
+                } else {
+                    LogEvent.logWarn(this.getClass().getSimpleName(), "createTestFromFHIR",
+                            "loinc code is missing a value in SR: " + serviceRequest.getIdElement().getIdPart());
+                }
+            }
+            i++;
+        }
+
+        LogEvent.logDebug(this.getClass().getSimpleName(), "createTestFromFHIR",
+                "no panel found for SR: " + serviceRequest.getIdElement().getIdPart());
+        return null;
+    }
+
     private MessagePatient createPatientFromFHIR() throws HL7Exception {
 
         MessagePatient messagePatient = new MessagePatient();
@@ -311,24 +345,9 @@ && getMessagePatient().getExternalId() == null) {
                     results.add(InterpreterResults.MISSING_PATIENT_IDENTIFIER);
                 }
 
-                if (test == null || !getTestIdentityService().doesActiveTestExistForLoinc(test.getLoinc())) {
+                if ((test == null || !getTestIdentityService().doesActiveTestExistForLoinc(test.getLoinc())) && (panel == null || !getTestIdentityService().doesActivePanelExistForLoinc(panel.getLoinc()))) {
                     results.add(InterpreterResults.UNSUPPORTED_TESTS);
                 }
-
-                // try {
-                // OML_O21_OBSERVATION_REQUEST orderRequest = orderMessage.getORDERAll().get(0)
-                // .getOBSERVATION_REQUEST();
-                // checkOBR(orderRequest.getOBR());
-                // List<OML_O21_ORDER_PRIOR> priorOrders =
-                // orderRequest.getPRIOR_RESULT().getORDER_PRIORAll();
-                // for (OML_O21_ORDER_PRIOR priorOrder : priorOrders) {
-                // checkOBR(priorOrder.getOBR());
-                // }
-                //
-                // } catch (HL7Exception e) {
-                // LogEvent.logDebug(e);
-                // results.add(InterpreterResults.INTERPRET_ERROR);
-                // }
             }
         }
 
@@ -339,29 +358,6 @@ && getMessagePatient().getExternalId() == null) {
         return results;
     }
 
-    private void checkOBR(OBR obr) throws HL7Exception {
-        if (obr.isEmpty()) {
-            results.add(InterpreterResults.MISSING_TESTS);
-        }
-        // moving away from name based testrequet to LOINC based test requests
-        // test request no longer in obr, now appears in orc
-        /*
-         * else{ String name = obr.getUniversalServiceIdentifier().getText().getValue();
-         * String identifier =
-         * obr.getUniversalServiceIdentifier().getIdentifier().getValue(); if(
-         * identifier.startsWith(ServiceIdentifier.TEST.getIdentifier() + "-")){
-         * if(!getTestIdentityService().doesActiveTestExist(name)){ if(
-         * !results.contains(InterpreterResults.UNSUPPORTED_TESTS)){
-         * results.add(InterpreterResults.UNSUPPORTED_TESTS); } unsupportedTests.add(
-         * name ); } }else if(
-         * identifier.startsWith(ServiceIdentifier.PANEL.getIdentifier() + "-")){
-         * if(!getTestIdentityService().doesPanelExist(name)){ if(
-         * !results.contains(InterpreterResults.UNSUPPORTED_PANELS)){
-         * results.add(InterpreterResults.UNSUPPORTED_PANELS); } unsupportedPanels.add(
-         * name ); } }else{
-         * results.add(InterpreterResults.OTHER_THAN_PANEL_OR_TEST_REQUESTED); } }
-         */
-    }
 
     @Override
     public OrderPriority getOrderPriority() {
@@ -441,4 +437,9 @@ private void getOrderPriorityFromIncomingOrder(ServiceRequestPriority serviceReq
     public Test getTest() {
         return test;
     }
+
+    @Override
+    public Panel getPanel() {
+        return panel;
+    }
 }
diff --git a/src/main/java/org/openelisglobal/panel/dao/PanelDAO.java b/src/main/java/org/openelisglobal/panel/dao/PanelDAO.java
index bd757a4aa1..262848bf43 100644
--- a/src/main/java/org/openelisglobal/panel/dao/PanelDAO.java
+++ b/src/main/java/org/openelisglobal/panel/dao/PanelDAO.java
@@ -63,4 +63,6 @@ public interface PanelDAO extends BaseDAO<Panel, String> {
     boolean duplicatePanelDescriptionExists(Panel panel);
 
     void clearIDMaps();
+
+    Panel getPanelByLoincCode(String loincCode);
 }
diff --git a/src/main/java/org/openelisglobal/panel/daoimpl/PanelDAOImpl.java b/src/main/java/org/openelisglobal/panel/daoimpl/PanelDAOImpl.java
index 1851c8ffdc..3cb4e2fcfb 100644
--- a/src/main/java/org/openelisglobal/panel/daoimpl/PanelDAOImpl.java
+++ b/src/main/java/org/openelisglobal/panel/daoimpl/PanelDAOImpl.java
@@ -29,6 +29,7 @@
 import org.openelisglobal.common.util.StringUtil;
 import org.openelisglobal.panel.dao.PanelDAO;
 import org.openelisglobal.panel.valueholder.Panel;
+import org.openelisglobal.test.valueholder.Test;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -301,6 +302,9 @@ public void clearIDMaps() {
     @Override
     @Transactional(readOnly = true)
     public Panel getPanelByName(String panelName) {
+        if (panelName == null) {
+            panelName = "";
+        }
         try {
             String sql = "from Panel p where p.panelName = :name";
             Query<Panel> query = entityManager.unwrap(Session.class).createQuery(sql, Panel.class);
@@ -313,4 +317,23 @@ public Panel getPanelByName(String panelName) {
             throw new LIMSRuntimeException("Error in Panel getPanelByName()", e);
         }
     }
+
+    @Override
+    public Panel getPanelByLoincCode(String loincCode) {
+        if (loincCode == null) {
+            LogEvent.logWarn(this.getClass().getSimpleName(), "getPanelByLoincCode", "loincCode is null");
+        }
+        LogEvent.logDebug(this.getClass().getSimpleName(), "getPanelByLoincCode", "loincCode is: " + loincCode);
+
+        String sql = "From Panel p where p.loinc = :loinc";
+        try {
+            Query<Panel> query = entityManager.unwrap(Session.class).createQuery(sql, Panel.class);
+            query.setParameter("loinc", loincCode);
+            return query.uniqueResult();
+        } catch (HibernateException e) {
+            handleException(e, "getPanelByLoincCode");
+        }
+
+        return null;
+    }
 }
diff --git a/src/main/java/org/openelisglobal/panel/service/PanelService.java b/src/main/java/org/openelisglobal/panel/service/PanelService.java
index fbced743ce..de9f368c7c 100644
--- a/src/main/java/org/openelisglobal/panel/service/PanelService.java
+++ b/src/main/java/org/openelisglobal/panel/service/PanelService.java
@@ -1,6 +1,8 @@
 package org.openelisglobal.panel.service;
 
 import java.util.List;
+import java.util.Optional;
+
 import org.openelisglobal.common.service.BaseObjectService;
 import org.openelisglobal.localization.valueholder.Localization;
 import org.openelisglobal.panel.valueholder.Panel;
@@ -32,4 +34,7 @@ public interface PanelService extends BaseObjectService<Panel, String> {
     List<Panel> getAllPanels();
 
     Localization getLocalizationForPanel(String id);
+
+    Panel getPanelByLoincCode(String loincCode);
+
 }
diff --git a/src/main/java/org/openelisglobal/panel/service/PanelServiceImpl.java b/src/main/java/org/openelisglobal/panel/service/PanelServiceImpl.java
index f1f573860d..45b5b871a0 100644
--- a/src/main/java/org/openelisglobal/panel/service/PanelServiceImpl.java
+++ b/src/main/java/org/openelisglobal/panel/service/PanelServiceImpl.java
@@ -1,6 +1,7 @@
 package org.openelisglobal.panel.service;
 
 import java.util.List;
+
 import org.hibernate.Hibernate;
 import org.openelisglobal.common.exception.LIMSDuplicateRecordException;
 import org.openelisglobal.common.service.AuditableBaseObjectServiceImpl;
@@ -147,4 +148,9 @@ public Localization getLocalizationForPanel(String id) {
         Hibernate.initialize(localization);
         return localization;
     }
+
+    @Override 
+    public Panel getPanelByLoincCode(String loincCode) {
+        return getBaseObjectDAO().getPanelByLoincCode(loincCode);
+    }
 }
diff --git a/src/main/java/org/openelisglobal/panel/valueholder/Panel.java b/src/main/java/org/openelisglobal/panel/valueholder/Panel.java
index 8cfa3004e7..51f825520f 100644
--- a/src/main/java/org/openelisglobal/panel/valueholder/Panel.java
+++ b/src/main/java/org/openelisglobal/panel/valueholder/Panel.java
@@ -27,6 +27,8 @@ public class Panel extends EnumValueItemImpl {
     private String id;
     private String panelName;
     private String description;
+    private String loinc;
+
     private int sortOrderInt;
     private ValueHolder localization = new ValueHolder();
 
@@ -59,6 +61,13 @@ public String getDescription() {
     public void setDescription(String description) {
         this.description = description;
     }
+    public String getLoinc() {
+        return loinc;
+    }
+
+    public void setLoinc(String loinc) {
+        this.loinc = loinc;
+    }
 
     @Override
     protected String getDefaultLocalizedName() {
diff --git a/src/main/java/org/openelisglobal/systemuser/daoimpl/SystemUserDAOImpl.java b/src/main/java/org/openelisglobal/systemuser/daoimpl/SystemUserDAOImpl.java
index 8adea37e47..2042b66ade 100644
--- a/src/main/java/org/openelisglobal/systemuser/daoimpl/SystemUserDAOImpl.java
+++ b/src/main/java/org/openelisglobal/systemuser/daoimpl/SystemUserDAOImpl.java
@@ -163,13 +163,13 @@ public boolean duplicateSystemUserExists(SystemUser systemUser) throws LIMSRunti
     public SystemUser getDataForLoginUser(String userName) throws LIMSRuntimeException {
         List<SystemUser> list;
         try {
-            String sql = "from SystemUser where loginName = :name";
+            String sql = "from SystemUser where login_Name = :name";
             Query<SystemUser> query = entityManager.unwrap(Session.class).createQuery(sql, SystemUser.class);
             query.setParameter("name", userName);
             list = query.list();
         } catch (RuntimeException e) {
             LogEvent.logError(e);
-            throw new LIMSRuntimeException("Error in SystemUser getDataForUser()", e);
+            throw new LIMSRuntimeException("Error in SystemUser getDataForLoginUser()", e);
         }
 
         return list.size() > 0 ? list.get(0) : null;
diff --git a/src/main/java/org/openelisglobal/systemuser/service/UserServiceImpl.java b/src/main/java/org/openelisglobal/systemuser/service/UserServiceImpl.java
index e43e8be0c5..b803792837 100644
--- a/src/main/java/org/openelisglobal/systemuser/service/UserServiceImpl.java
+++ b/src/main/java/org/openelisglobal/systemuser/service/UserServiceImpl.java
@@ -41,6 +41,7 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
 import org.springframework.security.saml2.provider.service.authentication.DefaultSaml2AuthenticatedPrincipal;
@@ -175,21 +176,25 @@ private void updateUserRoles(List<String> selectedRoles, SystemUser systemUser,
 
     @Override
     public List<IdValuePair> getUserTestSections(String systemUserId, String roleId) {
-        // Authentication authentication2 =
-        // SecurityContextHolder.getContext().getAuthentication();
+        Authentication authentication = null;
         // TODO workaround for Security Context authentication is null
         RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
 
         HttpServletRequest request = null;
         if (requestAttributes instanceof ServletRequestAttributes) {
             request = ((ServletRequestAttributes) requestAttributes).getRequest();
-        }
-        Object sc = request.getSession().getAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY);
-        if (!(sc instanceof SecurityContext)) {
+
+            Object sc = request.getSession().getAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY);
+            if (!(sc instanceof SecurityContext)) {
+                LogEvent.logWarn(this.getClass().getSimpleName(), "getUserLogin",
+                        "security context is not of type SecurityContext");
+            } else {
+                authentication = ((SecurityContext) sc).getAuthentication();
+            }
+        } else {
             LogEvent.logWarn(this.getClass().getSimpleName(), "getUserLogin",
-                    "security context is not of type SecurityContext");
-        }
-        Authentication authentication = ((SecurityContext) sc).getAuthentication();
+                    "requestAttributes is not of type ServletRequestAttributes");
+                }
         if (authentication != null) {
             Object principal = authentication.getPrincipal();
             if (principal instanceof UserDetails) {
diff --git a/src/main/resources/hibernate/hbm/Panel.hbm.xml b/src/main/resources/hibernate/hbm/Panel.hbm.xml
index d4a2614ba1..fa5d7eec93 100644
--- a/src/main/resources/hibernate/hbm/Panel.hbm.xml
+++ b/src/main/resources/hibernate/hbm/Panel.hbm.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
     <class name="org.openelisglobal.panel.valueholder.Panel"
@@ -22,6 +21,9 @@
         <property name="description" type="java.lang.String">
             <column name="DESCRIPTION" length="60" not-null="true" />
         </property>
+        <property name="loinc" type="java.lang.String">
+            <column name="LOINC" length="10" />
+        </property>
         <many-to-one name="localization"
             class="org.openelisglobal.localization.valueholder.Localization"
             fetch="select" lazy="false">
@@ -33,4 +35,4 @@
             type="java.lang.String" />
 
     </class>
-</hibernate-mapping>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/src/main/resources/liquibase/3.1.x.x/base.xml b/src/main/resources/liquibase/3.1.x.x/base.xml
new file mode 100644
index 0000000000..76b3bdda2e
--- /dev/null
+++ b/src/main/resources/liquibase/3.1.x.x/base.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+  xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd">
+
+  <include relativeToChangelogFile="true" file="panel_loinc.xml" />
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/liquibase/3.1.x.x/panel_loinc.xml b/src/main/resources/liquibase/3.1.x.x/panel_loinc.xml
new file mode 100644
index 0000000000..e56ccbc0e7
--- /dev/null
+++ b/src/main/resources/liquibase/3.1.x.x/panel_loinc.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9 http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
+    <!--Organization
+    settings-->
+    <changeSet id="1" author="csteele">
+        <validCheckSum>8:bc3102f55e943fbbb61b69324a5d6eb0</validCheckSum>
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists columnName="loinc" schemaName="clinlims"
+                    tableName="panel" />
+            </not>
+        </preConditions>
+        <comment>Adds loinc columns to panel</comment>
+        <addColumn tableName="panel">
+            <column name="loinc" type="character varying(10)"></column>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/liquibase/base-changelog.xml b/src/main/resources/liquibase/base-changelog.xml
index 84e7e3dd47..9590ee4e08 100644
--- a/src/main/resources/liquibase/base-changelog.xml
+++ b/src/main/resources/liquibase/base-changelog.xml
@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <databaseChangeLog
-    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
-      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd">
+  xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd">
 
-    <include file="liquibase/2.0.x.x/base.xml"/>
-    <include file="liquibase/2.1.x.x/base.xml"/>
-    <include file="liquibase/2.2.x.x/base.xml"/>
-    <include file="liquibase/2.3.x.x/base.xml"/>
-    <include file="liquibase/2.4.x.x/base.xml"/>
-    <include file="liquibase/2.5.x.x/base.xml"/>
-    <include file="liquibase/2.6.x.x/base.xml"/>
-    <include file="liquibase/2.7.x.x/base.xml"/>
-    <include file="liquibase/2.8.x.x/base.xml"/>
+  <include file="liquibase/2.0.x.x/base.xml" />
+  <include file="liquibase/2.1.x.x/base.xml" />
+  <include file="liquibase/2.2.x.x/base.xml" />
+  <include file="liquibase/2.3.x.x/base.xml" />
+  <include file="liquibase/2.4.x.x/base.xml" />
+  <include file="liquibase/2.5.x.x/base.xml" />
+  <include file="liquibase/2.6.x.x/base.xml" />
+  <include file="liquibase/2.7.x.x/base.xml" />
+  <include file="liquibase/2.8.x.x/base.xml" />
+  <include file="liquibase/3.1.x.x/base.xml" />
 
-
-
-
-
-</databaseChangeLog>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/webapp/pages/patient/patientManagement.jsp b/src/main/webapp/pages/patient/patientManagement.jsp
index 33cb9e39c1..5cdcc435d9 100644
--- a/src/main/webapp/pages/patient/patientManagement.jsp
+++ b/src/main/webapp/pages/patient/patientManagement.jsp
@@ -381,7 +381,7 @@ function  /*void*/ updatePatientAge( DOB )
 {
 	var date = String( DOB.value );
 
-	var datePattern = '<%=LocaleConfiguraiton.getInstance().getPatternForDateLocale() %>';
+	var datePattern = '<%=DateUtil.getDateFormat() %>';
 	var splitPattern = datePattern.split("/");
 	var dayIndex = 0;
 	var monthIndex = 1;

From 9f9d20a77f9efd1fc50bb6c089b06a3c49327396 Mon Sep 17 00:00:00 2001
From: josephbate <sjb.lav@gmail.com>
Date: Mon, 28 Oct 2024 15:55:57 +0300
Subject: [PATCH 17/56] added sample service test class

---
 .../daoimpl/SampleHumanDAOImpl.java           |   2 +-
 .../org/openelisglobal/AppTestConfig.java     | 173 ++++++++
 .../sample/SampleServiceTest.java             | 404 ++++++++++++++++++
 3 files changed, 578 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/openelisglobal/sample/SampleServiceTest.java

diff --git a/src/main/java/org/openelisglobal/samplehuman/daoimpl/SampleHumanDAOImpl.java b/src/main/java/org/openelisglobal/samplehuman/daoimpl/SampleHumanDAOImpl.java
index 36684fdae4..35ea8536e1 100644
--- a/src/main/java/org/openelisglobal/samplehuman/daoimpl/SampleHumanDAOImpl.java
+++ b/src/main/java/org/openelisglobal/samplehuman/daoimpl/SampleHumanDAOImpl.java
@@ -145,7 +145,7 @@ public List<Sample> getSamplesForPatient(String patientID) throws LIMSRuntimeExc
                     + " sampleHuman.sampleId = sample.id and sampleHuman.patientId = :patientId order by"
                     + " sample.id";
             Query<Sample> query = entityManager.unwrap(Session.class).createQuery(sql, Sample.class);
-            query.setParameter("patientId", Integer.parseInt(patientID));
+            query.setParameter("patientId", patientID);
             samples = query.list();
         } catch (HibernateException e) {
             LogEvent.logError(e);
diff --git a/src/test/java/org/openelisglobal/AppTestConfig.java b/src/test/java/org/openelisglobal/AppTestConfig.java
index c790fd6441..d3400f8eca 100644
--- a/src/test/java/org/openelisglobal/AppTestConfig.java
+++ b/src/test/java/org/openelisglobal/AppTestConfig.java
@@ -7,19 +7,43 @@
 import java.util.List;
 import lombok.NonNull;
 import org.openelisglobal.audittrail.dao.AuditTrailService;
+import org.openelisglobal.common.services.IStatusService;
 import org.openelisglobal.common.util.Versioning;
 import org.openelisglobal.dataexchange.fhir.service.FhirPersistanceService;
+import org.openelisglobal.dataexchange.service.order.ElectronicOrderService;
 import org.openelisglobal.externalconnections.service.BasicAuthenticationDataService;
 import org.openelisglobal.externalconnections.service.ExternalConnectionService;
 import org.openelisglobal.internationalization.MessageUtil;
 import org.openelisglobal.localization.dao.LocalizationDAO;
 import org.openelisglobal.localization.service.LocalizationServiceImpl;
+import org.openelisglobal.note.service.NoteService;
+import org.openelisglobal.referral.service.ReferralResultService;
+import org.openelisglobal.referral.service.ReferralSetService;
+
+import org.openelisglobal.notification.service.AnalysisNotificationConfigService;
+import org.openelisglobal.notification.service.TestNotificationConfigService;
+import org.openelisglobal.observationhistory.service.ObservationHistoryService;
+import org.openelisglobal.observationhistorytype.service.ObservationHistoryTypeService;
+import org.openelisglobal.organization.service.OrganizationService;
+import org.openelisglobal.program.service.ImmunohistochemistrySampleService;
+import org.openelisglobal.program.service.PathologySampleService;
+import org.openelisglobal.program.service.ProgramSampleService;
+import org.openelisglobal.provider.service.ProviderService;
+import org.openelisglobal.referral.service.ReferralService;
+import org.openelisglobal.requester.service.RequesterTypeService;
+import org.openelisglobal.requester.service.SampleRequesterService;
+import org.openelisglobal.sampleorganization.service.SampleOrganizationService;
+import org.openelisglobal.sampleqaevent.service.SampleQaEventService;
 import org.openelisglobal.siteinformation.service.SiteInformationService;
+import org.openelisglobal.statusofsample.service.StatusOfSampleService;
 import org.openelisglobal.test.dao.TestDAO;
+import org.openelisglobal.test.service.TestSectionService;
 import org.openelisglobal.test.service.TestServiceImpl;
 import org.openelisglobal.testresult.service.TestResultService;
 import org.openelisglobal.typeofsample.service.TypeOfSampleService;
 import org.openelisglobal.typeofsample.service.TypeOfSampleTestService;
+import org.openelisglobal.userrole.service.UserRoleService;
+import org.springframework.beans.factory.UnsatisfiedDependencyException;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -51,8 +75,13 @@
         "org.openelisglobal.systemusermodule.daoimpl", "org.openelisglobal.systemusermodule.service",
         "org.openelisglobal.login.service", "org.openelisglobal.view", "org.openelisglobal.search.service",
         "org.openelisglobal.sample.daoimpl", "org.openelisglobal.common.util",
+        "org.openelisglobal.login.service", "org.openelisglobal.view", "org.openelisglobal.search.service", 
+        "org.openelisglobal.sample", "org.openelisglobal.sampleitem.", "org.openelisglobal.analysis", "org.openelisglobal.result.service", 
+        "org.openelisglobal.result.daoimpl", "org.openelisglobal.resultlimit", "org.openelisglobal.resultlimits", 
+        "org.openelisglobal.typeoftestresult", "org.openelisglobal.samplehuman", 
         "org.openelisglobal.role", }, excludeFilters = {
                 @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.patient.controller.*"),
+                @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.sample.controller.*"),
                 @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.dictionary.controller.*.java"),
                 @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.config.*"),
                 @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.fhir.*"),
@@ -91,6 +120,138 @@ public BasicAuthenticationDataService basicAuthDataService() {
         return mock(BasicAuthenticationDataService.class);
     }
 
+    @Bean()
+    @Profile("test")
+    public NoteService noteServiceoteService() {
+        return mock(NoteService.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public SampleQaEventService sampleQaEventService() {
+        return mock(SampleQaEventService.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public SampleRequesterService sampleRequesterService() {
+        return mock(SampleRequesterService.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public RequesterTypeService requesterTypeService() {
+        return mock(RequesterTypeService.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public OrganizationService organizationService() {
+        return mock(OrganizationService.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public BasicAuthenticationDataService basicAuthenticationDataService() {
+        return mock(BasicAuthenticationDataService.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public ObservationHistoryService observationHistoryService() {
+        return mock(ObservationHistoryService.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public TestSectionService testSectionService() {
+        return mock(TestSectionService.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public ProviderService providerService() {
+        return mock(ProviderService.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public UserRoleService userRoleService() {
+        return mock(UserRoleService.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public TestNotificationConfigService testNotificationConfigService() {
+        return mock(TestNotificationConfigService.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public UnsatisfiedDependencyException unsatisfiedDependencyException() {
+        return mock(UnsatisfiedDependencyException.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public ElectronicOrderService electronicOrderService() {
+        return mock(ElectronicOrderService.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public AnalysisNotificationConfigService analysisNotificationConfigService() {
+        return mock(AnalysisNotificationConfigService.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public PathologySampleService pathologySampleService() {
+        return mock(PathologySampleService.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public ImmunohistochemistrySampleService immunohistochemistrySampleService() {
+        return mock(ImmunohistochemistrySampleService.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public ProgramSampleService programSampleService() {
+        return mock(ProgramSampleService.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public ObservationHistoryTypeService observationHistoryTypeService() {
+        return mock(ObservationHistoryTypeService.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public SampleOrganizationService sampleOrganizationService() {
+        return mock(SampleOrganizationService.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public ReferralResultService ReferralResultService() {
+        return mock(ReferralResultService.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public ReferralService referralService() {
+        return mock(ReferralService.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public ReferralSetService ReferralSetService() {
+        return mock(ReferralSetService.class);
+    }
+
     @Bean()
     @Profile("test")
     public TestServiceImpl testServiceImpl() {
@@ -168,6 +329,18 @@ public MappingJackson2HttpMessageConverter jsonConverter() {
         return jsonConverter;
     }
 
+    @Bean()
+    @Profile("test")
+    public IStatusService iStatusService() {
+        return mock(IStatusService.class);
+    }
+
+    @Bean()
+    @Profile("test")
+    public StatusOfSampleService statusOfSampleService() {
+        return mock(StatusOfSampleService.class);
+    }
+
     @Override
     public void configureMessageConverters(@NonNull List<HttpMessageConverter<?>> converters) {
         WebMvcConfigurer.super.configureMessageConverters(converters);
diff --git a/src/test/java/org/openelisglobal/sample/SampleServiceTest.java b/src/test/java/org/openelisglobal/sample/SampleServiceTest.java
new file mode 100644
index 0000000000..2c4afa83e7
--- /dev/null
+++ b/src/test/java/org/openelisglobal/sample/SampleServiceTest.java
@@ -0,0 +1,404 @@
+package org.openelisglobal.sample;
+
+import java.sql.Timestamp;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.sql.Date;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.openelisglobal.BaseWebContextSensitiveTest;
+import org.openelisglobal.common.util.ConfigurationProperties;
+import org.openelisglobal.patient.service.PatientService;
+import org.openelisglobal.patient.valueholder.Patient;
+import org.openelisglobal.person.service.PersonService;
+import org.openelisglobal.person.valueholder.Person;
+import org.openelisglobal.sample.service.SampleService;
+import org.openelisglobal.sample.valueholder.Sample;
+import org.openelisglobal.samplehuman.dao.SampleHumanDAO;
+import org.openelisglobal.samplehuman.service.SampleHumanService;
+import org.openelisglobal.samplehuman.valueholder.SampleHuman;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class SampleServiceTest extends BaseWebContextSensitiveTest {
+
+     @Autowired
+    PersonService personService;
+
+    @Autowired
+    PatientService patientService;
+
+    @Autowired
+    SampleService sampleService;
+    
+    @Autowired
+    SampleHumanService sampleHumanService;
+
+    SampleHumanDAO sampleHumanDAO;
+
+
+    @Before
+    public void init() throws Exception {
+
+        patientService.deleteAll(patientService.getAll());
+        personService.deleteAll(personService.getAll());
+        sampleService.deleteAll(sampleService.getAll());
+        sampleHumanService.deleteAll(sampleHumanService.getAll());
+    }
+
+    @After
+    public void tearDown() {
+        patientService.deleteAll(patientService.getAll());
+        personService.deleteAll(personService.getAll());
+        sampleService.deleteAll(sampleService.getAll());
+        sampleHumanService.deleteAll(sampleHumanService.getAll());
+    }
+
+    private Sample createSample(String receivedTimestamp, String accessionNumber) throws ParseException {
+
+        DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+        java.util.Date date = dateFormat.parse(receivedTimestamp);
+        long time = date.getTime();
+        Timestamp doc = new Timestamp(time);
+        
+        Sample sample = new Sample();
+        sample.setReceivedTimestamp(doc);
+        sample.setAccessionNumber(accessionNumber);
+
+        return sample;
+    }
+
+    @Test
+    public void createSample_shouldCreateNewSample() throws Exception {
+        Date enteredDate = Date.valueOf("2024-06-13");
+        String receivedTimestamp = "13/06/2024";
+        String accessionNumber = "123";
+        Sample samp = createSample(receivedTimestamp, accessionNumber);
+        samp.setEnteredDate(enteredDate);
+
+        Assert.assertEquals(0, sampleService.getAll().size());
+        // save person to the DB
+        String sampleId = sampleService.insert(samp);
+        Sample savedSample = sampleService.get(sampleId);
+
+        Assert.assertEquals(1, sampleService.getAll().size());
+        Assert.assertEquals(accessionNumber, savedSample.getAccessionNumber());
+        Assert.assertEquals("2024-06-13 00:00:00.0", savedSample.getReceivedTimestamp().toString());
+    }
+
+    @Test
+    public void getAccessionNumber_shouldReturnAccessionNumber() throws Exception {
+        Date enteredDate = Date.valueOf("2024-06-03");
+        String receivedTimestamp = "03/06/2024";
+        String accessionNumber = "12";
+        Sample samp = createSample(receivedTimestamp, accessionNumber);
+        samp.setEnteredDate(enteredDate);
+
+        Assert.assertEquals(0, sampleService.getAll().size());
+        // save person to the DB
+        String sampleId = sampleService.insert(samp);
+        Sample savedSample = sampleService.get(sampleId);
+        Assert.assertEquals(accessionNumber, savedSample.getAccessionNumber());
+    }
+
+    @Test
+    public void getSampleByAccessionNumber_shouldReturnSampleByAccessionNumber() throws Exception {
+        Date enteredDate = Date.valueOf("2024-06-03");
+        String receivedTimestamp = "03/06/2024";
+        String accessionNumber = "12";
+        Sample samp = createSample(receivedTimestamp, accessionNumber);
+        samp.setEnteredDate(enteredDate);
+
+        Assert.assertEquals(0, sampleService.getAll().size());
+        // save person to the DB
+        String sampleId = sampleService.insert(samp);
+        Sample savedSample = sampleService.getSampleByAccessionNumber(accessionNumber);
+        Assert.assertEquals("2024-06-03 00:00:00.0", savedSample.getReceivedTimestamp().toString());
+    }
+
+
+    @Test
+    public void insertDataWithAccessionNumber_shouldReturnsampleWithInsertedData() throws Exception {
+       Sample sample = new Sample();
+       Date enteredDate = Date.valueOf("2024-06-03");
+       DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+       java.util.Date date = dateFormat.parse("03/06/2024");
+       long time = date.getTime();
+       Timestamp doc = new Timestamp(time);
+       sample.setAccessionNumber("43");
+       sample.setReceivedTimestamp(doc);
+       sample.setEnteredDate(enteredDate);
+
+       String sampId = sampleService.insert(sample);
+       Sample savedSample = sampleService.getSampleByAccessionNumber("43");
+       savedSample.setEnumName("HIV4");
+       sampleService.update(savedSample);
+
+       Assert.assertEquals("HIV4", savedSample.getEnumName());
+    
+    }
+
+    @Test
+    public void getOrderedDate_shouldReturnOrderedDate()throws Exception{
+        Date enteredDate = Date.valueOf("2024-06-03");
+        String receivedTimestamp = "03/06/2024";
+        String accessionNumber = "12";
+        Sample samp = createSample(receivedTimestamp, accessionNumber);
+        samp.setEnteredDate(enteredDate);
+
+        String sampleId = sampleService.insert(samp);
+        Sample savedSample = sampleService.get(sampleId);
+        Assert.assertEquals("2024-06-03 00:00:00.0", sampleService.getOrderedDate(savedSample).toString());
+    }
+
+    @Test
+    public void getSamplesReceivedOn_shouldReturnSamplesOnDate()throws Exception{
+        Date enteredDate = Date.valueOf("2024-06-03");
+        Date recievedDate= Date.valueOf("2024-06-04");
+        String receivedTimestamp = "03/06/2024";
+        String accessionNumber = "12";
+        Sample samp = createSample(receivedTimestamp, accessionNumber);
+        samp.setEnteredDate(enteredDate);
+        samp.setReceivedDate(recievedDate);
+
+        String sampleId = sampleService.insert(samp);
+        int receivedSamples = sampleService.getSamplesReceivedOn("04/06/2024").size();
+        Assert.assertEquals(1, receivedSamples);
+    }
+
+    // @Test
+    // public void getSamplesForPatient_shouldReturnSamplesForPatient() throws Exception {
+        
+    //     Date enteredDate = Date.valueOf("2024-06-03");
+    //     String receivedTimestamp = "03/06/2024";
+    //     String accessionNumber = "12";
+    //     Sample samp = createSample(receivedTimestamp, accessionNumber);
+    //     samp.setEnteredDate(enteredDate);
+    //     String sampleId = sampleService.insert(samp);
+
+    //     Person person = new Person();
+    //     person.setFirstName("kasozi");
+    //     person.setLastName("paulaaa");
+    //     personService.save(person);
+
+    //     DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+    //     java.util.Date date = dateFormat.parse("03/06/2024");
+    //     long time = date.getTime();
+    //     Timestamp dob = new Timestamp(time);
+
+    //     Patient pat= new Patient();
+    //     pat.setPerson(person);
+    //     pat.setBirthDate(dob);
+    //     pat.setGender("M");
+    //     String patId = patientService.insert(pat);
+        
+
+    //     SampleHuman human = new SampleHuman();
+    //     human.setSampleId(sampleId);
+    //     human.setPatientId(patId);
+    //     String humanId = sampleHumanService.insert(human);
+
+    //     Assert.assertEquals(1, sampleHumanService.getSamplesForPatient(patId).size());
+
+    // }
+
+    @Test
+    public void getReceivedDateForDisplay_shouldReturnReceivedDateForDisplay()throws Exception{
+        Date enteredDate = Date.valueOf("2024-06-03");
+        Date recievedDate= Date.valueOf("2024-06-04");
+        String receivedTimestamp = "03/06/2024";
+        String accessionNumber = "12";
+        Sample samp = createSample(receivedTimestamp, accessionNumber);
+        samp.setEnteredDate(enteredDate);
+        samp.setReceivedDate(recievedDate);
+        samp.setReceivedDateForDisplay("04/06/2024");
+
+        String sampleId = sampleService.insert(samp);
+        Sample savedSample = sampleService.get(sampleId);
+        
+        Assert.assertEquals("04/06/2024", sampleService.getReceivedDateForDisplay(savedSample));
+    }
+
+    @Test
+    public void getReceived24HourTimeForDisplay_shouldReturnReceived24HourTimeForDisplay()throws Exception{
+        Date enteredDate = Date.valueOf("2024-06-03");
+        String receivedTimestamp = "03/06/2024";
+        String accessionNumber = "12";
+        Sample samp = createSample(receivedTimestamp, accessionNumber);
+        samp.setEnteredDate(enteredDate);
+
+        String sampleId = sampleService.insert(samp);
+        Sample savedSample = sampleService.get(sampleId);
+        Assert.assertEquals("00:00", sampleService.getReceived24HourTimeForDisplay(savedSample));
+    }
+
+    @Test
+    public void getReceivedTimeForDisplay_shouldReturnReceivedTimeForDisplay()throws Exception{
+        Date enteredDate = Date.valueOf("2024-06-03");
+        String receivedTimestamp = "03/06/2024";
+        String accessionNumber = "12";
+        Sample samp = createSample(receivedTimestamp, accessionNumber);
+        samp.setEnteredDate(enteredDate);
+        samp.setReceivedDateForDisplay("04/06/2024");
+
+        String sampleId = sampleService.insert(samp);
+        Sample savedSample = sampleService.get(sampleId);
+        
+        Assert.assertEquals("00:00", sampleService.getReceivedTimeForDisplay(savedSample));
+    }
+
+    @Test
+    public void isConfirmationSample_shouldReturnisConfirmationSample()throws Exception{
+        Date enteredDate = Date.valueOf("2024-06-03");
+        String receivedTimestamp = "03/06/2024";
+        String accessionNumber = "12";
+        Sample samp = createSample(receivedTimestamp, accessionNumber);
+        samp.setEnteredDate(enteredDate);
+        samp.setIsConfirmation(true);
+
+        String sampleId = sampleService.insert(samp);
+        Sample savedSample = sampleService.get(sampleId);
+
+        assertFalse(sampleService.isConfirmationSample(null));
+        assertTrue(sampleService.isConfirmationSample(savedSample));
+    }
+
+    @Test
+    public void getReceivedDateWithTwoYearDisplay_shouldReturnReceivedDateWithTwoYearDisplay()throws Exception{
+        Date enteredDate = Date.valueOf("2024-06-03");
+        String receivedTimestamp = "03/06/2024";
+        String accessionNumber = "12";
+        Sample samp = createSample(receivedTimestamp, accessionNumber);
+        samp.setEnteredDate(enteredDate);
+
+        String sampleId = sampleService.insert(samp);
+        Sample savedSample = sampleService.get(sampleId);
+        Assert.assertEquals("03/06/24", sampleService.getReceivedDateWithTwoYearDisplay(savedSample));
+    }
+
+    @Test
+    public void getConfirmationSamplesReceivedInDateRange_shouldReturnConfirmationSamplesReceivedInDateRange()throws Exception{
+        Date recievedDateStart = Date.valueOf("2024-06-03");
+        Date recievedDateEnd = Date.valueOf("2024-06-04");
+        Date enteredDate = Date.valueOf("2024-06-03");
+        String receivedTimestamp = "03/06/2024";
+        String accessionNumber = "12";
+        Sample samp = createSample(receivedTimestamp, accessionNumber);
+        samp.setEnteredDate(enteredDate);
+        samp.setIsConfirmation(true);
+
+        String sampleId = sampleService.insert(samp);
+        Sample savedSample = sampleService.get(sampleId);
+        Assert.assertEquals(1, sampleService.getConfirmationSamplesReceivedInDateRange(recievedDateStart, recievedDateEnd).size());
+    }
+
+    @Test
+    public void getSamplesCollectedOn_shouldReturnSamplesCollected() throws Exception {
+        Date enteredDate = Date.valueOf("2024-06-03");
+        String receivedTimestamp = "03/06/2024";
+        String accessionNumber = "123";
+        String collectionDate="03/06/2024";
+
+        Date enteredDate2 = Date.valueOf("2024-06-04");
+        String receivedTimestamp2 = "03/06/2024";
+        String accessionNumber2 = "312";
+
+        DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+        java.util.Date date = dateFormat.parse(collectionDate);
+        long time = date.getTime();
+        Timestamp doc = new Timestamp(time);
+
+        Sample samp = createSample(receivedTimestamp, accessionNumber);
+        samp.setEnteredDate(enteredDate);
+        samp.setCollectionDate(doc);
+        String sampleId = sampleService.insert(samp);
+
+
+        DateFormat dateFormat2 = new SimpleDateFormat("dd/MM/yyyy");
+        java.util.Date date2 = dateFormat2.parse(collectionDate);
+        long time2 = date2.getTime();
+        Timestamp doc2 = new Timestamp(time2);
+
+        Sample samp2 = createSample(receivedTimestamp2, accessionNumber2);
+        samp2.setEnteredDate(enteredDate2);
+        samp2.setCollectionDate(doc2);
+        String sampleId2 = sampleService.insert(samp2);
+        Assert.assertEquals(2, sampleService.getSamplesCollectedOn(collectionDate).size());
+    }
+
+    @Test
+    public void getLargestAccessionNumber_shouldReturnLargestAccessionNumber() throws Exception {
+        Date enteredDate = Date.valueOf("2024-06-03");
+        String receivedTimestamp = "03/06/2024";
+        String accessionNumber = "123";
+
+        Date enteredDate2 = Date.valueOf("2024-06-04");
+        String receivedTimestamp2 = "03/06/2024";
+        String accessionNumber2 = "312";
+
+        Sample samp = createSample(receivedTimestamp, accessionNumber);
+        samp.setEnteredDate(enteredDate);
+        String sampleId = sampleService.insert(samp);
+
+        Sample samp2 = createSample(receivedTimestamp2, accessionNumber2);
+        samp2.setEnteredDate(enteredDate2);
+        String sampleId2 = sampleService.insert(samp2);
+        Assert.assertEquals(accessionNumber2, sampleService.getLargestAccessionNumber());
+    }
+
+    @Test
+    public void getSamplesReceivedInDateRange_shouldReturnSamplesReceivedInDateRange()throws Exception{
+        String recievedDateStart = "03/06/2024";
+        String recievedDateEnd = "04/06/2024";
+        Date enteredDate = Date.valueOf("2024-06-03");
+        String receivedTimestamp = "03/06/2024";
+        String accessionNumber = "12";
+        Sample samp = createSample(receivedTimestamp, accessionNumber);
+        samp.setEnteredDate(enteredDate);
+
+        String sampleId = sampleService.insert(samp);
+        Sample savedSample = sampleService.get(sampleId);
+        Assert.assertEquals(1, sampleService.getSamplesReceivedInDateRange(recievedDateStart, recievedDateEnd).size());
+    }
+
+    @Test
+    public void getSamplesByAccessionRange_shouldReturnSamplesByAccessionRange() throws Exception {
+        Date enteredDate = Date.valueOf("2024-06-03");
+        String receivedTimestamp = "03/06/2024";
+        String accessionNumber = "123";
+
+        Date enteredDate2 = Date.valueOf("2024-06-04");
+        String receivedTimestamp2 = "03/06/2024";
+        String accessionNumber2 = "312";
+
+        Sample samp = createSample(receivedTimestamp, accessionNumber);
+        samp.setEnteredDate(enteredDate);
+        String sampleId = sampleService.insert(samp);
+
+        Sample samp2 = createSample(receivedTimestamp2, accessionNumber2);
+        samp2.setEnteredDate(enteredDate2);
+        String sampleId2 = sampleService.insert(samp2);
+        Assert.assertEquals(2, sampleService.getSamplesByAccessionRange(accessionNumber, accessionNumber2).size());
+    }
+
+    @Test
+    public void getId_shouldReturnId()throws Exception{
+        Date enteredDate = Date.valueOf("2024-06-03");
+        String receivedTimestamp = "03/06/2024";
+        String accessionNumber = "12";
+        Sample samp = createSample(receivedTimestamp, accessionNumber);
+        samp.setEnteredDate(enteredDate);
+
+        String sampleId = sampleService.insert(samp);
+        Sample savedSample = sampleService.get(sampleId);
+        Assert.assertEquals(sampleId, sampleService.getId(savedSample));
+    }
+   }

From fbe793933acdbf511a25b8bf379fbfb52fa395ee Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Mon, 28 Oct 2024 19:31:46 +0300
Subject: [PATCH 18/56] minor fixes in config properties

---
 dev.docker-compose.yml                        |   1 +
 .../dataexchange/fhir/FhirConfig.java         |  10 +-
 .../properties/SystemConfiguration.properties | 131 ++++++++++++++++++
 3 files changed, 137 insertions(+), 5 deletions(-)
 create mode 100644 volume/properties/SystemConfiguration.properties

diff --git a/dev.docker-compose.yml b/dev.docker-compose.yml
index 3813849783..ca0316e512 100644
--- a/dev.docker-compose.yml
+++ b/dev.docker-compose.yml
@@ -59,6 +59,7 @@ services:
             - ./volume/plugins/:/var/lib/openelis-global/plugins
             - ./volume/tomcat/oe_server.xml:/usr/local/tomcat/conf/server.xml
             - ./target/OpenELIS-Global.war:/usr/local/tomcat/webapps/OpenELIS-Global.war
+            - ./volume/properties/SystemConfiguration.properties:/var/lib/openelis-global/properties/SystemConfiguration.properties
             -  lucene_index-vol:/var/lib/lucene_index
         secrets:
             - source: datasource.password
diff --git a/src/main/java/org/openelisglobal/dataexchange/fhir/FhirConfig.java b/src/main/java/org/openelisglobal/dataexchange/fhir/FhirConfig.java
index d4a7aab6de..3f197008a9 100644
--- a/src/main/java/org/openelisglobal/dataexchange/fhir/FhirConfig.java
+++ b/src/main/java/org/openelisglobal/dataexchange/fhir/FhirConfig.java
@@ -31,11 +31,11 @@ public class FhirConfig {
     private String oeFhirSystem;
 
     @Getter
-    @Value("${org.openelisglobal.fhirstore.uri}")
+    @Value("${org.openelisglobal.fhirstore.uri:}")
     private String localFhirStorePath;
 
     @Getter
-    @Value("${org.openelisglobal.remote.source.uri}")
+    @Value("${org.openelisglobal.remote.source.uri:}")
     private String[] remoteStorePaths;
 
     @Getter
@@ -47,15 +47,15 @@ public class FhirConfig {
     private String password;
 
     @Getter
-    @Value("${org.openelisglobal.crserver.uri}")
+    @Value("${org.openelisglobal.crserver.uri:}")
     private String clientRegistryServerUrl;
 
     @Getter
-    @Value("${org.openelisglobal.crserver.username}")
+    @Value("${org.openelisglobal.crserver.username:}")
     private String clientRegistryUserName;
 
     @Getter
-    @Value("${org.openelisglobal.crserver.password}")
+    @Value("${org.openelisglobal.crserver.password:}")
     private String clientRegistryPassword;
 
     @Value("${org.openelisglobal.remote.source.identifier:}#{T(java.util.Collections).emptyList()}")
diff --git a/volume/properties/SystemConfiguration.properties b/volume/properties/SystemConfiguration.properties
new file mode 100644
index 0000000000..681e895983
--- /dev/null
+++ b/volume/properties/SystemConfiguration.properties
@@ -0,0 +1,131 @@
+# System Config properties
+###### Un comment the properties below to overide the Configuration proporties from the DB
+# date.ambiguous.date.value=
+# date.ambiguous.date.holder=
+# organization.reference.lab.parent=
+# setFieldForm=
+# passwordRequirements=
+# stringContext=
+# statusRules=
+# siteNumber=
+# SiteName=
+# Address line 1 label=
+# Address line 2 label=
+# Address line 3 label=
+# Geographic Unit 1 Label=
+# Geographic Unit 2 Label=
+# acessionFormat=
+# reflexAction=
+# TrainingInstallation=
+# useExternalPatientSource=
+# patientSearchURL=
+# patientSearchLogOnUser=
+# PatientSearchPassword=
+# PatientSearchEnabled=
+# lab director=
+# allowLanguageChange=
+# resultReporting=
+# resultReportingURL=
+# malariaSurReport=
+# malariaSurURL=
+# malariaCaseReport=
+# malariaCaseURL=
+# releaseNumber=
+# configuration name=
+# testUsageAggregationUrl=
+# testUsageReporting=
+# modify results role=
+# modify results note required=
+# ResultTechnicianName=
+# customCriticalMessage=
+# allowResultRejection=
+# restrictFreeTextRefSiteEntry=
+# restrictFreeTextMethodEntry=
+# restrictFreeTextProviderEntry=
+# autoFillTechNameBox=
+# autoFillTechNameUser=
+# auto-fill collection date/time=
+# showValidationFailureIcon=
+# results.send.retry.time=
+# trackPayment=
+# validateAccessionNumber=
+# alertWhenInvalidResult=
+# default language locale=
+# default date locale=
+# condenseNFS=
+# roleForPatientOnResults=
+# reportPageNumbers=
+# sortQaEvents=
+# validate all results=
+# additional site info=
+# subject on workplan=
+# next visit on workplan=
+# results on workplan=
+# external orders=
+# non-conformity signature=
+# Reception as unit=
+# Collection as unit=
+# Accession number prefix=
+# validationOnlyNotesAreExternal=
+# phone format=
+# validate phone format=
+# Allow duplicate subject number=
+# Allow duplicate national ids=
+# validateTechnicalRejection=
+# augmentTestNameWithType=
+# billingRefNumber=
+# billingRefNumberLocalization=
+# Program=
+# bannerHeading=
+# 24 hour clock=
+# supportPatientNationality=
+# Patient ID required=
+# Subject number required=
+# National ID required=
+# sample id required=
+# numMaxOrderLabels=
+# numMaxSpecimenLabels=
+# numMaxAliquotLabels=
+# numDefaultOrderLabels=
+# numDefaultSpecimenLabels=
+# numDefaultAliquotLabels=
+# heightOrderLabels=
+# widthOrderLabels=
+# heightSpecimenLabels=
+# widthSpecimenLabels=
+# collectionDateCheck=
+# patientSexCheck=
+# collectedByCheck=
+# testsCheck=
+# heightBlockLabels=
+# widthBlockLabels=
+# heightSlideLabels=
+# widthSlideLabels=
+# prePrintAltAccessionPrefix=
+# prePrintUseAltAccession=
+# useAlphanumAccessionPrefix=
+# alphanumAccessionPrefix=
+# labDirectorName=
+# labDirectorTitle=
+# infoHighway.username=
+# infoHighway.password=
+# infoHighway.uri=
+# infoHighway.enabled=
+# patientresultsbmpsms.username=
+# patientresultsbmpsms.password=
+# patientresultsbmpsms.uri=
+# patientresultsbmpsms.enabled=
+# patientresultssmpp.username=
+# patientresultssmpp.password=
+# patientresultssmpp.uri=
+# patientresultssmpp.enabled=
+# patientresultssmtp.username=
+# patientresultssmtp.password=
+# patientresultssmtp.uri=
+# patientresultssmtp.enabled=
+# contactTracingEnabled=
+#requireLabUnitAtLogin=
+# enableClientRegistry=
+
+
+

From 3e074bb7801500a2b8c0b6f6ffc36716ec2a7b53 Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Mon, 28 Oct 2024 19:45:48 +0300
Subject: [PATCH 19/56] build and publish fhir and proxy images

---
 .github/workflows/publish-and-test.yml | 165 +++++++++++++++++++++++++
 dev.docker-compose.yml                 |   4 +-
 test.docker-compose.yml                |   8 +-
 3 files changed, 169 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/publish-and-test.yml b/.github/workflows/publish-and-test.yml
index 7f34437bd6..3aaa45ec0a 100644
--- a/.github/workflows/publish-and-test.yml
+++ b/.github/workflows/publish-and-test.yml
@@ -188,6 +188,88 @@ jobs:
           # cache-from: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-frontend:buildcache
           cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-frontend:buildcache,mode=max
 
+  build-and-push-test-image-proxy:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # Add support for more platforms with QEMU (optional)
+      # https://github.com/docker/setup-qemu-action
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.DOCKER_TEST_NAME }}-proxy
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: ./nginx-proxy
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          # cache-from: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-frontend:buildcache
+          cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-proxy:buildcache,mode=max      
+   
+  build-and-push-test-image-fhir:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # Add support for more platforms with QEMU (optional)
+      # https://github.com/docker/setup-qemu-action
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.DOCKER_TEST_NAME }}-fhir
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: ./fhir
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          # cache-from: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-frontend:buildcache
+          cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-fhir:buildcache,mode=max
+
   run-e2e-qa:
     needs:
       [build-and-push-test-image-backend, build-and-push-test-image-frontend]
@@ -303,3 +385,86 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-frontend:buildcache
           cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-frontend:buildcache,mode=max
+
+
+  build-and-push-image-proxy:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # Add support for more platforms with QEMU (optional)
+      # https://github.com/docker/setup-qemu-action
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.DOCKER_NAME }}-proxy
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: ./nginx-proxy
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-proxy:buildcache
+          cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-proxy:buildcache,mode=max      
+   
+  build-and-push-image-fhir:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # Add support for more platforms with QEMU (optional)
+      # https://github.com/docker/setup-qemu-action
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.DOCKER_NAME }}-fhir
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: ./fhir
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-fhir:buildcache
+          cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-fhir:buildcache,mode=max
diff --git a/dev.docker-compose.yml b/dev.docker-compose.yml
index ca0316e512..17ea7322b4 100644
--- a/dev.docker-compose.yml
+++ b/dev.docker-compose.yml
@@ -67,7 +67,7 @@ services:
             
     fhir.openelis.org:
         container_name: external-fhir-api
-        image: hapiproject/hapi:v6.6.0-tomcat
+        image: itechuw/openelis-global-2-fhir:develop
         depends_on:
             - database
             - certs
@@ -108,7 +108,7 @@ services:
         tty: true
 
     proxy:
-        image: nginx:1.15-alpine
+        image: itechuw/openelis-global-2-proxy:develop
         container_name: openelisglobal-proxy
         ports:
             - 80:80
diff --git a/test.docker-compose.yml b/test.docker-compose.yml
index 7bc64524c1..8908cfef68 100644
--- a/test.docker-compose.yml
+++ b/test.docker-compose.yml
@@ -69,9 +69,7 @@ services:
 
   fhir.openelis.org:
     container_name: external-fhir-api
-    build:
-      context: ./fhir
-      dockerfile: ./Dockerfile
+    image: "${DOCKER_TEST_NAME}-fhir:${GITHUB_REF_NAME}"
     depends_on:
       - database
       - certs
@@ -109,9 +107,7 @@ services:
       start_period: 2m
 
   proxy:
-    build:
-      context: ./nginx-proxy
-      dockerfile: ./Dockerfile
+    image: "${DOCKER_TEST_NAME}-proxy:${GITHUB_REF_NAME}"
     container_name: openelisglobal-proxy
     ports:
       - 80:80

From 6f242433cce30f9ee8cfb093b8dd16cdbc4397a6 Mon Sep 17 00:00:00 2001
From: josephbate <sjb.lav@gmail.com>
Date: Mon, 28 Oct 2024 20:22:31 +0300
Subject: [PATCH 20/56] formatting fix

---
 .../daoimpl/SampleHumanDAOImpl.java           |  2 +-
 .../org/openelisglobal/AppTestConfig.java     | 15 ++-
 .../sample/SampleServiceTest.java             | 92 +++++++++----------
 3 files changed, 51 insertions(+), 58 deletions(-)

diff --git a/src/main/java/org/openelisglobal/samplehuman/daoimpl/SampleHumanDAOImpl.java b/src/main/java/org/openelisglobal/samplehuman/daoimpl/SampleHumanDAOImpl.java
index 35ea8536e1..36684fdae4 100644
--- a/src/main/java/org/openelisglobal/samplehuman/daoimpl/SampleHumanDAOImpl.java
+++ b/src/main/java/org/openelisglobal/samplehuman/daoimpl/SampleHumanDAOImpl.java
@@ -145,7 +145,7 @@ public List<Sample> getSamplesForPatient(String patientID) throws LIMSRuntimeExc
                     + " sampleHuman.sampleId = sample.id and sampleHuman.patientId = :patientId order by"
                     + " sample.id";
             Query<Sample> query = entityManager.unwrap(Session.class).createQuery(sql, Sample.class);
-            query.setParameter("patientId", patientID);
+            query.setParameter("patientId", Integer.parseInt(patientID));
             samples = query.list();
         } catch (HibernateException e) {
             LogEvent.logError(e);
diff --git a/src/test/java/org/openelisglobal/AppTestConfig.java b/src/test/java/org/openelisglobal/AppTestConfig.java
index d3400f8eca..58b807c5eb 100644
--- a/src/test/java/org/openelisglobal/AppTestConfig.java
+++ b/src/test/java/org/openelisglobal/AppTestConfig.java
@@ -17,9 +17,6 @@
 import org.openelisglobal.localization.dao.LocalizationDAO;
 import org.openelisglobal.localization.service.LocalizationServiceImpl;
 import org.openelisglobal.note.service.NoteService;
-import org.openelisglobal.referral.service.ReferralResultService;
-import org.openelisglobal.referral.service.ReferralSetService;
-
 import org.openelisglobal.notification.service.AnalysisNotificationConfigService;
 import org.openelisglobal.notification.service.TestNotificationConfigService;
 import org.openelisglobal.observationhistory.service.ObservationHistoryService;
@@ -29,7 +26,9 @@
 import org.openelisglobal.program.service.PathologySampleService;
 import org.openelisglobal.program.service.ProgramSampleService;
 import org.openelisglobal.provider.service.ProviderService;
+import org.openelisglobal.referral.service.ReferralResultService;
 import org.openelisglobal.referral.service.ReferralService;
+import org.openelisglobal.referral.service.ReferralSetService;
 import org.openelisglobal.requester.service.RequesterTypeService;
 import org.openelisglobal.requester.service.SampleRequesterService;
 import org.openelisglobal.sampleorganization.service.SampleOrganizationService;
@@ -74,11 +73,11 @@
         "org.openelisglobal.systemusermodule.service", "org.openelisglobal.rolemodule.service",
         "org.openelisglobal.systemusermodule.daoimpl", "org.openelisglobal.systemusermodule.service",
         "org.openelisglobal.login.service", "org.openelisglobal.view", "org.openelisglobal.search.service",
-        "org.openelisglobal.sample.daoimpl", "org.openelisglobal.common.util",
-        "org.openelisglobal.login.service", "org.openelisglobal.view", "org.openelisglobal.search.service", 
-        "org.openelisglobal.sample", "org.openelisglobal.sampleitem.", "org.openelisglobal.analysis", "org.openelisglobal.result.service", 
-        "org.openelisglobal.result.daoimpl", "org.openelisglobal.resultlimit", "org.openelisglobal.resultlimits", 
-        "org.openelisglobal.typeoftestresult", "org.openelisglobal.samplehuman", 
+        "org.openelisglobal.sample.daoimpl", "org.openelisglobal.common.util", "org.openelisglobal.login.service",
+        "org.openelisglobal.view", "org.openelisglobal.search.service", "org.openelisglobal.sample",
+        "org.openelisglobal.sampleitem.", "org.openelisglobal.analysis", "org.openelisglobal.result.service",
+        "org.openelisglobal.result.daoimpl", "org.openelisglobal.resultlimit", "org.openelisglobal.resultlimits",
+        "org.openelisglobal.typeoftestresult", "org.openelisglobal.samplehuman",
         "org.openelisglobal.role", }, excludeFilters = {
                 @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.patient.controller.*"),
                 @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.sample.controller.*"),
diff --git a/src/test/java/org/openelisglobal/sample/SampleServiceTest.java b/src/test/java/org/openelisglobal/sample/SampleServiceTest.java
index 2c4afa83e7..5ef7b6d46c 100644
--- a/src/test/java/org/openelisglobal/sample/SampleServiceTest.java
+++ b/src/test/java/org/openelisglobal/sample/SampleServiceTest.java
@@ -1,22 +1,18 @@
 package org.openelisglobal.sample;
 
-import java.sql.Timestamp;
-
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.sql.Date;
+import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.List;
-
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.openelisglobal.BaseWebContextSensitiveTest;
-import org.openelisglobal.common.util.ConfigurationProperties;
 import org.openelisglobal.patient.service.PatientService;
 import org.openelisglobal.patient.valueholder.Patient;
 import org.openelisglobal.person.service.PersonService;
@@ -30,7 +26,7 @@
 
 public class SampleServiceTest extends BaseWebContextSensitiveTest {
 
-     @Autowired
+    @Autowired
     PersonService personService;
 
     @Autowired
@@ -38,13 +34,12 @@ public class SampleServiceTest extends BaseWebContextSensitiveTest {
 
     @Autowired
     SampleService sampleService;
-    
+
     @Autowired
     SampleHumanService sampleHumanService;
 
     SampleHumanDAO sampleHumanDAO;
 
-
     @Before
     public void init() throws Exception {
 
@@ -56,7 +51,7 @@ public void init() throws Exception {
 
     @After
     public void tearDown() {
-        patientService.deleteAll(patientService.getAll());
+        // patientService.deleteAll(patientService.getAll());
         personService.deleteAll(personService.getAll());
         sampleService.deleteAll(sampleService.getAll());
         sampleHumanService.deleteAll(sampleHumanService.getAll());
@@ -68,7 +63,7 @@ private Sample createSample(String receivedTimestamp, String accessionNumber) th
         java.util.Date date = dateFormat.parse(receivedTimestamp);
         long time = date.getTime();
         Timestamp doc = new Timestamp(time);
-        
+
         Sample sample = new Sample();
         sample.setReceivedTimestamp(doc);
         sample.setAccessionNumber(accessionNumber);
@@ -124,30 +119,29 @@ public void getSampleByAccessionNumber_shouldReturnSampleByAccessionNumber() thr
         Assert.assertEquals("2024-06-03 00:00:00.0", savedSample.getReceivedTimestamp().toString());
     }
 
-
     @Test
     public void insertDataWithAccessionNumber_shouldReturnsampleWithInsertedData() throws Exception {
-       Sample sample = new Sample();
-       Date enteredDate = Date.valueOf("2024-06-03");
-       DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
-       java.util.Date date = dateFormat.parse("03/06/2024");
-       long time = date.getTime();
-       Timestamp doc = new Timestamp(time);
-       sample.setAccessionNumber("43");
-       sample.setReceivedTimestamp(doc);
-       sample.setEnteredDate(enteredDate);
-
-       String sampId = sampleService.insert(sample);
-       Sample savedSample = sampleService.getSampleByAccessionNumber("43");
-       savedSample.setEnumName("HIV4");
-       sampleService.update(savedSample);
-
-       Assert.assertEquals("HIV4", savedSample.getEnumName());
-    
+        Sample sample = new Sample();
+        Date enteredDate = Date.valueOf("2024-06-03");
+        DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+        java.util.Date date = dateFormat.parse("03/06/2024");
+        long time = date.getTime();
+        Timestamp doc = new Timestamp(time);
+        sample.setAccessionNumber("43");
+        sample.setReceivedTimestamp(doc);
+        sample.setEnteredDate(enteredDate);
+
+        String sampId = sampleService.insert(sample);
+        Sample savedSample = sampleService.getSampleByAccessionNumber("43");
+        savedSample.setEnumName("HIV4");
+        sampleService.update(savedSample);
+
+        Assert.assertEquals("HIV4", savedSample.getEnumName());
+
     }
 
     @Test
-    public void getOrderedDate_shouldReturnOrderedDate()throws Exception{
+    public void getOrderedDate_shouldReturnOrderedDate() throws Exception {
         Date enteredDate = Date.valueOf("2024-06-03");
         String receivedTimestamp = "03/06/2024";
         String accessionNumber = "12";
@@ -160,9 +154,9 @@ public void getOrderedDate_shouldReturnOrderedDate()throws Exception{
     }
 
     @Test
-    public void getSamplesReceivedOn_shouldReturnSamplesOnDate()throws Exception{
+    public void getSamplesReceivedOn_shouldReturnSamplesOnDate() throws Exception {
         Date enteredDate = Date.valueOf("2024-06-03");
-        Date recievedDate= Date.valueOf("2024-06-04");
+        Date recievedDate = Date.valueOf("2024-06-04");
         String receivedTimestamp = "03/06/2024";
         String accessionNumber = "12";
         Sample samp = createSample(receivedTimestamp, accessionNumber);
@@ -176,7 +170,7 @@ public void getSamplesReceivedOn_shouldReturnSamplesOnDate()throws Exception{
 
     // @Test
     // public void getSamplesForPatient_shouldReturnSamplesForPatient() throws Exception {
-        
+
     //     Date enteredDate = Date.valueOf("2024-06-03");
     //     String receivedTimestamp = "03/06/2024";
     //     String accessionNumber = "12";
@@ -194,12 +188,11 @@ public void getSamplesReceivedOn_shouldReturnSamplesOnDate()throws Exception{
     //     long time = date.getTime();
     //     Timestamp dob = new Timestamp(time);
 
-    //     Patient pat= new Patient();
+    //     Patient pat = new Patient();
     //     pat.setPerson(person);
     //     pat.setBirthDate(dob);
     //     pat.setGender("M");
     //     String patId = patientService.insert(pat);
-        
 
     //     SampleHuman human = new SampleHuman();
     //     human.setSampleId(sampleId);
@@ -211,9 +204,9 @@ public void getSamplesReceivedOn_shouldReturnSamplesOnDate()throws Exception{
     // }
 
     @Test
-    public void getReceivedDateForDisplay_shouldReturnReceivedDateForDisplay()throws Exception{
+    public void getReceivedDateForDisplay_shouldReturnReceivedDateForDisplay() throws Exception {
         Date enteredDate = Date.valueOf("2024-06-03");
-        Date recievedDate= Date.valueOf("2024-06-04");
+        Date recievedDate = Date.valueOf("2024-06-04");
         String receivedTimestamp = "03/06/2024";
         String accessionNumber = "12";
         Sample samp = createSample(receivedTimestamp, accessionNumber);
@@ -223,12 +216,12 @@ public void getReceivedDateForDisplay_shouldReturnReceivedDateForDisplay()throws
 
         String sampleId = sampleService.insert(samp);
         Sample savedSample = sampleService.get(sampleId);
-        
+
         Assert.assertEquals("04/06/2024", sampleService.getReceivedDateForDisplay(savedSample));
     }
 
     @Test
-    public void getReceived24HourTimeForDisplay_shouldReturnReceived24HourTimeForDisplay()throws Exception{
+    public void getReceived24HourTimeForDisplay_shouldReturnReceived24HourTimeForDisplay() throws Exception {
         Date enteredDate = Date.valueOf("2024-06-03");
         String receivedTimestamp = "03/06/2024";
         String accessionNumber = "12";
@@ -241,7 +234,7 @@ public void getReceived24HourTimeForDisplay_shouldReturnReceived24HourTimeForDis
     }
 
     @Test
-    public void getReceivedTimeForDisplay_shouldReturnReceivedTimeForDisplay()throws Exception{
+    public void getReceivedTimeForDisplay_shouldReturnReceivedTimeForDisplay() throws Exception {
         Date enteredDate = Date.valueOf("2024-06-03");
         String receivedTimestamp = "03/06/2024";
         String accessionNumber = "12";
@@ -251,12 +244,12 @@ public void getReceivedTimeForDisplay_shouldReturnReceivedTimeForDisplay()throws
 
         String sampleId = sampleService.insert(samp);
         Sample savedSample = sampleService.get(sampleId);
-        
+
         Assert.assertEquals("00:00", sampleService.getReceivedTimeForDisplay(savedSample));
     }
 
     @Test
-    public void isConfirmationSample_shouldReturnisConfirmationSample()throws Exception{
+    public void isConfirmationSample_shouldReturnisConfirmationSample() throws Exception {
         Date enteredDate = Date.valueOf("2024-06-03");
         String receivedTimestamp = "03/06/2024";
         String accessionNumber = "12";
@@ -272,7 +265,7 @@ public void isConfirmationSample_shouldReturnisConfirmationSample()throws Except
     }
 
     @Test
-    public void getReceivedDateWithTwoYearDisplay_shouldReturnReceivedDateWithTwoYearDisplay()throws Exception{
+    public void getReceivedDateWithTwoYearDisplay_shouldReturnReceivedDateWithTwoYearDisplay() throws Exception {
         Date enteredDate = Date.valueOf("2024-06-03");
         String receivedTimestamp = "03/06/2024";
         String accessionNumber = "12";
@@ -285,7 +278,8 @@ public void getReceivedDateWithTwoYearDisplay_shouldReturnReceivedDateWithTwoYea
     }
 
     @Test
-    public void getConfirmationSamplesReceivedInDateRange_shouldReturnConfirmationSamplesReceivedInDateRange()throws Exception{
+    public void getConfirmationSamplesReceivedInDateRange_shouldReturnConfirmationSamplesReceivedInDateRange()
+            throws Exception {
         Date recievedDateStart = Date.valueOf("2024-06-03");
         Date recievedDateEnd = Date.valueOf("2024-06-04");
         Date enteredDate = Date.valueOf("2024-06-03");
@@ -297,7 +291,8 @@ public void getConfirmationSamplesReceivedInDateRange_shouldReturnConfirmationSa
 
         String sampleId = sampleService.insert(samp);
         Sample savedSample = sampleService.get(sampleId);
-        Assert.assertEquals(1, sampleService.getConfirmationSamplesReceivedInDateRange(recievedDateStart, recievedDateEnd).size());
+        Assert.assertEquals(1,
+                sampleService.getConfirmationSamplesReceivedInDateRange(recievedDateStart, recievedDateEnd).size());
     }
 
     @Test
@@ -305,7 +300,7 @@ public void getSamplesCollectedOn_shouldReturnSamplesCollected() throws Exceptio
         Date enteredDate = Date.valueOf("2024-06-03");
         String receivedTimestamp = "03/06/2024";
         String accessionNumber = "123";
-        String collectionDate="03/06/2024";
+        String collectionDate = "03/06/2024";
 
         Date enteredDate2 = Date.valueOf("2024-06-04");
         String receivedTimestamp2 = "03/06/2024";
@@ -321,7 +316,6 @@ public void getSamplesCollectedOn_shouldReturnSamplesCollected() throws Exceptio
         samp.setCollectionDate(doc);
         String sampleId = sampleService.insert(samp);
 
-
         DateFormat dateFormat2 = new SimpleDateFormat("dd/MM/yyyy");
         java.util.Date date2 = dateFormat2.parse(collectionDate);
         long time2 = date2.getTime();
@@ -355,7 +349,7 @@ public void getLargestAccessionNumber_shouldReturnLargestAccessionNumber() throw
     }
 
     @Test
-    public void getSamplesReceivedInDateRange_shouldReturnSamplesReceivedInDateRange()throws Exception{
+    public void getSamplesReceivedInDateRange_shouldReturnSamplesReceivedInDateRange() throws Exception {
         String recievedDateStart = "03/06/2024";
         String recievedDateEnd = "04/06/2024";
         Date enteredDate = Date.valueOf("2024-06-03");
@@ -390,7 +384,7 @@ public void getSamplesByAccessionRange_shouldReturnSamplesByAccessionRange() thr
     }
 
     @Test
-    public void getId_shouldReturnId()throws Exception{
+    public void getId_shouldReturnId() throws Exception {
         Date enteredDate = Date.valueOf("2024-06-03");
         String receivedTimestamp = "03/06/2024";
         String accessionNumber = "12";
@@ -401,4 +395,4 @@ public void getId_shouldReturnId()throws Exception{
         Sample savedSample = sampleService.get(sampleId);
         Assert.assertEquals(sampleId, sampleService.getId(savedSample));
     }
-   }
+}

From 98b5e10c2ed50433bb0c98dab7744b16ebdb3a15 Mon Sep 17 00:00:00 2001
From: CalebSLane <c.steelelane@gmail.com>
Date: Mon, 28 Oct 2024 12:10:01 -0700
Subject: [PATCH 21/56] fix id conflict preventing click event to work

---
 frontend/src/components/admin/menu/GlobalMenuManagement.js | 2 +-
 frontend/src/components/admin/menu/MenuUtil.js             | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/admin/menu/GlobalMenuManagement.js b/frontend/src/components/admin/menu/GlobalMenuManagement.js
index 9aefabdb0b..7bcc039aae 100644
--- a/frontend/src/components/admin/menu/GlobalMenuManagement.js
+++ b/frontend/src/components/admin/menu/GlobalMenuManagement.js
@@ -33,7 +33,7 @@ function GlobalMenuManagement() {
 
   const [loading, setLoading] = useState(false);
   const [isSubmitting, setIsSubmitting] = useState(false);
-  const [showChildren, setShowChildren] = useState(false);
+  const [showChildren, setShowChildren] = useState(true);
   const [menuItem, setMenuItem] = useState({
     menu: { isActive: true, elementId: "menu_sidenav" },
     childMenus: [],
diff --git a/frontend/src/components/admin/menu/MenuUtil.js b/frontend/src/components/admin/menu/MenuUtil.js
index db32bec713..ded4dd5c0a 100644
--- a/frontend/src/components/admin/menu/MenuUtil.js
+++ b/frontend/src/components/admin/menu/MenuUtil.js
@@ -39,7 +39,7 @@ export const MenuCheckBox = (props) => {
           style={{ marginLeft: 2 * depth + "rem" }}
         >
           <Checkbox
-            id={curMenuItem?.menu.elementId}
+            id={curMenuItem?.menu.elementId + "_checkbox"}
             labelText={intl.formatMessage({
               id: labelKey
                 ? labelKey
@@ -47,6 +47,7 @@ export const MenuCheckBox = (props) => {
                   ? curMenuItem.menu.displayKey
                   : "missing display key",
             })}
+            disabled={curMenuItem.menu.elementId === "menu_sidenav"}
             checked={curMenuItem?.menu.isActive}
             onChange={(_, { checked }) => {
               if (path === "$" || !path) {

From b5450e2f446ae96186824b5eb0c551da78c2dba5 Mon Sep 17 00:00:00 2001
From: CalebSLane <c.steelelane@gmail.com>
Date: Mon, 28 Oct 2024 12:27:20 -0700
Subject: [PATCH 22/56] bump version

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f1d12af3e3..f1453457e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
     <minor.version>0</minor.version>
     <state.version>3</state.version>
     <!-- 0 = alpha, 1 = beta, 2 = rc, 3 = deployable -->
-    <fix.version>4</fix.version>
+    <fix.version>5</fix.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <liquibase.propertyFile>${project.basedir}/liquibase/liquibase.properties</liquibase.propertyFile>
     <castor.version>1.4.1</castor.version>
@@ -724,4 +724,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+</project>
\ No newline at end of file

From f9a808e91601b4b5ce0ec6c30e6c8af1845a9ada Mon Sep 17 00:00:00 2001
From: CalebSLane <c.steelelane@gmail.com>
Date: Mon, 28 Oct 2024 12:33:32 -0700
Subject: [PATCH 23/56] formatting

---
 pom.xml                                               |  2 +-
 .../common/provider/query/LabOrderSearchProvider.java | 11 +++++++----
 ...SampleEntryTestsForTypeProviderRestController.java |  2 +-
 .../common/services/TestIdentityService.java          |  2 --
 .../fhir/service/TaskInterpreterImpl.java             |  7 ++++---
 .../openelisglobal/panel/daoimpl/PanelDAOImpl.java    |  1 -
 .../openelisglobal/panel/service/PanelService.java    |  2 --
 .../panel/service/PanelServiceImpl.java               |  3 +--
 .../org/openelisglobal/panel/valueholder/Panel.java   |  1 +
 .../systemuser/service/UserServiceImpl.java           |  6 +++---
 src/main/resources/hibernate/hbm/Panel.hbm.xml        |  2 +-
 src/main/resources/liquibase/3.1.x.x/base.xml         |  2 +-
 src/main/resources/liquibase/3.1.x.x/panel_loinc.xml  |  2 +-
 src/main/resources/liquibase/base-changelog.xml       |  2 +-
 14 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index f1453457e5..92de4d7fc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -724,4 +724,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/main/java/org/openelisglobal/common/provider/query/LabOrderSearchProvider.java b/src/main/java/org/openelisglobal/common/provider/query/LabOrderSearchProvider.java
index 487f9b3a21..e8eb672918 100644
--- a/src/main/java/org/openelisglobal/common/provider/query/LabOrderSearchProvider.java
+++ b/src/main/java/org/openelisglobal/common/provider/query/LabOrderSearchProvider.java
@@ -480,7 +480,8 @@ private void getTestsAndPanels(List<Request> tests, List<Request> panels, String
     //
     // }
 
-    private void addToTestOrPanel(List<Request> tests, List<Request> panels, String loinc, String sampleTypeAbbreviation) {
+    private void addToTestOrPanel(List<Request> tests, List<Request> panels, String loinc,
+            String sampleTypeAbbreviation) {
         Test test = null;
         Panel panel = null;
         TypeOfSample typeOfSample = null;
@@ -504,15 +505,17 @@ private void addToTestOrPanel(List<Request> tests, List<Request> panels, String
                 typeOfSample = typeOfSampleService.getTypeOfSampleForTest(test.getId()).get(0);
             }
             tests.add(new Request(test.getName(), loinc, typeOfSample.getLocalizedName()));
-            return; 
+            return;
         }
         panel = panelService.getPanelByLoincCode(loinc);
         if (panel != null) {
-            LogEvent.logDebug(this.getClass().getSimpleName(), "addToTestOrPanel", "panel matching loinc is: " + panel.getDescription());
+            LogEvent.logDebug(this.getClass().getSimpleName(), "addToTestOrPanel",
+                    "panel matching loinc is: " + panel.getDescription());
 
             if (typeOfSample == null) {
                 typeOfSample = typeOfSampleService.getTypeOfSampleForPanelId(panel.getId()).get(0);
-                LogEvent.logDebug(this.getClass().getSimpleName(), "addToTestOrPanel", "typeOfSample matching for panel is: " + typeOfSample.getDescription());
+                LogEvent.logDebug(this.getClass().getSimpleName(), "addToTestOrPanel",
+                        "typeOfSample matching for panel is: " + typeOfSample.getDescription());
 
             }
             panels.add(new Request(panel.getPanelName(), loinc, typeOfSample.getLocalizedName()));
diff --git a/src/main/java/org/openelisglobal/common/rest/provider/SampleEntryTestsForTypeProviderRestController.java b/src/main/java/org/openelisglobal/common/rest/provider/SampleEntryTestsForTypeProviderRestController.java
index b3cf4899b3..49603df506 100755
--- a/src/main/java/org/openelisglobal/common/rest/provider/SampleEntryTestsForTypeProviderRestController.java
+++ b/src/main/java/org/openelisglobal/common/rest/provider/SampleEntryTestsForTypeProviderRestController.java
@@ -285,7 +285,7 @@ public class PanelTestMap {
 
         private String testIds;
 
-        //panel id
+        // panel id
         private String id;
 
         private int panelOrder;
diff --git a/src/main/java/org/openelisglobal/common/services/TestIdentityService.java b/src/main/java/org/openelisglobal/common/services/TestIdentityService.java
index 3163f1d8a6..eff7c19284 100644
--- a/src/main/java/org/openelisglobal/common/services/TestIdentityService.java
+++ b/src/main/java/org/openelisglobal/common/services/TestIdentityService.java
@@ -16,11 +16,9 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
-
 import javax.annotation.PostConstruct;
 import org.apache.commons.validator.GenericValidator;
 import org.openelisglobal.panel.service.PanelService;
-import org.openelisglobal.panel.valueholder.Panel;
 import org.openelisglobal.test.service.TestService;
 import org.openelisglobal.test.valueholder.Test;
 import org.openelisglobal.testresult.service.TestResultService;
diff --git a/src/main/java/org/openelisglobal/dataexchange/fhir/service/TaskInterpreterImpl.java b/src/main/java/org/openelisglobal/dataexchange/fhir/service/TaskInterpreterImpl.java
index 126b82268a..6de6598cc4 100644
--- a/src/main/java/org/openelisglobal/dataexchange/fhir/service/TaskInterpreterImpl.java
+++ b/src/main/java/org/openelisglobal/dataexchange/fhir/service/TaskInterpreterImpl.java
@@ -186,7 +186,7 @@ private Panel createPanelFromFHIR(ServiceRequest serviceRequest) throws HL7Excep
                 loincCode = serviceRequest.getCode().getCoding().get(i).getCodeElement().toString();
                 if (!GenericValidator.isBlankOrNull(loincCode)) {
                     panel = panelService.getPanelByLoincCode(loincCode);
-                   return panel;
+                    return panel;
                 } else {
                     LogEvent.logWarn(this.getClass().getSimpleName(), "createTestFromFHIR",
                             "loinc code is missing a value in SR: " + serviceRequest.getIdElement().getIdPart());
@@ -345,7 +345,9 @@ && getMessagePatient().getExternalId() == null) {
                     results.add(InterpreterResults.MISSING_PATIENT_IDENTIFIER);
                 }
 
-                if ((test == null || !getTestIdentityService().doesActiveTestExistForLoinc(test.getLoinc())) && (panel == null || !getTestIdentityService().doesActivePanelExistForLoinc(panel.getLoinc()))) {
+                if ((test == null || !getTestIdentityService().doesActiveTestExistForLoinc(test.getLoinc()))
+                        && (panel == null
+                                || !getTestIdentityService().doesActivePanelExistForLoinc(panel.getLoinc()))) {
                     results.add(InterpreterResults.UNSUPPORTED_TESTS);
                 }
             }
@@ -358,7 +360,6 @@ && getMessagePatient().getExternalId() == null) {
         return results;
     }
 
-
     @Override
     public OrderPriority getOrderPriority() {
         return priority;
diff --git a/src/main/java/org/openelisglobal/panel/daoimpl/PanelDAOImpl.java b/src/main/java/org/openelisglobal/panel/daoimpl/PanelDAOImpl.java
index 3cb4e2fcfb..2832c2bd86 100644
--- a/src/main/java/org/openelisglobal/panel/daoimpl/PanelDAOImpl.java
+++ b/src/main/java/org/openelisglobal/panel/daoimpl/PanelDAOImpl.java
@@ -29,7 +29,6 @@
 import org.openelisglobal.common.util.StringUtil;
 import org.openelisglobal.panel.dao.PanelDAO;
 import org.openelisglobal.panel.valueholder.Panel;
-import org.openelisglobal.test.valueholder.Test;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/src/main/java/org/openelisglobal/panel/service/PanelService.java b/src/main/java/org/openelisglobal/panel/service/PanelService.java
index de9f368c7c..b11a56181a 100644
--- a/src/main/java/org/openelisglobal/panel/service/PanelService.java
+++ b/src/main/java/org/openelisglobal/panel/service/PanelService.java
@@ -1,8 +1,6 @@
 package org.openelisglobal.panel.service;
 
 import java.util.List;
-import java.util.Optional;
-
 import org.openelisglobal.common.service.BaseObjectService;
 import org.openelisglobal.localization.valueholder.Localization;
 import org.openelisglobal.panel.valueholder.Panel;
diff --git a/src/main/java/org/openelisglobal/panel/service/PanelServiceImpl.java b/src/main/java/org/openelisglobal/panel/service/PanelServiceImpl.java
index 45b5b871a0..5815439446 100644
--- a/src/main/java/org/openelisglobal/panel/service/PanelServiceImpl.java
+++ b/src/main/java/org/openelisglobal/panel/service/PanelServiceImpl.java
@@ -1,7 +1,6 @@
 package org.openelisglobal.panel.service;
 
 import java.util.List;
-
 import org.hibernate.Hibernate;
 import org.openelisglobal.common.exception.LIMSDuplicateRecordException;
 import org.openelisglobal.common.service.AuditableBaseObjectServiceImpl;
@@ -149,7 +148,7 @@ public Localization getLocalizationForPanel(String id) {
         return localization;
     }
 
-    @Override 
+    @Override
     public Panel getPanelByLoincCode(String loincCode) {
         return getBaseObjectDAO().getPanelByLoincCode(loincCode);
     }
diff --git a/src/main/java/org/openelisglobal/panel/valueholder/Panel.java b/src/main/java/org/openelisglobal/panel/valueholder/Panel.java
index 51f825520f..6411f877cf 100644
--- a/src/main/java/org/openelisglobal/panel/valueholder/Panel.java
+++ b/src/main/java/org/openelisglobal/panel/valueholder/Panel.java
@@ -61,6 +61,7 @@ public String getDescription() {
     public void setDescription(String description) {
         this.description = description;
     }
+
     public String getLoinc() {
         return loinc;
     }
diff --git a/src/main/java/org/openelisglobal/systemuser/service/UserServiceImpl.java b/src/main/java/org/openelisglobal/systemuser/service/UserServiceImpl.java
index b803792837..19e05ce701 100644
--- a/src/main/java/org/openelisglobal/systemuser/service/UserServiceImpl.java
+++ b/src/main/java/org/openelisglobal/systemuser/service/UserServiceImpl.java
@@ -41,7 +41,6 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
 import org.springframework.security.saml2.provider.service.authentication.DefaultSaml2AuthenticatedPrincipal;
@@ -184,7 +183,8 @@ public List<IdValuePair> getUserTestSections(String systemUserId, String roleId)
         if (requestAttributes instanceof ServletRequestAttributes) {
             request = ((ServletRequestAttributes) requestAttributes).getRequest();
 
-            Object sc = request.getSession().getAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY);
+            Object sc = request.getSession()
+                    .getAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY);
             if (!(sc instanceof SecurityContext)) {
                 LogEvent.logWarn(this.getClass().getSimpleName(), "getUserLogin",
                         "security context is not of type SecurityContext");
@@ -194,7 +194,7 @@ public List<IdValuePair> getUserTestSections(String systemUserId, String roleId)
         } else {
             LogEvent.logWarn(this.getClass().getSimpleName(), "getUserLogin",
                     "requestAttributes is not of type ServletRequestAttributes");
-                }
+        }
         if (authentication != null) {
             Object principal = authentication.getPrincipal();
             if (principal instanceof UserDetails) {
diff --git a/src/main/resources/hibernate/hbm/Panel.hbm.xml b/src/main/resources/hibernate/hbm/Panel.hbm.xml
index fa5d7eec93..230b614d11 100644
--- a/src/main/resources/hibernate/hbm/Panel.hbm.xml
+++ b/src/main/resources/hibernate/hbm/Panel.hbm.xml
@@ -35,4 +35,4 @@
             type="java.lang.String" />
 
     </class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
diff --git a/src/main/resources/liquibase/3.1.x.x/base.xml b/src/main/resources/liquibase/3.1.x.x/base.xml
index 76b3bdda2e..d0fc67e425 100644
--- a/src/main/resources/liquibase/3.1.x.x/base.xml
+++ b/src/main/resources/liquibase/3.1.x.x/base.xml
@@ -5,4 +5,4 @@
   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd">
 
   <include relativeToChangelogFile="true" file="panel_loinc.xml" />
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog>
diff --git a/src/main/resources/liquibase/3.1.x.x/panel_loinc.xml b/src/main/resources/liquibase/3.1.x.x/panel_loinc.xml
index e56ccbc0e7..d3607c112e 100644
--- a/src/main/resources/liquibase/3.1.x.x/panel_loinc.xml
+++ b/src/main/resources/liquibase/3.1.x.x/panel_loinc.xml
@@ -17,4 +17,4 @@
             <column name="loinc" type="character varying(10)"></column>
         </addColumn>
     </changeSet>
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog>
diff --git a/src/main/resources/liquibase/base-changelog.xml b/src/main/resources/liquibase/base-changelog.xml
index 9590ee4e08..4a018ce791 100644
--- a/src/main/resources/liquibase/base-changelog.xml
+++ b/src/main/resources/liquibase/base-changelog.xml
@@ -15,4 +15,4 @@
   <include file="liquibase/2.8.x.x/base.xml" />
   <include file="liquibase/3.1.x.x/base.xml" />
 
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog>

From 53600200e54aaa4500c2af0fecfca1761b04c2cb Mon Sep 17 00:00:00 2001
From: CalebSLane <c.steelelane@gmail.com>
Date: Mon, 28 Oct 2024 12:48:57 -0700
Subject: [PATCH 24/56] chnge to 3.1

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

diff --git a/pom.xml b/pom.xml
index 92de4d7fc1..7582194274 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,10 +13,10 @@
   <properties>
     <maven.java.release>11</maven.java.release>
     <major.version>3</major.version>
-    <minor.version>0</minor.version>
-    <state.version>3</state.version>
+    <minor.version>1</minor.version>
+    <state.version>0</state.version>
     <!-- 0 = alpha, 1 = beta, 2 = rc, 3 = deployable -->
-    <fix.version>5</fix.version>
+    <fix.version>0</fix.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <liquibase.propertyFile>${project.basedir}/liquibase/liquibase.properties</liquibase.propertyFile>
     <castor.version>1.4.1</castor.version>

From 76ab36e61c4ec36041a8c56200aaccc678644c48 Mon Sep 17 00:00:00 2001
From: josephbate <sjb.lav@gmail.com>
Date: Mon, 28 Oct 2024 23:52:28 +0300
Subject: [PATCH 25/56] formating fix

---
 .../sample/SampleServiceTest.java             | 67 +++++++++----------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/src/test/java/org/openelisglobal/sample/SampleServiceTest.java b/src/test/java/org/openelisglobal/sample/SampleServiceTest.java
index 5ef7b6d46c..1ae2ac5c53 100644
--- a/src/test/java/org/openelisglobal/sample/SampleServiceTest.java
+++ b/src/test/java/org/openelisglobal/sample/SampleServiceTest.java
@@ -14,14 +14,11 @@
 import org.junit.Test;
 import org.openelisglobal.BaseWebContextSensitiveTest;
 import org.openelisglobal.patient.service.PatientService;
-import org.openelisglobal.patient.valueholder.Patient;
 import org.openelisglobal.person.service.PersonService;
-import org.openelisglobal.person.valueholder.Person;
 import org.openelisglobal.sample.service.SampleService;
 import org.openelisglobal.sample.valueholder.Sample;
 import org.openelisglobal.samplehuman.dao.SampleHumanDAO;
 import org.openelisglobal.samplehuman.service.SampleHumanService;
-import org.openelisglobal.samplehuman.valueholder.SampleHuman;
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class SampleServiceTest extends BaseWebContextSensitiveTest {
@@ -169,37 +166,39 @@ public void getSamplesReceivedOn_shouldReturnSamplesOnDate() throws Exception {
     }
 
     // @Test
-    // public void getSamplesForPatient_shouldReturnSamplesForPatient() throws Exception {
-
-    //     Date enteredDate = Date.valueOf("2024-06-03");
-    //     String receivedTimestamp = "03/06/2024";
-    //     String accessionNumber = "12";
-    //     Sample samp = createSample(receivedTimestamp, accessionNumber);
-    //     samp.setEnteredDate(enteredDate);
-    //     String sampleId = sampleService.insert(samp);
-
-    //     Person person = new Person();
-    //     person.setFirstName("kasozi");
-    //     person.setLastName("paulaaa");
-    //     personService.save(person);
-
-    //     DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
-    //     java.util.Date date = dateFormat.parse("03/06/2024");
-    //     long time = date.getTime();
-    //     Timestamp dob = new Timestamp(time);
-
-    //     Patient pat = new Patient();
-    //     pat.setPerson(person);
-    //     pat.setBirthDate(dob);
-    //     pat.setGender("M");
-    //     String patId = patientService.insert(pat);
-
-    //     SampleHuman human = new SampleHuman();
-    //     human.setSampleId(sampleId);
-    //     human.setPatientId(patId);
-    //     String humanId = sampleHumanService.insert(human);
-
-    //     Assert.assertEquals(1, sampleHumanService.getSamplesForPatient(patId).size());
+    // public void getSamplesForPatient_shouldReturnSamplesForPatient() throws
+    // Exception {
+
+    // Date enteredDate = Date.valueOf("2024-06-03");
+    // String receivedTimestamp = "03/06/2024";
+    // String accessionNumber = "12";
+    // Sample samp = createSample(receivedTimestamp, accessionNumber);
+    // samp.setEnteredDate(enteredDate);
+    // String sampleId = sampleService.insert(samp);
+
+    // Person person = new Person();
+    // person.setFirstName("kasozi");
+    // person.setLastName("paulaaa");
+    // personService.save(person);
+
+    // DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+    // java.util.Date date = dateFormat.parse("03/06/2024");
+    // long time = date.getTime();
+    // Timestamp dob = new Timestamp(time);
+
+    // Patient pat = new Patient();
+    // pat.setPerson(person);
+    // pat.setBirthDate(dob);
+    // pat.setGender("M");
+    // String patId = patientService.insert(pat);
+
+    // SampleHuman human = new SampleHuman();
+    // human.setSampleId(sampleId);
+    // human.setPatientId(patId);
+    // String humanId = sampleHumanService.insert(human);
+
+    // Assert.assertEquals(1,
+    // sampleHumanService.getSamplesForPatient(patId).size());
 
     // }
 

From a61232356303a81c54d9ad933491b75863ae385a Mon Sep 17 00:00:00 2001
From: Saksham Gupta <sakshamgupta@Shreyas-MacBook-Air.local>
Date: Tue, 29 Oct 2024 11:51:43 +0530
Subject: [PATCH 26/56] Improve styling for the AutoComplete Component

---
 frontend/src/components/admin/reflexTests/ReflexStyles.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/admin/reflexTests/ReflexStyles.css b/frontend/src/components/admin/reflexTests/ReflexStyles.css
index 52aa9858d8..3d96e7aaea 100644
--- a/frontend/src/components/admin/reflexTests/ReflexStyles.css
+++ b/frontend/src/components/admin/reflexTests/ReflexStyles.css
@@ -26,9 +26,9 @@ body {
   margin-left: 0px;
   overflow-y: auto;
   padding-left: 0px;
-  width: 30%;
+  width: 100%;
   z-index: 10;
-  position: absolute;
+  position: relative;
   background-color: #ffffff;
 }
 

From 317bf9ee069f47411c40f8ff89d1cae5067072b0 Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Tue, 29 Oct 2024 11:04:47 +0300
Subject: [PATCH 27/56] minor fixes

---
 docker-compose.yml                            |  4 +-
 frontend/cypress/e2e/dashboard.cy.js          |  2 +-
 .../admin/reflexTests/ReflexStyles.css        |  7 +++-
 .../src/components/common/AutoComplete.js     | 38 ++++++++++---------
 4 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index f06475c127..18ecc1fe85 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -67,7 +67,7 @@ services:
             
     fhir.openelis.org:
         container_name: external-fhir-api
-        image: hapiproject/hapi:v6.6.0-tomcat
+        image: itechuw/openelis-global-2-fhir:develop
         depends_on:
             - database
             - certs
@@ -106,7 +106,7 @@ services:
         tty: true
 
     proxy:
-        image: nginx:1.15-alpine
+        image: itechuw/openelis-global-2-proxy:develop
         container_name: openelisglobal-proxy
         ports:
             - 80:80
diff --git a/frontend/cypress/e2e/dashboard.cy.js b/frontend/cypress/e2e/dashboard.cy.js
index dad22382e6..52bdb1855d 100644
--- a/frontend/cypress/e2e/dashboard.cy.js
+++ b/frontend/cypress/e2e/dashboard.cy.js
@@ -38,7 +38,7 @@ describe("Pathology Dashboard", function () {
 
   it("Validate the Status of Order", () => {
     cy.fixture("DashBoard").then((order) => {
-    //  dashboard.validateOrderStatus(order.labNo, 4);
+      //  dashboard.validateOrderStatus(order.labNo, 4);
     });
   });
 });
diff --git a/frontend/src/components/admin/reflexTests/ReflexStyles.css b/frontend/src/components/admin/reflexTests/ReflexStyles.css
index 3d96e7aaea..20fa3226e6 100644
--- a/frontend/src/components/admin/reflexTests/ReflexStyles.css
+++ b/frontend/src/components/admin/reflexTests/ReflexStyles.css
@@ -28,10 +28,15 @@ body {
   padding-left: 0px;
   width: 100%;
   z-index: 10;
-  position: relative;
+  position: absolute;
   background-color: #ffffff;
 }
 
+.suggestions-container {
+  position: relative;
+  width: 100%;
+}
+
 .suggestions li {
   padding: 0.5rem;
   z-index: 99 !important;
diff --git a/frontend/src/components/common/AutoComplete.js b/frontend/src/components/common/AutoComplete.js
index 5680a7312a..debe13c90d 100644
--- a/frontend/src/components/common/AutoComplete.js
+++ b/frontend/src/components/common/AutoComplete.js
@@ -88,24 +88,26 @@ function AutoComplete(props) {
   if (showSuggestions && userInput) {
     if (filteredSuggestions.length) {
       suggestionsListComponent = (
-        <ul className="suggestions">
-          {filteredSuggestions.map((suggestion, index) => {
-            let className;
-            // Flag the active suggestion with a class
-            if (index === activeSuggestion) {
-              className = "suggestion-active";
-            }
-            return (
-              <li
-                className={className}
-                key={index}
-                onClick={(e) => onClick(e, suggestion.id, suggestion)}
-              >
-                {suggestion.value}
-              </li>
-            );
-          })}
-        </ul>
+        <div class="suggestions-container">
+          <ul className="suggestions">
+            {filteredSuggestions.map((suggestion, index) => {
+              let className;
+              // Flag the active suggestion with a class
+              if (index === activeSuggestion) {
+                className = "suggestion-active";
+              }
+              return (
+                <li
+                  className={className}
+                  key={index}
+                  onClick={(e) => onClick(e, suggestion.id, suggestion)}
+                >
+                  {suggestion.value}
+                </li>
+              );
+            })}
+          </ul>
+        </div>
       );
     } else {
       suggestionsListComponent = (

From ddeb0f9d7da237453747c4cd7c71cf4ddf91fcfe Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Tue, 29 Oct 2024 11:12:09 +0300
Subject: [PATCH 28/56] fix ci build

---
 frontend/src/components/common/AutoComplete.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/common/AutoComplete.js b/frontend/src/components/common/AutoComplete.js
index debe13c90d..1cb61892d2 100644
--- a/frontend/src/components/common/AutoComplete.js
+++ b/frontend/src/components/common/AutoComplete.js
@@ -88,7 +88,7 @@ function AutoComplete(props) {
   if (showSuggestions && userInput) {
     if (filteredSuggestions.length) {
       suggestionsListComponent = (
-        <div class="suggestions-container">
+        <div className="suggestions-container">
           <ul className="suggestions">
             {filteredSuggestions.map((suggestion, index) => {
               let className;

From 0139b2b4a494d720145fe571eeb51a4e397b057c Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Tue, 29 Oct 2024 12:18:49 +0300
Subject: [PATCH 29/56] fix  sample service integration tests

---
 .../patient/PatientServiceTest.java           |  6 +-
 .../sample/SampleServiceTest.java             | 87 +++++++++----------
 .../hibernate/test-hibernate.cfg.xml          | 10 +++
 3 files changed, 56 insertions(+), 47 deletions(-)

diff --git a/src/test/java/org/openelisglobal/patient/PatientServiceTest.java b/src/test/java/org/openelisglobal/patient/PatientServiceTest.java
index d4741b9281..fdba8566f4 100644
--- a/src/test/java/org/openelisglobal/patient/PatientServiceTest.java
+++ b/src/test/java/org/openelisglobal/patient/PatientServiceTest.java
@@ -142,7 +142,8 @@ public void deletePatient_shouldRemovePatient() throws Exception {
     @Test
     public void createPatientType_shouldCreateNewPatientType() throws Exception {
         PatientType patientType = new PatientType();
-        patientType.setDescription("Test Type");
+        patientType.setDescription("Test Type Description");
+        patientType.setType("Test Type");
 
         Assert.assertEquals(0, patientTypeService.getAllPatientTypes().size());
 
@@ -150,7 +151,8 @@ public void createPatientType_shouldCreateNewPatientType() throws Exception {
         PatientType savedPatientType = patientTypeService.get(patientTypeId);
 
         Assert.assertEquals(1, patientTypeService.getAllPatientTypes().size());
-        Assert.assertEquals("Test Type", savedPatientType.getDescription());
+        Assert.assertEquals("Test Type Description", savedPatientType.getDescription());
+        Assert.assertEquals("Test Type", savedPatientType.getType());
     }
 
     @Test
diff --git a/src/test/java/org/openelisglobal/sample/SampleServiceTest.java b/src/test/java/org/openelisglobal/sample/SampleServiceTest.java
index 1ae2ac5c53..0b1e9a05bb 100644
--- a/src/test/java/org/openelisglobal/sample/SampleServiceTest.java
+++ b/src/test/java/org/openelisglobal/sample/SampleServiceTest.java
@@ -14,11 +14,13 @@
 import org.junit.Test;
 import org.openelisglobal.BaseWebContextSensitiveTest;
 import org.openelisglobal.patient.service.PatientService;
+import org.openelisglobal.patient.valueholder.Patient;
 import org.openelisglobal.person.service.PersonService;
+import org.openelisglobal.person.valueholder.Person;
 import org.openelisglobal.sample.service.SampleService;
 import org.openelisglobal.sample.valueholder.Sample;
-import org.openelisglobal.samplehuman.dao.SampleHumanDAO;
 import org.openelisglobal.samplehuman.service.SampleHumanService;
+import org.openelisglobal.samplehuman.valueholder.SampleHuman;
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class SampleServiceTest extends BaseWebContextSensitiveTest {
@@ -35,23 +37,20 @@ public class SampleServiceTest extends BaseWebContextSensitiveTest {
     @Autowired
     SampleHumanService sampleHumanService;
 
-    SampleHumanDAO sampleHumanDAO;
-
     @Before
     public void init() throws Exception {
-
+        sampleHumanService.deleteAll(sampleHumanService.getAll());
+        sampleService.deleteAll(sampleService.getAll());
         patientService.deleteAll(patientService.getAll());
         personService.deleteAll(personService.getAll());
-        sampleService.deleteAll(sampleService.getAll());
-        sampleHumanService.deleteAll(sampleHumanService.getAll());
     }
 
     @After
     public void tearDown() {
-        // patientService.deleteAll(patientService.getAll());
-        personService.deleteAll(personService.getAll());
-        sampleService.deleteAll(sampleService.getAll());
         sampleHumanService.deleteAll(sampleHumanService.getAll());
+        sampleService.deleteAll(sampleService.getAll());
+        patientService.deleteAll(patientService.getAll());
+        personService.deleteAll(personService.getAll());
     }
 
     private Sample createSample(String receivedTimestamp, String accessionNumber) throws ParseException {
@@ -165,42 +164,40 @@ public void getSamplesReceivedOn_shouldReturnSamplesOnDate() throws Exception {
         Assert.assertEquals(1, receivedSamples);
     }
 
-    // @Test
-    // public void getSamplesForPatient_shouldReturnSamplesForPatient() throws
-    // Exception {
-
-    // Date enteredDate = Date.valueOf("2024-06-03");
-    // String receivedTimestamp = "03/06/2024";
-    // String accessionNumber = "12";
-    // Sample samp = createSample(receivedTimestamp, accessionNumber);
-    // samp.setEnteredDate(enteredDate);
-    // String sampleId = sampleService.insert(samp);
-
-    // Person person = new Person();
-    // person.setFirstName("kasozi");
-    // person.setLastName("paulaaa");
-    // personService.save(person);
-
-    // DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
-    // java.util.Date date = dateFormat.parse("03/06/2024");
-    // long time = date.getTime();
-    // Timestamp dob = new Timestamp(time);
-
-    // Patient pat = new Patient();
-    // pat.setPerson(person);
-    // pat.setBirthDate(dob);
-    // pat.setGender("M");
-    // String patId = patientService.insert(pat);
-
-    // SampleHuman human = new SampleHuman();
-    // human.setSampleId(sampleId);
-    // human.setPatientId(patId);
-    // String humanId = sampleHumanService.insert(human);
-
-    // Assert.assertEquals(1,
-    // sampleHumanService.getSamplesForPatient(patId).size());
-
-    // }
+    @Test
+    public void getSamplesForPatient_shouldReturnSamplesForPatient() throws ParseException {
+
+        Date enteredDate = Date.valueOf("2024-06-03");
+        String receivedTimestamp = "03/06/2024";
+        String accessionNumber = "12";
+        Sample samp = createSample(receivedTimestamp, accessionNumber);
+        samp.setEnteredDate(enteredDate);
+        String sampleId = sampleService.insert(samp);
+
+        Person person = new Person();
+        person.setFirstName("kasozi");
+        person.setLastName("paulaaa");
+        personService.save(person);
+
+        DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+        java.util.Date date = dateFormat.parse("03/06/2024");
+        long time = date.getTime();
+        Timestamp dob = new Timestamp(time);
+
+        Patient pat = new Patient();
+        pat.setPerson(person);
+        pat.setBirthDate(dob);
+        pat.setGender("M");
+        String patId = patientService.insert(pat);
+
+        SampleHuman human = new SampleHuman();
+        human.setSampleId(sampleId);
+        human.setPatientId(patId);
+        String humanId = sampleHumanService.insert(human);
+        sampleHumanService.getSamplesForPatient(String.valueOf(patId));
+        Assert.assertEquals(1, sampleHumanService.getSamplesForPatient(patId).size());
+
+    }
 
     @Test
     public void getReceivedDateForDisplay_shouldReturnReceivedDateForDisplay() throws Exception {
diff --git a/src/test/resources/hibernate/test-hibernate.cfg.xml b/src/test/resources/hibernate/test-hibernate.cfg.xml
index 54910a1095..e9e5371743 100644
--- a/src/test/resources/hibernate/test-hibernate.cfg.xml
+++ b/src/test/resources/hibernate/test-hibernate.cfg.xml
@@ -11,6 +11,16 @@
         <property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>
         <property name="show_sql">false</property>
         <property name="hibernate.format_sql">true</property>
+         <property name="hibernate.jdbc.batch_size">50</property>
+        <property name="hibernate.jdbc.batch_versioned_data">true</property>
+        <!-- <property name="transaction.factory_class">org.hibernate.transaction.JDBCTransactionFactory</property>
+            <property name="current_session_context_class">thread</property> -->
+        <property name="hibernate.query.factory_class">org.hibernate.hql.internal.classic.ClassicQueryTranslatorFactory</property>
+        <property name="hibernate.cache.provider_class">org.hibernate.cache.NoCacheProvider</property>
+        <property name="hibernate.cache.use_second_level_cache">false</property>
+        <property name="hibernate.cache.use_query_cache">false</property>
+        <property name="hibernate.current_session_context_class">thread</property>
+
         <property name="connection.url">${db.url}</property>
         <property name="connection.driver_class">org.postgresql.Driver</property>
         <property name="hibernate.hbm2ddl.auto">update</property>

From 856bff2047469fab9681acbe70ba6a0b0a2a1e79 Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Tue, 29 Oct 2024 20:32:38 +0300
Subject: [PATCH 30/56] automate building installer

---
 .github/workflows/build-installer.yml  | 21 +++++++++++++++++++++
 .github/workflows/publish-and-test.yml |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 .github/workflows/build-installer.yml

diff --git a/.github/workflows/build-installer.yml b/.github/workflows/build-installer.yml
new file mode 100644
index 0000000000..0ae8c1de7c
--- /dev/null
+++ b/.github/workflows/build-installer.yml
@@ -0,0 +1,21 @@
+name: OpenELIS-Global-2 CI Build
+on:
+  workflow_dispatch:
+    
+jobs:
+  check-out-and-build-installer:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout OpenELIS-Global2
+        uses: actions/checkout@v2
+        with:
+          repository: ${{github.repository}}
+          submodules: recursive
+
+      - name: Build installer
+        run: ./build.sh -ib develop
+
+      - name: check installer
+        run: ls OEInstaller  
+ 
diff --git a/.github/workflows/publish-and-test.yml b/.github/workflows/publish-and-test.yml
index 3aaa45ec0a..c39dd94d07 100644
--- a/.github/workflows/publish-and-test.yml
+++ b/.github/workflows/publish-and-test.yml
@@ -388,6 +388,7 @@ jobs:
 
 
   build-and-push-image-proxy:
+    needs: [run-e2e-qa]
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -429,6 +430,7 @@ jobs:
           cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-proxy:buildcache,mode=max      
    
   build-and-push-image-fhir:
+    needs: [run-e2e-qa]
     runs-on: ubuntu-latest
     permissions:
       contents: read

From 912b1ae4d3cbb9bd56499c1881ae25b188f15648 Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Tue, 29 Oct 2024 20:35:59 +0300
Subject: [PATCH 31/56] update CI  Build label

---
 .github/workflows/build-installer.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-installer.yml b/.github/workflows/build-installer.yml
index 0ae8c1de7c..b6ed99837e 100644
--- a/.github/workflows/build-installer.yml
+++ b/.github/workflows/build-installer.yml
@@ -1,4 +1,4 @@
-name: OpenELIS-Global-2 CI Build
+name: Build OpenELIS-Global-2 Installer
 on:
   workflow_dispatch:
     

From 735ee687cb17782b0f0c966be0bd862478523844 Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Tue, 29 Oct 2024 20:53:23 +0300
Subject: [PATCH 32/56] update dir

---
 .github/workflows/build-installer.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-installer.yml b/.github/workflows/build-installer.yml
index b6ed99837e..c2be48dffd 100644
--- a/.github/workflows/build-installer.yml
+++ b/.github/workflows/build-installer.yml
@@ -17,5 +17,5 @@ jobs:
         run: ./build.sh -ib develop
 
       - name: check installer
-        run: ls OEInstaller  
+        run: ls OEInstaller/linux  
  

From d459bda0e684a712cc2defc895271ad153669db8 Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Tue, 29 Oct 2024 21:08:59 +0300
Subject: [PATCH 33/56] build installer on release

---
 .github/workflows/build-installer.yml | 33 +++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-installer.yml b/.github/workflows/build-installer.yml
index c2be48dffd..a9a235c2ff 100644
--- a/.github/workflows/build-installer.yml
+++ b/.github/workflows/build-installer.yml
@@ -1,9 +1,10 @@
 name: Build OpenELIS-Global-2 Installer
 on:
-  workflow_dispatch:
+  release:
+    types: [published] 
     
 jobs:
-  check-out-and-build-installer:
+  build-installer-and-upload-installer:
     runs-on: ubuntu-latest
     steps:
 
@@ -18,4 +19,32 @@ jobs:
 
       - name: check installer
         run: ls OEInstaller/linux  
+
+
+      - name: Find installer file
+        id: find_file
+        run: |
+          # Find the file in OEInstaller/linux with .tar.gz extension
+          FILE_PATH=$(find OEInstaller/linux -name "*.tar.gz" -print -quit)
+          if [ -z "$FILE_PATH" ]; then
+            echo "No .tar.gz file found in OEInstaller/linux directory."
+            exit 1
+          fi
+          echo "File path: $FILE_PATH"
+          # Extract the file name from the path
+          FILE_NAME=$(basename "$FILE_PATH")
+          echo "File name: $FILE_NAME"
+          # Pass the file path and name to outputs
+          echo "FILE_PATH=$FILE_PATH" >> $GITHUB_ENV
+          echo "FILE_NAME=$FILE_NAME" >> $GITHUB_ENV
+
+      - name: Upload Release Asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ${{ env.FILE_PATH }}
+          asset_name: ${{ env.FILE_NAME }}
+          asset_content_type: application/gzip  
  

From 1ee9f3c718e473d791c7b94f7726a0d108f13417 Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Wed, 30 Oct 2024 16:41:35 +0300
Subject: [PATCH 34/56] minor fixes

---
 frontend/cypress/e2e/dashboard.cy.js          |  3 ++-
 .../addOrder/OrderEntryAdditionalQuestions.js | 26 ++++++++++---------
 .../resultsViewer/results-viewer.styles.scss  | 13 +++++-----
 .../patient/resultsViewer/results-viewer.tsx  |  4 +--
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/frontend/cypress/e2e/dashboard.cy.js b/frontend/cypress/e2e/dashboard.cy.js
index 52bdb1855d..9612f2b30a 100644
--- a/frontend/cypress/e2e/dashboard.cy.js
+++ b/frontend/cypress/e2e/dashboard.cy.js
@@ -78,7 +78,8 @@ describe("ImmunoChemistry Dashboard", function () {
 
   it("Validate the Status of Order", () => {
     cy.fixture("DashBoard").then((order) => {
-      dashboard.validateOrderStatus(order.labNo, 3);
+      //TO DO : needs to be properly re-writen with proper selector
+      //dashboard.validateOrderStatus(order.labNo, 3);
     });
   });
 });
diff --git a/frontend/src/components/addOrder/OrderEntryAdditionalQuestions.js b/frontend/src/components/addOrder/OrderEntryAdditionalQuestions.js
index 6ab4e3cffe..9c1c1dd055 100644
--- a/frontend/src/components/addOrder/OrderEntryAdditionalQuestions.js
+++ b/frontend/src/components/addOrder/OrderEntryAdditionalQuestions.js
@@ -381,18 +381,20 @@ const OrderEntryAdditionalQuestions = ({
 
   function setAdditionalQuestions(res, event) {
     console.debug(res);
-    setQuestionnaire(res);
-    var convertedQuestionnaireResponse = convertQuestionnaireToResponse(res);
-    setQuestionnaireResponse(convertedQuestionnaireResponse);
-    setOrderFormValues({
-      ...orderFormValues,
-      sampleOrderItems: {
-        ...orderFormValues.sampleOrderItems,
-        questionnaire: res,
-        programId: event ? event.target.value : "",
-        additionalQuestions: convertedQuestionnaireResponse,
-      },
-    });
+    if ("item" in res) {
+      setQuestionnaire(res);
+      var convertedQuestionnaireResponse = convertQuestionnaireToResponse(res);
+      setQuestionnaireResponse(convertedQuestionnaireResponse);
+      setOrderFormValues({
+        ...orderFormValues,
+        sampleOrderItems: {
+          ...orderFormValues.sampleOrderItems,
+          questionnaire: res,
+          programId: event ? event.target.value : "",
+          additionalQuestions: convertedQuestionnaireResponse,
+        },
+      });
+    }
   }
   const getAnswer = (linkId) => {
     var responseItem = questionnaireResponse?.item?.find(
diff --git a/frontend/src/components/patient/resultsViewer/results-viewer.styles.scss b/frontend/src/components/patient/resultsViewer/results-viewer.styles.scss
index ffc273daec..98a97a1ab0 100644
--- a/frontend/src/components/patient/resultsViewer/results-viewer.styles.scss
+++ b/frontend/src/components/patient/resultsViewer/results-viewer.styles.scss
@@ -203,20 +203,19 @@
   height: 5rem;
   border-radius: 1px;
 }
-@media screen and (max-width:673px){
+@media screen and (max-width: 673px) {
   .patient-name {
     font-size: 16px;
-    margin-left:5%;
+    margin-left: 5%;
   }
-  
+
   .patient-dob {
     font-size: 14px;
-    margin-left:5%;
+    margin-left: 5%;
   }
-  
+
   .patient-id {
     font-size: 12px;
-    margin-left:5%;
+    margin-left: 5%;
   }
-  
 }
diff --git a/frontend/src/components/patient/resultsViewer/results-viewer.tsx b/frontend/src/components/patient/resultsViewer/results-viewer.tsx
index 4ddd4bea93..50b0d6a658 100644
--- a/frontend/src/components/patient/resultsViewer/results-viewer.tsx
+++ b/frontend/src/components/patient/resultsViewer/results-viewer.tsx
@@ -88,7 +88,7 @@ const RoutedResultsViewer: React.FC<ResultsViewerProps> = () => {
       <>
         <Loading></Loading>
         <Grid fullWidth={true}>
-          <Column lg={16} md={8} sm={4} >
+          <Column lg={16} md={8} sm={4}>
             <EmptyState
               headerTitle={intl.formatMessage({ id: "label.test.results" })}
               displayText={intl.formatMessage({
@@ -116,7 +116,7 @@ const RoutedResultsViewer: React.FC<ResultsViewerProps> = () => {
         </Column>
       </Grid>
       <Grid fullWidth={true}>
-        <Column lg={16} md={8} sm={4} >
+        <Column lg={16} md={8} sm={4}>
           <Section>
             <Section>
               <Heading>

From 0be7826daba880f01f64f21ab8d9cc19d6037109 Mon Sep 17 00:00:00 2001
From: Brian308 <bahatibrianp@gmail.com>
Date: Wed, 30 Oct 2024 19:43:19 +0300
Subject: [PATCH 35/56] made the search bar responsive

---
 frontend/src/components/Style.css             | 10 +----
 .../components/layout/search/searchBar.css    | 43 ++++++++++++++++---
 .../src/components/layout/search/searchBar.js |  2 +-
 frontend/src/index.css                        |  3 +-
 4 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/frontend/src/components/Style.css b/frontend/src/components/Style.css
index d9e8fefcb3..7e113f90bd 100644
--- a/frontend/src/components/Style.css
+++ b/frontend/src/components/Style.css
@@ -57,7 +57,8 @@ li.clickableUserDetails:hover {
 
 .inputSearch {
   --cds-text-primary: black;
-  width: 100%;
+  /*width: 100%;*/
+  width: 50%;
   --cds-text-secondary: black;
   --cds-icon-primary: black;
 }
@@ -279,13 +280,6 @@ button {
   --cds-text-secondary: black;
 }
 
-.inputSearch {
-  --cds-text-primary: black;
-  width: 100%;
-  --cds-text-secondary: black;
-  --cds-icon-primary: black;
-}
-
 .results {
   display: flex;
   justify-content: space-between;
diff --git a/frontend/src/components/layout/search/searchBar.css b/frontend/src/components/layout/search/searchBar.css
index 4e1e7aabc7..263b4414a3 100644
--- a/frontend/src/components/layout/search/searchBar.css
+++ b/frontend/src/components/layout/search/searchBar.css
@@ -16,6 +16,7 @@
 .search-input {
   width: 100%;
   position: relative;
+  
 }
 
 .search-bar-container:hover {
@@ -48,24 +49,54 @@
   cursor: pointer;
 }
 
+/* Small screens - Mobile layout (768px and below) */
 @media (max-width: 768px) {
   .patientHead {
-    flex-direction: column;
+    flex-direction: column; /* Stack elements vertically on small screens */
+    align-items: center; /* Center items for mobile view */
+    width: 50%; /* Allow full width on mobile */
   }
 
   .search-bar-container {
-    flex-direction: column;
-    align-items: stretch;
+    flex-direction: row; /* Stack search elements vertically */
+    align-items: centre;
+    margin-top: 40px;
+    width: 50%; /* Expand to full width on mobile */
+    /* padding: 10px;  Optional padding for better spacing */
   }
 
   .search-input {
-    width: 100%;
+    width: 90%; /* Set search input to almost full width */
+    /*margin: 10px 0;  Add margin to separate elements */
   }
 }
 
-@media (min-width: 769px) and (max-width: 1024px) {
+
+
+/* Medium screens - Tablet layout */
+@media (min-width: 769px) and (max-width: 1099px) {
+  .patientHead {
+    flex-direction: row;
+    justify-content: space-between;
+  }
+
+  .search-bar-container {
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: 40px;
+  }
+
+  .search-input {
+    width: 75%; /* Adjust for better usability on tablets */
+  }
+}
+
+/* Larger screens - Desktop layout */
+@media (min-width: 1100px) {
   .patientHead {
     flex-direction: row;
+    justify-content: space-between;
   }
 
   .search-bar-container {
@@ -74,6 +105,6 @@
   }
 
   .search-input {
-    width: 75%;
+    width: 50%; /* Width for desktop */
   }
 }
diff --git a/frontend/src/components/layout/search/searchBar.js b/frontend/src/components/layout/search/searchBar.js
index e1db0c5216..a3223b6b28 100644
--- a/frontend/src/components/layout/search/searchBar.js
+++ b/frontend/src/components/layout/search/searchBar.js
@@ -148,4 +148,4 @@ const SearchBar = (props) => {
   );
 };
 
-export default SearchBar;
+export default SearchBar;
\ No newline at end of file
diff --git a/frontend/src/index.css b/frontend/src/index.css
index 026fe15cfc..5aa3ee2f3b 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -71,7 +71,8 @@ code {
   .slide-over-panel {
     width: 25%;
     /* Use percentage for width on larger screens */
-    max-width: 25%;
+   /* max-width: 25%;*/
+    max-width: 50%;
     /* Use percentage for max-width on larger screens */
   }
 }

From 676c1d44589a5282dd4ae080e924fd94d7d11d1f Mon Sep 17 00:00:00 2001
From: Brian308 <bahatibrianp@gmail.com>
Date: Wed, 30 Oct 2024 22:10:42 +0300
Subject: [PATCH 36/56] modified the searchBar.css

---
 .../components/layout/search/searchBar.css    | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/layout/search/searchBar.css b/frontend/src/components/layout/search/searchBar.css
index 263b4414a3..92a164d3b4 100644
--- a/frontend/src/components/layout/search/searchBar.css
+++ b/frontend/src/components/layout/search/searchBar.css
@@ -49,8 +49,30 @@
   cursor: pointer;
 }
 
-/* Small screens - Mobile layout (768px and below) */
-@media (max-width: 768px) {
+/* Small screens - Mobile layout (768px and 600px) */
+@media (max-width: 600px) {
+  .patientHead {
+    flex-direction: column; /* Stack elements vertically on small screens */
+    align-items: center; /* Center items for mobile view */
+    width: 50%; /* Allow full width on mobile */
+  }
+
+  .search-bar-container {
+    flex-direction: row; /* Stack search elements vertically */
+    align-items: right;
+    margin-top: 40px;
+    width: 35%; /* Expand to full width on mobile */
+    /* padding: 10px;  Optional padding for better spacing */
+  }
+
+  .search-input {
+    width: 90%; /* Set search input to almost full width */
+    /*margin: 10px 0;  Add margin to separate elements */
+  }
+}
+
+/* Small screens - Mobile layout (768px and 601px) */
+@media (min-width: 601px) and (max-width: 768px) {
   .patientHead {
     flex-direction: column; /* Stack elements vertically on small screens */
     align-items: center; /* Center items for mobile view */

From fe9ef5a205a05867c8f3d44d90eed9a2c7a85edc Mon Sep 17 00:00:00 2001
From: Brian308 <bahatibrianp@gmail.com>
Date: Thu, 31 Oct 2024 08:01:22 +0300
Subject: [PATCH 37/56] made improvements to the searchBar

---
 frontend/src/components/layout/search/searchBar.css | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/layout/search/searchBar.css b/frontend/src/components/layout/search/searchBar.css
index 92a164d3b4..52a64f98ab 100644
--- a/frontend/src/components/layout/search/searchBar.css
+++ b/frontend/src/components/layout/search/searchBar.css
@@ -58,16 +58,15 @@
   }
 
   .search-bar-container {
-    flex-direction: row; /* Stack search elements vertically */
-    align-items: right;
+    flex-direction: row; /* Stack search elements horizontally */ 
     margin-top: 40px;
-    width: 35%; /* Expand to full width on mobile */
+    width: 35%;
+    box-shadow: none;
     /* padding: 10px;  Optional padding for better spacing */
   }
 
   .search-input {
     width: 90%; /* Set search input to almost full width */
-    /*margin: 10px 0;  Add margin to separate elements */
   }
 }
 

From af5b3e04aedd6ea2b1cbb49e9ae20ac693d59cff Mon Sep 17 00:00:00 2001
From: Brian308 <bahatibrianp@gmail.com>
Date: Thu, 31 Oct 2024 11:14:21 +0300
Subject: [PATCH 38/56] refactored media

---
 .../components/layout/search/searchBar.css    | 63 ++++++++++++-------
 1 file changed, 39 insertions(+), 24 deletions(-)

diff --git a/frontend/src/components/layout/search/searchBar.css b/frontend/src/components/layout/search/searchBar.css
index 52a64f98ab..bf1d35b83a 100644
--- a/frontend/src/components/layout/search/searchBar.css
+++ b/frontend/src/components/layout/search/searchBar.css
@@ -49,52 +49,65 @@
   cursor: pointer;
 }
 
-/* Small screens - Mobile layout (768px and 600px) */
-@media (max-width: 600px) {
+/* Small screens - Mobile layout (300px to 479px) */
+@media (min-width: 300px) and (max-width: 479px) {
   .patientHead {
-    flex-direction: column; /* Stack elements vertically on small screens */
-    align-items: center; /* Center items for mobile view */
-    width: 50%; /* Allow full width on mobile */
+    flex-direction: row;
+    align-items: stretch;
   }
 
   .search-bar-container {
-    flex-direction: row; /* Stack search elements horizontally */ 
     margin-top: 40px;
-    width: 35%;
+    width: 30%;
     box-shadow: none;
-    /* padding: 10px;  Optional padding for better spacing */
   }
 
   .search-input {
-    width: 90%; /* Set search input to almost full width */
+    width: 30%;
   }
 }
 
-/* Small screens - Mobile layout (768px and 601px) */
-@media (min-width: 601px) and (max-width: 768px) {
+/* Small-medium screens (480px to 600px) */
+@media (min-width: 480px) and (max-width: 600px) {
   .patientHead {
-    flex-direction: column; /* Stack elements vertically on small screens */
-    align-items: center; /* Center items for mobile view */
-    width: 50%; /* Allow full width on mobile */
+    flex-direction: column;
+    align-items: center;
+    width: 35%;
   }
 
   .search-bar-container {
-    flex-direction: row; /* Stack search elements vertically */
-    align-items: centre;
+    flex-direction: row;
     margin-top: 40px;
-    width: 50%; /* Expand to full width on mobile */
-    /* padding: 10px;  Optional padding for better spacing */
+    width: 35%;
+    box-shadow: none;
   }
 
   .search-input {
-    width: 90%; /* Set search input to almost full width */
-    /*margin: 10px 0;  Add margin to separate elements */
+    width: 35%;
   }
 }
 
+/* Medium screens (601px to 768px) */
+@media (min-width: 601px) and (max-width: 768px) {
+  .patientHead {
+    flex-direction: column;
+    align-items: center;
+    width: 40%;
+  }
+
+  .search-bar-container {
+    flex-direction: row;
+    align-items: center;
+    margin-top: 40px;
+    width: 40%;
+  }
 
+  .search-input {
+    width: 40%;
+  }
+}
 
-/* Medium screens - Tablet layout */
+/* Medium-large screens (769px to 1099px) */
 @media (min-width: 769px) and (max-width: 1099px) {
   .patientHead {
     flex-direction: row;
@@ -106,14 +119,15 @@
     align-items: center;
     justify-content: space-between;
     margin-top: 40px;
+    width: 60%;
   }
 
   .search-input {
-    width: 75%; /* Adjust for better usability on tablets */
+    width: 60%;
   }
 }
 
-/* Larger screens - Desktop layout */
+/* Large screens (1100px and up) */
 @media (min-width: 1100px) {
   .patientHead {
     flex-direction: row;
@@ -123,9 +137,10 @@
   .search-bar-container {
     flex-direction: row;
     align-items: center;
+    width: 60%;
   }
 
   .search-input {
-    width: 50%; /* Width for desktop */
+    width: 60%;
   }
 }

From 98c3f49c97f7f16e3e998e2c8a93bf938f4afbf0 Mon Sep 17 00:00:00 2001
From: Brian308 <bahatibrianp@gmail.com>
Date: Thu, 31 Oct 2024 11:26:29 +0300
Subject: [PATCH 39/56] modifications

---
 frontend/src/components/layout/search/searchBar.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/layout/search/searchBar.css b/frontend/src/components/layout/search/searchBar.css
index bf1d35b83a..b65e369153 100644
--- a/frontend/src/components/layout/search/searchBar.css
+++ b/frontend/src/components/layout/search/searchBar.css
@@ -92,18 +92,18 @@
   .patientHead {
     flex-direction: column;
     align-items: center;
-    width: 40%;
+    width: 45%;
   }
 
   .search-bar-container {
     flex-direction: row;
     align-items: center;
     margin-top: 40px;
-    width: 40%;
+    width: 45%;
   }
 
   .search-input {
-    width: 40%;
+    width: 45%;
   }
 }
 

From 54e39f0988603e0408eaea6b792647368cad8683 Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Thu, 31 Oct 2024 13:48:37 +0300
Subject: [PATCH 40/56] update Read me and Global search bar styling

---
 README.md                                           | 7 +++++++
 dev.docker-compose.yml                              | 2 +-
 frontend/src/components/layout/search/searchBar.css | 7 ++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 1dfbb4a87e..66134a39df 100644
--- a/README.md
+++ b/README.md
@@ -15,10 +15,17 @@ You can find more information on how to set up OpenELIS at our
 
 [![End to End QA Tests Status](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/frontend-qa.yml/badge.svg)](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/frontend-qa.yml)
 
+[![End to End QA Tests Status](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/build-installer.yml/badge.svg)](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/build-installer.yml)
+
+### For Offline Installation ,Download the OpenELIS Global Installer for each Release from the [Release Assets](https://github.com/I-TECH-UW/OpenELIS-Global-2/releases)
+
+see full [installtion instructions](https://docs.openelis-global.org/en/latest/install/) with the Offline Installer
+
 ### For Implementers who Just want to run OpenELIS without Making any Code Changes
 
 see [OpenELIS-Docker setup](https://github.com/I-TECH-UW/openelis-docker)
 
+
 ### Running OpenELIS in Docker For Devlopers with Intention of Making code Changes
 
 #### Running docker compose With pre-released docker images
diff --git a/dev.docker-compose.yml b/dev.docker-compose.yml
index 17ea7322b4..715de637bc 100644
--- a/dev.docker-compose.yml
+++ b/dev.docker-compose.yml
@@ -24,7 +24,7 @@ services:
             - ./volume/database/database.env
         volumes:
               # preserves the database between containers
-             - db-data:/var/lib/postgresql/data                
+             - ./volume/database/data:/var/lib/postgresql/data                
               # files here will run on install
              - ./volume/database/dbInit:/docker-entrypoint-initdb.d
         networks:
diff --git a/frontend/src/components/layout/search/searchBar.css b/frontend/src/components/layout/search/searchBar.css
index 4e1e7aabc7..7ead152835 100644
--- a/frontend/src/components/layout/search/searchBar.css
+++ b/frontend/src/components/layout/search/searchBar.css
@@ -7,7 +7,7 @@
 .search-bar-container {
   position: absolute;
   display: flex;
-  width: 430px;
+  width: 100%;
   top: 10px;
   right: -30px;
   box-shadow: 0em 0.1em 0.05em #ccc;
@@ -24,11 +24,12 @@
 
 .patients {
   overflow-y: auto;
-  width: 700px;
+  width: 100%;
   max-height: 250px;
-  position: relative;
+  position: absolute;
   background-color: #f0e7e7;
   top: 45px;
+  right: -30px;
   box-shadow: 0em 0.1em 0.5em #ccc;
 }
 

From fb0cf3eb1b61e6759953e67790303fbf64dc791e Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Thu, 31 Oct 2024 13:53:56 +0300
Subject: [PATCH 41/56] format read me

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 66134a39df..8d5494c770 100644
--- a/README.md
+++ b/README.md
@@ -19,13 +19,14 @@ You can find more information on how to set up OpenELIS at our
 
 ### For Offline Installation ,Download the OpenELIS Global Installer for each Release from the [Release Assets](https://github.com/I-TECH-UW/OpenELIS-Global-2/releases)
 
-see full [installtion instructions](https://docs.openelis-global.org/en/latest/install/) with the Offline Installer
+see full
+[installtion instructions](https://docs.openelis-global.org/en/latest/install/)
+with the Offline Installer
 
 ### For Implementers who Just want to run OpenELIS without Making any Code Changes
 
 see [OpenELIS-Docker setup](https://github.com/I-TECH-UW/openelis-docker)
 
-
 ### Running OpenELIS in Docker For Devlopers with Intention of Making code Changes
 
 #### Running docker compose With pre-released docker images

From d4bbaec42ea87e1ac2e332ee7228ca8384e85117 Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Thu, 31 Oct 2024 14:11:33 +0300
Subject: [PATCH 42/56] update Read Me

---
 README.md | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 8d5494c770..21473461b9 100644
--- a/README.md
+++ b/README.md
@@ -17,27 +17,30 @@ You can find more information on how to set up OpenELIS at our
 
 [![End to End QA Tests Status](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/build-installer.yml/badge.svg)](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/build-installer.yml)
 
-### For Offline Installation ,Download the OpenELIS Global Installer for each Release from the [Release Assets](https://github.com/I-TECH-UW/OpenELIS-Global-2/releases)
+### For Offline Installation Using the OpenELIS Global2 Installer
+
+Download the OpenELIS Global Installer for each Release from the
+[Release Assets](https://github.com/I-TECH-UW/OpenELIS-Global-2/releases)
 
 see full
 [installtion instructions](https://docs.openelis-global.org/en/latest/install/)
-with the Offline Installer
+for Offline Installation
 
-### For Implementers who Just want to run OpenELIS without Making any Code Changes
+### For running OpenELIS Global2 in Docker with default Settings out of the Box
 
 see [OpenELIS-Docker setup](https://github.com/I-TECH-UW/openelis-docker)
 
-### Running OpenELIS in Docker For Devlopers with Intention of Making code Changes
+### For Running OpenELIS Global2 from Source Code
 
-#### Running docker compose With pre-released docker images
+#### Running OpenELIS Global2 using docker compose With published docker images on dockerhub
 
     docker-compose up -d
 
-#### Running docker compose with docker images built directly from the source code
+#### Running OpenELIS Global2 using docker compose with docker images built directly from the source code
 
     docker-compose -f build.docker-compose.yml up -d --build
 
-#### Running docker compose With locally compiled/built Artifacts (ie the War file and React code) For Developers
+#### Running OpenELIS Global2 using docker compose With locally compiled/built Artifacts (ie the War file and React code)
 
 1.  Fork the
     [OpenELIS-Global Repository](https://github.com/I-TECH-UW/OpenELIS-Global-2.git)

From 69d020b7def285fd4aac6a4db66731b82fbbdec4 Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Thu, 31 Oct 2024 14:14:00 +0300
Subject: [PATCH 43/56] update Read me

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 21473461b9..61e5f09e2c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # OpenELIS Global 2
 
 This is the OpenELIS rewrite onto Java Spring, and with all new technology and
-features. Please see our [website](http://www.openelis-global.org/) for more
+features. Please vist our [website](http://www.openelis-global.org/) for more
 information.
 
 You can find more information on how to set up OpenELIS at our

From da0efe1f9f95889f16f3ac899574b4d218e56398 Mon Sep 17 00:00:00 2001
From: josephbate <sjb.lav@gmail.com>
Date: Fri, 1 Nov 2024 15:25:54 +0300
Subject: [PATCH 44/56] completed more personService Intergration test

---
 .../person/PersonServiceTest.java             | 170 +++++++++++++++++-
 1 file changed, 169 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/openelisglobal/person/PersonServiceTest.java b/src/test/java/org/openelisglobal/person/PersonServiceTest.java
index 35abee42f8..6c54d57774 100644
--- a/src/test/java/org/openelisglobal/person/PersonServiceTest.java
+++ b/src/test/java/org/openelisglobal/person/PersonServiceTest.java
@@ -1,9 +1,16 @@
 package org.openelisglobal.person;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import javax.transaction.Transactional;
 import org.junit.After;
@@ -11,6 +18,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.openelisglobal.BaseWebContextSensitiveTest;
+import org.openelisglobal.common.util.ConfigurationProperties;
 import org.openelisglobal.patient.service.PatientService;
 import org.openelisglobal.patient.valueholder.Patient;
 import org.openelisglobal.person.service.PersonService;
@@ -112,6 +120,28 @@ public void getLastName_shouldReturnEmptyStringForNullPerson() {
         Assert.assertEquals("", retrievedLastName);
     }
 
+    @Test
+    public void getLastName_shouldReturnLastName() {
+        String firstName = "John";
+        String lastName = "Doe";
+
+        Person person = createPerson(firstName, lastName);
+        String retrievedLastName = personService.getLastName(person);
+
+        Assert.assertEquals(lastName, retrievedLastName);
+    }
+
+    @Test
+    public void getFirstName_shouldReturnFirstName() {
+        String firstName = "Jones";
+        String lastName = "Doe";
+
+        Person person = createPerson(firstName, lastName);
+        String retrievedFirstName = personService.getFirstName(person);
+
+        Assert.assertEquals(firstName, retrievedFirstName);
+    }
+
     @Test
     public void getLastFirstName_shouldReturnCorrectFormat() throws Exception {
         String firstName = "John";
@@ -123,6 +153,112 @@ public void getLastFirstName_shouldReturnCorrectFormat() throws Exception {
         Assert.assertEquals(lastName + ", " + firstName, lastFirstName);
     }
 
+    @Test
+    public void getWorkPhone_shouldReturnWorkPhone() throws Exception {
+        String firstName = "John";
+        String lastName = "Doe";
+
+        Person person = createPerson(firstName, lastName);
+        person.setWorkPhone("12345");
+        String personId = personService.insert(person);
+        Assert.assertEquals("12345", personService.getWorkPhone(person));
+    }
+
+    @Test
+    public void getCellPhone_shouldReturnCellPhone() throws Exception {
+        String firstName = "John";
+        String lastName = "Doe";
+
+        Person person = createPerson(firstName, lastName);
+        person.setCellPhone("12345");
+        String personId = personService.insert(person);
+        Assert.assertEquals("12345", personService.getCellPhone(person));
+    }
+
+    @Test
+    public void getFax_shouldReturnFax() throws Exception {
+        String firstName = "John";
+        String lastName = "Doe";
+
+        Person person = createPerson(firstName, lastName);
+        person.setFax("1245");
+        String personId = personService.insert(person);
+        Assert.assertEquals("1245", personService.getFax(person));
+    }
+
+    @Test
+    public void getPersonById_shouldReturngetPersonById() throws Exception {
+        String firstName = "John";
+        String lastName = "Doe";
+
+        Person person = createPerson(firstName, lastName);
+        person.setFax("1245");
+        String personId = personService.insert(person);
+
+        Person savedPerson = personService.getPersonById(personId);
+        Assert.assertEquals("1245", personService.getFax(savedPerson));
+    }
+
+    @Test
+    public void getData_shouldReturncopiesPropertiesFromDatabase() throws Exception {
+        String firstName = "John";
+        String lastName = "Doe";
+
+        Person person = createPerson(firstName, lastName);
+        person.setFax("1245");
+        String personId = personService.insert(person);
+
+        Person personToUpdate = new Person();
+        personToUpdate.setId(personId);
+
+        personService.getData(personToUpdate);
+
+        assertNotNull(personToUpdate.getId());
+        assertEquals("1245", personToUpdate.getFax());
+    }
+
+    @Test
+    public void getData_shouldReturnpersonNotFound() throws Exception {
+        String firstName = "John";
+        String lastName = "Doe";
+
+        Person person = createPerson(firstName, lastName);
+        person.setFax("1245");
+        String personId = personService.insert(person);
+
+        Person personToUpdate = new Person();
+        personToUpdate.setId("345");
+
+        personService.getData(personToUpdate);
+
+        assertNull(personToUpdate.getId());
+    }
+
+    @Test
+    public void getPageOfPersons_shouldReturnPageOfPersons() {
+        String firstName = "John";
+        String lastName = "Doe";
+
+        String firstName2 = "Joseph";
+        String lastName2 = "Luke";
+
+        Person person = createPerson(firstName, lastName);
+        Person person2 = createPerson(firstName2, lastName2);
+        personService.insert(person);
+        personService.insert(person2);
+
+        List<Person> personsPage = personService.getPageOfPersons(1);
+
+        int expectedPageSize = Integer
+                .parseInt(ConfigurationProperties.getInstance().getPropertyValue("page.defaultPageSize"));
+        Assert.assertTrue(personsPage.size() <= expectedPageSize);
+
+        if (expectedPageSize >= 2) {
+            Assert.assertTrue(personsPage.stream().anyMatch(p -> p.getFirstName().equals(firstName)));
+            Assert.assertTrue(personsPage.stream().anyMatch(p -> p.getFirstName().equals(firstName2)));
+        }
+    }
+
     @Test
     public void getData_shouldRetrieveDataForPerson() throws Exception {
         // Create a new person
@@ -209,4 +345,36 @@ public void getPersonByLastName_shouldReturnCorrectPerson() throws Exception {
         Assert.assertEquals(lastName, retrievedPerson.getLastName());
     }
 
-}
+    @Test
+    public void getAddressComponents_shouldReturngetAddressComponents() throws Exception {
+        String firstName = "Jane";
+        String lastName = "Smith";
+        String city = "Kampala";
+        String country = "Uganda";
+        String state = "Kisumali";
+        String streetAdress = "Bakuli";
+        String zipCode = "256";
+
+        Person person = createPerson(firstName, lastName);
+        person.setCity(city);
+        person.setCountry(country);
+        person.setState(state);
+        person.setStreetAddress(streetAdress);
+        person.setZipCode(zipCode);
+        personService.insert(person);
+
+        Map<String, String> result = personService.getAddressComponents(person);
+        assertEquals(city, result.get("City"));
+        assertEquals(country, result.get("Country"));
+        assertEquals(state, result.get("State"));
+        assertEquals(streetAdress, result.get("Street"));
+        assertEquals(zipCode, result.get("Zip"));
+    }
+
+     @Test
+    public void testGetAddressComponents_handlesNullPerson() {
+        Map<String, String> result = personService.getAddressComponents(null);
+
+        assertTrue(result.isEmpty());
+    }
+}
\ No newline at end of file

From 4a6830b2314fa300e1431c891063a7530d288ae1 Mon Sep 17 00:00:00 2001
From: josephbate <sjb.lav@gmail.com>
Date: Fri, 1 Nov 2024 15:28:56 +0300
Subject: [PATCH 45/56] formatinng fix

---
 src/test/java/org/openelisglobal/person/PersonServiceTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/openelisglobal/person/PersonServiceTest.java b/src/test/java/org/openelisglobal/person/PersonServiceTest.java
index 6c54d57774..fc366245ed 100644
--- a/src/test/java/org/openelisglobal/person/PersonServiceTest.java
+++ b/src/test/java/org/openelisglobal/person/PersonServiceTest.java
@@ -371,7 +371,7 @@ public void getAddressComponents_shouldReturngetAddressComponents() throws Excep
         assertEquals(zipCode, result.get("Zip"));
     }
 
-     @Test
+    @Test
     public void testGetAddressComponents_handlesNullPerson() {
         Map<String, String> result = personService.getAddressComponents(null);
 

From 534396b0a98b65283e99014b2ca95768fd1e4ca5 Mon Sep 17 00:00:00 2001
From: Brian308 <bahatibrianp@gmail.com>
Date: Fri, 1 Nov 2024 17:26:20 +0300
Subject: [PATCH 46/56] made searchBar occupy screen width and refactored the
 code too

---
 .../components/layout/search/searchBar.css    | 97 ++-----------------
 1 file changed, 9 insertions(+), 88 deletions(-)

diff --git a/frontend/src/components/layout/search/searchBar.css b/frontend/src/components/layout/search/searchBar.css
index ef61e5efee..ddaacebf1b 100644
--- a/frontend/src/components/layout/search/searchBar.css
+++ b/frontend/src/components/layout/search/searchBar.css
@@ -1,7 +1,6 @@
 .main {
   position: absolute;
-  right: 175px;
-  width: 700px;
+  width: 100%;
 }
 
 .search-bar-container {
@@ -9,7 +8,9 @@
   display: flex;
   width: 100%;
   top: 10px;
-  right: -30px;
+  margin-top: 38px;
+  right: 1px;
+  /*right: -20px;*/
   box-shadow: 0em 0.1em 0.05em #ccc;
 }
 
@@ -50,98 +51,18 @@
   cursor: pointer;
 }
 
-/* Small screens - Mobile layout (300px to 479px) */
-@media (min-width: 300px) and (max-width: 479px) {
-  .patientHead {
-    flex-direction: row;
-    align-items: stretch;
-  }
-
-  .search-bar-container {
-    margin-top: 40px;
-    width: 30%;
-    box-shadow: none;
-  }
-
-  .search-input {
-    width: 30%;
-  }
-}
-
-/* Small-medium screens (480px to 600px) */
-@media (min-width: 480px) and (max-width: 600px) {
-  .patientHead {
-    flex-direction: column;
-    align-items: center;
-    width: 35%;
-  }
-
-  .search-bar-container {
-    flex-direction: row;
-    margin-top: 40px;
-    width: 35%;
-    box-shadow: none;
-  }
-
-  .search-input {
-    width: 35%;
-  }
-}
 
-/* Medium screens (601px to 768px) */
-@media (min-width: 601px) and (max-width: 768px) {
-  .patientHead {
-    flex-direction: column;
-    align-items: center;
-    width: 45%;
-  }
+/* Large screens (1208px and up) */
+@media (min-width: 1208px) {
+  
 
   .search-bar-container {
-    flex-direction: row;
-    align-items: center;
-    margin-top: 40px;
     width: 45%;
+    margin-top: 0%;
+    right: 130px;
   }
 
   .search-input {
     width: 45%;
   }
 }
-
-/* Medium-large screens (769px to 1099px) */
-@media (min-width: 769px) and (max-width: 1099px) {
-  .patientHead {
-    flex-direction: row;
-    justify-content: space-between;
-  }
-
-  .search-bar-container {
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
-    margin-top: 40px;
-    width: 60%;
-  }
-
-  .search-input {
-    width: 60%;
-  }
-}
-
-/* Large screens (1100px and up) */
-@media (min-width: 1100px) {
-  .patientHead {
-    flex-direction: row;
-    justify-content: space-between;
-  }
-
-  .search-bar-container {
-    flex-direction: row;
-    align-items: center;
-    width: 60%;
-  }
-
-  .search-input {
-    width: 60%;
-  }
-}

From 2e5bd2ce1a60cf36674bf62b6d23202f46506f1b Mon Sep 17 00:00:00 2001
From: josephbate <sjb.lav@gmail.com>
Date: Fri, 1 Nov 2024 18:49:32 +0300
Subject: [PATCH 47/56] Added more intergration tests for patientService class

---
 .../patient/PatientServiceTest.java           | 139 ++++++++++++++++++
 1 file changed, 139 insertions(+)

diff --git a/src/test/java/org/openelisglobal/patient/PatientServiceTest.java b/src/test/java/org/openelisglobal/patient/PatientServiceTest.java
index fdba8566f4..3f4cbd8948 100644
--- a/src/test/java/org/openelisglobal/patient/PatientServiceTest.java
+++ b/src/test/java/org/openelisglobal/patient/PatientServiceTest.java
@@ -1,11 +1,14 @@
 package org.openelisglobal.patient;
 
+import static org.junit.Assert.assertEquals;
+
 import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -64,6 +67,99 @@ public void createPatient_shouldCreateNewPatient() throws Exception {
         Assert.assertEquals(gender, savedPatient.getGender());
     }
 
+    @Test
+    public void getData_shouldCopyPropertiesFromDatabase() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        Patient savedPatient = new Patient();
+        savedPatient.setId(patientId);
+        patientService.getData(savedPatient);
+
+        Assert.assertEquals(gender, savedPatient.getGender());
+    }
+
+    @Test
+    public void getData_shouldCopyPropertiesFromDatabaseById() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        Patient patient2 = patientService.getData(patientId);
+
+        Assert.assertEquals(gender, patient2.getGender());
+    }
+
+    @Test
+    public void getEnteredDOB_shouldReturnEnteredDOB() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        patient.setBirthDateForDisplay("12/12/1992");
+        patientService.insert(patient);
+        Assert.assertEquals(dob, patientService.getEnteredDOB(patient));
+    }
+
+    @Test
+    public void getDOB_shouldReturnDOB() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        patientService.insert(patient);
+        Assert.assertEquals("1992-12-12 00:00:00.0", patientService.getDOB(patient).toString());
+    }
+
+    @Test
+    public void getPhone_shouldReturnPhone() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        patient.getPerson().setPrimaryPhone("12345");
+        patientService.insert(patient);
+        Assert.assertEquals("12345", patientService.getPhone(patient));
+    }
+
+    @Test
+    public void getPerson_shouldReturnPerson() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+
+        patientService.insert(patient);
+
+        Person retrievedPerson = patientService.getPerson(patient);
+        Assert.assertEquals(firstName, retrievedPerson.getFirstName());
+        Assert.assertEquals(lastname, retrievedPerson.getLastName());
+    }
+
+    @Test
+    public void getPatientId_shouldReturngetPatientId() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+
+        String patientId = patientService.insert(patient);
+
+        Assert.assertEquals(patientId, patientService.getPatientId(patient));
+    }
+
     @Test
     public void getAllPatients_shouldGetAllPatients() throws Exception {
         String firstName = "John";
@@ -155,6 +251,49 @@ public void createPatientType_shouldCreateNewPatientType() throws Exception {
         Assert.assertEquals("Test Type", savedPatientType.getType());
     }
 
+    @Test
+    public void getNationalId_shouldReturnNationalId() throws Exception {
+        String firstName = "Bruce";
+        String lastName = "Wayne";
+        String dob = "10/10/1975";
+        String gender = "M";
+        Patient pat = createPatient(firstName, lastName, dob, gender);
+        pat.setNationalId("12345");
+
+        String patientId = patientService.insert(pat);
+
+        Assert.assertEquals("12345", patientService.getNationalId(pat));
+    }
+
+    @Test
+    public void getAddressComponents_shouldReturnAddressComponents() throws Exception {
+        String firstName = "Bruce";
+        String lastName = "Wayne";
+        String dob = "10/10/1975";
+        String gender = "M";
+        String city = "Kampala";
+        String country = "Uganda";
+        String state = "Kisumali";
+        String streetAdress = "Bakuli";
+        String zipCode = "256";
+        Patient pat = createPatient(firstName, lastName, dob, gender);
+        pat.getPerson().setCity(city);
+        pat.getPerson().setCountry(country);
+        pat.getPerson().setState(state);
+        pat.getPerson().setStreetAddress(streetAdress);
+        pat.getPerson().setZipCode(zipCode);
+
+        String patientId = patientService.insert(pat);
+
+        Map<String, String> result = patientService.getAddressComponents(pat);
+
+        assertEquals(city, result.get("City"));
+        assertEquals(country, result.get("Country"));
+        assertEquals(state, result.get("State"));
+        assertEquals(streetAdress, result.get("Street"));
+        assertEquals(zipCode, result.get("Zip"));
+    }
+
     @Test
     public void getPatientByNationalId_shouldReturnCorrectPatient() throws Exception {
         String firstName = "Bruce";

From b96634a527e9c1e8739e42c99afa2bd6a71b10c4 Mon Sep 17 00:00:00 2001
From: josephbate <sjb.lav@gmail.com>
Date: Fri, 1 Nov 2024 19:05:28 +0300
Subject: [PATCH 48/56] add a delete test

---
 .../person/PersonServiceTest.java              | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/openelisglobal/person/PersonServiceTest.java b/src/test/java/org/openelisglobal/person/PersonServiceTest.java
index fc366245ed..a7b4bdfa28 100644
--- a/src/test/java/org/openelisglobal/person/PersonServiceTest.java
+++ b/src/test/java/org/openelisglobal/person/PersonServiceTest.java
@@ -200,7 +200,7 @@ public void getPersonById_shouldReturngetPersonById() throws Exception {
     }
 
     @Test
-    public void getData_shouldReturncopiesPropertiesFromDatabase() throws Exception {
+    public void getData_shouldReturncopiedPropertiesFromDatabase() throws Exception {
         String firstName = "John";
         String lastName = "Doe";
 
@@ -377,4 +377,20 @@ public void testGetAddressComponents_handlesNullPerson() {
 
         assertTrue(result.isEmpty());
     }
+
+    @Test
+    public void deletePerson_shouldDeletePerson() {
+        String firstName = "John";
+        String lastName = "Doe";
+
+        Person person = createPerson(firstName, lastName);
+        String personId = personService.insert(person);
+        Assert.assertNotNull(personId);
+
+        Person savedPerson = personService.get(personId);
+
+        personService.delete(savedPerson);
+
+        Assert.assertEquals(0, personService.getAll().size());
+    }
 }
\ No newline at end of file

From 64242361db7460a52c3974b081d0cd88c1656b5c Mon Sep 17 00:00:00 2001
From: josephbate <sjb.lav@gmail.com>
Date: Sun, 3 Nov 2024 13:53:14 +0300
Subject: [PATCH 49/56] added more test

---
 .../patient/PatientServiceTest.java           | 98 +++++++++++++++++++
 1 file changed, 98 insertions(+)

diff --git a/src/test/java/org/openelisglobal/patient/PatientServiceTest.java b/src/test/java/org/openelisglobal/patient/PatientServiceTest.java
index 3f4cbd8948..cd3ebb0b8a 100644
--- a/src/test/java/org/openelisglobal/patient/PatientServiceTest.java
+++ b/src/test/java/org/openelisglobal/patient/PatientServiceTest.java
@@ -171,6 +171,36 @@ public void getAllPatients_shouldGetAllPatients() throws Exception {
         Assert.assertEquals(1, patientService.getAllPatients().size());
     }
 
+    @Test
+    public void getPatientByPerson_shouldReturnPatientByPerson() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dobs = "12/12/1992";
+        String gender = "M";
+
+        Person person = new Person();
+        person.setFirstName(firstName);
+        person.setLastName(lastname);
+        personService.save(person);
+
+        DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+        Date date = dateFormat.parse(dobs);
+        long time = date.getTime();
+        Timestamp dob = new Timestamp(time);
+
+        Patient pat = new Patient();
+        pat.setPerson(person);
+        pat.setBirthDate(dob);
+        pat.setGender(gender);
+
+        patientService.insert(pat);
+
+        Patient patient = patientService.getPatientByPerson(person);
+
+        Assert.assertEquals(gender, patient.getGender());
+
+    }
+
     private Patient createPatient(String firstName, String LastName, String birthDate, String gender)
             throws ParseException {
         Person person = new Person();
@@ -311,6 +341,32 @@ public void getPatientByNationalId_shouldReturnCorrectPatient() throws Exception
         Assert.assertEquals(patientId, fetchedPatient.getId());
     }
 
+    @Test
+    public void getPatientsByNationalId_shouldReturnListOfPatients() throws Exception {
+        String firstName = "Bruce";
+        String lastName = "Wayne";
+        String dob = "10/10/1975";
+        String gender = "M";
+        Patient pat = createPatient(firstName, lastName, dob, gender);
+        pat.setNationalId("12345");
+
+        String patientId = patientService.insert(pat);
+
+        String firstName2 = "Bruce";
+        String lastName2 = "Wayne";
+        String dob2 = "10/10/1975";
+        String gender2 = "M";
+        Patient pat2 = createPatient(firstName2, lastName2, dob2, gender2);
+        pat2.setNationalId("12345");
+
+        String patientId2 = patientService.insert(pat2);
+
+        List<Patient> fetchedPatients = patientService.getPatientsByNationalId("12345");
+
+        Assert.assertNotNull(fetchedPatients);
+        Assert.assertEquals(2, fetchedPatients.size());
+    }
+
     @Test
     public void getPatientByExternalId_shouldReturnCorrectPatient() throws Exception {
         String firstName = "Oliver";
@@ -328,6 +384,48 @@ public void getPatientByExternalId_shouldReturnCorrectPatient() throws Exception
         Assert.assertEquals(patientId, fetchedPatient.getId());
     }
 
+    @Test
+    public void externalIDExists_shouldReturnExternalIDExists() throws Exception {
+        String firstName = "Oliver";
+        String lastName = "Queen";
+        String dob = "27/09/1985";
+        String gender = "M";
+        Patient pat = createPatient(firstName, lastName, dob, gender);
+        pat.setExternalId("EX123");
+
+        String patientId = patientService.insert(pat);
+
+        Assert.assertTrue(patientService.externalIDExists("EX123"));
+    }
+
+    @Test
+    public void getExternalID_shouldReturnExternalID() throws Exception {
+        String firstName = "Oliver";
+        String lastName = "Queen";
+        String dob = "27/09/1985";
+        String gender = "M";
+        Patient pat = createPatient(firstName, lastName, dob, gender);
+        pat.setExternalId("EX123");
+
+        Assert.assertEquals("EX123", patientService.getExternalId(pat));
+    }
+
+    @Test
+    public void readPatient_shouldReadPatient() throws Exception {
+        String firstName = "Oliver";
+        String lastName = "Queen";
+        String dob = "27/09/1985";
+        String gender = "M";
+        Patient pat = createPatient(firstName, lastName, dob, gender);
+        pat.setExternalId("EX123");
+
+        String patientId = patientService.insert(pat);
+
+        Patient patient = patientService.readPatient(patientId);
+        Assert.assertEquals(gender, patient.getGender());
+        Assert.assertEquals("1985-09-27 00:00:00.0", patient.getBirthDate().toString());
+    }
+
     @Test
     public void getFirstName_shouldReturnCorrectFirstName() throws Exception {
         String firstName = "Tony";

From 2702ea06300299f15ac4cb3199632509efc1d689 Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Mon, 4 Nov 2024 21:25:22 +0300
Subject: [PATCH 50/56] add coverage badge

---
 .github/workflows/ci.yml | 11 ++++++++
 pom.xml                  | 54 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d001bcf4b4..3d5a9472b2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,3 +39,14 @@ jobs:
 
       - name: Build OpenELIS-Global2
         run: mvn clean install -Dspotless.check.skip=true
+
+      - name: Generate JaCoCo Badge
+        uses: cicirello/jacoco-badge-generator@v2
+        with:
+          jacoco-csv-file: target/site/jacoco/jacoco.csv
+          badges-directory: target/html/badges
+
+      - name: Publish coverage report to GitHub Pages
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          folder: target/html/    
diff --git a/pom.xml b/pom.xml
index 7582194274..8cea320285 100644
--- a/pom.xml
+++ b/pom.xml
@@ -722,6 +722,60 @@
           </java>
         </configuration>
       </plugin>
+      <plugin>
+          <groupId>org.jacoco</groupId>
+          <artifactId>jacoco-maven-plugin</artifactId>
+          <version>0.8.12</version>
+          <configuration>
+             <excludes>
+                    <exclude>**/*.jar</exclude>
+                    <exclude>naughty-dependency/**/*.class</exclude>
+                </excludes>
+          </configuration>
+          <executions>
+              <execution>
+                  <goals>
+                      <goal>prepare-agent</goal>
+                  </goals>
+              </execution>
+              <execution>
+                  <id>report</id>
+                  <phase>test</phase>
+                  <goals>
+                      <goal>report</goal>
+                  </goals>
+              </execution>
+
+               <!-- Make sure we have at least 70% coverage -->
+              <!-- <execution>
+                <id>verify-test-coverage</id>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+                <configuration>
+                  <rules>
+                    <rule>
+                      <element>BUNDLE</element>
+                      <excludes>
+                        <exclude>*Mojo</exclude>
+                      </excludes>
+                      <limits>
+                        <limit>
+                          <counter>INSTRUCTION</counter>
+                          <value>COVEREDRATIO</value>
+                          <minimum>10%</minimum>
+                        </limit>
+                      </limits>
+                    </rule>
+                  </rules>
+                </configuration>
+              </execution> -->
+               
+          </executions>
+        </plugin>
+
+  
+
     </plugins>
   </build>
 </project>

From 1a2b43a5e65d0ef056b7a8b4d70298852419cb22 Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Mon, 4 Nov 2024 21:27:32 +0300
Subject: [PATCH 51/56] apply format

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8cea320285..6af06f581c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -770,11 +770,11 @@
                   </rules>
                 </configuration>
               </execution> -->
-               
+
           </executions>
         </plugin>
 
-  
+
 
     </plugins>
   </build>

From 66edaa1da0a2aa71b54d74c9e1f65e5bd6065b0d Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Mon, 4 Nov 2024 22:12:19 +0300
Subject: [PATCH 52/56] update Read Me

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 61e5f09e2c..d1e0bdc035 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@ You can find more information on how to set up OpenELIS at our
 ### CI Status
 
 [![Maven Build Status](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/ci.yml/badge.svg)](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/ci.yml)
+![Coverage](https://raw.githubusercontent.com/I-TECH-UW/OpenELIS-Global-2/refs/heads/gh-pages/badges/jacoco.svg)
 
 [![Publish OpenELIS WebApp Docker Image Status](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/publish-and-test.yml/badge.svg)](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/publish-and-test.yml)
 

From 0d6ac5adc5b224d5f09f564fac5fe49a2aca3c1c Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Mon, 4 Nov 2024 22:30:32 +0300
Subject: [PATCH 53/56] only deploy badge on push

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3d5a9472b2..2f6e116231 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,12 +41,14 @@ jobs:
         run: mvn clean install -Dspotless.check.skip=true
 
       - name: Generate JaCoCo Badge
+        if: github.event_name == 'push'
         uses: cicirello/jacoco-badge-generator@v2
         with:
           jacoco-csv-file: target/site/jacoco/jacoco.csv
           badges-directory: target/html/badges
 
       - name: Publish coverage report to GitHub Pages
+        if: github.event_name == 'push'
         uses: JamesIves/github-pages-deploy-action@v4
         with:
           folder: target/html/    

From 6863f83d78a67fee22c197640c50f235192d44d9 Mon Sep 17 00:00:00 2001
From: josephbate <sjb.lav@gmail.com>
Date: Tue, 5 Nov 2024 12:59:00 +0300
Subject: [PATCH 54/56] adding more tests for patientService

---
 .../patient/PatientServiceTest.java           | 445 ++++++++++++++++++
 1 file changed, 445 insertions(+)

diff --git a/src/test/java/org/openelisglobal/patient/PatientServiceTest.java b/src/test/java/org/openelisglobal/patient/PatientServiceTest.java
index cd3ebb0b8a..960db97bb0 100644
--- a/src/test/java/org/openelisglobal/patient/PatientServiceTest.java
+++ b/src/test/java/org/openelisglobal/patient/PatientServiceTest.java
@@ -18,6 +18,9 @@
 import org.openelisglobal.patient.service.PatientService;
 import org.openelisglobal.patient.service.PatientTypeService;
 import org.openelisglobal.patient.valueholder.Patient;
+import org.openelisglobal.patientidentity.service.PatientIdentityService;
+import org.openelisglobal.patientidentity.valueholder.PatientIdentity;
+import org.openelisglobal.patientidentitytype.service.PatientIdentityTypeService;
 import org.openelisglobal.patienttype.valueholder.PatientType;
 import org.openelisglobal.person.service.PersonService;
 import org.openelisglobal.person.valueholder.Person;
@@ -34,15 +37,26 @@ public class PatientServiceTest extends BaseWebContextSensitiveTest {
     @Autowired
     PersonService personService;
 
+    @Autowired
+    PatientIdentityTypeService identityTypeService;
+
+    @Autowired
+    PatientIdentityService identityService;
+
     @Before
     public void init() throws Exception {
+        // identityTypeService.deleteAll(identityTypeService.getAll());
+        identityService.deleteAll(identityService.getAll());
         patientService.deleteAll(patientService.getAll());
         personService.deleteAll(personService.getAll());
         patientTypeService.deleteAll(patientTypeService.getAll());
+
     }
 
     @After
     public void tearDown() {
+        // identityTypeService.deleteAll(identityTypeService.getAll());
+        identityService.deleteAll(identityService.getAll());
         patientService.deleteAll(patientService.getAll());
         personService.deleteAll(personService.getAll());
         patientTypeService.deleteAll(patientTypeService.getAll());
@@ -83,6 +97,413 @@ public void getData_shouldCopyPropertiesFromDatabase() throws Exception {
         Assert.assertEquals(gender, savedPatient.getGender());
     }
 
+    @Test
+    public void getSubjectNumber_shouldReturnSubjectNumber() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        String typeID = identityTypeService.getNamedIdentityType("SUBJECT").getId();
+
+        PatientIdentity patientIdentity = new PatientIdentity();
+        patientIdentity.setIdentityTypeId(typeID);
+        patientIdentity.setPatientId(patientId);
+        patientIdentity.setIdentityData("334-422-A");
+        identityService.insert(patientIdentity);
+
+        Assert.assertEquals("334-422-A", patientService.getSubjectNumber(patient));
+    }
+
+    @Test
+    public void getIdentityList_shouldReturnIdentityList() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        String typeID = identityTypeService.getNamedIdentityType("AKA").getId();
+
+        PatientIdentity patientIdentity = new PatientIdentity();
+        patientIdentity.setIdentityTypeId(typeID);
+        patientIdentity.setPatientId(patientId);
+        patientIdentity.setIdentityData("BigMan");
+        identityService.insert(patientIdentity);
+
+        String typeID2 = identityTypeService.getNamedIdentityType("GUID").getId();
+
+        PatientIdentity patientIdentity2 = new PatientIdentity();
+        patientIdentity2.setIdentityTypeId(typeID2);
+        patientIdentity2.setPatientId(patientId);
+        patientIdentity2.setIdentityData("EA400A1");
+        identityService.insert(patientIdentity2);
+
+        Assert.assertEquals(2, patientService.getIdentityList(patient).size());
+    }
+
+    @Test
+    public void getNationality_shouldReturnNationality() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        String typeID = identityTypeService.getNamedIdentityType("NATIONALITY").getId();
+
+        PatientIdentity patientIdentity = new PatientIdentity();
+        patientIdentity.setIdentityTypeId(typeID);
+        patientIdentity.setPatientId(patientId);
+        patientIdentity.setIdentityData("Ugandan");
+        identityService.insert(patientIdentity);
+
+        Assert.assertEquals("Ugandan", patientService.getNationality(patient));
+    }
+
+    @Test
+    public void getOtherNationality_shouldReturnOtherNationality() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        String typeID = identityTypeService.getNamedIdentityType("OTHER NATIONALITY").getId();
+
+        PatientIdentity patientIdentity = new PatientIdentity();
+        patientIdentity.setIdentityTypeId(typeID);
+        patientIdentity.setPatientId(patientId);
+        patientIdentity.setIdentityData("USA");
+        identityService.insert(patientIdentity);
+
+        Assert.assertEquals("USA", patientService.getOtherNationality(patient));
+    }
+
+    @Test
+    public void getMother_shouldReturnMother() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        String typeID = identityTypeService.getNamedIdentityType("MOTHER").getId();
+
+        PatientIdentity patientIdentity = new PatientIdentity();
+        patientIdentity.setIdentityTypeId(typeID);
+        patientIdentity.setPatientId(patientId);
+        patientIdentity.setIdentityData("Jackie Moore");
+        identityService.insert(patientIdentity);
+
+        Assert.assertEquals("Jackie Moore", patientService.getMother(patient));
+    }
+
+    @Test
+    public void getMothersInitial_shouldReturnMothersInitial() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        String typeID = identityTypeService.getNamedIdentityType("MOTHERS_INITIAL").getId();
+
+        PatientIdentity patientIdentity = new PatientIdentity();
+        patientIdentity.setIdentityTypeId(typeID);
+        patientIdentity.setPatientId(patientId);
+        patientIdentity.setIdentityData("Jackie Moore");
+        identityService.insert(patientIdentity);
+
+        Assert.assertEquals("Jackie Moore", patientService.getMothersInitial(patient));
+    }
+
+    @Test
+    public void getInsurance_shouldReturnInsurance() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        String typeID = identityTypeService.getNamedIdentityType("INSURANCE").getId();
+
+        PatientIdentity patientIdentity = new PatientIdentity();
+        patientIdentity.setIdentityTypeId(typeID);
+        patientIdentity.setPatientId(patientId);
+        patientIdentity.setIdentityData("US119a36");
+        identityService.insert(patientIdentity);
+
+        Assert.assertEquals("US119a36", patientService.getInsurance(patient));
+    }
+
+    @Test
+    public void getOccupation_shouldReturnOccupation() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        String typeID = identityTypeService.getNamedIdentityType("OCCUPATION").getId();
+
+        PatientIdentity patientIdentity = new PatientIdentity();
+        patientIdentity.setIdentityTypeId(typeID);
+        patientIdentity.setPatientId(patientId);
+        patientIdentity.setIdentityData("Truck Driver");
+        identityService.insert(patientIdentity);
+
+        Assert.assertEquals("Truck Driver", patientService.getOccupation(patient));
+    }
+
+    @Test
+    public void getOrgSite_shouldReturnOrgSite() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        String typeID = identityTypeService.getNamedIdentityType("ORG_SITE").getId();
+
+        PatientIdentity patientIdentity = new PatientIdentity();
+        patientIdentity.setIdentityTypeId(typeID);
+        patientIdentity.setPatientId(patientId);
+        patientIdentity.setIdentityData("orgSite");
+        identityService.insert(patientIdentity);
+
+        Assert.assertEquals("orgSite", patientService.getOrgSite(patient));
+    }
+
+    @Test
+    public void getEducation_shouldReturnEducationQualification() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        String typeID = identityTypeService.getNamedIdentityType("EDUCATION").getId();
+
+        PatientIdentity patientIdentity = new PatientIdentity();
+        patientIdentity.setIdentityTypeId(typeID);
+        patientIdentity.setPatientId(patientId);
+        patientIdentity.setIdentityData("MBA Certificate");
+        identityService.insert(patientIdentity);
+
+        Assert.assertEquals("MBA Certificate", patientService.getEducation(patient));
+    }
+
+    @Test
+    public void getHealthDistrict_shouldReturnHealthDistrict() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        String typeID = identityTypeService.getNamedIdentityType("HEALTH DISTRICT").getId();
+
+        PatientIdentity patientIdentity = new PatientIdentity();
+        patientIdentity.setIdentityTypeId(typeID);
+        patientIdentity.setPatientId(patientId);
+        patientIdentity.setIdentityData("Jinja");
+        identityService.insert(patientIdentity);
+
+        Assert.assertEquals("Jinja", patientService.getHealthDistrict(patient));
+    }
+
+    @Test
+    public void getHealthRegion_shouldReturnHealthRegion() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        String typeID = identityTypeService.getNamedIdentityType("HEALTH REGION").getId();
+
+        PatientIdentity patientIdentity = new PatientIdentity();
+        patientIdentity.setIdentityTypeId(typeID);
+        patientIdentity.setPatientId(patientId);
+        patientIdentity.setIdentityData("EastAfrica");
+        identityService.insert(patientIdentity);
+
+        Assert.assertEquals("EastAfrica", patientService.getHealthRegion(patient));
+    }
+
+    @Test
+    public void getMaritalStatus_shouldReturnMaritalStatus() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        String typeID = identityTypeService.getNamedIdentityType("MARITIAL").getId();
+
+        PatientIdentity patientIdentity = new PatientIdentity();
+        patientIdentity.setIdentityTypeId(typeID);
+        patientIdentity.setPatientId(patientId);
+        patientIdentity.setIdentityData("Married");
+        identityService.insert(patientIdentity);
+
+        Assert.assertEquals("Married", patientService.getMaritalStatus(patient));
+    }
+
+    @Test
+    public void getObNumber_shouldReturngObNumber() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        String typeID = identityTypeService.getNamedIdentityType("OB_NUMBER").getId();
+
+        PatientIdentity patientIdentity = new PatientIdentity();
+        patientIdentity.setIdentityTypeId(typeID);
+        patientIdentity.setPatientId(patientId);
+        patientIdentity.setIdentityData("1234");
+        identityService.insert(patientIdentity);
+
+        Assert.assertEquals("1234", patientService.getObNumber(patient));
+    }
+
+    @Test
+    public void getPCNumber_shouldReturngPCNumber() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        String typeID = identityTypeService.getNamedIdentityType("PC_NUMBER").getId();
+
+        PatientIdentity patientIdentity = new PatientIdentity();
+        patientIdentity.setIdentityTypeId(typeID);
+        patientIdentity.setPatientId(patientId);
+        patientIdentity.setIdentityData("1234");
+        identityService.insert(patientIdentity);
+
+        Assert.assertEquals("1234", patientService.getPCNumber(patient));
+    }
+
+    @Test
+    public void getSTNumber_shouldReturngSTNumber() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        String typeID = identityTypeService.getNamedIdentityType("ST").getId();
+
+        PatientIdentity patientIdentity = new PatientIdentity();
+        patientIdentity.setIdentityTypeId(typeID);
+        patientIdentity.setPatientId(patientId);
+        patientIdentity.setIdentityData("1234");
+        identityService.insert(patientIdentity);
+
+        Assert.assertEquals("1234", patientService.getSTNumber(patient));
+    }
+
+    @Test
+    public void getAKA_shouldReturnAKA() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        String typeID = identityTypeService.getNamedIdentityType("AKA").getId();
+
+        PatientIdentity patientIdentity = new PatientIdentity();
+        patientIdentity.setIdentityTypeId(typeID);
+        patientIdentity.setPatientId(patientId);
+        patientIdentity.setIdentityData("BigMan");
+        identityService.insert(patientIdentity);
+
+        Assert.assertEquals("BigMan", patientService.getAKA(patient));
+    }
+
+    @Test
+    public void getGUID_shouldReturnGUID() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        String typeID = identityTypeService.getNamedIdentityType("GUID").getId();
+
+        PatientIdentity patientIdentity = new PatientIdentity();
+        patientIdentity.setIdentityTypeId(typeID);
+        patientIdentity.setPatientId(patientId);
+        patientIdentity.setIdentityData("EA400A1");
+        identityService.insert(patientIdentity);
+
+        Assert.assertEquals("EA400A1", patientService.getGUID(patient));
+    }
+
+    @Test
+    public void getGUID_shouldReturnEmptyStringForNullPatient() throws Exception {
+        Assert.assertEquals("", patientService.getGUID(null));
+    }
+
+    @Test
+    public void getGUID_shouldReturnEmptyStringForNullPatientWithNoGUID() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        Assert.assertEquals("", patientService.getGUID(patient));
+    }
+
+    @Test
+    public void getPatientForGuid_shouldReturnPatientForGuid() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        String patientId = patientService.insert(patient);
+
+        String typeID = identityTypeService.getNamedIdentityType("GUID").getId();
+
+        PatientIdentity patientIdentity = new PatientIdentity();
+        patientIdentity.setIdentityTypeId(typeID);
+        patientIdentity.setPatientId(patientId);
+        patientIdentity.setIdentityData("EA400A1");
+        identityService.insert(patientIdentity);
+
+        Patient savedPatient = patientService.getPatientForGuid("EA400A1");
+
+        Assert.assertEquals(gender, savedPatient.getGender());
+    }
+
     @Test
     public void getData_shouldCopyPropertiesFromDatabaseById() throws Exception {
         String firstName = "John";
@@ -171,6 +592,18 @@ public void getAllPatients_shouldGetAllPatients() throws Exception {
         Assert.assertEquals(1, patientService.getAllPatients().size());
     }
 
+    @Test
+    public void getByExternalId_shouldGetAllPatients() throws Exception {
+        String firstName = "John";
+        String lastname = "Doe";
+        String dob = "12/12/1992";
+        String gender = "M";
+        Patient patient = createPatient(firstName, lastname, dob, gender);
+        patient.setExternalId("432");
+        patientService.insert(patient);
+        Assert.assertEquals(gender, patientService.getByExternalId("432").getGender());
+    }
+
     @Test
     public void getPatientByPerson_shouldReturnPatientByPerson() throws Exception {
         String firstName = "John";
@@ -501,6 +934,18 @@ public void getLocalizedGender_shouldReturnCorrectLocalizedGender() throws Excep
         Assert.assertEquals("MALE", localizedGender);
     }
 
+    @Test
+    public void getBirthdayForDisplay_shouldReturnBirthdayForDisplay() throws Exception {
+        String firstName = "Tayebwa";
+        String lastName = "Noah";
+        String dob = "01/01/2020";
+        String gender = "M";
+        Patient pat = createPatient(firstName, lastName, dob, gender);
+        pat.setBirthDateForDisplay("01/01/2020");
+
+        Assert.assertEquals(dob, patientService.getBirthdayForDisplay(pat));
+    }
+
     @Test
     public void getPageOfPatients_shouldReturnCorrectPatients() throws Exception {
         String firstName1 = "Josh";

From 73104245062c15c6562a57d308b336469a289129 Mon Sep 17 00:00:00 2001
From: Brian308 <bahatibrianp@gmail.com>
Date: Wed, 6 Nov 2024 20:12:25 +0300
Subject: [PATCH 55/56] made modifications for patients class not obstract the
 search bar on small screens

---
 frontend/src/components/layout/search/searchBar.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/layout/search/searchBar.css b/frontend/src/components/layout/search/searchBar.css
index ddaacebf1b..6fa1fb47cd 100644
--- a/frontend/src/components/layout/search/searchBar.css
+++ b/frontend/src/components/layout/search/searchBar.css
@@ -30,7 +30,7 @@
   max-height: 250px;
   position: absolute;
   background-color: #f0e7e7;
-  top: 45px;
+  top: 90px;
   right: -30px;
   box-shadow: 0em 0.1em 0.5em #ccc;
 }
@@ -65,4 +65,7 @@
   .search-input {
     width: 45%;
   }
+  .patients{
+    top: 45px;
+  }
 }

From 8e8eff5cb6d3efdb29b313d9f39ec27d4bcbd5bd Mon Sep 17 00:00:00 2001
From: Brian308 <bahatibrianp@gmail.com>
Date: Wed, 6 Nov 2024 21:44:28 +0300
Subject: [PATCH 56/56] modified the patients class to make it responsive

---
 .../components/layout/search/searchBar.css    | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/layout/search/searchBar.css b/frontend/src/components/layout/search/searchBar.css
index 6fa1fb47cd..e202ea237d 100644
--- a/frontend/src/components/layout/search/searchBar.css
+++ b/frontend/src/components/layout/search/searchBar.css
@@ -30,17 +30,18 @@
   max-height: 250px;
   position: absolute;
   background-color: #f0e7e7;
-  top: 90px;
-  right: -30px;
+  top: 89px;
+  right: -1px;
   box-shadow: 0em 0.1em 0.5em #ccc;
 }
 
 .patientHead {
-  width: 680px;
+  width: 103%;
   position: relative;
   border-bottom: 2px solid #eee3e3;
   background-color: #fcfbfb;
   height: 52px;
+  right: -1px;
   box-shadow: 0em 0.01em 0.05em #ccc;
 }
 .tags {
@@ -65,7 +66,26 @@
   .search-input {
     width: 45%;
   }
-  .patients{
-    top: 45px;
+
+  .patients {
+    overflow-y: auto;
+    width: 45%;
+    max-height: 250px;
+    position: absolute;
+    background-color: #f0e7e7;
+    top: 48px;
+    right: 130px;
+    box-shadow: 0em 0.1em 0.5em #ccc;
+  }
+  
+  .patientHead {
+    overflow-y: auto;
+    width: 600px;
+    right: -1px;
+    position: relative;
+    border-bottom: 2px solid #eee3e3;
+    background-color: #fcfbfb;
+    height: 52px;
+    box-shadow: 0em 0.01em 0.05em #ccc;
   }
 }