Merge pull request #725 from odisha-muktasoft/UCE,-765-2

UCEM-765 : updated locality code for wage seeker modification
odisha-muktasoft · Oct 18, 2024 · 6227fe8 · 6227fe8
2 parents 7f30f19 + f15699f
commit 6227fe8
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/...es/modules/Masters/src/pages/employee/WageSeeker/ModifyWageSeeker/ModifyWageSeekerForm.js b/...es/modules/Masters/src/pages/employee/WageSeeker/ModifyWageSeeker/ModifyWageSeekerForm.js
@@ -88,15 +88,19 @@ const requestCriteria = {
               const wards = []
               const localities = {}
               data?.TenantBoundary[0]?.boundary.sort((a, b) => a.code.localeCompare(b.code)).forEach((item) => {
-                  localities[item?.code] = item?.children.map(item => ({ code: item.code, name: t(`${headerLocale}_ADMIN_${item?.code}`), i18nKey: `${headerLocale}_ADMIN_${item?.code}`, label : item?.label }))
+                  localities[item?.code] = item?.children.map(item => ({ code: item.code, name: t(`${headerLocale}_ADMIN_${item?.code}`), i18nKey: `${headerLocale}_ADMIN_${item?.code}`, label : t(`${headerLocale}_ADMIN_${item?.code}`)}))
                   wards.push({ code: item.code, name: t(`${headerLocale}_ADMIN_${item?.code}`), i18nKey: `${headerLocale}_ADMIN_${item?.code}` })
               });
              return {
                   wards, localities
              }
           }
       },true);
-    const filteredLocalities = wardsAndLocalities?.localities[selectedWard];
+    // const filteredLocalities = wardsAndLocalities?.localities[selectedWard];
+    let filteredLocalities = []
+    wardsAndLocalities ? Object.values(wardsAndLocalities?.localities).forEach(localities => {
+        filteredLocalities = filteredLocalities.concat(localities)
+    }) : []
 
     //wage seeker form config
     const config = useMemo(
@@ -120,7 +124,7 @@ const requestCriteria = {
         },
         {
             key : 'locDetails_locality',
-            value : [filteredLocalities]
+            value : [filteredLocalities.sort((a, b) => a.code.localeCompare(b.code))]
         },
         {
             key : "basicDetails_wageSeekerId",