From 740166116b086770fccc025c69ce5af85d8d1ddc Mon Sep 17 00:00:00 2001 From: Sharif Magembe Date: Fri, 15 Mar 2024 17:19:54 +0300 Subject: [PATCH 1/5] Added Patient BreadCrumb --- frontend/src/components/patient/PatientHistory.js | 5 ++++- frontend/src/languages/en.json | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/patient/PatientHistory.js b/frontend/src/components/patient/PatientHistory.js index 664d2f4654..db252d1950 100644 --- a/frontend/src/components/patient/PatientHistory.js +++ b/frontend/src/components/patient/PatientHistory.js @@ -5,8 +5,11 @@ import { Heading, Grid, Column, Section } from "@carbon/react"; import SearchPatientForm from "./SearchPatientForm"; import { useState, useEffect, useRef } from "react"; import PageBreadCrumb from "../common/PageBreadCrumb"; -let breadcrumbs = [{ label: "home.label", link: "/" }]; +let breadcrumbs = [ + { label: "home.label", link: "/" }, + { label: "patient.label.PatientHistory", link: "/PatientHistory" }, +]; const PatientHistory = () => { const [selectedPatient, setSelectedPatient] = useState({}); const componentMounted = useRef(false); diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json index c549da6c76..803f44b829 100644 --- a/frontend/src/languages/en.json +++ b/frontend/src/languages/en.json @@ -20,7 +20,10 @@ "login.msg.password.missing": "A password is required", "login.notice.message": "Notice: Access to this service is for authorized personnel only. If you do not have the expressed authorization of the administrator, you must exit now. This organization prohibits unauthorized access, disclosure, duplication, modification, diversion, destruction, loss, misuse, or theft of its information.", "error.invalidcredentials": "Username or Password are incorrect", - "patient.label.modify" : "Add/Modify Patient" , + "patient.label.modify" :"Modify Patient" , + "patient.label.create" :"Create Patient" , + "patient.label.PatientHistory" :"PatientHistory" , + "patient.label.SamplePatientEntry" :"SamplePatientEntry" , "patient.label.info" : "Patient Information", "breadcrumb.home" : "Home", "admin.legacy" :"Legacy Admin", From 280b4da876b04fe5985412a08363ab3104ab7027 Mon Sep 17 00:00:00 2001 From: sherrif10 Date: Fri, 15 Mar 2024 17:26:56 +0300 Subject: [PATCH 2/5] minor fix --- frontend/src/languages/en.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json index 803f44b829..dcefa8e4ac 100644 --- a/frontend/src/languages/en.json +++ b/frontend/src/languages/en.json @@ -21,9 +21,7 @@ "login.notice.message": "Notice: Access to this service is for authorized personnel only. If you do not have the expressed authorization of the administrator, you must exit now. This organization prohibits unauthorized access, disclosure, duplication, modification, diversion, destruction, loss, misuse, or theft of its information.", "error.invalidcredentials": "Username or Password are incorrect", "patient.label.modify" :"Modify Patient" , - "patient.label.create" :"Create Patient" , "patient.label.PatientHistory" :"PatientHistory" , - "patient.label.SamplePatientEntry" :"SamplePatientEntry" , "patient.label.info" : "Patient Information", "breadcrumb.home" : "Home", "admin.legacy" :"Legacy Admin", From d8248a2413126f8e2ccdaa0bff7518ac79c76b13 Mon Sep 17 00:00:00 2001 From: sherrif10 Date: Tue, 19 Mar 2024 10:44:31 +0300 Subject: [PATCH 3/5] minor fix --- frontend/src/languages/en.json | 2 +- frontend/src/languages/fr.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json index dcefa8e4ac..c83f4cd629 100644 --- a/frontend/src/languages/en.json +++ b/frontend/src/languages/en.json @@ -20,7 +20,7 @@ "login.msg.password.missing": "A password is required", "login.notice.message": "Notice: Access to this service is for authorized personnel only. If you do not have the expressed authorization of the administrator, you must exit now. This organization prohibits unauthorized access, disclosure, duplication, modification, diversion, destruction, loss, misuse, or theft of its information.", "error.invalidcredentials": "Username or Password are incorrect", - "patient.label.modify" :"Modify Patient" , + "patient.label.modify" :"Add Or Modify Patient" , "patient.label.PatientHistory" :"PatientHistory" , "patient.label.info" : "Patient Information", "breadcrumb.home" : "Home", diff --git a/frontend/src/languages/fr.json b/frontend/src/languages/fr.json index 6e6f7dcf3b..f3db7fd016 100644 --- a/frontend/src/languages/fr.json +++ b/frontend/src/languages/fr.json @@ -24,7 +24,7 @@ "login.msg.password.missing": "Votre mot de passe requis", "login.notice.message": "Veuillez entrer dans le logiciel de Syst\u00E8me d'Information \u00C9lectronique de Laboratoire:", "error.invalidcredentials": "L'identifiant ou le mot de passe est incorrect", - "patient.label.modify" : "Ajouter/Modifier un patient" , + "patient.label.modify" : "Ajouter ou modifier un patient" , "patient.label.info" : "Informations sur les patients", "breadcrumb.home" : "Domicile", "admin.legacy" :"Précédent Admin", From 847c7c4cbebbd7a820275aa0fe61e71274db287d Mon Sep 17 00:00:00 2001 From: sherrif10 Date: Tue, 19 Mar 2024 12:37:43 +0300 Subject: [PATCH 4/5] minor revert --- frontend/src/languages/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json index c83f4cd629..e22ece6b47 100644 --- a/frontend/src/languages/en.json +++ b/frontend/src/languages/en.json @@ -21,7 +21,7 @@ "login.notice.message": "Notice: Access to this service is for authorized personnel only. If you do not have the expressed authorization of the administrator, you must exit now. This organization prohibits unauthorized access, disclosure, duplication, modification, diversion, destruction, loss, misuse, or theft of its information.", "error.invalidcredentials": "Username or Password are incorrect", "patient.label.modify" :"Add Or Modify Patient" , - "patient.label.PatientHistory" :"PatientHistory" , + "patient.label.PatientHistory" :"Patient History" , "patient.label.info" : "Patient Information", "breadcrumb.home" : "Home", "admin.legacy" :"Legacy Admin", From 4408e2f4407b8693e8ed7f285d80fb80d6bcf208 Mon Sep 17 00:00:00 2001 From: sherrif10 Date: Tue, 19 Mar 2024 12:39:47 +0300 Subject: [PATCH 5/5] minor revert --- frontend/src/languages/en.json | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json index e22ece6b47..81a04d354a 100644 --- a/frontend/src/languages/en.json +++ b/frontend/src/languages/en.json @@ -21,7 +21,6 @@ "login.notice.message": "Notice: Access to this service is for authorized personnel only. If you do not have the expressed authorization of the administrator, you must exit now. This organization prohibits unauthorized access, disclosure, duplication, modification, diversion, destruction, loss, misuse, or theft of its information.", "error.invalidcredentials": "Username or Password are incorrect", "patient.label.modify" :"Add Or Modify Patient" , - "patient.label.PatientHistory" :"Patient History" , "patient.label.info" : "Patient Information", "breadcrumb.home" : "Home", "admin.legacy" :"Legacy Admin",