From 36714ba02700a398ba40d1af4134ee8740504920 Mon Sep 17 00:00:00 2001 From: jona42-ui Date: Thu, 23 Nov 2023 13:58:48 +0300 Subject: [PATCH 01/10] add translations to reports --- frontend/src/components/Reports/Routine.js | 50 +++++++------ frontend/src/components/Reports/Study.js | 73 ++++++++++--------- .../components/resultPage/SearchResultForm.js | 10 +-- frontend/src/languages/en.json | 56 ++++++++++++++ frontend/src/languages/fr.json | 58 ++++++++++++++- 5 files changed, 181 insertions(+), 66 deletions(-) diff --git a/frontend/src/components/Reports/Routine.js b/frontend/src/components/Reports/Routine.js index e89adadba9..39b3694570 100644 --- a/frontend/src/components/Reports/Routine.js +++ b/frontend/src/components/Reports/Routine.js @@ -1,5 +1,6 @@ import React from "react"; import GlobalSideBar from "../common/GlobalSideBar"; +import { FormattedMessage, injectIntl } from "react-intl"; import { IbmWatsonDiscovery, IbmWatsonNaturalLanguageUnderstanding, @@ -10,137 +11,138 @@ export const RoutineReportsMenu = { className: "resultSideNav", sideNavMenuItems: [ { - title: "Patient Status Report", + title: , icon: IbmWatsonDiscovery, SideNavMenuItem: [ { link: config.serverBaseUrl + "/Report?type=patient&report=patientCILNSP_vreduit", - label: "Patient Status Report", + label: , }, ], }, { - title: "Aggregate Reports", + title: , icon: Microscope, SideNavMenuItem: [ { link: config.serverBaseUrl + "/Report?type=indicator&report=statisticsReport", - label: "Statistics Report", + label: , }, { link: config.serverBaseUrl + "/Report?type=indicator&report=indicatorHaitiLNSPAllTests", - label: "Summary of All Tests", + label: }, { link: config.serverBaseUrl + "/Report?type=indicator&report=indicatorCDILNSPHIV", - label: "HIV Test Summary", + label: , }, ], }, { - title: "Rejection Report", + title: , icon: IbmWatsonNaturalLanguageUnderstanding, SideNavMenuItem: [ { link: config.serverBaseUrl + "/Report?type=indicator&report=sampleRejectionReport", - label: "Rejection Report", + label: , }, ], }, { - title: "Activity Report", + title: , icon: IbmWatsonNaturalLanguageUnderstanding, SideNavMenuItem: [ { link: config.serverBaseUrl + "/Report?type=indicator&report=activityReportByTest", - label: "By Test Type", + label: , }, { link: config.serverBaseUrl + "/Report?type=indicator&report=activityReportByPanel", - label: "By Panel Type", + label: , }, { link: config.serverBaseUrl + "/Report?type=indicator&report=activityReportByTestSection", - label: "By Unit", + label: , }, ], }, { - title: "Referred Tests Report", + title: , icon: IbmWatsonNaturalLanguageUnderstanding, SideNavMenuItem: [ { link: config.serverBaseUrl + "/Report?type=patient&report=referredOut", - label: "Referred Tests Report", + label: , }, ], }, { - title: "Non conformity Reports", + title: , icon: IbmWatsonNaturalLanguageUnderstanding, SideNavMenuItem: [ { link: config.serverBaseUrl + "/Report?type=patient&report=haitiNonConformityByDate", - label: "By Date", + label: , }, { link: config.serverBaseUrl + "/Report?type=patient&report=haitiNonConformityBySectionReason", - label: "By unit and Reason", + label: , }, ], }, { - title: "Delayed Validation", + title: , icon: IbmWatsonNaturalLanguageUnderstanding, SideNavMenuItem: [ { link: config.serverBaseUrl + "/ReportPrint?type=indicator&report=validationBacklog", - label: "Delayed Validation", + label: , + icon: IbmWatsonNaturalLanguageUnderstanding, }, ], }, { - title: "Audit Trail", + title: , icon: IbmWatsonNaturalLanguageUnderstanding, SideNavMenuItem: [ { link: config.serverBaseUrl + "/AuditTrailReport", - label: "Audit Trail", + label: , }, ], }, { - title: "Export Routine CSV file", + title: , icon: IbmWatsonNaturalLanguageUnderstanding, SideNavMenuItem: [ { link: config.serverBaseUrl + "/Report?type=patient&report=CISampleRoutineExport", - label: "Export Routine CSV file", + label: , }, ], }, @@ -155,4 +157,4 @@ const Routine = () => { ); }; -export default Routine; +export default injectIntl(Routine); diff --git a/frontend/src/components/Reports/Study.js b/frontend/src/components/Reports/Study.js index 4a4d3bc861..7780ad4be3 100644 --- a/frontend/src/components/Reports/Study.js +++ b/frontend/src/components/Reports/Study.js @@ -1,5 +1,6 @@ import React from "react"; import GlobalSideBar from "../common/GlobalSideBar"; +import { FormattedMessage, injectIntl} from "react-intl"; import { IbmWatsonDiscovery, IbmWatsonNaturalLanguageUnderstanding, @@ -10,202 +11,202 @@ export const RoutineReportsMenu = { className: "resultSideNav", sideNavMenuItems: [ { - title: "ARV Reports", + title:, icon: IbmWatsonDiscovery, SideNavMenuItem: [ { link: config.serverBaseUrl + "/Report?type=patient&report=patientARVInitial1", - label: "ARV Initial Version 1", + label: , }, { link: config.serverBaseUrl + "/Report?type=patient&report=patientARVInitial2", - label: "ARV Initial Version 2", + label:, }, { link: config.serverBaseUrl + "/Report?type=patient&report=patientARVFollowup1", - label: "ARV Follow-up Version 1", + label: , }, { link: config.serverBaseUrl + "/Report?type=patient&report=patientARVFollowup2", - label: "ARV Follow-up Version 2", + label: , }, { link: config.serverBaseUrl + "/Report?type=patient&report=patientARV1", - label: "ARV-Version 1", + label: , }, ], }, { - title: "EID Reports", + title: , icon: Microscope, SideNavMenuItem: [ { link: config.serverBaseUrl + "/Report?type=patient&report=patientEID1", - label: "EID Version 1", + label: , }, { link: config.serverBaseUrl + "/Report?type=patient&report=patientEID2", - label: "EID Version 2", + label: , }, ], }, { - title: "VL Report", + title: , icon: IbmWatsonNaturalLanguageUnderstanding, SideNavMenuItem: [ { link: config.serverBaseUrl + "/Report?type=patient&report=patientVL1", - label: "VL version Nationale", + label: , }, ], }, { - title: "Intermediate Report", + title: , icon: IbmWatsonNaturalLanguageUnderstanding, SideNavMenuItem: [ { link: config.serverBaseUrl + "/Report?type=patient&report=patientIndeterminate1", - label: "Intermediate version 1", + label: , }, { link: config.serverBaseUrl + "/Report?type=patient&report=patientIndeterminate2", - label: "Intermediate version 2", + label: , }, { link: config.serverBaseUrl + "/Report?type=patient&report=patientIndeterminateByLocation", - label: "Intermediate By Service", + label: , }, ], }, { - title: "Special Request ", + title: , icon: IbmWatsonNaturalLanguageUnderstanding, SideNavMenuItem: [ { link: config.serverBaseUrl + "/Report?type=patient&report=patientSpecialReport", - label: "Special Request", + label: , }, ], }, { - title: "Collected ARV patient Report", + title: , icon: IbmWatsonNaturalLanguageUnderstanding, SideNavMenuItem: [ { link: config.serverBaseUrl + "/Report?type=patient&report=patientCollection", - label: "Collected ARV patient Report", + label: , }, ], }, { - title: "Associated Patient Report", + title: , icon: IbmWatsonNaturalLanguageUnderstanding, SideNavMenuItem: [ { link: config.serverBaseUrl + "/Report?type=patient&report=patientAssociated", - label: "Associated Patient Report", + label: , }, ], }, { - title: "Indicator", + title: , icon: IbmWatsonNaturalLanguageUnderstanding, SideNavMenuItem: [ { link: config.serverBaseUrl + "/ReportPrint?type=indicator&report=indicatorSectionPerformance", - label: "Section Performance", + label: , }, { link: config.serverBaseUrl + "/ReportPrint?type=indicator&report=validationBacklog", - label: "Delayed Validation", + label: , }, ], }, { - title: "Non conformity Reports", + title: , icon: IbmWatsonNaturalLanguageUnderstanding, SideNavMenuItem: [ { link: config.serverBaseUrl + "/Report?type=patient&report=retroCINonConformityByDate", - label: "By date", + label: , }, { link: config.serverBaseUrl + "/Report?type=patient&report=retroCInonConformityBySectionReason", - label: config.serverBaseUrl + "By Unit and Reason", + label: config.serverBaseUrl + , }, { link: config.serverBaseUrl + "/Report?type=patient&report=retroCINonConformityByLabno", - label: "By LabNo", + label: , }, { link: config.serverBaseUrl + "/Report?type=patient&report=retroCInonConformityNotification", - label: "Non-conformity notification", + label: , }, { link: config.serverBaseUrl + "/Report?type=patient&report=retroCIFollowupRequiredByLocation", - label: "Follow-up required", + label:, }, ], }, { - title: "Export By Date", + title: , icon: IbmWatsonNaturalLanguageUnderstanding, SideNavMenuItem: [ { link: config.serverBaseUrl + "/Report?type=patient&report=CIStudyExport", - label: "General Report", + label: , }, { link: config.serverBaseUrl + "/Report?type=patient&report=Trends", - label: "Viral Load Data Export", + label: , }, ], }, { - title: "Audit Trail", + title: , icon: IbmWatsonNaturalLanguageUnderstanding, SideNavMenuItem: [ { link: config.serverBaseUrl + "/AuditTrailReport", - label: "Audit Trail", + label:, }, ], }, @@ -220,4 +221,4 @@ const Study = () => { ); }; -export default Study; +export default injectIntl(Study); diff --git a/frontend/src/components/resultPage/SearchResultForm.js b/frontend/src/components/resultPage/SearchResultForm.js index 91090e1461..137a223044 100644 --- a/frontend/src/components/resultPage/SearchResultForm.js +++ b/frontend/src/components/resultPage/SearchResultForm.js @@ -754,7 +754,7 @@ export function SearchResults(props) { - } - name={field.name} - id={field.name} - > - - {tests.map((test, index) => { - return ( - - ); - })} - - )} - - - - - {({ field }) => ( - - )} - - - - - {({ field }) => ( - - )} - - - - - )} - - {searchBy.type !== "patient" && searchBy.type !== "unit" && ( - - - - )} - - - - )} - - {searchBy.type === "patient" && ( - - )} - - {searchBy.type === "unit" && ( - <> - - - - - - - - )} - - ); -} - -export function SearchResults(props) { - const { notificationVisible, setNotificationBody, setNotificationVisible } = - useContext(NotificationContext); - const { configurationProperties } = useContext(ConfigurationContext); - - const [page, setPage] = useState(1); - const [pageSize, setPageSize] = useState(20); - const [acceptAsIs, setAcceptAsIs] = useState([]); - const [referalOrganizations, setReferalOrganizations] = useState([]); - const [methods, setMethods] = useState([]); - const [referralReasons, setReferralReasons] = useState([]); - const [rejectReasons, setRejectReasons] = useState([]); - const [rejectedItems, setRejectedItems] = useState({}); - const saveStatus = ""; - - const componentMounted = useRef(true); - - useEffect(() => { - componentMounted.current = true; - - getFromOpenElisServer( - "/rest/displayList/REFERRAL_ORGANIZATIONS", - loadReferalOrganizations, - ); - getFromOpenElisServer("/rest/displayList/METHODS", loadMethods); - getFromOpenElisServer( - "/rest/displayList/REFERRAL_REASONS", - loadReferalReasons, - ); - getFromOpenElisServer( - "/rest/displayList/REJECTION_REASONS", - loadRejectReasons, - ); - if (props.results.testResult.length > 0) { - var defaultRejectedItems = {}; - props.results.testResult.forEach((result) => { - defaultRejectedItems[result.id] = false; - }); - setRejectedItems(defaultRejectedItems); - } - return () => { - componentMounted.current = false; - }; - }, []); - - const loadReferalOrganizations = (values) => { - if (componentMounted.current) { - setReferalOrganizations(values); - } - }; - - const loadMethods = (values) => { - if (componentMounted.current) { - setMethods(values); - } - }; - - const loadReferalReasons = (values) => { - if (componentMounted.current) { - setReferralReasons(values); - } - }; - - const loadRejectReasons = (values) => { - if (componentMounted.current) { - setRejectReasons(values); - } - }; - - const addRejectResult = () => { - const resultColumn = { - name: "Reject", - cell: (row, index, column, id) => { - return renderCell(row, index, column, id); - }, - width: "12rem", - }; - - if (configurationProperties.allowResultRejection == "true") { - if (columns) { - const updatedList = [ - ...columns.slice(0, 8), - resultColumn, - ...columns.slice(8), - ]; - columns = updatedList; - } - } - }; - - var columns = [ - { - name: "Sample Info", - cell: (row, index, column, id) => { - return renderCell(row, index, column, id); - }, - sortable: true, - width: "15rem", - }, - { - name: "Test Date", - selector: (row) => row.testDate, - sortable: true, - width: "7rem", - }, - - { - name: "Analyzer Result", - selector: (row) => row.analysisMethod, - sortable: true, - width: "7rem", - }, - { - name: "Test Name", - selector: (row) => row.testName, - sortable: true, - width: "8rem", - }, - { - name: "Normal Range", - selector: (row) => row.normalRange, - sortable: true, - width: "8rem", - }, - { - name: "Accept", - cell: (row, index, column, id) => { - return renderCell(row, index, column, id); - }, - width: "5rem", - }, - { - name: "Result", - cell: (row, index, column, id) => { - return renderCell(row, index, column, id); - }, - width: "8rem", - }, - { - name: "Current Result", - cell: (row, index, column, id) => { - return renderCell(row, index, column, id); - }, - width: "8rem", - }, - { - name: "Notes", - cell: (row, index, column, id) => { - return renderCell(row, index, column, id); - }, - width: "7rem", - }, - ]; - - const renderCell = (row, index, column, id) => { - let formatLabNum = configurationProperties.AccessionFormat === "ALPHANUM"; - - console.log("renderCell: index: " + index + ", id: " + id); - switch (column.name) { - case "Sample Info": - // return - return ( - <> -
- -
- {row.nonconforming && ( - - nonconforming - - )} - - ); - - case "Accept": - return ( - <> - - {() => ( - handleAcceptAsIsChange(e, row.id)} - /> - )} - - - ); - - case "Reject": - return ( - <> - - - - {() => ( - handleRejectCheckBoxChange(e, row.id)} - /> - )} - - - {rejectedItems[row.id] == true && ( - - - - )} - - - ); - - case "Notes": - return ( - <> -
- -
- - ); - - case "Result": - switch (row.resultType) { - case "M": - case "C": - case "D": - return ( - - ); - - case "N": - return ( - handleChange(e, row.id)} - /> - ); - - case "R": - return ( - + + {row.nonconforming && ( + + nonconforming + + )} + + ); + + case "Accept": + return ( + <> + + {() => ( + handleAcceptAsIsChange(e, row.id)} + /> + )} + + + ); + + case "Reject": + return ( + <> + + + + {() => ( + handleRejectCheckBoxChange(e, row.id)} + /> + )} + + + {rejectedItems[row.id] == true && ( + + + + )} + + + ); + + case "Notes": + return ( + <> +
+ +
+ + ); + + case "Result": + switch (row.resultType) { + case "M": + case "C": + case "D": + return ( + + ); + + case "N": + return ( + handleChange(e, row.id)} + /> + ); + + case "R": + return ( + + + + + + + + + + + + + + + + handleDatePickerChange(date, data.id)} + > + } + id="date-picker-single" + /> + + + + ); const validateResults = (e, rowId) => { @@ -1048,8 +1114,8 @@ export function SearchResults(props) { nonconforming From 33ce67fc1265be0e049507a9db5c1f564cf7ef51 Mon Sep 17 00:00:00 2001 From: jona42-ui Date: Mon, 4 Dec 2023 19:22:51 +0300 Subject: [PATCH 06/10] clean up --- frontend/src/languages/en.json | 4 ---- frontend/src/languages/fr.json | 4 ---- 2 files changed, 8 deletions(-) diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json index d7f787d2e5..2c52741908 100644 --- a/frontend/src/languages/en.json +++ b/frontend/src/languages/en.json @@ -278,11 +278,7 @@ "patient.label": "Patient", "requester.label": "Requester", "search.patient.label": "Search for Patient", - "referral.label.institute":"Institute", - "referral.label.testmethod":"Method", "referral.testresult.pastnote":"Past Notes", - "referral.label.sentdate":"Sent Date", - "referral.label.reason":"Referral Reason", "new.patient.label": "New Patient", "sample.select.type": "Select sample type", "sample.reject.label": "Reject Sample", diff --git a/frontend/src/languages/fr.json b/frontend/src/languages/fr.json index 939fc66829..55c3f952e9 100644 --- a/frontend/src/languages/fr.json +++ b/frontend/src/languages/fr.json @@ -51,11 +51,7 @@ "result.noTestsFound": "Aucun test approprié trouvé", "quick.entry.accession.number":"N° Labo", "patient.subject.number":"Sujet No.", - "referral.label.institute":"Institut", - "referral.label.testmethod":"Méthode", "referral.testresult.pastnote":"Notes passées", - "referral.label.sentdate":"Date envoyée", - "referral.label.reason":"Raison de la référence", "sample.entry.nextVisit.date":"Date de rendez vous", "sample.entry.project.testName":"Nom du Test", "sample.receivedDate":"Date de réception", From 0eb68a61a2e7f5d2ab6d4032739433c96dd4bffd Mon Sep 17 00:00:00 2001 From: jona42-ui Date: Tue, 5 Dec 2023 23:10:24 +0300 Subject: [PATCH 07/10] clean up --- frontend/src/languages/en.json | 88 +++++++++++++++---------------- frontend/src/languages/fr.json | 96 +++++++++++++++++----------------- 2 files changed, 93 insertions(+), 91 deletions(-) diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json index 2c52741908..e611311cc6 100644 --- a/frontend/src/languages/en.json +++ b/frontend/src/languages/en.json @@ -128,6 +128,50 @@ "header.label.version" :"Version:", "header.label.logout" :"Logout" , "header.label.selectlocale" : "Select Locale" , + "sidenav.label.order" : "Order", + "sidenav.label.addorder" : "Add Order" , + "sidenav.label.editorder" : "Edit Order" , + "sidenav.label.incomingorder" : "Incoming Orders", + "sidenav.label.batchorder" : "Batch Order Entry" , + "sidenav.label.barcode" : "Barcode" , + "sidenav.label.patient" : "Patient" , + "sidenav.label.editpatient" : "Add/Edit Patient" , + "sidenav.label.patientHistory" : "Patient History" , + "sidenav.label.nonConform" : "Non-Conform", + "sidenav.label.nonConform.report" : "Report Non-Conforming Event" , + "sidenav.label.nonConform.view" : "View New Non-Conforming Events" , + "sidenav.label.nonConform.actions" : "Corrective actions" , + "sidenav.label.workplan" : "Workplan", + "sidenav.label.workplan.test" : "By Test Type", + "sidenav.label.workplan.panel" : "By Panel Type" , + "sidenav.label.workplan.unit" : "By Unit" , + "sidenav.label.workplan.priority" : "By Priority" , + "sidenav.label.pathology" : "Pathology", + "sidenav.label.immunochem" : "Immunohistochemistry", + "sidenav.label.cytology" : "Cytology" , + "sidenav.label.pathology.dashboard" : "DashBoard" , + "sidenav.label.results" : "Results", + "sidenav.label.results.unit" : "By Unit", + "sidenav.label.results.patient" : "By Patient" , + "sidenav.label.results.order" : "By Order" , + "sidenav.label.results.testdate" : "By Test Date" , + "sidenav.label.results.byrange" : "By Range of Order numbers" , + "sidenav.label.validation" : "Validation" , + "sidenav.label.validation.routine" : "Routine", + "sidenav.label.validation.study" : "Study", + "sidenav.label.validation.order" : "Search By Order" , + "sidenav.label.validation.testdate" : "Search By Test Date" , + "sidenav.label.reports" : "Reports" , + "sidenav.label.reports.routine" : "Routine" , + "sidenav.label.reports.study" : "Study" , + "sidenav.label.admin" : "Admin" , + "sidenav.label.admin.testmgt" : "Test Management" , + "sidenav.label.admin.testmgt.reflex" : "Reflex Tests Management" , + "sidenav.label.admin.testmgt.calculated" : "Calculated Value Tests Management" , + "sidenav.label.admin.program" : "Program Entry" , + "sidenav.label.admin.organizationmgt" : "Organization Management" , + "sidenav.label.admin.usermgt" : "User Management", + "sidenav.label.admin.labNumber" : "Lab Number Management", "sidenav.title.statusreport":"Patient Status Report", "sidenav.label.statusreport": "Patient Status Report", "sidenav.title.aggregatereport":"Aggregate Reports", @@ -179,50 +223,6 @@ "sideNav.label.associatedpatientreport" :"Associated Patient Report", "sideNav.title.indicator":"Indicator", "sideNav.label.sectionperformance":"Section Performance", - "sidenav.label.order" : "Order", - "sidenav.label.addorder" : "Add Order" , - "sidenav.label.editorder" : "Edit Order" , - "sidenav.label.incomingorder" : "Incoming Orders", - "sidenav.label.batchorder" : "Batch Order Entry" , - "sidenav.label.barcode" : "Barcode" , - "sidenav.label.patient" : "Patient" , - "sidenav.label.editpatient" : "Add/Edit Patient" , - "sidenav.label.patientHistory" : "Patient History" , - "sidenav.label.nonConform" : "Non-Conform", - "sidenav.label.nonConform.report" : "Report Non-Conforming Event" , - "sidenav.label.nonConform.view" : "View New Non-Conforming Events" , - "sidenav.label.nonConform.actions" : "Corrective actions" , - "sidenav.label.workplan" : "Workplan", - "sidenav.label.workplan.test" : "By Test Type", - "sidenav.label.workplan.panel" : "By Panel Type" , - "sidenav.label.workplan.unit" : "By Unit" , - "sidenav.label.workplan.priority" : "By Priority" , - "sidenav.label.pathology" : "Pathology", - "sidenav.label.immunochem" : "Immunohistochemistry", - "sidenav.label.cytology" : "Cytology" , - "sidenav.label.pathology.dashboard" : "DashBoard" , - "sidenav.label.results" : "Results", - "sidenav.label.results.unit" : "By Unit", - "sidenav.label.results.patient" : "By Patient" , - "sidenav.label.results.order" : "By Order" , - "sidenav.label.results.testdate" : "By Test Date" , - "sidenav.label.results.byrange" : "By Range of Order numbers" , - "sidenav.label.validation" : "Validation" , - "sidenav.label.validation.routine" : "Routine", - "sidenav.label.validation.study" : "Study", - "sidenav.label.validation.order" : "Search By Order" , - "sidenav.label.validation.testdate" : "Search By Test Date" , - "sidenav.label.reports" : "Reports" , - "sidenav.label.reports.routine" : "Routine" , - "sidenav.label.reports.study" : "Study" , - "sidenav.label.admin" : "Admin" , - "sidenav.label.admin.testmgt" : "Test Management" , - "sidenav.label.admin.testmgt.reflex" : "Reflex Tests Management" , - "sidenav.label.admin.testmgt.calculated" : "Calculated Value Tests Management" , - "sidenav.label.admin.program" : "Program Entry" , - "sidenav.label.admin.organizationmgt" : "Organization Management" , - "sidenav.label.admin.usermgt" : "User Management", - "sidenav.label.admin.labNumber" : "Lab Number Management", "patient.label.name" : "Name" , "patient.label.sex" : "Sex" , "patient.label.age" : "Age" , diff --git a/frontend/src/languages/fr.json b/frontend/src/languages/fr.json index 55c3f952e9..077eeacc50 100644 --- a/frontend/src/languages/fr.json +++ b/frontend/src/languages/fr.json @@ -133,7 +133,52 @@ "cytology.label.otherResult" : "Autre Résultat de Diagnostic", "header.label.version" :"Version:", "header.label.logout" :"Déconnexion", - "header.label.selectlocale": "Sélectionner la Langue", + "header.label.selectlocale": "Sélectionner la Langue", + "sideNav.title.intermediatereport1" :"Version intermédiaire 1", + "sideNav.title.intermediatereport2" :"Version intermédiaire 2", + "sidenav.label.addorder" : "Ajouter une commande", + "sidenav.label.editorder" : "Modifier la commande", + "sidenav.label.incomingorder" : "Commandes Entrantes", + "sidenav.label.batchorder" : "Saisie de Commande en Lot", + "sidenav.label.barcode" : "Code-barres", + "sidenav.label.patient" : "Patient", + "sidenav.label.editpatient" : "Ajouter/Modifier un Patient", + "sidenav.label.patientHistory" : "Historique du Patient", + "sidenav.label.nonConform" : "Non Conforme", + "sidenav.label.nonConform.report" : "Signaler un Événement Non Conforme", + "sidenav.label.nonConform.view" : "Voir les Nouveaux Événements Non Conformes", + "sidenav.label.nonConform.actions" : "Actions Correctives", + "sidenav.label.workplan" : "Plan de Travail", + "sidenav.label.workplan.test" : "Par Type de Test", + "sidenav.label.workplan.panel" : "Par Type de Panel", + "sidenav.label.workplan.unit" : "Par Unité", + "sidenav.label.workplan.priority" : "Par Priorité", + "sidenav.label.pathology" : "Pathologie", + "sidenav.label.immunochem" : "Immuno-Histochimie", + "sidenav.label.cytology" : "Cytologie", + "sidenav.label.pathology.dashboard" : "Tableau de Bord", + "sidenav.label.results" : "Résultats", + "sidenav.label.results.unit" : "Par Unité", + "sidenav.label.results.patient" : "Par Patient", + "sidenav.label.results.order" : "Par Commande", + "sidenav.label.results.testdate" : "Par Date de Test", + "sidenav.label.results.byrange" : "Par plage de numéros de commande", + "sidenav.label.validation" : "Validation", + "sidenav.label.validation.routine" : "Routine", + "sidenav.label.validation.study" : "Étude", + "sidenav.label.validation.order" : "Recherche Par Commande", + "sidenav.label.validation.testdate" : "Recherche Par Date de Test", + "sidenav.label.reports" : "Rapports", + "sidenav.label.reports.routine" : "Routine", + "sidenav.label.reports.study" : "Étude", + "sidenav.label.admin" : "Administration", + "sidenav.label.admin.testmgt" : "Gestion des Tests", + "sidenav.label.admin.testmgt.reflex": "Gestion des tests de réflexes", + "sidenav.label.admin.testmgt.calculated": "Gestion des tests de valeur calculée", + "sidenav.label.admin.program" : "Entrée du Programme", + "sidenav.label.admin.organizationmgt" : "Gestion de l'Organisation", + "sidenav.label.admin.usermgt" : "Gestion des Utilisateurs", + "sidenav.label.admin.labNumber" : "Gestion des Numéro de Laboratoire", "sidenav.title.statusreport":"Rapport sur l'état du patient", "sidenav.label.statusreport":"Rapport sur l'état du patient", "sidenav.title.aggregatereport":"Rapports globaux", @@ -173,8 +218,8 @@ "sideNav.label.eidreports2":"EID version 2", "sideNav.title.vlreport":"Rapport VL", "sideNav.title.intermediatereport" :"Rapport intermédiaire", - "sideNav.title.intermediatereport1" :"Version intermédiaire 1", - "sideNav.title.intermediatereport2" :"Version intermédiaire 2", + "sideNav.label.intermediatereport1" :"Version intermédiaire 1", + "sideNav.label.intermediatereport2" :"Version intermédiaire 2", "sideNav.label.intermediatebyservice" :"Intermédiaire par service", "sideNav.title.specialrequest":"Demande spéciale ", "sideNav.label.specialrequest":"Demande spéciale ", @@ -183,52 +228,9 @@ "sideNav.title.associatedpatientreport":"Rapport de patient associé", "sideNav.label.associatedpatientreport":"Rapport de patient associé", "sideNav.title.indicator":"Indicateur", + "sideNav.label.sectionperformance":"Performances de la section", "sideNav.label.vlversionnational":"VL version Nationale", - "sidenav.label.order" : "Commande", "sideNav.label.audittrail" :"Piste d'audit", - "sidenav.label.addorder" : "Ajouter une commande", - "sidenav.label.editorder" : "Modifier la commande", - "sidenav.label.incomingorder" : "Commandes Entrantes", - "sidenav.label.batchorder" : "Saisie de Commande en Lot", - "sidenav.label.barcode" : "Code-barres", - "sidenav.label.patient" : "Patient", - "sidenav.label.editpatient" : "Ajouter/Modifier un Patient", - "sidenav.label.patientHistory" : "Historique du Patient", - "sidenav.label.nonConform" : "Non Conforme", - "sidenav.label.nonConform.report" : "Signaler un Événement Non Conforme", - "sidenav.label.nonConform.view" : "Voir les Nouveaux Événements Non Conformes", - "sidenav.label.nonConform.actions" : "Actions Correctives", - "sidenav.label.workplan" : "Plan de Travail", - "sidenav.label.workplan.test" : "Par Type de Test", - "sidenav.label.workplan.panel" : "Par Type de Panel", - "sidenav.label.workplan.unit" : "Par Unité", - "sidenav.label.workplan.priority" : "Par Priorité", - "sidenav.label.pathology" : "Pathologie", - "sidenav.label.immunochem" : "Immuno-Histochimie", - "sidenav.label.cytology" : "Cytologie", - "sidenav.label.pathology.dashboard" : "Tableau de Bord", - "sidenav.label.results" : "Résultats", - "sidenav.label.results.unit" : "Par Unité", - "sidenav.label.results.patient" : "Par Patient", - "sidenav.label.results.order" : "Par Commande", - "sidenav.label.results.testdate" : "Par Date de Test", - "sidenav.label.results.byrange" : "Par plage de numéros de commande", - "sidenav.label.validation" : "Validation", - "sidenav.label.validation.routine" : "Routine", - "sidenav.label.validation.study" : "Étude", - "sidenav.label.validation.order" : "Recherche Par Commande", - "sidenav.label.validation.testdate" : "Recherche Par Date de Test", - "sidenav.label.reports" : "Rapports", - "sidenav.label.reports.routine" : "Routine", - "sidenav.label.reports.study" : "Étude", - "sidenav.label.admin" : "Administration", - "sidenav.label.admin.testmgt" : "Gestion des Tests", - "sidenav.label.admin.testmgt.reflex": "Gestion des tests de réflexes", - "sidenav.label.admin.testmgt.calculated": "Gestion des tests de valeur calculée", - "sidenav.label.admin.program" : "Entrée du Programme", - "sidenav.label.admin.organizationmgt" : "Gestion de l'Organisation", - "sidenav.label.admin.usermgt" : "Gestion des Utilisateurs", - "sidenav.label.admin.labNumber" : "Gestion des Numéro de Laboratoire", "patient.label.name" : "Nom", "patient.label.sex" : "Sexe", "patient.label.age" : "Âge", From dd42b1abc791ad4ca7a1bfeaa6677c6ad8ad2f32 Mon Sep 17 00:00:00 2001 From: jona42-ui Date: Tue, 5 Dec 2023 23:35:22 +0300 Subject: [PATCH 08/10] remove redundant code --- frontend/src/languages/fr.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/src/languages/fr.json b/frontend/src/languages/fr.json index 9c718b3446..0afce493de 100644 --- a/frontend/src/languages/fr.json +++ b/frontend/src/languages/fr.json @@ -140,8 +140,6 @@ "header.label.version" :"Version:", "header.label.logout" :"Déconnexion", "header.label.selectlocale": "Sélectionner la Langue", - "sideNav.title.intermediatereport1" :"Version intermédiaire 1", - "sideNav.title.intermediatereport2" :"Version intermédiaire 2", "sidenav.label.addorder" : "Ajouter une commande", "sidenav.label.editorder" : "Modifier la commande", "sidenav.label.incomingorder" : "Commandes Entrantes", From 56507979c1afe85cae9bf8f61af55af85a343a09 Mon Sep 17 00:00:00 2001 From: jona42-ui Date: Tue, 5 Dec 2023 23:39:55 +0300 Subject: [PATCH 09/10] resolve accidental deletion --- frontend/src/languages/fr.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/languages/fr.json b/frontend/src/languages/fr.json index 0afce493de..8c417242b5 100644 --- a/frontend/src/languages/fr.json +++ b/frontend/src/languages/fr.json @@ -139,7 +139,8 @@ "cytology.label.review": "En attente de révision cytopathologique", "header.label.version" :"Version:", "header.label.logout" :"Déconnexion", - "header.label.selectlocale": "Sélectionner la Langue", + "header.label.selectlocale": "Sélectionner la Langue", + "sidenav.label.order" : "Commande", "sidenav.label.addorder" : "Ajouter une commande", "sidenav.label.editorder" : "Modifier la commande", "sidenav.label.incomingorder" : "Commandes Entrantes", From a47b9436b788099343da979254e35b483c196a7f Mon Sep 17 00:00:00 2001 From: jona42-ui Date: Wed, 6 Dec 2023 12:22:19 +0300 Subject: [PATCH 10/10] minor changes --- frontend/src/languages/en.json | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json index 7652b156be..0a58941088 100644 --- a/frontend/src/languages/en.json +++ b/frontend/src/languages/en.json @@ -190,6 +190,7 @@ "sideNav.title.activityreport" :"Activity Report", "sideNav.title.referredtestreport":"Referred Tests Report", "sideNav.title.noncomformityreports":"Non conformity Reports", + "sideNav.label.bytesttype":"By Test Type", "sideNav.label.bypaneltype":"By Panel Type", "sideNav.label.byunit" :"By Unit", "sideNav.label.referredtestreport" : "Referred Tests Report",