Merge pull request #783 from odisha-muktasoft/UAT

Uat
odisha-muktasoft · Nov 8, 2024 · 41b0816 · 41b0816
2 parents 96d8ea1 + f08f60e
commit 41b0816
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 37 deletions.
diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -19,9 +19,9 @@
     "@egovernments/digit-ui-module-contracts": "0.4.15",
     "@egovernments/digit-ui-module-measurement":"0.2.18",
     "@egovernments/digit-ui-module-estimate": "0.4.22",
-    "@egovernments/digit-ui-module-masters": "0.4.20",
-    "@egovernments/digit-ui-module-project": "0.4.16",
-    "@egovernments/digit-ui-module-expenditure": "0.4.26",
+    "@egovernments/digit-ui-module-masters": "0.4.23",
+    "@egovernments/digit-ui-module-project": "0.4.17",
+    "@egovernments/digit-ui-module-expenditure": "0.4.27",
     "@egovernments/digit-ui-customisation-mukta": "0.2.14",
     "@egovernments/digit-ui-module-rate-analysis": "0.4.16",
     "http-proxy-middleware": "^1.0.5",

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js b/frontend/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js
@@ -150,15 +150,15 @@ export const UICustomizations = {
     if (businessService === businessServiceMap?.measurement) {
       const workflow = {
         comment: data.comments,
-        documents: data?.documents?.map((document) => {
-          return {
-            documentType: action?.action + " DOC",
-            fileName: document?.[1]?.file?.name,
-            fileStoreId: document?.[1]?.fileStoreId?.fileStoreId,
-            documentUid: document?.[1]?.fileStoreId?.fileStoreId,
-            tenantId: document?.[1]?.fileStoreId?.tenantId,
-          };
-        }),
+        // documents: data?.documents?.map((document) => {
+        //   return {
+        //     documentType: action?.action + " DOC",
+        //     fileName: document?.[1]?.file?.name,
+        //     fileStoreId: document?.[1]?.fileStoreId?.fileStoreId,
+        //     documentUid: document?.[1]?.fileStoreId?.fileStoreId,
+        //     tenantId: document?.[1]?.fileStoreId?.tenantId,
+        //   };
+        // }),
         assignees: data?.assignees?.uuid ? [data?.assignees?.uuid] : null,
         action: action.action,
       };

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-expenditure",
-  "version": "0.4.26",
+  "version": "0.4.27",
   "description": "Expenditure Management Module UI",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",

diff --git a/...web/micro-ui-internals/packages/modules/Expenditure/src/components/PaymentTrackerTable.js b/...web/micro-ui-internals/packages/modules/Expenditure/src/components/PaymentTrackerTable.js
@@ -21,7 +21,7 @@ const PaymentTrackerTable = ({excludeFailed, setExcludeFailed, ...props}) => {
               {value ? (
                 <span className={"link"}>
                   <Link
-                    to={`/${window.contextPath}/employee/expenditure/purchase-bill-details?tenantId=${tenantId}&billNumber=${value}&workOrderNumber=${row.original.workOrderNumber?.split("_")?.[0]}`}
+                    to={`/${window.contextPath}/employee/expenditure/${value?.includes("PB")? "purchase-bill-details" : (value?.includes("SB")? "supervision-bill-details" : "wage-bill-details")}?tenantId=${tenantId}&billNumber=${value}&workOrderNumber=${row.original.workOrderNumber?.split("_")?.[0]}`}
                   >
                     <Button
                       className=""

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@egovernments/digit-ui-module-masters",
-    "version": "0.4.20",
+    "version": "0.4.23",
     "description": "Masters Module UI",
     "main": "dist/index.js",
     "module": "dist/index.modern.js",

diff --git a/...es/modules/Masters/src/pages/employee/WageSeeker/ModifyWageSeeker/ModifyWageSeekerForm.js b/...es/modules/Masters/src/pages/employee/WageSeeker/ModifyWageSeeker/ModifyWageSeekerForm.js
@@ -149,7 +149,7 @@ const requestCriteria = {
       let validateCheckPass = true
       const countSkillsInCategory = {}
       formData.skillDetails_skill.map(skill => {
-        countSkillsInCategory[skill.code.split('.')[1]] = countSkillsInCategory[skill.code.split('.')[1]] ? countSkillsInCategory[skill.code.split('.')[1]] + 1 : 1
+        countSkillsInCategory[skill.code.split('.')[1]?skill.code.split('.')[1]:skill.code.split('.')[0]] = countSkillsInCategory[skill.code.split('.')[1]?skill.code.split('.')[1]:skill.code.split('.')[0]] ? countSkillsInCategory[skill.code.split('.')[1]?skill.code.split('.')[1]:skill.code.split('.')[0]] + 1 : 1
       });
 
       if(Object.keys(countSkillsInCategory)?.length <= 0)

diff --git a/...nternals/packages/modules/Masters/src/pages/employee/WageSeeker/ModifyWageSeeker/index.js b/...nternals/packages/modules/Masters/src/pages/employee/WageSeeker/ModifyWageSeeker/index.js
@@ -76,7 +76,7 @@ const ModifyWageSeeker = () => {
 
     useEffect(() => {
         if(configs && !wageSeekerDataFetching) {
-            updateWageSeekerFormDefaultValues({ configs, isModify, sessionFormData, setSessionFormData, wageSeekerData, tenantId, headerLocale, ULBOptions, setIsFormReady})
+            updateWageSeekerFormDefaultValues({ configs, isModify, sessionFormData, setSessionFormData, wageSeekerData, tenantId, headerLocale, ULBOptions, setIsFormReady, t})
         }
       },[configs, wageSeekerDataFetching]);
 

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/utils/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/utils/index.js
@@ -12,14 +12,14 @@ export const getTomorrowsDate = () => {
     return tomorrow.toISOString().split("T")[0]
 }
 
-export const updateWageSeekerFormDefaultValues = async ({configs, isModify, sessionFormData, setSessionFormData, wageSeekerData, tenantId, headerLocale, ULBOptions, setIsFormReady }) => {
+export const updateWageSeekerFormDefaultValues = async ({configs, isModify, sessionFormData, setSessionFormData, wageSeekerData, tenantId, headerLocale, ULBOptions, setIsFormReady, t }) => {
 
     const individual = wageSeekerData?.individual
     const bankAccountDetails = wageSeekerData?.bankDetails?.[0]?.bankAccountDetails?.[0]
 
     const adhaar = individual?.identifiers?.find(item => item?.identifierType === 'AADHAAR')
     const socialCategory = individual?.additionalFields?.fields?.find(item => item?.key === "SOCIAL_CATEGORY")
-    const skills = individual?.skills?.length > 0 ? individual?.skills?.map(skill => ({code: `${skill?.level}.${skill?.type}`, name: `COMMON_MASTERS_SKILLS_${skill?.level}`})) : ""
+    const skills = individual?.skills?.length > 0 ? individual?.skills?.map(skill => ({code: `${skill?.level}`, name: t(`COMMON_MASTERS_SKILLS_${skill?.level}`)})) : ""
 
     let photo = ''
     try {
@@ -66,7 +66,7 @@ export const updateWageSeekerFormDefaultValues = async ({configs, isModify, sess
 const getSkillsToUpdate = (formData, wageSeekerDataFromAPI) => {
     let updatedSkills = formData?.skillDetails_skill
     //added code field in existing skills to find difference
-    let existingSkills = wageSeekerDataFromAPI?.individual?.skills?.map(item => ({ ...item, code : `${item?.level}.${item?.type}`}))
+    let existingSkills = wageSeekerDataFromAPI?.individual?.skills?.map(item => ({ ...item, code : `${item?.level}`}))
 
     let set1 = new Set(updatedSkills.map(({ code }) => code))
     let set2 = new Set(existingSkills.map(({ code }) => code))
@@ -85,8 +85,10 @@ const getSkillsToUpdate = (formData, wageSeekerDataFromAPI) => {
     })
 
     let skillsTobeAdded = extraSkillsTobeAdded?.map(item => {
-        const separator = item?.code.includes('.') ? '.' : '_';
-        const [level, type] = item?.code.split(separator);
+        //const separator = item?.code.includes('.') ? '.' : '_';
+        //const [level, type] = item?.code.split(separator);
+        const level = item?.code;
+        const type = item?.code;
         return { level, type };
     });
     let skillsTobeRemoved = extraSkillsTobeRemoved?.map(item => ({ ...item, isDeleted: true }))
@@ -180,14 +182,15 @@ export const getWageSeekerUpdatePayload = ({formData, wageSeekerDataFromAPI, ten
 }
 
 export const getWageSeekerSkillDeletePayload = ({wageSeekerDataFromAPI, tenantId, skillsTobeRemoved}) => {
-    let Individual = {}
+    let Individual = {...wageSeekerDataFromAPI?.Individual}
     Individual.id = wageSeekerDataFromAPI?.Individual?.id
     Individual.tenantId = tenantId
     Individual.name = wageSeekerDataFromAPI?.Individual?.name
     Individual.rowVersion = parseInt(wageSeekerDataFromAPI?.Individual?.rowVersion)
     Individual.skills = skillsTobeRemoved
+    Individual.additionalFields = wageSeekerDataFromAPI?.Individual?.additionalFields
     return {
-        Individual
+       Individual
     }
 }
 

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@egovernments/digit-ui-module-project",
-    "version": "0.4.16",
+    "version": "0.4.17",
     "description": "Project Module UI",
     "main": "dist/index.js",
     "module": "dist/index.modern.js",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/FormComposer.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/FormComposer.js
@@ -515,6 +515,7 @@ export const FormComposer = (props) => {
                 <div style={{ display: "grid", gridAutoFlow: "row", width: "100%" }}>
                   <MultiSelectDropdown
                     options={populators?.options}
+                    chipsKey={populators?.optionsKey}
                     optionsKey={populators?.optionsKey}
                     props={props}
                     isPropsNeeded={true}

diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json
@@ -26,9 +26,9 @@
     "@egovernments/digit-ui-module-contracts": "0.4.15",
     "@egovernments/digit-ui-module-measurement":"0.2.18",
     "@egovernments/digit-ui-module-estimate": "0.4.22",
-    "@egovernments/digit-ui-module-masters": "0.4.20",
-    "@egovernments/digit-ui-module-project": "0.4.16",
-    "@egovernments/digit-ui-module-expenditure": "0.4.26",
+    "@egovernments/digit-ui-module-masters": "0.4.23",
+    "@egovernments/digit-ui-module-project": "0.4.17",
+    "@egovernments/digit-ui-module-expenditure": "0.4.27",
     "@egovernments/digit-ui-customisation-mukta": "0.2.14",
     "@egovernments/digit-ui-module-rate-analysis": "0.4.16",
     "babel-loader": "8.1.0",

diff --git a/frontend/micro-ui/web/src/Customisations/UICustomizations.js b/frontend/micro-ui/web/src/Customisations/UICustomizations.js
@@ -150,15 +150,15 @@ export const UICustomizations = {
     if (businessService === businessServiceMap?.measurement) {
       const workflow = {
         comment: data.comments,
-        documents: data?.documents?.map((document) => {
-          return {
-            documentType: action?.action + " DOC",
-            fileName: document?.[1]?.file?.name,
-            fileStoreId: document?.[1]?.fileStoreId?.fileStoreId,
-            documentUid: document?.[1]?.fileStoreId?.fileStoreId,
-            tenantId: document?.[1]?.fileStoreId?.tenantId,
-          };
-        }),
+        // documents: data?.documents?.map((document) => {
+        //   return {
+        //     documentType: action?.action + " DOC",
+        //     fileName: document?.[1]?.file?.name,
+        //     fileStoreId: document?.[1]?.fileStoreId?.fileStoreId,
+        //     documentUid: document?.[1]?.fileStoreId?.fileStoreId,
+        //     tenantId: document?.[1]?.fileStoreId?.tenantId,
+        //   };
+        // }),
         assignees: data?.assignees?.uuid ? [data?.assignees?.uuid] : null,
         action: action.action,
       };