diff --git a/frontend/micro-ui/web/docker/Dockerfile b/frontend/micro-ui/web/docker/Dockerfile
index 1cdc89bc5f7..91ffae28ff1 100644
--- a/frontend/micro-ui/web/docker/Dockerfile
+++ b/frontend/micro-ui/web/docker/Dockerfile
@@ -4,7 +4,7 @@ RUN apk update && apk upgrade
RUN apk add --no-cache git>2.30.0
RUN yarn add @upyog/digit-ui-libraries
RUN yarn add @upyog/digit-ui-module-pt
-RUN yarn add @upyog/digit-ui-module-fsm
+RUN yarn add @egovernments/digit-ui-module-fsm
RUN yarn add @upyog/digit-ui-module-tl
RUN yarn add @upyog/digit-ui-module-dss
RUN yarn add @upyog/digit-ui-module-mcollect
diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
index 475dcda5641..4e551590db2 100644
--- a/frontend/micro-ui/web/micro-ui-internals/example/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -12,7 +12,7 @@
"@upyog/digit-ui-module-bills": "1.8.0",
"@upyog/digit-ui-module-common": "1.8.0",
"@upyog/digit-ui-module-engagement": "1.8.0",
- "@upyog/digit-ui-module-fsm": "1.8.4",
+ "@egovernments/digit-ui-module-fsm": "1.8.4-beta1",
"@upyog/digit-ui-module-mcollect": "1.8.0",
"@upyog/digit-ui-module-noc": "1.8.0",
"@upyog/digit-ui-module-obps": "1.8.3",
diff --git a/frontend/micro-ui/web/micro-ui-internals/example/src/index.js b/frontend/micro-ui/web/micro-ui-internals/example/src/index.js
index 4af7d76a4d5..d339a462e2d 100644
--- a/frontend/micro-ui/web/micro-ui-internals/example/src/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/example/src/index.js
@@ -6,7 +6,7 @@ import { PGRReducers } from "@upyog/digit-ui-module-pgr";
import { PTModule, PTLinks, PTComponents } from "@upyog/digit-ui-module-pt";
import { MCollectModule, MCollectLinks } from "@upyog/digit-ui-module-mcollect";
// import { TLModule, TLLinks } from "@upyog/digit-ui-module-tl";
-import { initFSMComponents } from "@upyog/digit-ui-module-fsm";
+import { initFSMComponents } from "@egovernments/digit-ui-module-fsm";
import { initPGRComponents } from "@upyog/digit-ui-module-pgr";
import { initDSSComponents } from "@upyog/digit-ui-module-dss";
import { initHRMSComponents } from "@upyog/digit-ui-module-hrms";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/fsm/useWorkerSearch.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/fsm/useWorkerSearch.js
new file mode 100644
index 00000000000..c693b53c317
--- /dev/null
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/fsm/useWorkerSearch.js
@@ -0,0 +1,10 @@
+import { useQuery } from "react-query";
+import { FSMService } from "../../services/elements/FSM";
+
+const useWorkerSearch = (args) => {
+ const { tenantId, params, details, config } = args;
+ console.log(tenantId, params, details,"sssss")
+ return useQuery(["FSM_WORKER_SEARCH", details], () => FSMService.workerSearch({ tenantId, params, details }), config);
+};
+
+export default useWorkerSearch;
\ No newline at end of file
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/index.js
index fbeeb531020..cda243aa983 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/index.js
@@ -49,6 +49,7 @@ import usePGRTenants from "./pgr/useTenants";
import usePGRMDMS from "./pgr/useMDMS";
import useComplaintSubType from "./pgr/useComplaintSubType";
import useComplaintStatusCount from "./pgr/useComplaintStatusWithCount";
+import useWorkerSearch from "./fsm/useWorkerSearch";
import useTenantsFSM from "./fsm/useTenants";
import useDesludging from "./fsm/useDesludging";
@@ -334,6 +335,7 @@ const fsm = {
useVehicleTripCreate,
useVendorSearch,
useAdvanceBalanceCalulation,
+ useWorkerSearch
};
const ptr = {
usePetMDMS,
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js
index 3e691aab440..4f57c3ee447 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js
@@ -53,6 +53,7 @@ const Urls = {
updateDriver: "/vendor/driver/v1/_update",
vehicleTripCreate: "/vehicle/trip/v1/_create",
advanceBalanceCalculate: "/fsm-calculator/v1/_advancebalancecalculate",
+ workerSearch: "/individual/v1/_search",
},
payment: {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/FSM.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/FSM.js
index 67f4c4d688a..3b06a13f90c 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/FSM.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/FSM.js
@@ -174,4 +174,14 @@ export const FSMService = {
params: { tenantId, ...details },
auth: true,
}),
+ workerSearch: ({ tenantId, details, params }) =>
+ Request({
+ url: Urls.fsm.workerSearch,
+ data: details,
+ useCache: false,
+ userService: true,
+ method: "POST",
+ params: { tenantId, ...params },
+ auth: true,
+ }),
};
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json
index 1248f7db9a0..8474785ab58 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json
@@ -1,6 +1,6 @@
{
- "name": "@upyog/digit-ui-module-fsm",
- "version": "1.8.4",
+ "name": "@egovernments/digit-ui-module-fsm",
+ "version": "1.8.4-beta1",
"license": "MIT",
"main": "dist/index.js",
"description": "Digit FSM Module",
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/Module.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/Module.js
index 55413373277..caf13f64a51 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/Module.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/Module.js
@@ -62,6 +62,9 @@ import SelectTrips from "./pageComponents/SelectTrips";
import PlusMinusInput from "./pageComponents/PlusMinusInput";
import ConfirmationBox from "./components/Confirmation";
import SelectLocalityOrGramPanchayat from "./pageComponents/SelectLocalityOrGramPanchayat";
+import AddWorker from "./pages/employee/FSMRegistry/Worker/AddWorker"
+import EditWorker from "./pages/employee/FSMRegistry/Worker/EditWorker";
+import WorkerDetails from "./pages/employee/FSMRegistry/Worker/WorkerDetails";
const FSMModule = ({ stateCode, userType, tenants }) => {
const moduleCode = "FSM";
@@ -219,6 +222,9 @@ const componentsToRegister = {
PlusMinusInput,
ConfirmationBox,
SelectLocalityOrGramPanchayat,
+ AddWorker,
+ EditWorker,
+ WorkerDetails,
};
export const initFSMComponents = () => {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/Modal/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/Modal/index.js
index 91a7e98618b..1ecbb4d3deb 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/Modal/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/Modal/index.js
@@ -39,7 +39,7 @@ const popupActionBarStyles = {
justifyContent: 'space-around'
}
-const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction, actionData, module }) => {
+const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction, actionData, module, applicationDetails }) => {
const mobileView = Digit.Utils.browser.isMobile() ? true : false;
const { data: dsoData, isLoading: isDsoLoading, isSuccess: isDsoSuccess, error: dsoError } = Digit.Hooks.fsm.useDsoSearch(tenantId, { limit: '-1', status: 'ACTIVE' });
const { isLoading, isSuccess, isError, data: applicationData, error } = Digit.Hooks.fsm.useSearch(
@@ -130,6 +130,53 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction,
const [fstpoRejectionReason, setFstpoRejectionReason] = useState();
const [noOfTrips, setNoOfTrips] = useState(null);
+ const [workers,setWorkers] = useState([]);
+ const [drivers,setDrivers] = useState([]);
+ const [selectedDriver,setSelectedDriver] = useState([]);
+ const [selectedWorkers,setSelectedWorkers] = useState([]);
+ const [vehicleDriverList, setVehicleDriverList] = useState([]);
+ const [vehicleDriver, setVehicleDriver] = useState(null);
+
+ const individualIds = applicationDetails?.dsoDetails?.workers?.map(worker => {
+ return worker?.individualId
+ })?.filter(id => id)
+
+ console.log(applicationDetails,"applicationDetails")
+
+ const {
+ data: workerData,
+ isLoading: isLoadingWorkers,
+ isSuccess: isSuccessWorkers,
+ error: isErrorWorkers,
+ refetch: refetchWorkers,
+ } = Digit.Hooks.fsm.useWorkerSearch({
+ tenantId,
+ details: {
+ Individual: {
+ // roleCodes: ['SANITATION_WORKER'],
+ tenantId,
+ id:individualIds
+ },
+ },
+ params: {
+ // ...paginationParms,
+ // name: searchParams?.name,
+ limit: 100,
+ offset: 0,
+ },
+ config: {
+ enabled: individualIds?.length > 0 ? true : false,
+ select: (data) => {
+ const result = data?.Individual?.map(ind => {return {givenName:ind?.name?.givenName,optionsKey:`${ind?.name?.givenName} / ${ind?.individualId}`,...ind}})?.filter(worker => worker?.userDetails?.roles?.some(role=> role?.code === "SANITATION_WORKER"))
+ const workersOutOfResult = result?.filter(worker => worker?.userDetails?.roles?.some(role=> role?.code === "SANITATION_HELPER"))
+ setWorkers(workersOutOfResult)
+ const drivers = result?.filter(worker => worker?.userDetails?.roles?.some(role=> role?.code === "FSM_DRIVER"))
+ setDrivers(drivers)
+ return result
+ },
+ },
+ });
+
const [defaultValues, setDefautValue] = useState({
capacity: vehicle?.capacity,
wasteCollected: vehicle?.capacity,
@@ -200,7 +247,9 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction,
if (isSuccess && isDsoSuccess && applicationData && applicationData.dsoId) {
const [dso] = dsoData.filter((dso) => dso.id === applicationData.dsoId);
const tempList = dso?.vehicles?.filter((vehicle) => vehicle.capacity == applicationData?.vehicleCapacity);
- const vehicleNoList = tempList.sort((a,b) => (a.registrationNumber > b.registrationNumber ? 1 : -1 ));
+ const vehicleNoList = tempList?.sort((a,b) => (a?.registrationNumber > b?.registrationNumber ? 1 : -1 ));
+ const tempDriverList = dso?.drivers
+ setVehicleDriverList(tempDriverList)
setVehicleNoList(vehicleNoList);
}
}, [isSuccess, isDsoSuccess]);
@@ -253,6 +302,14 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction,
workflow.comments = data.comments ? state.code + "~" + data.comments : state.code;
}
+ function selectVehicleNo(vehicleNo) {
+ setVehicleNo(vehicleNo);
+ }
+
+ function selectVehicleDriver(driver) {
+ setVehicleDriver(driver)
+ }
+
const handleUpload = (ids) => {
if (!fileStoreId || fileStoreId.length < 4) {
setFileStoreId(ids);
@@ -267,6 +324,7 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction,
if (dso) applicationData.dsoId = dso.id;
if (vehicleNo && action === "ACCEPT") applicationData.vehicleId = vehicleNo.id;
if (vehicleNo && action === "DSO_ACCEPT") applicationData.vehicleId = vehicleNo.id;
+ if (vehicleDriver && action === "DSO_ACCEPT") applicationData.driverId = vehicleDriver.id;
if (vehicle && action === "ASSIGN") applicationData.vehicleType = vehicle.code;
if (data.date) applicationData.possibleServiceDate = new Date(`${data.date}`).getTime();
if (data.desluged) applicationData.completedOn = new Date(data.desluged).getTime();
@@ -289,7 +347,29 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction,
}
}
if (data.noOfTrips) applicationData.noOfTrips = Number(data.noOfTrips);
- if (action === "REASSING") applicationData.vehicleId = null;
+ if (action === "REASSING") {
+ applicationData.vehicleId = null
+ if(applicationData?.workers?.length > 0) {
+ applicationData.workers = applicationData?.workers?.map(worker => {
+ return {
+ ...worker,
+ status:"INACTIVE"
+ }
+ })
+ }
+ };
+ //if action is send back we'll inactivate the assigned workers
+
+ if (action === "SENDBACK") {
+ if(applicationData?.workers?.length > 0) {
+ applicationData.workers = applicationData?.workers?.map(worker => {
+ return {
+ ...worker,
+ status:"INACTIVE"
+ }
+ })
+ }
+ };
if (reassignReason) addCommentToWorkflow(reassignReason, workflow, data);
if (rejectionReason) addCommentToWorkflow(rejectionReason, workflow, data);
@@ -298,8 +378,44 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction,
if (fstpoRejectionReason && data.comments) workflow.comments = data.comments;
if (fstpoRejectionReason) workflow.fstpoRejectionReason = fstpoRejectionReason?.code;
+
+ if(action==="DSO_ACCEPT" || action==="ACCEPT"){
+ //if driver selected is there in selectedworkers do early return and show toast
+ if(selectedWorkers?.some?.(worker => worker?.id === selectedDriver?.id)){
+ setShowToast({ label:"FSM_DRIVER_SW_ERR",error:true });
+ setTimeout(closeToast, 5000);
+ return
+ }
+ const workersList = [selectedDriver,...tempSelectedWorkers]
+ // workerList?.filter(worker => worker?.userDetails?.roles?.some(role=> role?.code === "FSM_DRIVER"))
+ const workerPayload = workersList?.map((worker,idx)=> {
+ return {
+ tenantId:worker?.tenantId,
+ applicationId:applicationData?.id,
+ individualId:worker?.id,
+ // workerType:worker?.userDetails?.roles?.some(role=> role?.code === "FSM_DRIVER") ? "DRIVER":"HELPER",
+ workerType:idx===0 ? "DRIVER":"HELPER",
+
+ status:"ACTIVE"
+ }
+ })
+ //resettting the states
+ setSelectedDriver([])
+ setSelectedWorkers([])
+ setDrivers([])
+ setWorkers([])
+ refetchWorkers()
+ submitAction({ fsm: {...applicationData,workers:workerPayload}, workflow });
+ return
+ }
+
submitAction({ fsm: applicationData, workflow });
}
+
+ const onRemoveWorkers = (index, workerToRemove) => {
+ setSelectedWorkers(()=>selectedWorkers?.filter(worker=> worker.individualId!==workerToRemove.individualId))
+ };
+
useEffect(() => {
switch (action) {
case "UPDATE":
@@ -314,6 +430,32 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction,
})
);
case "DSO_ACCEPT":
+ //TODO: add accept UI
+ setFormValve(vehicleNo && selectedDriver?.optionsKey ? true : false);
+ return setConfig(
+ configAcceptDso({
+ t,
+ dsoData,
+ dso,
+ vehicle,
+ vehicleCapacity: applicationData?.vehicleCapacity,
+ noOfTrips: applicationData?.noOfTrips,
+ vehicleNo,
+ vehicleNoList,
+ selectVehicleNo,
+ vehicleDriverList,
+ vehicleDriver,
+ selectVehicleDriver,
+ action,
+ workers,
+ selectedDriver,
+ selectedWorkers,
+ setSelectedDriver,
+ setSelectedWorkers,
+ onRemoveWorkers,
+ drivers,
+ })
+ );
case "ACCEPT":
//TODO: add accept UI
setFormValve(vehicleNo ? true : false);
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/config/AcceptDso.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/config/AcceptDso.js
index 0a1ce8cc2cc..4dc26607c5f 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/config/AcceptDso.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/config/AcceptDso.js
@@ -1,12 +1,35 @@
import React from "react";
-import { CardLabelError, Dropdown } from "@upyog/digit-ui-react-components";
+import { CardLabelError, Dropdown, MultiSelectDropdown, RemoveableTag, LabelFieldPair, CardLabel } from "@upyog/digit-ui-react-components";
-export const configAcceptDso = ({ t, dsoData, dso, selectVehicleNo, vehicleNoList, vehicleNo, vehicle, noOfTrips, action }) => {
+// steps
+// get individualIds array from workers array in vendor object
+// call individual service and get those individuals
+// filter out drivers bases on system role
+// show drivers and sanitation workers
+
+export const configAcceptDso = ({
+ t,
+ dsoData,
+ dso,
+ selectVehicleNo,
+ vehicleNoList,
+ vehicleNo,
+ vehicle,
+ noOfTrips,
+ action,
+ workers,
+ selectedDriver,
+ selectedWorkers,
+ setSelectedDriver,
+ setSelectedWorkers,
+ onRemoveWorkers,
+ drivers,
+}) => {
return {
label: {
heading: `ES_FSM_ACTION_TITLE_${action}`,
- submit: `CS_COMMON_${action}`,
- cancel: "CS_COMMON_CLOSE",
+ submit: `CS_COMMON_ASSIGN`,
+ cancel: "CS_COMMON_CANCEL",
},
form: [
{
@@ -17,9 +40,6 @@ export const configAcceptDso = ({ t, dsoData, dso, selectVehicleNo, vehicleNoLis
type: "dropdown",
populators: (
- {!vehicleNoList?.length ? (
- {t("ES_FSM_NO_VEHICLE_AVAILABLE")}
- ) : null}
0 ? false : true}
/>
+ {!vehicleNoList?.length ? {t("ES_FSM_NO_VEHICLE_AVAILABLE")} : null}
),
},
@@ -44,6 +65,76 @@ export const configAcceptDso = ({ t, dsoData, dso, selectVehicleNo, vehicleNoLis
},
disable: true,
},
+ // {
+ // label: t('ES_FSM_ACTION_NUMBER_OF_TRIPS'),
+ // isMandatory: true,
+ // type: 'text',
+ // populators: {
+ // name: 'noOfTrips',
+ // validation: {
+ // required: true,
+ // },
+ // defaultValue: noOfTrips,
+ // },
+ // disable: true,
+ // },
+ {
+ label: t("ES_FSM_ACTION_ASSIGN_DRIVER"),
+ isMandatory: true,
+ type: "dropdown",
+ populators: (
+
+ {
+ setSelectedDriver(option);
+ }}
+ selected={selectedDriver}
+ disable={drivers?.length > 0 ? false : true}
+ placeholder={t("SW_SEARCH_BY_NAME_ID")}
+ optionCardStyles={{"maxHeight":"16rem"}}
+ />
+ {drivers?.length === 0 || !drivers ? {t("ES_FSM_NO_DRIVER_AVAILABLE")} : null}
+
+ ),
+ },
+ {
+ label: t("ES_FSM_ACTION_ASSIGN_SW"),
+ isMandatory: false,
+ type: "dropdown",
+ populators: (
+
+ {
+ if (data.length >= 0) {
+ setSelectedWorkers(data?.map((arr) => arr?.[1]));
+ } else {
+ setSelectedWorkers([]);
+ }
+ }}
+ optionsKey={"optionsKey"}
+ t={t}
+ ServerStyle={{"maxHeight":"12rem"}}
+ // defaultLabel={t("SW_SEARCH_BY_NAME_ID")}
+ // defaultLabelClassName={"as-placeholder"}
+ />
+
+ {selectedWorkers?.map((value, index) => {
+ return onRemoveWorkers(index, value)} />;
+ })}
+
+
+ ),
+ },
{
label: t("ES_FSM_ACTION_NUMBER_OF_TRIPS"),
isMandatory: true,
@@ -53,7 +144,7 @@ export const configAcceptDso = ({ t, dsoData, dso, selectVehicleNo, vehicleNoLis
validation: {
required: true,
},
- defaultValue: noOfTrips
+ defaultValue: noOfTrips,
},
disable: true,
},
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/index.js
index d0bf2e4c62c..6c1edf5da25 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/index.js
@@ -421,6 +421,7 @@ const ApplicationDetails = (props) => {
submitAction={submitAction}
actionData={workflowDetails?.data?.timeline}
module={workflowDetails?.data?.applicationBusinessService}
+ applicationDetails={applicationDetails}
/>
) : null}
{showToast && (
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Worker/AddWorker.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Worker/AddWorker.js
new file mode 100644
index 00000000000..3e0e77da015
--- /dev/null
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Worker/AddWorker.js
@@ -0,0 +1,323 @@
+import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { FormComposer, Toast, Header, FormComposerV2 } from "@upyog/digit-ui-react-components";
+import { useHistory } from "react-router-dom";
+import WorkerConfig from "../../configs/WorkerConfig";
+import { useQueryClient } from "react-query";
+
+const AddWorker = ({ parentUrl, heading }) => {
+ const tenantId = Digit.ULBService.getCurrentTenantId();
+ const stateId = Digit.ULBService.getStateId();
+ const [showToast, setShowToast] = useState(null);
+ const history = useHistory();
+ const queryClient = useQueryClient();
+ const { t } = useTranslation();
+ const [canSubmit, setSubmitValve] = useState(false);
+ const [checkRoleField, setCheckRoleField] = useState(false);
+ const [Config, setConfig] = useState(WorkerConfig({ t }));
+ const [skillsOption, setSkillsOption] = useState([]);
+ const [employer, setEmployer] = useState([]);
+ const { isLoading: isLoading, isError: vendorCreateError, data: updateResponse, error: updateError, mutate } = Digit.Hooks.fsm.useWorkerCreate(tenantId);
+ const {
+ isLoading: isVendorUpdateLoading,
+ isError: isvendorUpdateError,
+ data: vendorUpdateResponse,
+ error: vendorUpdateError,
+ mutate: vendorMutate,
+ } = Digit.Hooks.fsm.useVendorUpdate(tenantId);
+
+ const { isLoading: isPlantUserLoading, isError: isPlantUserError, data: plantUserResponse, error: PlantUserError, mutate: PlantUserMutate } = Digit.Hooks.fsm.usePlantUserCreate(
+ tenantId
+ );
+
+ const { isLoading: ismdms, data: mdmsOptions } = Digit.Hooks.useCustomMDMS(
+ stateId,
+ "FSM",
+ [
+ {
+ name: "SanitationWorkerSkills",
+ },
+ {
+ name: "SanitationWorkerEmployer",
+ },
+ {
+ name: "SanitationWorkerEmploymentType",
+ },
+ {
+ name: "SanitationWorkerFunctionalRoles",
+ },
+ ],
+ {
+ select: (data) => {
+ return data?.FSM;
+ },
+ }
+ );
+
+ useEffect(() => {
+ const tempSkills = mdmsOptions?.SanitationWorkerSkills?.map((i) => ({ ...i, i18nKey: `ES_FSM_OPTION_${i.code}` }));
+ const tempEmp = mdmsOptions?.SanitationWorkerEmployer?.map((i) => ({ ...i, i18nKey: `ES_FSM_OPTION_${i.code}` }));
+ setSkillsOption(tempSkills);
+ setEmployer(tempEmp);
+ }, [mdmsOptions, ismdms]);
+
+ useEffect(() => {
+ setConfig(WorkerConfig({ t, skillsOption, employer }));
+ }, [skillsOption, employer]);
+
+ const defaultValues = {};
+
+ const onFormValueChange = (setValue, formData, errors) => {
+ for (let i = 0; i < formData?.AddWorkerRoles?.length; i++) {
+ let key = formData?.AddWorkerRoles[i];
+ if (!(key?.emp_Type && key?.fn_role && key?.sys_role && key?.fn_role?.code)) {
+ setCheckRoleField(false);
+ break;
+ } else {
+ setCheckRoleField(true);
+ }
+ }
+
+ if (
+ !isNaN(formData?.SelectEmployeePhoneNumber?.mobileNumber?.length) &&
+ formData?.SelectEmployeePhoneNumber?.mobileNumber?.length === 10 &&
+ formData?.name &&
+ // formData?.selectGender &&
+ // formData?.dob &&
+ formData?.address?.city &&
+ formData?.address?.locality &&
+ formData?.skills &&
+ formData?.employementDetails?.employer &&
+ formData?.employementDetails?.vendor &&
+ (!formData?.AddWorkerRoles || formData?.AddWorkerRoles?.length === 0 || (formData?.AddWorkerRoles?.length > 0 && checkRoleField)) &&
+ !errors?.SelectEmployeePhoneNumber?.isMobilePresent
+ ) {
+ setSubmitValve(true);
+ } else {
+ setSubmitValve(false);
+ }
+ };
+
+ const closeToast = () => {
+ setShowToast(null);
+ };
+
+ const onSubmit = (data) => {
+ const name = data?.name;
+ const mobileNumber = data?.SelectEmployeePhoneNumber?.mobileNumber;
+ const gender = data?.selectGender?.code;
+ const dob = data.dob ? new Date(`${data.dob}`).getTime() : null;
+ const photograph = data?.documents?.img_photo?.[0]?.[1]?.fileStoreId?.fileStoreId || null;
+ const pincode = data?.pincode;
+ const city = data?.address?.city?.name;
+ const locality = data?.address?.locality?.code;
+ const doorNo = data?.doorNo;
+ const street = data?.street;
+ const landmark = data?.landmark;
+ const skills = data?.skills?.map((i) => {
+ return { type: i?.code, level: "UNSKILLED" };
+ });
+ const employer = data?.employementDetails?.employer?.code;
+ const vendor = data?.employementDetails?.vendor;
+ const roleDetails = data?.AddWorkerRoles;
+ const restructuredData = [];
+ roleDetails?.forEach((item) => {
+ const restructuredItem = {};
+ restructuredItem["FUNCTIONAL_ROLE"] = item.fn_role.code;
+ restructuredItem["EMPLOYMENT_TYPE"] = item.emp_Type.name;
+ restructuredItem["SYSTEM_ROLE"] = item.sys_role;
+ restructuredItem["PLANT"] = item?.plant;
+ restructuredData.push(restructuredItem);
+ });
+
+ const driverLicenses = roleDetails?.filter((entry) => entry.fn_role && entry.fn_role.code === "DRIVER" && entry.licenseNo).map((entry) => entry.licenseNo);
+ const roleDetailsArray = [];
+
+ roleDetails?.forEach((item, index) => {
+ // Extracting functional role information
+ const fnRoleKey = `FUNCTIONAL_ROLE_${index + 1}`;
+ const fnRoleValue = item.fn_role.code;
+
+ // Extracting employment type information
+ const empTypeKey = `EMPLOYMENT_TYPE_${index + 1}`;
+ const empTypeValue = item.emp_Type.name.toUpperCase();
+
+ // Pushing the extracted information to the output array
+ roleDetailsArray.push({ key: fnRoleKey, value: fnRoleValue });
+ roleDetailsArray.push({ key: empTypeKey, value: empTypeValue });
+ });
+
+ // Adding the count of functional roles
+ if (roleDetails) {
+ roleDetailsArray.push({ key: "FUNCTIONAL_ROLE_COUNT", value: `${roleDetails?.length < 10 ? "0" : ""}${roleDetails?.length.toString()}` });
+ }
+
+ // Adding the employer information (assuming it's a constant value like "PRIVATE_VENDOR")
+ roleDetailsArray.push({ key: "EMPLOYER", value: employer });
+
+ const checkDuplicacy = roleDetailsArray.filter((item) => item.key.startsWith("FUNCTIONAL_ROLE")).map((item) => item.value);
+ const isDuplicate = checkDuplicacy.length === new Set(checkDuplicacy).size;
+
+ if (!isDuplicate) {
+ setShowToast({ key: "error", action: `ES_FSM_WORKER_DUPLICATE_ROLE` });
+ setTimeout(() => {
+ closeToast();
+ }, 5000);
+ return;
+ }
+
+ const formData = {
+ Individual: {
+ tenantId: tenantId,
+ name: {
+ givenName: name,
+ },
+ dateOfBirth: dob,
+ gender: gender,
+ mobileNumber: mobileNumber,
+ address: [
+ {
+ tenantId: tenantId,
+ pincode: pincode,
+ city: tenantId,
+ street: street,
+ doorNo: doorNo,
+ locality: {
+ code: locality,
+ },
+ landmark: landmark,
+ type: "PERMANENT",
+ },
+ ],
+ identifiers:
+ driverLicenses?.length > 0
+ ? [
+ {
+ identifierType: "DRIVING_LICENSE_NUMBER",
+ identifierId: driverLicenses?.[0],
+ },
+ ]
+ : null,
+ skills: skills,
+ photo: photograph,
+ additionalFields: {
+ // fields: restructuredData,
+ fields: roleDetailsArray,
+ },
+ isSystemUser: true,
+ userDetails: {
+ username: mobileNumber,
+ tenantId: tenantId,
+ roles: roleDetails
+ ? // Object.values(roleDetails[0].sys_role).map((role) => ({
+ // code: role.code,
+ // tenantId: tenantId,
+ // }))
+ roleDetails
+ .map((item) => Object.values(item.sys_role))
+ .flat()
+ .reduce((result, role) => {
+ if (!result.some((entry) => entry.code === role.code)) {
+ result.push({ code: role.code, tenantId });
+ }
+ return result;
+ }, [])
+ : [{ code: "SANITATION_WORKER", tenantId }],
+ type: "CITIZEN",
+ },
+ },
+ };
+
+ mutate(formData, {
+ onError: (error, variables) => {
+ setShowToast({ key: "error", action: "ES_FSM_WORKER_ADD_FAILED" });
+ setTimeout(closeToast, 5000);
+ },
+ onSuccess: async (data, variables) => {
+ // setShowToast({ key: "success", action: "ADD_WORKER" });
+ // queryClient.invalidateQueries("FSM_WORKER_SEARCH");
+ // if (roleDetails?.some((entry) => entry.plant)) {
+ // try {
+ // const PlantCode = roleDetails
+ // ?.map((entry) => ({
+ // tenantId: tenantId,
+ // plantCode: entry?.plant?.code,
+ // individualId: data?.Individual?.individualId,
+ // isActive: true,
+ // }))
+ // .filter((i) => i?.plantCode);
+ // const plantFormData = {
+ // plantUsers: PlantCode,
+ // };
+ // const plantresponse = await PlantUserMutate(plantFormData);
+ // } catch (err) {
+ // console.error("Plant user create", err);
+ // setShowToast({ key: "error", action: err });
+ // }
+ // }
+ if (vendor) {
+ try {
+ const vendorData = {
+ vendor: {
+ ...vendor,
+ workers: vendor.workers
+ ? [...vendor.workers, { individualId: data?.Individual?.id, vendorWorkerStatus: "ACTIVE" }]
+ : [{ individualId: data?.Individual?.id, vendorWorkerStatus: "ACTIVE" }],
+ },
+ };
+ const response = await vendorMutate(vendorData);
+ setShowToast({ key: "success", action: "WORDER_ADDED_WITH_VENDOR" });
+ } catch (updateError) {
+ console.error("Error updating data:", updateError);
+ setShowToast({ key: "success", action: "WORDER_ADDED_VENDOR_FAILED" });
+ }
+ } else {
+ setShowToast({ key: "success", action: "ADD_WORKER_SUCCESS" });
+ }
+ setTimeout(() => {
+ closeToast();
+ history.push(`/${window?.contextPath}/employee/fsm/registry?selectedTabs=WORKER`);
+ }, 5000);
+ },
+ });
+ };
+ const isMobile = window.Digit.Utils.browser.isMobile();
+
+ return (
+
+
+ {t("FSM_REGISTRY_ADD_WORKER_HEADING")}
+
+
+ !i.hideInEmployee).map((config) => {
+ return {
+ ...config,
+ body: config.body.filter((a) => !a.hideInEmployee),
+ };
+ })}
+ fieldStyle={{ marginRight: 0 }}
+ sectionHeaderClassName="fsm-registry"
+ onSubmit={onSubmit}
+ defaultValues={defaultValues}
+ onFormValueChange={onFormValueChange}
+ noBreakLine={true}
+ cardStyle={{
+ padding: "1rem 1.5rem",
+ }}
+ />
+ {showToast && (
+
+ )}
+
+
+ );
+};
+
+export default AddWorker;
\ No newline at end of file
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Worker/EditWorker.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Worker/EditWorker.js
new file mode 100644
index 00000000000..2303bc8fe86
--- /dev/null
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Worker/EditWorker.js
@@ -0,0 +1,509 @@
+import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Toast, Header, FormComposerV2, Loader } from "@upyog/digit-ui-react-components";
+import { useHistory } from "react-router-dom";
+import WorkerConfig from "../../configs/WorkerConfig";
+import { useQueryClient } from "react-query";
+
+// IND-2023-11-24-010875
+const EditWorker = ({ parentUrl, heading }) => {
+ const tenantId = Digit.ULBService.getCurrentTenantId();
+ const stateId = Digit.ULBService.getStateId();
+ const [showToast, setShowToast] = useState(null);
+ const history = useHistory();
+ const queryClient = useQueryClient();
+ const { t } = useTranslation();
+ const [canSubmit, setSubmitValve] = useState(false);
+ const [workerinfo, setWorkerinfo] = useState(null);
+ const [defaultValues, setDefaultValues] = useState(null);
+ const [skillsOption, setSkillsOption] = useState([]);
+ const [employer, setEmployer] = useState([]);
+ const [Config, setConfig] = useState(WorkerConfig({ t, disabled: true }));
+ const searchParams = new URLSearchParams(location.search);
+ const id = searchParams.get("id");
+ const [checkRoleField, setCheckRoleField] = useState(false);
+
+ const { isLoading: ismdms, data: mdmsOptions } = Digit.Hooks.useCustomMDMS(
+ stateId,
+ "FSM",
+ [
+ {
+ name: "SanitationWorkerSkills",
+ },
+ {
+ name: "SanitationWorkerEmployer",
+ },
+ {
+ name: "SanitationWorkerEmploymentType",
+ },
+ {
+ name: "SanitationWorkerFunctionalRoles",
+ },
+ ],
+ {
+ select: (data) => {
+ return data?.FSM;
+ },
+ }
+ );
+
+ const { isLoading: isPlantUserLoading, data: plantUserData } = Digit.Hooks.useCustomAPIHook({
+ url: "/pqm-service/plant/user/v1/_search",
+ params: {},
+ body: {
+ plantUserSearchCriteria: {
+ tenantId: tenantId,
+ individualIds: [id],
+ },
+ pagination: {},
+ },
+ changeQueryName: "plantUser",
+ staletime: 0,
+ });
+
+ useEffect(() => {
+ const tempSkills = mdmsOptions?.SanitationWorkerSkills?.map((i) => ({ ...i, i18nKey: `ES_FSM_OPTION_${i.code}` }));
+ const tempEmp = mdmsOptions?.SanitationWorkerEmployer?.map((i) => ({ ...i, i18nKey: `ES_FSM_OPTION_${i.code}` }));
+ setSkillsOption(tempSkills);
+ setEmployer(tempEmp);
+ }, [mdmsOptions, ismdms]);
+
+
+ const { isLoading: isLoading, isError: vendorCreateError, data: updateResponse, error: updateError, mutate } = Digit.Hooks.fsm.useWorkerUpdate(tenantId);
+
+ const { data: workerData, isLoading: WorkerLoading } = Digit.Hooks.fsm.useWorkerSearch({
+ tenantId,
+ params: {
+ offset: 0,
+ limit: 100,
+ },
+ details: {
+ Individual: {
+ individualId: id,
+ },
+ },
+ });
+
+ useEffect(() => {
+ const workerDetails = workerData?.Individual?.[0];
+ setConfig(WorkerConfig({ t, disabled: true, skillsOption, defaultSkill: workerDetails?.skills?.filter((i) => i.isDeleted === false), employer }));
+ }, [skillsOption, employer, workerData]);
+
+ const { data: vendorData, isLoading: isVendorLoading, isSuccess: isVendorSuccess, error: vendorError, refetch: refetchVendor } = Digit.Hooks.fsm.useDsoSearch(
+ tenantId,
+ { sortBy: "name", sortOrder: "ASC", status: "ACTIVE", individualIds: workerData?.Individual?.[0]?.id },
+ { enabled: workerData && !WorkerLoading, cacheTime: 0 },
+ t
+ );
+
+ const {
+ isLoading: isPlantUpdateLoading,
+ isError: isPlantUserError,
+ data: plantUserResponse,
+ error: PlantUserError,
+ mutate: PlantUserMutate,
+ } = Digit.Hooks.fsm.usePlantUserUpdate(tenantId);
+
+ const {
+ isLoading: isVendorUpdateLoading,
+ isError: isvendorUpdateError,
+ data: vendorUpdateResponse,
+ error: vendorUpdateError,
+ mutate: vendorMutate,
+ } = Digit.Hooks.fsm.useVendorUpdate(tenantId);
+
+ function transformData(rdata) {
+ const data = rdata?.additionalFields?.fields;
+ const functionalRoleCount = parseInt(data?.find((item) => item?.key === "FUNCTIONAL_ROLE_COUNT")?.value, 10) || null;
+ const resultArray = [];
+ const allowedRoles = mdmsOptions?.SanitationWorkerFunctionalRoles;
+ const resproles = rdata?.userDetails?.roles;
+ if (functionalRoleCount) {
+ for (let i = 1; i <= functionalRoleCount; i++) {
+ const functionalRoleKey = `FUNCTIONAL_ROLE_${i}`;
+ const functionalRoleValue = data.find((item) => item.key === functionalRoleKey).value;
+ const fnmap = allowedRoles?.find((i) => i.code === functionalRoleValue);
+
+ const transformedData = {
+ emp_Type: {
+ code: data.find((item) => item.key === `EMPLOYMENT_TYPE_${i}`).value,
+ },
+ fn_role: {
+ code: fnmap?.code,
+ i18nKey: `ES_FSM_OPTION_${fnmap?.code}`,
+ },
+ };
+
+ if (functionalRoleValue === "DRIVER" && rdata?.identifiers?.[0]?.identifierType === "DRIVING_LICENSE_NUMBER") {
+ transformedData.licenseNo = rdata?.identifiers?.[0]?.identifierId;
+ }
+
+ if (functionalRoleValue === "PLANT_OPERATOR") {
+ transformedData.plant = {
+ ...plantUserData?.plantUsers?.[0],
+ name: plantUserData?.plantUsers?.[0]?.plantCode,
+ i18nKey: `PQM_PLANT_${plantUserData?.plantUsers?.[0]?.plantCode}`,
+ };
+ }
+
+ const tempRoles = allowedRoles?.find((i) => i.code === functionalRoleValue)?.allowedSystemRoles;
+ const filterCodes = resproles.map((item) => item.code);
+ const filteredArray = tempRoles.filter((item) => filterCodes.includes(item.code));
+ transformedData.sys_role = filteredArray;
+ // transformedData.sys_role = filteredArray?.reduce((result, item, index) => {
+ // result[index] = item;
+ // return result;
+ // }, {});
+ resultArray.push(transformedData);
+ }
+ }
+
+ return resultArray.length !== 0 ? resultArray : undefined;
+ }
+
+ useEffect(() => {
+ if (workerData && workerData?.Individual && !isVendorLoading && vendorData ) {
+ const workerDetails = workerData?.Individual?.[0];
+ const respSkills = workerDetails?.skills?.filter((i) => i.isDeleted === false);
+ setWorkerinfo(workerDetails);
+ const values = {
+ SelectEmployeePhoneNumber: {
+ mobileNumber: workerDetails?.mobileNumber,
+ },
+ name: workerDetails?.name?.givenName,
+ selectGender: {
+ code: workerDetails?.gender,
+ active: true,
+ i18nKey: `COMMON_GENDER_${workerDetails?.gender}`,
+ },
+ dob: workerDetails?.dateOfBirth ? workerDetails?.dateOfBirth.split("/").reverse().join("-") : null,
+ pincode: workerDetails?.address?.[0]?.pincode,
+ address: {
+ city: {
+ code: workerDetails?.address?.[0]?.city,
+ },
+ locality: { ...workerDetails?.address?.[0]?.locality },
+ },
+ street: workerDetails?.address?.[0]?.street,
+ doorNo: workerDetails?.address?.[0]?.doorNo,
+ landmark: workerDetails?.address?.[0]?.landmark,
+ skills: mdmsOptions?.SanitationWorkerSkills?.filter((mdm) => respSkills?.some((item) => item?.type === mdm?.code))?.map((i) => ({
+ ...i,
+ i18nKey: `ES_FSM_OPTION_${i.code}`,
+ })),
+ // workerDetails?.skills?.map((obj) => ({ ...obj, code: obj.type })),
+ employementDetails: {
+ employer: { name: workerDetails?.additionalFields?.fields?.find((i) => i.key === "EMPLOYER")?.value },
+ vendor: vendorData?.[0],
+ },
+ AddWorkerRoles: transformData(workerDetails),
+ documents: {
+ img_photo: workerDetails?.photo
+ ? [
+ [
+ "Photo",
+ {
+ file: { name: "photo" },
+ fileStoreId: {
+ fileStoreId: workerDetails?.photo,
+ tenantId: tenantId,
+ },
+ },
+ ],
+ ]
+ : null,
+ },
+ };
+ setDefaultValues(values);
+ }
+ }, [workerData, WorkerLoading, plantUserData, vendorData, isVendorLoading]);
+
+ const onFormValueChange = (setValue, formData, errors) => {
+ for (let i = 0; i < formData?.AddWorkerRoles?.length; i++) {
+ let key = formData?.AddWorkerRoles[i];
+ if (!(key?.emp_Type && key?.fn_role && key?.sys_role && key?.fn_role?.code)) {
+ setCheckRoleField(false);
+ // break;
+ } else {
+ setCheckRoleField(true);
+ }
+ }
+
+ if (
+ !isNaN(formData?.SelectEmployeePhoneNumber?.mobileNumber?.length) &&
+ formData?.SelectEmployeePhoneNumber?.mobileNumber?.length === 10 &&
+ formData?.name &&
+ // formData?.selectGender &&
+ // formData?.dob &&
+ formData?.address?.city &&
+ formData?.address?.locality &&
+ formData?.skills &&
+ formData?.employementDetails?.employer &&
+ formData?.employementDetails?.vendor &&
+ (!formData?.AddWorkerRoles || formData?.AddWorkerRoles?.length === 0 || (formData?.AddWorkerRoles?.length > 0 && checkRoleField))
+ ) {
+ if (errors?.SelectEmployeePhoneNumber?.isMobilePresent && formData?.SelectEmployeePhoneNumber?.mobileNumber !== workerData?.Individual?.[0]?.mobileNumber) {
+ setSubmitValve(false);
+ } else {
+ setSubmitValve(true);
+ }
+ } else {
+ setSubmitValve(false);
+ }
+ };
+
+ const closeToast = () => {
+ setShowToast(null);
+ };
+
+ const onSubmit = (data) => {
+ const name = data?.name;
+ const mobileNumber = data?.SelectEmployeePhoneNumber?.mobileNumber;
+ const gender = data?.selectGender?.code;
+ const dob = data.dob ? new Date(`${data.dob}`).getTime() : null;
+ const photograph = data?.documents?.img_photo?.[0]?.[1]?.fileStoreId?.fileStoreId || null;
+ const pincode = data?.pincode;
+ const city = data?.address?.city?.name;
+ const locality = data?.address?.locality?.code;
+ const doorNo = data?.doorNo;
+ const street = data?.street;
+ const landmark = data?.landmark;
+ const skills = data?.skills?.map((i) => {
+ return { type: i?.code, level: "UNSKILLED" };
+ });
+
+ let respSkills = workerinfo?.skills;
+
+ // if skills are not there but present in resp then remove
+ respSkills = respSkills.filter((resp_item) => skills.some((mydata_item) => resp_item.type === mydata_item.type && resp_item.level === mydata_item.level));
+ // respSkills.forEach((resp_item) => {
+ // const existsInSelected = skills.some((selected_item) => resp_item.type === selected_item.type && resp_item.level === selected_item.level);
+ // resp_item.isDeleted = !existsInSelected;
+ // });
+
+ // if skills are not there in resp but present in selected then add
+ skills.forEach((selected_item) => {
+ const exists = respSkills.some((resp_item) => resp_item.type === selected_item.type && resp_item.level === selected_item.level);
+ if (!exists) {
+ respSkills.push({
+ type: selected_item.type,
+ level: selected_item.level,
+ });
+ }
+ });
+
+ const employer = data?.employementDetails?.employer?.code || data?.employementDetails?.employer?.name;
+ const vendor = data?.employementDetails?.vendor;
+ const roleDetails = data?.AddWorkerRoles;
+ const restructuredData = [];
+
+ roleDetails?.forEach((item) => {
+ const restructuredItem = {};
+ restructuredItem["FUNCTIONAL_ROLE"] = item.fn_role.code;
+ restructuredItem["EMPLOYMENT_TYPE"] = item.emp_Type.name;
+ restructuredItem["SYSTEM_ROLE"] = item.sys_role;
+ restructuredItem["PLANT"] = item?.plant;
+ restructuredData.push(restructuredItem);
+ });
+
+ const driverLicenses = roleDetails?.filter((entry) => entry.fn_role && entry.fn_role.code === "DRIVER" && entry.licenseNo).map((entry) => entry.licenseNo);
+ const roleDetailsArray = [];
+
+ if (roleDetails) {
+ roleDetails?.forEach((item, index) => {
+ // Extracting functional role information
+ const fnRoleKey = `FUNCTIONAL_ROLE_${index + 1}`;
+ const fnRoleValue = item.fn_role.code;
+
+ // Extracting employment type information
+ const empTypeKey = `EMPLOYMENT_TYPE_${index + 1}`;
+ const empTypeValue = item.emp_Type.code.toUpperCase();
+
+ // Pushing the extracted information to the output array
+ roleDetailsArray.push({ key: fnRoleKey, value: fnRoleValue });
+ roleDetailsArray.push({ key: empTypeKey, value: empTypeValue });
+ });
+
+ // Adding the count of functional roles
+ roleDetailsArray.push({ key: "FUNCTIONAL_ROLE_COUNT", value: `${roleDetails?.length < 10 ? "0" : ""}${roleDetails?.length.toString()}` });
+ }
+
+ // Adding the employer information (assuming it's a constant value like "PRIVATE_VENDOR")
+ roleDetailsArray.push({ key: "EMPLOYER", value: employer });
+
+ const checkDuplicacy = roleDetailsArray.filter((item) => item.key.startsWith("FUNCTIONAL_ROLE")).map((item) => item.value);
+ const isDuplicate = checkDuplicacy.length === new Set(checkDuplicacy).size;
+
+ if (!isDuplicate) {
+ setShowToast({ key: "error", action: `ES_FSM_WORKER_DUPLICATE_ROLE` });
+ setTimeout(() => {
+ closeToast();
+ }, 5000);
+ return;
+ }
+
+ const formData = {
+ Individual: {
+ ...workerinfo,
+ tenantId: tenantId,
+ name: {
+ ...workerinfo.name,
+ givenName: name,
+ },
+ dateOfBirth: dob,
+ gender: gender,
+ mobileNumber: mobileNumber,
+ address: [
+ {
+ ...workerinfo?.address?.[0],
+ tenantId: tenantId,
+ pincode: pincode,
+ city: tenantId,
+ street: street,
+ doorNo: doorNo,
+ locality: {
+ ...workerinfo?.address?.[0]?.locality,
+ code: locality,
+ },
+ landmark: landmark,
+ type: "PERMANENT",
+ },
+ ],
+ identifiers:
+ driverLicenses?.length > 0
+ ? [
+ {
+ ...workerinfo?.indentifiers?.[0],
+ identifierType: "DRIVING_LICENSE_NUMBER",
+ identifierId: driverLicenses?.[0],
+ },
+ ]
+ : null,
+ skills: respSkills,
+ photo: photograph,
+ additionalFields: {
+ ...workerinfo?.additionalDetails,
+ // fields: restructuredData,
+ fields: roleDetailsArray,
+ },
+ isSystemUser: true,
+ userDetails: {
+ ...workerinfo?.userDetails,
+ username: mobileNumber,
+ tenantId: tenantId,
+ roles: roleDetails
+ ? // Object.values(roleDetails[0].sys_role).map((role) => ({
+ // code: role.code,
+ // tenantId: tenantId,
+ // }))
+ roleDetails
+ .map((item) => Object.values(item.sys_role))
+ .flat()
+ .reduce((result, role) => {
+ if (!result.some((entry) => entry.code === role.code)) {
+ result.push({ code: role.code, tenantId });
+ }
+ return result;
+ }, [])
+ : [{ code: "SANITATION_WORKER", tenantId }],
+ type: "CITIZEN",
+ },
+ },
+ };
+
+ mutate(formData, {
+ onError: (error, variables) => {
+ setShowToast({ key: "error", action: `ES_FSM_WORKER_UPDATE_FAILED` });
+ setTimeout(closeToast, 5000);
+ },
+ onSuccess: async (data, variables) => {
+ // queryClient.invalidateQueries("FSM_WORKER_SEARCH");
+ // if (roleDetails.some((entry) => entry.plant)) {
+ // try {
+ // const PlantCode = roleDetails
+ // ?.map((entry) => ({
+ // tenantId: tenantId,
+ // plantCode: entry?.plant?.code,
+ // individualId: data?.Individual?.individualId,
+ // isActive: true,
+ // }))
+ // .filter((i) => i?.plantCode);
+ // const plantFormData = {
+ // plantUsers: PlantCode,
+ // };
+ // const plantresponse = await PlantUserMutate(plantFormData);
+ // } catch (err) {
+ // console.error("Plant user create", err);
+ // setShowToast({ key: "error", action: err });
+ // }
+ // }
+ if (vendor && !(vendor?.id === vendorData?.[0]?.id)) {
+ try {
+ const vendorData = {
+ vendor: {
+ ...vendor,
+ workers: vendor.workers
+ ? [...vendor.workers, { individualId: data?.Individual?.id, vendorWorkerStatus: "ACTIVE" }]
+ : [{ individualId: data?.Individual?.id, vendorWorkerStatus: "ACTIVE" }],
+ },
+ };
+ const response = await vendorMutate(vendorData);
+ setShowToast({ key: "success", action: "UPDATE_WORKER_WITH_VENDOR" });
+ } catch (updateError) {
+ console.error("Error updating data:", updateError);
+ setShowToast({ key: "error", action: "UPDATE_WORKER_VENDOR_FAILED" });
+ }
+ } else {
+ setShowToast({ key: "success", action: "EDIT_WORKER_SUCCESS" });
+ }
+ setTimeout(() => {
+ closeToast();
+ queryClient.invalidateQueries("FSM_WORKER_SEARCH");
+ history.push(`/${window?.contextPath}/employee/fsm/registry/worker-details?id=${id}`);
+ }, 5000);
+ },
+ });
+ };
+ const isMobile = window.Digit.Utils.browser.isMobile();
+
+ if (!defaultValues) {
+ return ;
+ }
+ return (
+
+
+ {t("FSM_REGISTRY_EDIT_WORKER_HEADING")}
+
+
+ !i.hideInEmployee).map((config) => {
+ return {
+ ...config,
+ body: config.body.filter((a) => !a.hideInEmployee),
+ };
+ })}
+ fieldStyle={{ marginRight: 0 }}
+ sectionHeaderClassName="fsm-registry"
+ onSubmit={onSubmit}
+ defaultValues={defaultValues}
+ onFormValueChange={onFormValueChange}
+ noBreakLine={true}
+ cardStyle={{
+ padding: "1rem 1.5rem",
+ }}
+ />
+ {showToast && (
+
+ )}
+
+
+ );
+};
+
+export default EditWorker;
\ No newline at end of file
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Worker/WorkerDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Worker/WorkerDetails.js
new file mode 100644
index 00000000000..c3ec061bf66
--- /dev/null
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Worker/WorkerDetails.js
@@ -0,0 +1,549 @@
+import React, { Fragment, useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import {
+ Card,
+ StatusTable,
+ Row,
+ SubmitBar,
+ Loader,
+ CardSectionHeader,
+ ActionBar,
+ Menu,
+ Toast,
+ Header,
+ EditIcon,
+ DeleteIcon,
+ Modal,
+ CardText,
+ Dropdown,
+ AddIcon,
+ AddNewIcon,
+} from "@upyog/digit-ui-react-components";
+
+import { useQueryClient } from "react-query";
+
+import { useHistory, useParams } from "react-router-dom";
+import ConfirmationBox from "../../../../components/Confirmation";
+import { ViewImages } from "../../../../components/ViewImages";
+
+const Heading = (props) => {
+ return {props.label}
;
+};
+const Close = () => (
+
+);
+
+const CloseBtn = (props) => {
+ return (
+
+
+
+ );
+};
+
+const WorkerDetails = (props) => {
+ const tenantId = Digit.ULBService.getCurrentTenantId();
+ const state = Digit.ULBService.getStateId();
+ const { t } = useTranslation();
+ const history = useHistory();
+ const queryClient = useQueryClient();
+ const searchParams = new URLSearchParams(location.search);
+ const id = searchParams.get("id");
+ const [displayMenu, setDisplayMenu] = useState(false);
+ const [selectedAction, setSelectedAction] = useState(null);
+ const [config, setCurrentConfig] = useState({});
+ const [showModal, setShowModal] = useState(false);
+ const [showToast, setShowToast] = useState(null);
+ const [vendors, setVendors] = useState([]);
+
+ const [selectedOption, setSelectedOption] = useState({});
+
+ const { data: workerData, isLoading: isWorkerLoading, refetch } = Digit.Hooks.fsm.useWorkerDetails({
+ tenantId,
+ params: {
+ offset: 0,
+ limit: 100,
+ },
+ details: {
+ Individual: {
+ individualId: id,
+ },
+ },
+ t
+ });
+
+ // const { data: driverData, isLoading: isLoading, isSuccess: isDsoSuccess, error: dsoError, refetch } = Digit.Hooks.fsm.useDriverDetails(tenantId, { ids: id });
+
+ const { data: vendorData, isLoading: isVendorLoading, isSuccess: isVendorSuccess, error: vendorError } = Digit.Hooks.fsm.useDsoSearch(
+ tenantId,
+ { sortBy: "name", sortOrder: "ASC", status: "ACTIVE", agencyType: workerData?.[0]?.agencyType },
+ {},
+ t
+ );
+
+ const {
+ isLoading: ismutateUpdateWorkerLoading,
+ isError: vendorCreateError,
+ data: updateResponse,
+ error: updateError,
+ mutate: mutateUpdateWorker,
+ } = Digit.Hooks.fsm.useWorkerUpdate(tenantId);
+
+ const {
+ isLoading: isDeleteWorkerLoading,
+ isError: isDeleteWorkerError,
+ data: deleteWorkerResponse,
+ error: deleteWorkerError,
+ mutate: mutateDeleteWorker,
+ } = Digit.Hooks.fsm.useWorkerDelete(tenantId);
+
+ const {
+ isLoading: isVendorUpdateLoading,
+ isError: isVendorUpdateError,
+ data: vendorUpdateResponse,
+ error: vendorUpdateError,
+ mutate: mutateVendor,
+ } = Digit.Hooks.fsm.useVendorUpdate(tenantId);
+
+ function onActionSelect(action) {
+ setSelectedAction(action);
+ setDisplayMenu(false);
+ }
+ useEffect(() => {
+ if (vendorData) {
+ let vendors = vendorData.map((data) => data.dsoDetails);
+ setVendors(vendors);
+ }
+ }, [vendorData]);
+
+ useEffect(() => {
+ refetch();
+ }, []);
+
+ useEffect(() => {
+ switch (selectedAction) {
+ case "DELETE_SW":
+ case "ENABLE_SW":
+ case "ADD_VENDOR":
+ case "EDIT_VENDOR":
+ case "DELETE_VENDOR":
+ return setShowModal(true);
+ case "EDIT":
+ return history.push(`/${window?.contextPath}/employee/fsm/registry/edit-worker?id=${id}`);
+ case "HOME":
+ return history.push(`/${window?.contextPath}/employee/fsm/registry?selectedTabs=WORKER`);
+ default:
+ break;
+ }
+ }, [selectedAction]);
+
+ const closeToast = () => {
+ setShowToast(null);
+ };
+
+ const handleModalAction = () => {
+ switch (selectedAction) {
+ case "DELETE_SW":
+ case "ENABLE_SW":
+ return handleDeleteWorker();
+ case "DELETE_VENDOR":
+ return handleDeleteVendor();
+ case "ADD_VENDOR":
+ return handleAddVendor();
+ case "EDIT_VENDOR":
+ return handleEditVendor();
+ default:
+ break;
+ }
+ };
+
+ const handleDeleteWorker = () => {
+ let workerdetails = workerData?.[0]?.workerData;
+ const formData = {
+ Individual: {
+ ...workerdetails,
+ isSystemUserActive: selectedAction === "ENABLE_SW" ? true : false,
+ },
+ };
+
+ mutateUpdateWorker(formData, {
+ onError: (error, variables) => {
+ setShowToast({ key: "error", action: selectedAction === "ENABLE_SW" ? "ENABLE_WORKER_FAILED" : "DISABLE_WORKER_FAILED" });
+ setTimeout(closeToast, 5000);
+ },
+ onSuccess: (data, variables) => {
+ setShowToast({ key: "success", action: selectedAction === "ENABLE_SW" ? "ENABLE_WORKER" : "DISABLE_WORKER" });
+ queryClient.invalidateQueries("DSO_SEARCH");
+
+ setTimeout(() => {
+ closeToast, history.push(`/${window?.contextPath}/employee/fsm/registry?selectedTabs=WORKER`);
+ }, 5000);
+ },
+ });
+ setShowModal(false);
+ };
+
+ const handleDeleteVendor = () => {
+ let formData = {};
+ let dsoDetails = workerData?.[0]?.vendorDetails;
+ let getWorkerVendorDetails = dsoDetails?.workers;
+
+ getWorkerVendorDetails = getWorkerVendorDetails.map((data) => {
+ if (data.individualId === workerData?.[0]?.workerData?.id) {
+ data.vendorWorkerStatus = "INACTIVE";
+ }
+ return data;
+ });
+
+ formData = {
+ vendor: {
+ ...dsoDetails,
+ workers: getWorkerVendorDetails,
+ },
+ };
+
+ mutateVendor(formData, {
+ onError: (error, variables) => {
+ setShowToast({ key: "error", action: "DELETE_VENDOR_FAILED" });
+ setTimeout(closeToast, 5000);
+ },
+ onSuccess: (data, variables) => {
+ setShowToast({ key: "success", action: "DELETE_VENDOR" });
+ queryClient.invalidateQueries("DSO_SEARCH");
+ refetch();
+ setTimeout(closeToast, 5000);
+ },
+ });
+ setShowModal(false);
+ };
+
+ const handleAddVendor = () => {
+ let dsoDetails = selectedOption;
+ let workerDetails = workerData?.[0]?.workerData;
+ // workerDetails.vendorDriverStatus = "ACTIVE";
+ const formData = {
+ vendor: {
+ ...dsoDetails,
+ workers: dsoDetails.workers
+ ? [...dsoDetails.workers, { individualId: workerDetails?.id, vendorWorkerStatus: "ACTIVE" }]
+ : [{ individualId: workerDetails?.id, vendorWorkerStatus: "ACTIVE" }],
+ },
+ };
+ mutateVendor(formData, {
+ onError: (error, variables) => {
+ setShowToast({ key: "error", action: "ADD_VENDOR_FAILED" });
+ refetch();
+ setTimeout(closeToast, 5000);
+ },
+ onSuccess: (data, variables) => {
+ setShowToast({ key: "success", action: "ADD_VENDOR" });
+ queryClient.invalidateQueries("DSO_SEARCH");
+ refetch();
+ setTimeout(closeToast, 5000);
+ },
+ });
+ setShowModal(false);
+ setSelectedAction(null);
+ setSelectedOption({});
+ };
+
+ const handleEditVendor = () => {
+ let dsoDetails = selectedOption;
+ let workerDetails = workerData?.[0]?.workerData;
+ // driverDetails.vendorDriverStatus = "ACTIVE";
+
+ const formData = {
+ vendor: {
+ ...dsoDetails,
+ workers: dsoDetails.workers
+ ? [...dsoDetails.workers, { individualId: workerDetails?.id, vendorWorkerStatus: "ACTIVE" }]
+ : [{ individualId: workerDetails?.id, vendorWorkerStatus: "ACTIVE" }],
+ },
+ };
+
+ mutateVendor(formData, {
+ onError: (error, variables) => {
+ setShowToast({ key: "error", action: "EDIT_VENDOR_FAILED" });
+ setTimeout(closeToast, 5000);
+ },
+ onSuccess: (data, variables) => {
+ setShowToast({ key: "success", action: "EDIT_VENDOR" });
+ refetch();
+ queryClient.invalidateQueries("DSO_SEARCH");
+ setTimeout(closeToast, 5000);
+ },
+ });
+ setShowModal(false);
+ setSelectedAction(null);
+ setSelectedOption({});
+ };
+
+ const closeModal = () => {
+ setSelectedAction(null);
+ setSelectedOption({});
+ setShowModal(false);
+ };
+
+ const modalHeading = () => {
+ switch (selectedAction) {
+ case "DELETE_SW":
+ return "ES_FSM_REGISTRY_DELETE_SW_POPUP_HEADER";
+ case "ENABLE_SW":
+ return "ES_FSM_REGISTRY_ENABLE_SW_POPUP_HEADER";
+ case "DELETE_VENDOR":
+ return "ES_FSM_REGISTRY_DELETE_POPUP_HEADER";
+ case "ADD_VENDOR":
+ return "ES_FSM_REGISTRY_ADD_VENDOR_POPUP_HEADER";
+ case "EDIT_VENDOR":
+ return "ES_FSM_REGISTRY_ADD_VENDOR_POPUP_HEADER";
+ default:
+ break;
+ }
+ };
+
+ const renderModalContent = () => {
+ if (selectedAction === "DELETE_SW" || selectedAction === "ENABLE_SW") {
+ return (
+
+ //
+ // {t(`ES_FSM_REGISTRY_DELETE_TEXT`)}
+ //
+ );
+ }
+ if (selectedAction === "DELETE_VENDOR") {
+ return (
+
+ //
+ // {t(`ES_FSM_REGISTRY_DELETE_TEXT`)}
+ //
+ );
+ }
+ if (selectedAction === "ADD_VENDOR") {
+ return (
+ <>
+ {t(`ES_FSM_REGISTRY_SELECT_VENODOR`)}
+
+
+ );
+ }
+ if (selectedAction === "EDIT_VENDOR") {
+ return (
+ <>
+ {t(`ES_FSM_REGISTRY_SELECT_VENODOR`)}
+
+
+ );
+ }
+ };
+ const isMobile = window.Digit.Utils.browser.isMobile();
+
+ if (isWorkerLoading) {
+ return ;
+ }
+
+ return (
+
+ {!isWorkerLoading ? (
+
+ {t("ES_FSM_REGISTRY_WORKER_DETAILS_ID", { ID: id })}
+
+
+ {workerData?.[0]?.employeeResponse?.map((detail, index) => (
+
+ 0 ? { marginBottom: "16px", marginTop: "32px" } : { marginBottom: "16px" }}>{t(detail.title)}
+
+ {detail?.values?.map((value, index) =>
+ value?.type === "custom" ? (
+ <>
+
+
{t(value.title)}
+
+ {value.value === "ES_FSM_REGISTRY_DETAILS_ADD_VENDOR" && (
+
onActionSelect("ADD_VENDOR")}>
+
+
+ )}
+ {t(value.value) || "N/A"}
+ {value.value != "ES_FSM_REGISTRY_DETAILS_ADD_VENDOR" && (
+
onActionSelect("EDIT_VENDOR")}>
+
+
+ )}
+ {value.value != "ES_FSM_REGISTRY_DETAILS_ADD_VENDOR" && (
+
onActionSelect("DELETE_VENDOR")}>
+
+
+ )}
+
+
|
+ )
+ )}
+ {detail?.isPhoto && (
+ <>
+ 0 ? { marginBottom: "16px", marginTop: "32px" } : { marginBottom: "16px" }}>{t(detail.titlee)}
+ window.open(source, "_blank")}
+ />
+ }
+ />
+
+ )}
+ {/* {detail?.isPhoto && (
+
+
+ window.open(source, '_blank')
+ }
+ />
+
+ )} */}
+ {detail?.child?.map((data, index) => {
+ return (
+
+
+
+ {t(`ES_SW_${detail.type}`)} {index + 1}
+
+
+ {data?.FUNCTIONAL_ROLE && (
+ |
+ )}
+ {data?.EMPLOYMENT_TYPE && (
+ |
+ )}
+ {data?.LICENSE_NUMBER && (
+ |
+ )}
+
+ );
+ })}
+
+
+ ))}
+
+