diff --git a/cypress/e2e/patient_spec/PatientLogUpdate.cy.ts b/cypress/e2e/patient_spec/PatientLogUpdate.cy.ts index 7faaeed5a9f..6a2dcd6743f 100644 --- a/cypress/e2e/patient_spec/PatientLogUpdate.cy.ts +++ b/cypress/e2e/patient_spec/PatientLogUpdate.cy.ts @@ -129,7 +129,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => { cy.verifyNotification("Progress Note Log Update filed successfully"); cy.closeNotification(); // Verify the data reflection - cy.contains("button", "Daily Rounds").click(); + cy.contains("button", "Log Updates").click(); patientLogupdate.clickLogUpdateViewDetails( "#dailyround-entry", patientCategory, @@ -179,7 +179,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => { cy.submitButton("Complete"); cy.verifyNotification("Detailed Log Update filed successfully"); cy.closeNotification(); - cy.contains("button", "Daily Rounds").click(); + cy.contains("button", "Log Update").click(); patientLogupdate.clickLogUpdateViewDetails( "#dailyround-entry", patientCategory, @@ -194,7 +194,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => { ]); // Go back and edit the data on a third section patientLogupdate.clickGoBackConsultation(); - cy.contains("button", "Daily Rounds").click(); + cy.contains("button", "Log Update").click(); patientLogupdate.clickLogUpdateUpdateLog( "#dailyround-entry", patientCategory, @@ -209,7 +209,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => { cy.verifyNotification("Detailed Log Update filed successfully"); cy.closeNotification(); //Reverify the editted and newly added data - cy.contains("button", "Daily Rounds").click(); + cy.contains("button", "Log Update").click(); patientLogupdate.clickLogUpdateViewDetails( "#dailyround-entry", patientCategory, @@ -284,7 +284,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => { cy.verifyNotification("Brief Update created successfully"); cy.closeNotification(); // edit the card and verify the data. - cy.contains("button", "Daily Rounds").click(); + cy.contains("button", "Log Update").click(); patientLogupdate.clickLogUpdateViewDetails( "#dailyround-entry", patientCategory, @@ -308,7 +308,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => { patientLogupdate.typeDiastolic(patientModifiedDiastolic); cy.submitButton("Continue"); cy.verifyNotification("Brief Update updated successfully"); - cy.contains("button", "Daily Rounds").click(); + cy.contains("button", "Log Update").click(); patientLogupdate.clickLogUpdateViewDetails( "#dailyround-entry", patientCategory, diff --git a/src/Common/constants.tsx b/src/Common/constants.tsx index 70b5bc78e23..07806889c0f 100644 --- a/src/Common/constants.tsx +++ b/src/Common/constants.tsx @@ -624,12 +624,12 @@ export const NOTIFICATION_EVENTS: NotificationEvent[] = [ }, { id: "PATIENT_CONSULTATION_CREATED", - text: "Patient Consultation Created", + text: "Patient Log Update Created", icon: "l-heart", }, { id: "PATIENT_CONSULTATION_UPDATED", - text: "Patient Consultation Updated", + text: "Patient Log Update Updated", icon: "l-heart-medical", }, { diff --git a/src/Components/Facility/ConsultationCard.tsx b/src/Components/Facility/ConsultationCard.tsx index 23b9cb86567..3369dbcda7a 100644 --- a/src/Components/Facility/ConsultationCard.tsx +++ b/src/Components/Facility/ConsultationCard.tsx @@ -197,7 +197,7 @@ export const ConsultationCard = (props: ConsultationProps) => { setOpen(true); } else { navigate( - `/facility/${itemData.facility}/patient/${itemData.patient}/consultation/${itemData.id}/daily-rounds`, + `/facility/${itemData.facility}/patient/${itemData.patient}/consultation/${itemData.id}/Log Update`, ); } }} diff --git a/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx index a1f898ee9c5..6ef0b92d281 100644 --- a/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx +++ b/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx @@ -665,7 +665,7 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => { ), value: 1, }, - { text: "Daily Rounds", value: 0 }, + { text: "Log Updates", value: 0 }, ]} onTabChange={(v) => setShowEvents(!!v)} currentTab={showEvents ? 1 : 0} diff --git a/src/Components/Facility/Consultations/DailyRounds/DefaultLogUpdateCard.tsx b/src/Components/Facility/Consultations/DailyRounds/DefaultLogUpdateCard.tsx index fa589c89710..9802e5127b7 100644 --- a/src/Components/Facility/Consultations/DailyRounds/DefaultLogUpdateCard.tsx +++ b/src/Components/Facility/Consultations/DailyRounds/DefaultLogUpdateCard.tsx @@ -52,8 +52,8 @@ const DefaultLogUpdateCard = ({ round, ...props }: Props) => { ["NORMAL", "TELEMEDICINE", "DOCTORS_LOG"].includes( round.rounds_type!, ) - ? `${consultationUrl}/daily-rounds/${round.id}` - : `${consultationUrl}/daily_rounds/${round.id}` + ? `${consultationUrl}/Log Update/${round.id}` + : `${consultationUrl}/Log Update/${round.id}` } > @@ -74,8 +74,8 @@ const DefaultLogUpdateCard = ({ round, ...props }: Props) => { "DOCTORS_LOG", "COMMUNITY_NURSES_LOG", ].includes(round.rounds_type!) - ? `${consultationUrl}/daily-rounds/${round.id}/update` - : `${consultationUrl}/daily_rounds/${round.id}/update` + ? `${consultationUrl}/Log Update/${round.id}/update` + : `${consultationUrl}/Log Update/${round.id}/update` } > diff --git a/src/Components/LogUpdate/CriticalCareEditor.tsx b/src/Components/LogUpdate/CriticalCareEditor.tsx index 975d06848b0..8969898a401 100644 --- a/src/Components/LogUpdate/CriticalCareEditor.tsx +++ b/src/Components/LogUpdate/CriticalCareEditor.tsx @@ -89,7 +89,7 @@ export default function CriticalCareEditor(props: Props) { ghost className="w-full bg-primary-100/50 py-3" border - href={`${consultationDashboardUrl}/daily-rounds/${props.id}/update`} + href={`${consultationDashboardUrl}/Log Update/${props.id}/update`} > { - const [consultationId, id] = useSlugs("consultation", "daily_rounds"); + const [consultationId, id] = useSlugs("consultation", "Log Update"); const [diff, setDiff] = useState>({}); const [isProcessing, setIsProcessing] = useState(false); diff --git a/src/Components/Notifications/NotificationsList.tsx b/src/Components/Notifications/NotificationsList.tsx index 2de3ae7922c..b7ceaaa2356 100644 --- a/src/Components/Notifications/NotificationsList.tsx +++ b/src/Components/Notifications/NotificationsList.tsx @@ -67,9 +67,9 @@ const NotificationTile = ({ case "PATIENT_CONSULTATION_UPDATED": return `/facility/${data.facility}/patient/${data.patient}/consultation/${data.consultation}`; case "PATIENT_CONSULTATION_UPDATE_CREATED": - return `/facility/${data.facility}/patient/${data.patient}/consultation/${data.consultation}/daily-rounds/${data.daily_round}`; + return `/facility/${data.facility}/patient/${data.patient}/consultation/${data.consultation}/Log Update/${data.daily_round}`; case "PATIENT_CONSULTATION_UPDATE_UPDATED": - return `/facility/${data.facility}/patient/${data.patient}/consultation/${data.consultation}/daily-rounds/${data.daily_round}`; + return `/facility/${data.facility}/patient/${data.patient}/consultation/${data.consultation}/Log Update/${data.daily_round}`; case "INVESTIGATION_SESSION_CREATED": return `/facility/${data.facility}/patient/${data.patient}/consultation/${data.consultation}/investigation/${data.session}`; case "PATIENT_NOTE_ADDED": diff --git a/src/Components/Notifications/ShowPushNotification.tsx b/src/Components/Notifications/ShowPushNotification.tsx index 2d2faa5ff5f..901f4d69c2a 100644 --- a/src/Components/Notifications/ShowPushNotification.tsx +++ b/src/Components/Notifications/ShowPushNotification.tsx @@ -24,9 +24,9 @@ export default function ShowPushNotification({ id }: DetailRoute) { case "PATIENT_CONSULTATION_UPDATED": return `/facility/${caused_objects?.facility}/patient/${caused_objects?.patient}/consultation/${caused_objects?.consultation}`; case "PATIENT_CONSULTATION_UPDATE_CREATED": - return `/facility/${caused_objects?.facility}/patient/${caused_objects?.patient}/consultation/${caused_objects?.consultation}/daily-rounds/${caused_objects?.daily_round}`; + return `/facility/${caused_objects?.facility}/patient/${caused_objects?.patient}/consultation/${caused_objects?.consultation}/Log Update/${caused_objects?.daily_round}`; case "PATIENT_CONSULTATION_UPDATE_UPDATED": - return `/facility/${caused_objects?.facility}/patient/${caused_objects?.patient}/consultation/${caused_objects?.consultation}/daily-rounds/${caused_objects?.daily_round}`; + return `/facility/${caused_objects?.facility}/patient/${caused_objects?.patient}/consultation/${caused_objects?.consultation}/Log Update/${caused_objects?.daily_round}`; case "INVESTIGATION_SESSION_CREATED": return `/facility/${caused_objects?.facility}/patient/${caused_objects?.patient}/consultation/${caused_objects?.consultation}/investigation/${caused_objects?.session}`; case "PATIENT_NOTE_ADDED": diff --git a/src/Components/Patient/DailyRoundListDetails.tsx b/src/Components/Patient/DailyRoundListDetails.tsx index eb7eda62064..582c989db27 100644 --- a/src/Components/Patient/DailyRoundListDetails.tsx +++ b/src/Components/Patient/DailyRoundListDetails.tsx @@ -29,8 +29,8 @@ export const DailyRoundListDetails = (props: any) => { return (
{
Update Details diff --git a/src/Components/Patient/DailyRounds.tsx b/src/Components/Patient/DailyRounds.tsx index c0cd7fe803c..1ceadf7e61e 100644 --- a/src/Components/Patient/DailyRounds.tsx +++ b/src/Components/Patient/DailyRounds.tsx @@ -145,7 +145,7 @@ export const DailyRounds = (props: any) => { const [diagnoses, setDiagnoses] = useState(); const [showDiscontinuedPrescriptions, setShowDiscontinuedPrescriptions] = useState(false); - const headerText = !id ? "Add Consultation Update" : "Info"; + const headerText = !id ? "Add Log Update" : "Info"; const buttonText = !id ? !["VENTILATOR", "DOCTORS_LOG"].includes(state.form.rounds_type) ? t("save") @@ -393,7 +393,7 @@ export const DailyRounds = (props: any) => { ); } else { navigate( - `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/daily_rounds/${obj.id}/update`, + `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/Log Update/${obj.id}/update`, ); } } @@ -421,7 +421,7 @@ export const DailyRounds = (props: any) => { ); } else { navigate( - `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/daily_rounds/${obj.id}/update`, + `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/Log Update/${obj.id}/update`, ); } } @@ -535,7 +535,7 @@ export const DailyRounds = (props: any) => { }} backUrl={ id - ? `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/daily-rounds` + ? `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/Log Update` : `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}` } className="mx-auto max-w-4xl" diff --git a/src/Components/Patient/PatientInfoCard.tsx b/src/Components/Patient/PatientInfoCard.tsx index 1f581b9b0e7..0b0b6ab297a 100644 --- a/src/Components/Patient/PatientInfoCard.tsx +++ b/src/Components/Patient/PatientInfoCard.tsx @@ -587,7 +587,7 @@ export default function PatientInfoCard(props: { href={ consultation?.admitted && !consultation?.current_bed ? undefined - : `/facility/${patient.facility}/patient/${patient.id}/consultation/${consultation?.id}/daily-rounds` + : `/facility/${patient.facility}/patient/${patient.id}/consultation/${consultation?.id}/Log Update` } onClick={() => { if ( diff --git a/src/Redux/api.tsx b/src/Redux/api.tsx index 0bedb12dca5..fa4a36029a3 100644 --- a/src/Redux/api.tsx +++ b/src/Redux/api.tsx @@ -629,25 +629,25 @@ const routes = { method: "DELETE", }, createDailyRounds: { - path: "/api/v1/consultation/{consultationId}/daily_rounds/", + path: "/api/v1/consultation/{consultationId}/Log Update/", TBody: Type(), TRes: Type(), method: "POST", }, updateDailyReport: { - path: "/api/v1/consultation/{consultationId}/daily_rounds/{id}/", + path: "/api/v1/consultation/{consultationId}/Log Update/{id}/", TBody: Type(), TRes: Type(), method: "PUT", }, updateDailyRound: { - path: "/api/v1/consultation/{consultationId}/daily_rounds/{id}/", + path: "/api/v1/consultation/{consultationId}/Log Update/{id}/", method: "PATCH", TBody: Type>(), TRes: Type(), }, getDailyReports: { - path: "/api/v1/consultation/{consultationId}/daily_rounds/", + path: "/api/v1/consultation/{consultationId}/Log Update/", method: "GET", TRes: Type>(), }, @@ -659,12 +659,12 @@ const routes = { }, getDailyReport: { - path: "/api/v1/consultation/{consultationId}/daily_rounds/{id}/", + path: "/api/v1/consultation/{consultationId}/Log Update/{id}/", method: "GET", TRes: Type(), }, dailyRoundsAnalyse: { - path: "/api/v1/consultation/{consultationId}/daily_rounds/analyse/", + path: "/api/v1/consultation/{consultationId}/Log Update/analyse/", method: "POST", TBody: Type(), TRes: Type(), diff --git a/src/Routers/routes/ConsultationRoutes.tsx b/src/Routers/routes/ConsultationRoutes.tsx index 598fd06adc3..2ac2d5c42ac 100644 --- a/src/Routers/routes/ConsultationRoutes.tsx +++ b/src/Routers/routes/ConsultationRoutes.tsx @@ -101,14 +101,14 @@ export default { /> ), - "/facility/:facilityId/patient/:patientId/consultation/:consultationId/daily_rounds/:id": + "/facility/:facilityId/patient/:patientId/consultation/:consultationId/Log Update/:id": (params: { facilityId: string; patientId: string; consultationId: string; id: string; }) => , - "/facility/:facilityId/patient/:patientId/consultation/:consultationId/daily_rounds/:id/update": + "/facility/:facilityId/patient/:patientId/consultation/:consultationId/Log Update/:id/update": (params: { facilityId: string; patientId: string;