diff --git a/public/locale/en.json b/public/locale/en.json index 4ccb09513f2..15d2abc315b 100644 --- a/public/locale/en.json +++ b/public/locale/en.json @@ -712,9 +712,11 @@ "created_on": "Created On", "creating": "Creating...", "creating_facility": "Creating Facility...", + "critical": "Critical", "criticality": "Criticality", "csv_file_in_the_specified_format": "Select a CSV file in the specified format", "current_address": "Current Address", + "current_organizations": "Current Organizations", "current_password": "Current Password", "current_role": "Current Role", "current_status": "Current Status", @@ -910,6 +912,7 @@ "encounter_discharge_disposition__snf": "Skilled nursing facility", "encounter_duration_confirmation": "The duration of this encounter would be", "encounter_id": "Encounter ID", + "encounter_manage_organization_description": "Add or remove organizations from this encouter", "encounter_marked_as_complete": "Encounter Completed", "encounter_notes__all_discussions": "All Discussions", "encounter_notes__be_first_to_send": "Be the first to send a message", @@ -1238,6 +1241,7 @@ "last_modified": "Last Modified", "last_modified_by": "Last Modified By", "last_name": "Last Name", + "last_occurrence": "Last Occurrence", "last_online": "Last Online", "last_serviced_on": "Last Serviced On", "last_updated_by": "Last updated by", @@ -1381,6 +1385,7 @@ "next_week_short": "Next wk", "no": "No", "no_address_provided": "No address provided", + "no_allergies_recorded": "No allergies recorded", "no_appointments": "No appointments found", "no_attachments_found": "This communication has no attachments.", "no_availabilities_yet": "No availabilities yet", @@ -1412,6 +1417,7 @@ "no_notices_for_you": "No notices for you.", "no_observations": "No Observations", "no_ongoing_medications": "No Ongoing Medications", + "no_organizations_added_yet": "No organizations added yet", "no_organizations_found": "No Organizations Found", "no_organizations_selected": "No organizations selected", "no_patient_record_found": "No Patient Records Found", @@ -1482,6 +1488,7 @@ "on_hold": "On Hold", "ongoing_medications": "Ongoing Medications", "only_indian_mobile_numbers_supported": "Currently only Indian numbers are supported", + "onset": "Onset", "op_encounter": "OP Encounter", "op_file_closed": "OP file closed", "open": "Open", @@ -1948,6 +1955,7 @@ "set_home_facility": "Set as home facility", "set_your_local_language": "Set your local language", "settings_and_filters": "Settings and Filters", + "severity": "Severity", "severity_of_breathlessness": "Severity of Breathlessness", "sex": "Sex", "shared_by": "Shared By", @@ -2018,6 +2026,7 @@ "subscribed_successfully": "Subscribed Successfully", "subscription_error": "Subscription Error", "subscription_failed": "Subscription Failed", + "substance": "Substance", "suggested_investigations": "Suggested Investigations", "suggestion": "Suggestion", "summary": "Summary", @@ -2025,6 +2034,7 @@ "switch": "Switch", "switch_bed": "Switch Bed", "switch_camera_is_not_available": "Switch camera is not available.", + "symptom": "Symptom", "symptoms": "Symptoms", "symptoms_empty_message": "No symptoms recorded", "systolic": "Systolic", @@ -2215,6 +2225,7 @@ "ventilator_oxygen_modality": "Oxygen Modality", "ventilator_oxygen_modality_oxygen_rate": "Oxygen Flow Rate", "ventilator_spo2": "SpO₂", + "verification": "Verification", "verification_failed": "Verification Failed", "verify": "Verify", "verify_and_link": "Verify and Link", diff --git a/src/components/Patient/ManageEncounterOrganizations.tsx b/src/components/Patient/ManageEncounterOrganizations.tsx index 00ff39b8165..9c2b8c169ca 100644 --- a/src/components/Patient/ManageEncounterOrganizations.tsx +++ b/src/components/Patient/ManageEncounterOrganizations.tsx @@ -1,4 +1,5 @@ import { useMutation, useQueryClient } from "@tanstack/react-query"; +import { t } from "i18next"; import { Building, Loader2, Trash2 } from "lucide-react"; import { useState } from "react"; import { toast } from "sonner"; @@ -81,22 +82,21 @@ export default function ManageEncounterOrganizations({ {trigger || ( )} - Manage Organizations + {t("manage_organizations")} - Add or remove organizations from this encounter + {t("encounter_manage_organization_description")}
-

Add Organization

{isAdding && } - Add Organization + {t("add_organizations")}
-

Current Organizations

+

+ {t("current_organizations")} +

{encounter.organizations.map((org) => (
- No organizations added yet + {t("no_organizations_added_yet")}

)}
diff --git a/src/components/Patient/allergy/list.tsx b/src/components/Patient/allergy/list.tsx index 456f61c759e..f03788afd24 100644 --- a/src/components/Patient/allergy/list.tsx +++ b/src/components/Patient/allergy/list.tsx @@ -16,6 +16,7 @@ import { import { Avatar } from "@/components/Common/Avatar"; import query from "@/Utils/request/query"; +import { formatName } from "@/Utils/utils"; import { AllergyIntolerance } from "@/types/emr/allergyIntolerance/allergyIntolerance"; import allergyIntoleranceApi from "@/types/emr/allergyIntolerance/allergyIntoleranceApi"; @@ -37,7 +38,7 @@ export function AllergyList({ patientId, encounterId }: AllergyListProps) { return ( - Allergies + {t("allergies")} @@ -50,10 +51,10 @@ export function AllergyList({ patientId, encounterId }: AllergyListProps) { return ( - Allergies + {t("allergies")} -

No allergies recorded

+

{t("no_allergies_recorded")}

 ); @@ -136,7 +137,9 @@ export function AllergyList({ patientId, encounterId }: AllergyListProps) { className="w-4 h-4" imageUrl={allergy.created_by.profile_picture_url} /> - {allergy.created_by.username} + + {formatName(allergy.created_by)} + ))} diff --git a/src/components/Patient/diagnosis/DiagnosisTable.tsx b/src/components/Patient/diagnosis/DiagnosisTable.tsx index 05bbd2561d4..edc57f9a636 100644 --- a/src/components/Patient/diagnosis/DiagnosisTable.tsx +++ b/src/components/Patient/diagnosis/DiagnosisTable.tsx @@ -1,3 +1,5 @@ +import { t } from "i18next"; + import { Badge } from "@/components/ui/badge"; import { Table, @@ -10,6 +12,7 @@ import { import { Avatar } from "@/components/Common/Avatar"; +import { formatName } from "@/Utils/utils"; import { Diagnosis } from "@/types/emr/diagnosis/diagnosis"; export const getStatusBadgeStyle = (status: string) => { @@ -41,12 +44,12 @@ export function DiagnosisTable({ {showHeader && ( - Diagnosis - Status - Verification - Onset - Notes - By + {t("diagnosis")} + {t("status")} + {t("verification")} + {t("onset")} + {t("notes")} + {t("created_by")} )} @@ -77,16 +80,17 @@ export function DiagnosisTable({ {diagnosis.note || "-"} - - - - {diagnosis.created_by?.first_name}{" "} - {diagnosis.created_by?.last_name} - + +
+ + + {formatName(diagnosis.created_by)} + +
))} diff --git a/src/components/Patient/symptoms/SymptomTable.tsx b/src/components/Patient/symptoms/SymptomTable.tsx index 87fa2961f19..9ecbb11f729 100644 --- a/src/components/Patient/symptoms/SymptomTable.tsx +++ b/src/components/Patient/symptoms/SymptomTable.tsx @@ -1,3 +1,5 @@ +import { t } from "i18next"; + import { Badge } from "@/components/ui/badge"; import { Table, @@ -10,6 +12,7 @@ import { import { Avatar } from "@/components/Common/Avatar"; +import { formatName } from "@/Utils/utils"; import { Symptom } from "@/types/emr/symptom/symptom"; export const getStatusBadgeStyle = (status: string) => { @@ -41,12 +44,12 @@ export function SymptomTable({ {showHeader && ( - Symptom - Status - Severity - Onset - Notes - By + {t("symptom")} + {t("status")} + {t("severity")} + {t("onset")} + {t("notes")} + {t("created_by")} )} @@ -77,15 +80,17 @@ export function SymptomTable({ {symptom.note || "-"} - - - - {symptom.created_by?.first_name} {symptom.created_by?.last_name} - + +
+ + + {formatName(symptom.created_by)} + +
))} diff --git a/src/pages/Encounters/EncounterShow.tsx b/src/pages/Encounters/EncounterShow.tsx index 0440aa49aae..f68c01a6725 100644 --- a/src/pages/Encounters/EncounterShow.tsx +++ b/src/pages/Encounters/EncounterShow.tsx @@ -241,8 +241,8 @@ export const EncounterShow = (props: Props) => {
-
-
+
+