FSM HRMS MCOLLECT NOC module addded for 2.9

upyog · Mar 20, 2024 · a769740 · a769740
1 parent d1feec0
commit a769740
Show file tree

Hide file tree

Showing 79 changed files with 1,842 additions and 1,019 deletions.
diff --git a/frontend/micro-ui/web/docker/Dockerfile b/frontend/micro-ui/web/docker/Dockerfile
@@ -7,11 +7,11 @@ RUN yarn add @upyog/digit-ui-module-pt
 RUN yarn add @upyog/digit-ui-module-fsm
 RUN yarn add @upyog/digit-ui-module-tl
 RUN yarn add @upyog/digit-ui-module-dss
-RUN yarn add @egovernments/digit-ui-module-mcollect
+RUN yarn add @upyog/digit-ui-module-mcollect
 RUN yarn add @upyog/digit-ui-module-pgr
-RUN yarn add @egovernments/digit-ui-module-noc
+RUN yarn add @upyog/digit-ui-module-noc
 RUN yarn add @upyog/digit-ui-module-engagement
-RUN yarn add @egovernments/digit-ui-module-hrms
+RUN yarn add @upyog/digit-ui-module-hrms
 RUN yarn add @egovernments/digit-ui-module-core
 RUN yarn add @upyog/digit-ui-module-obps
 RUN yarn add @egovernments/digit-ui-module-common

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json b/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json
@@ -13,8 +13,8 @@
     "@egovernments/digit-ui-module-common":"^1.4.0",
     "@upyog/digit-ui-module-engagement":"^1.4.0",
     "@upyog/digit-ui-module-fsm":"^1.4.0",
-    "@egovernments/digit-ui-module-mcollect":"^1.4.0",
-    "@egovernments/digit-ui-module-noc":"^1.4.0",
+    "@upyog/digit-ui-module-mcollect":"^1.4.0",
+    "@upyog/digit-ui-module-noc":"^1.4.0",
     "@upyog/digit-ui-module-obps":"^1.4.0",
     "@upyog/digit-ui-module-pgr":"^1.4.0",
     "@upyog/digit-ui-module-pt":"^1.4.0",

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -12,9 +12,9 @@
     "@egovernments/digit-ui-libraries": "1.7.2",
     "@egovernments/digit-ui-module-common": "1.7.2",
     "@upyog/digit-ui-module-engagement": "1.7.2",
-    "@upyog/digit-ui-module-fsm": "1.7.2",
-    "@egovernments/digit-ui-module-mcollect": "1.7.2",
-    "@egovernments/digit-ui-module-noc": "1.7.2",
+    "@upyog/digit-ui-module-fsm": "1.7.3",
+    "@upyog/digit-ui-module-mcollect": "1.7.3",
+    "@upyog/digit-ui-module-noc": "1.7.3",
     "@upyog/digit-ui-module-obps": "1.7.2",
     "@upyog/digit-ui-module-pgr": "1.7.3",
     "@upyog/digit-ui-module-pt": "1.7.2",

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
@@ -4,21 +4,21 @@ import ReactDOM from "react-dom";
 import { initLibraries } from "@egovernments/digit-ui-libraries";
 import { PGRReducers } from "@upyog/digit-ui-module-pgr";
 import { PTModule, PTLinks, PTComponents } from "@upyog/digit-ui-module-pt";
-import { MCollectModule, MCollectLinks } from "@egovernments/digit-ui-module-mcollect";
+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 { initPGRComponents } from "@upyog/digit-ui-module-pgr";
 import { initDSSComponents } from "@upyog/digit-ui-module-dss";
-import { initHRMSComponents } from "@egovernments/digit-ui-module-hrms";
+import { initHRMSComponents } from "@upyog/digit-ui-module-hrms";
 import { initReceiptsComponents, ReceiptsModule } from "@egovernments/digit-ui-module-receipts";
 // import { initReportsComponents } from "@egovernments/digit-ui-module-reports";
-import { initMCollectComponents } from "@egovernments/digit-ui-module-mcollect";
+import { initMCollectComponents } from "@upyog/digit-ui-module-mcollect";
 import { initTLComponents } from "@upyog/digit-ui-module-tl";
 import { PaymentModule, PaymentLinks, paymentConfigs } from "@egovernments/digit-ui-module-common";
-import { HRMSModule } from "@egovernments/digit-ui-module-hrms";
+import { HRMSModule } from "@upyog/digit-ui-module-hrms";
 import { initOBPSComponents } from "@upyog/digit-ui-module-obps";
 import { initEngagementComponents } from "@upyog/digit-ui-module-engagement";
-import { initNOCComponents } from "@egovernments/digit-ui-module-noc";
+import { initNOCComponents } from "@upyog/digit-ui-module-noc";
 import { initWSComponents } from "@upyog/digit-ui-module-ws";
 import { DigitUI } from "@egovernments/digit-ui-module-core";
 import { initCommonPTComponents } from "@egovernments/digit-ui-module-commonpt";

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/fsm/useMDMS.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/fsm/useMDMS.js
@@ -24,6 +24,10 @@ const useMDMS = (tenantId, moduleCode, type, config = {}, payload = []) => {
     return useQuery("FSM_APPLICATION_EDIT_APPLICATION_CHANNEL", () => onlyEmployeeChannels(), queryConfig);
   };
 
+  const useUrcConfig = () => {
+    return useQuery("FSM_APPLICATION_NEW_URC_CONFIG", () => MdmsService.getUrcConfig(tenantId, moduleCode, type), queryConfig);
+  };
+
   const usePropertyType = () => {
     return useQuery("FSM_PROPERTY_TYPE", () => MdmsService.getPropertyType(tenantId, moduleCode, type), queryConfig);
   };
@@ -146,7 +150,9 @@ const useMDMS = (tenantId, moduleCode, type, config = {}, payload = []) => {
     case "ReceivedPaymentType":
       return useReceivedPaymentType();
     case "WSTaxHeadMaster":
-      return useWSTaxHeadMaster()
+      return useWSTaxHeadMaster();
+    case "UrcConfig":
+      return useUrcConfig();
     default:
       return null;
   }

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/MDMS.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/MDMS.js
@@ -1004,6 +1004,8 @@ const GetApplicationChannel = (MdmsRes) =>
     i18nKey: `ES_APPLICATION_DETAILS_APPLICATION_CHANNEL_${channel.code}`,
   }));
 
+const getUrcConfig = (MdmsRes) => MdmsRes["FSM"].UrcConfig;
+
 const GetPropertyType = (MdmsRes) =>
   MdmsRes["FSM"].PropertyType.filter((property) => property.active && !property.propertyType).map((item) => ({
     ...item,
@@ -1407,6 +1409,8 @@ const transformResponse = (type, MdmsRes, moduleCode, tenantId) => {
       return GetTripNumber(MdmsRes);
     case "ReceivedPaymentType":
       return GetReceivedPaymentType(MdmsRes);
+    case "UrcConfig":
+      return getUrcConfig(MdmsRes);
     default:
       return MdmsRes;
   }
@@ -1522,6 +1526,9 @@ export const MdmsService = {
   getApplicationChannel: (tenantId, moduleCode) => {
     return MdmsService.getDataByCriteria(tenantId, getApplicationChannelCriteria(tenantId, moduleCode), moduleCode);
   },
+  getUrcConfig: (tenantId, moduleCode, type) => {
+    return MdmsService.getDataByCriteria(tenantId, getUrcConfigCriteria(tenantId, moduleCode, type), moduleCode);
+  },
   getPropertyType: (tenantId, moduleCode, type) => {
     return MdmsService.getDataByCriteria(tenantId, getPropertyTypeCriteria(tenantId, moduleCode, type), moduleCode);
   },

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/README.md b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/README.md
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
@@ -1,6 +1,6 @@
 {
   "name": "@upyog/digit-ui-module-fsm",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "license": "MIT",
   "main": "dist/index.js",
   "description": "Digit FSM Module",
@@ -19,8 +19,8 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.7.2",
-    "microbundle-crl": "0.13.11",
+    "@egovernments/digit-ui-react-components": "^1.7.0-beta.2",
+    "microbundle-crl":  "0.13.11",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-hook-form": "6.15.8",

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
@@ -21,12 +21,13 @@ import SelectRoadDetails from "./pageComponents/SelectRoadDetails";
 import SelectPropertySubtype from "./pageComponents/SelectPropertySubtype";
 import SelectPropertyType from "./pageComponents/SelectPropertyType";
 import SelectPropertyID from "./pageComponents/SelectPropertyID";
+import SelectTripNo from "./pageComponents/SelectTripNo";
 import SelectSlumName from "./pageComponents/SelectSlumName";
 // import SelectStreet from "./pageComponents/SelectStreet";
 import FSMSelectStreet from "./pageComponents/FSMSelectStreet";
 import SelectTankSize from "./pageComponents/SelectTankSize";
 import SelectTripData from "./pageComponents/SelectTripData";
-import SelectTripNo from "./pageComponents/SelectTripNo";
+// import SelectTripNo from "./pageComponents/SelectTripNo";
 import SelectPaymentPreference from "./pageComponents/SelectPaymentPreference";
 import SelectVehicle from "./pageComponents/SelectVehicleType";
 import CitizenApp from "./pages/citizen";
@@ -60,6 +61,7 @@ import AdvanceCollection from "./pageComponents/AdvanceCollection";
 import SelectTrips from "./pageComponents/SelectTrips";
 import PlusMinusInput from "./pageComponents/PlusMinusInput";
 import ConfirmationBox from "./components/Confirmation";
+import SelectLocalityOrGramPanchayat from "./pageComponents/SelectLocalityOrGramPanchayat";
 
 const FSMModule = ({ stateCode, userType, tenants }) => {
   const moduleCode = "FSM";
@@ -216,6 +218,7 @@ const componentsToRegister = {
   SelectTrips,
   PlusMinusInput,
   ConfirmationBox,
+  SelectLocalityOrGramPanchayat,
 };
 
 export const initFSMComponents = () => {

diff --git a/...icro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/ApplicationTimeline.js b/...icro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/ApplicationTimeline.js
@@ -2,19 +2,19 @@ import React, { Fragment } from "react";
 import { useTranslation } from "react-i18next";
 import { Link, useHistory, useParams } from "react-router-dom";
 import {
-  Header,
+  // Header,
   ActionLinks,
-  Card,
+  // Card,
   CardSectionHeader,
   ConnectingCheckPoints,
   CheckPoint,
-  KeyNote,
+  // KeyNote,
   SubmitBar,
-  LinkButton,
+  // LinkButton,
   Loader,
   Rating,
 } from "@egovernments/digit-ui-react-components";
-import _ from "lodash";
+// import _ from "lodash";
 import TLCaption from "./TLCaption";
 
 export const ApplicationTimeline = (props) => {
@@ -85,15 +85,15 @@ export const ApplicationTimeline = (props) => {
       if (checkpoint?.numberOfTrips) caption.comment = `${t("NUMBER_OF_TRIPS")}: ${checkpoint?.numberOfTrips}`;
       return <TLCaption data={caption} />;
     }
-    else if (checkpoint.status === "PENDING_PAYYY") {
+    /* else if (checkpoint.status === "PENDING_PAYYY") {
       const caption = {
         name: checkpoint?.assigner,
         mobileNumber: checkpoint?.assigner?.mobileNumber,
         date: `${t("CS_FSM_EXPECTED_DATE")} ${Digit.DateUtils.ConvertTimestampToDate(props.application?.possibleServiceDate)}`,
       };
-      return <TLCaption data={caption} />;
+      return <TLCaption data={caption} />; */
   };
-}
+// }
 
   const showNextActions = (nextAction) => {
     switch (nextAction?.action) {
@@ -106,7 +106,7 @@ export const ApplicationTimeline = (props) => {
                 state: { tenantId: props.application.tenantId },
               }}
             >
-              {window.location.href.includes("citizen/fsm/") && <SubmitBar label={t("CS_APPLICATION_DETAILS_MAKE_PAYMENT")} />}
+              <SubmitBar label={t("CS_APPLICATION_DETAILS_MAKE_PAYMENT")} />
             </Link>
           </div>
         );
@@ -125,7 +125,7 @@ export const ApplicationTimeline = (props) => {
     return <Loader />;
   }
 
-
+/*
   let deepCopy = _.cloneDeep( data )
 let index1 =0
 deepCopy?.timeline.map((check,index) => {
@@ -137,7 +137,7 @@ deepCopy?.timeline.map((check,index) => {
       data.timeline[index].status ="ASSING_DSO_PAY"
       data.timeline.splice(index, 0, obj);
   }
-})
+}) */
   return (
     <React.Fragment>
       {!isLoading && (
@@ -148,7 +148,8 @@ deepCopy?.timeline.map((check,index) => {
             </CardSectionHeader>
           )}
           {data?.timeline && data?.timeline?.length === 1 ? (
-            <CheckPoint isCompleted={true} label={t("CS_COMMON_FSM_" + `${data?.timeline[0]?.performedAction === "UPDATE" ? "UPDATE_" : ""}` + data?.timeline[0]?.status)} customChild={getTimelineCaptions(data?.timeline[0])} />            
+            <CheckPoint isCompleted={true} label={t("CS_COMMON_" + data?.timeline[0]?.status)} customChild={getTimelineCaptions(data?.timeline[0])} />
+
           ) : (
             <ConnectingCheckPoints>
               {data?.timeline &&
@@ -158,7 +159,7 @@ deepCopy?.timeline.map((check,index) => {
                       <CheckPoint
                         keyValue={index}
                         isCompleted={index === 0}
-                        label={t("CS_COMMON_" +  `${checkpoint?.performedAction === "UPDATE" ? "UPDATE_" : ""}` + checkpoint.status)}
+                        label={t("CS_COMMON_" + checkpoint.status)}
                         customChild={getTimelineCaptions(checkpoint)}
                       />
                     </React.Fragment>

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/DesktopInbox.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/DesktopInbox.js
@@ -135,7 +135,7 @@ const DesktopInbox = (props) => {
               let citizen_info = props?.fstprequest?.find((i) => row.original.tripDetails[0].referenceNo === i.applicationNo);
               return (
                 <div>
-                  <span>{t(`${citizen_info?.address?.locality?.code}`)}</span>
+                  <span>{t(`${citizen_info?.address?.locality?.name}`)}</span>
                 </div>
               );
             },