diff --git a/packages/esm-admin-app/src/components/facility-setup/facility-info.component.tsx b/packages/esm-admin-app/src/components/facility-setup/facility-info.component.tsx index a99453c5..e13e621a 100644 --- a/packages/esm-admin-app/src/components/facility-setup/facility-info.component.tsx +++ b/packages/esm-admin-app/src/components/facility-setup/facility-info.component.tsx @@ -5,9 +5,11 @@ import styles from './facility-info.scss'; import { useTranslation } from 'react-i18next'; import { showNotification, showSnackbar } from '@openmrs/esm-framework'; import { FacilityData } from '../../types'; + const FacilityInfo: React.FC = () => { const { t } = useTranslation(); - const { defaultFacility, isLoading: defaultFacilityLoading, error, refetch } = useFacilityInfo(); + const [shouldSynchronize, setshouldSynchronize] = useState(false); + const { defaultFacility, isLoading: defaultFacilityLoading, error, refetch } = useFacilityInfo(shouldSynchronize); const [facilityData, setFacilityData] = useState(defaultFacility); useEffect(() => { @@ -19,7 +21,7 @@ const FacilityInfo: React.FC = () => { const synchronizeFacilityData = async () => { try { - // Trigger manual refetch + setshouldSynchronize(true); await refetch(); showSnackbar({ title: t('syncingHieSuccess', 'Synchronization Complete'), diff --git a/packages/esm-admin-app/src/components/hook/useFacilityInfo.tsx b/packages/esm-admin-app/src/components/hook/useFacilityInfo.tsx index 61f9e91c..a3c60a68 100644 --- a/packages/esm-admin-app/src/components/hook/useFacilityInfo.tsx +++ b/packages/esm-admin-app/src/components/hook/useFacilityInfo.tsx @@ -2,9 +2,9 @@ import { FetchResponse, openmrsFetch, restBaseUrl, useSession } from '@openmrs/e import useSWR from 'swr'; import { FacilityData } from '../../types'; -export function useFacilityInfo() { +export function useFacilityInfo(shouldSynchronize: boolean = false) { const { authenticated } = useSession(); - const url = `${restBaseUrl}/kenyaemr/default-facility`; + const url = `${restBaseUrl}/kenyaemr/default-facility?synchronize=${shouldSynchronize}`; const { data, isLoading, error, mutate } = useSWR>( authenticated ? url : null, diff --git a/packages/esm-billing-app/translations/en.json b/packages/esm-billing-app/translations/en.json index 19a44396..9ac8559b 100644 --- a/packages/esm-billing-app/translations/en.json +++ b/packages/esm-billing-app/translations/en.json @@ -78,7 +78,6 @@ "delete": "Delete", "deleteBill": "Delete Bill", "description": "Description", - "diagnoses": "Diagnoses", "discard": "Discard", "discardClaim": "Discard Claim", "discount": "Discount", @@ -109,6 +108,7 @@ "enterRegExp": "Enter regular expression", "error": "Error", "errored": "Errored", + "errorEndingVisit": "Error ending visit", "errorFetchingPackages": "Error fetching packeges", "errorLoadingBillServices": "Error loading bill services", "errorLoadingPaymentModes": "Payment modes error", @@ -201,7 +201,6 @@ "payments": "Payments", "paymentType": "Payment Type", "pendingHIEVerification": "Pending HIE verification", - "pendingVerificationReason": "", "Phone Number": "Phone Number", "pickLabRequest": "Pick Lab Request", "policyNumber": "Policy number", @@ -282,8 +281,9 @@ "unsettledBill": "Unsettled bill", "updateRegistration": "Update registration", "valuated": "Valuated", - "verify": "Verify", "verifyingBillStatus": "Verifying bill status...", + "visitEnded": "Visit ended", + "visitEndSuccessfully": "", "visitTime": "Visit time", "visittype": "Visit Type", "waiveBill": "Waive Bill",