+
+
+
+ );
+ }
+
+ if (!voucherUuid) {
+ return (
+
+
+
+
+
+ 
+
+ {formatMessage('PublicVoucherDetailsPage.title')}
+
+
+
+
+
+ );
+}
diff --git a/src/pages/WorkerDetailsPage.js b/src/pages/WorkerDetailsPage.js
index 4835df9..40e091c 100644
--- a/src/pages/WorkerDetailsPage.js
+++ b/src/pages/WorkerDetailsPage.js
@@ -4,7 +4,7 @@ import { useDispatch, useSelector } from 'react-redux';
import { makeStyles } from '@material-ui/styles';
import {
- Form, Helmet, useHistory, useModulesManager, useTranslations, parseData, journalize,
+ Form, Helmet, useHistory, useModulesManager, useTranslations, parseData, useToast,
} from '@openimis/fe-core';
import {
appendWorkerToEconomicUnit, clearWorker, fetchWorker, fetchWorkerVoucherCount,
@@ -14,6 +14,7 @@ import {
} from '../constants';
import WorkerMasterPanel from '../components/WorkerMasterPanel';
import WorkerMConnectMasterPanel from '../components/WorkerMConnectMasterPanel';
+import { getLastMutationLog } from '../utils/utils';
const useStyles = makeStyles((theme) => ({
page: theme.page,
@@ -35,6 +36,7 @@ function WorkerDetailsPage({ match }) {
const [reset, setReset] = useState(0);
const [workerVoucherCount, setWorkerVoucherCount] = useState(0);
const { mutation, submittingMutation } = useSelector((state) => state.workerVoucher);
+ const { showSuccess, showError } = useToast();
const titleParams = (worker) => ({
chfId: worker?.chfId ?? EMPTY_STRING,
@@ -79,20 +81,27 @@ function WorkerDetailsPage({ match }) {
code: 'M',
};
- dispatch(appendWorkerToEconomicUnit(economicUnit.code, data, 'Append Worker to Economic Unit')).then(
- () => history.goBack(),
- );
+ dispatch(appendWorkerToEconomicUnit(economicUnit.code, data, 'Append Worker to Economic Unit'))
+ .then(() => history.goBack());
} catch (error) {
setReset((prevReset) => prevReset + 1);
throw new Error(`[WORKER_DETAILS_PAGE]: Saving worker failed. ${error}`);
}
};
- useEffect(() => {
+ useEffect(async () => {
if (prevSubmittingMutationRef.current && !submittingMutation) {
- dispatch(journalize(mutation));
+ const mutationLog = await getLastMutationLog(dispatch, mutation?.clientMutationId || EMPTY_STRING);
+
+ if (mutationLog?.error) {
+ showError(formatMessageWithValues('saveWorker.error'));
+ setReset((prevReset) => prevReset + 1);
+ return;
+ }
+
+ showSuccess(formatMessage('saveWorker.success'));
}
- }, [submittingMutation]);
+ }, [submittingMutation, mutation]);
useEffect(() => {
prevSubmittingMutationRef.current = submittingMutation;
diff --git a/src/translations/en.json b/src/translations/en.json
index 35cc0b3..51c14fd 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -76,6 +76,10 @@
"workerVoucher.WorkerSearcher.dialog.message": "You are about to delete the worker. This action cannot be undone. Please confirm if you wish to proceed with this action.",
"workerVoucher.WorkerSearcher.dialog.confirm": "Delete",
"workerVoucher.WorkerSearcher.dialog.abandon": "Cancel",
+ "workerVoucher.deleteWorker.success": "The worker(s) has been deleted successfully.",
+ "workerVoucher.deleteWorker.error": "Something went wrong while deleting the worker(s). {detail}",
+ "workerVoucher.saveWorker.success": "The worker has been saved successfully.",
+ "workerVoucher.saveWorker.error": "Something went wrong while saving the worker.",
"workerVoucher.priceManagement": "Confirm Voucher Price",
"workerVoucher.mobileAppPassword": "Submit Change",
"workerVoucher.password.mustMatch": "The new password and confirmation password must match",
@@ -195,5 +199,11 @@
"workerVoucher.WorkerDateRangePicker.selectDate.moreInfo": "Define the validity period for the selected workers' vouchers. You can add multiple validity periods, but they must not overlap. First, set the period, and then confirm it using the button below.",
"workerVoucher.VoucherAssignmentForm.form.moreInfo": "Define the workers to whom you want to assign the non-personal vouchers. You can assign vouchers to multiple workers at once. First, select the workers, and then define periods in which the vouchers will be valid. Confirm the assignment using the top right corner button.",
"workerVoucher.WorkerImportDialog.moreInfo": "By using this feature, you can import your workers immediately. You can choose to import all workers, workers you've worked with, workers from the previous day only or workers from the particular group. Once you've selected the option, click the Import button to proceed.",
- "workerVoucher.GroupPicker.label": "Group"
+ "workerVoucher.GroupPicker.label": "Group",
+ "workerVoucher.PublicVoucherDetailsPage.title": "Public Voucher Check",
+ "workerVoucher.PublicVoucherDetailsPage.backButton": "Back",
+ "workerVoucher.PublicVoucherDetailsPage.noVoucherUuid": " Voucher UUID not provided.",
+ "workerVoucher.PublicVoucherDetailsPage.voucherNotFound": "Voucher not found.",
+ "workerVoucher.PublicVoucherDetailsPage.invalidVoucherFound": "Voucher is no longer valid. It was valid on the day {assignedDate} at the {employer} employer.",
+ "workerVoucher.PublicVoucherDetailsPage.voucherFound": "Voucher found. It is valid on the day {assignedDate} at the {employer} employer."
}
diff --git a/src/utils/utils.js b/src/utils/utils.js
index feba8dc..fde2828 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1,7 +1,7 @@
/* eslint-disable import/prefer-default-export */
import { baseApiUrl, parseData } from '@openimis/fe-core';
-import { MPAY_BILL_URL } from '../constants';
+import { MPAY_BILL_URL, WORKER_VOUCHER_STATUS } from '../constants';
import { fetchMutation } from '../actions';
const fetchMPayArgs = async (url) => {
@@ -70,3 +70,8 @@ export const getLastMutationLog = async (dispatch, mutationId) => {
return parseData(mutation.payload.data.mutationLogs)?.[0];
};
+
+export const isTheVoucherExpired = (voucher) => voucher.status === WORKER_VOUCHER_STATUS.EXPIRED
+|| new Date(voucher.expiryDate) < new Date();
+
+export const trimDate = (date) => date.split('T')[0];
{children}
+