Skip to content

Commit f08f60e

Browse files
authored
Merge pull request #782 from odisha-muktasoft/UCEM-765-4
Ucem 765 4
2 parents 8d6693e + 64b9a4b commit f08f60e

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

frontend/micro-ui/web/micro-ui-internals/example/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@egovernments/digit-ui-module-contracts": "0.4.15",
2020
"@egovernments/digit-ui-module-measurement":"0.2.18",
2121
"@egovernments/digit-ui-module-estimate": "0.4.22",
22-
"@egovernments/digit-ui-module-masters": "0.4.22",
22+
"@egovernments/digit-ui-module-masters": "0.4.23",
2323
"@egovernments/digit-ui-module-project": "0.4.17",
2424
"@egovernments/digit-ui-module-expenditure": "0.4.27",
2525
"@egovernments/digit-ui-customisation-mukta": "0.2.14",

frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@egovernments/digit-ui-module-masters",
3-
"version": "0.4.22",
3+
"version": "0.4.23",
44
"description": "Masters Module UI",
55
"main": "dist/index.js",
66
"module": "dist/index.modern.js",

frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/WageSeeker/ModifyWageSeeker/ModifyWageSeekerForm.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ const requestCriteria = {
149149
let validateCheckPass = true
150150
const countSkillsInCategory = {}
151151
formData.skillDetails_skill.map(skill => {
152-
countSkillsInCategory[skill.code.split('.')[1]] = countSkillsInCategory[skill.code.split('.')[1]] ? countSkillsInCategory[skill.code.split('.')[1]] + 1 : 1
152+
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
153153
});
154154

155155
if(Object.keys(countSkillsInCategory)?.length <= 0)

frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/utils/index.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export const updateWageSeekerFormDefaultValues = async ({configs, isModify, sess
6666
const getSkillsToUpdate = (formData, wageSeekerDataFromAPI) => {
6767
let updatedSkills = formData?.skillDetails_skill
6868
//added code field in existing skills to find difference
69-
let existingSkills = wageSeekerDataFromAPI?.individual?.skills?.map(item => ({ ...item, code : `${item?.level}.${item?.type}`}))
69+
let existingSkills = wageSeekerDataFromAPI?.individual?.skills?.map(item => ({ ...item, code : `${item?.level}`}))
7070

7171
let set1 = new Set(updatedSkills.map(({ code }) => code))
7272
let set2 = new Set(existingSkills.map(({ code }) => code))
@@ -85,8 +85,10 @@ const getSkillsToUpdate = (formData, wageSeekerDataFromAPI) => {
8585
})
8686

8787
let skillsTobeAdded = extraSkillsTobeAdded?.map(item => {
88-
const separator = item?.code.includes('.') ? '.' : '_';
89-
const [level, type] = item?.code.split(separator);
88+
//const separator = item?.code.includes('.') ? '.' : '_';
89+
//const [level, type] = item?.code.split(separator);
90+
const level = item?.code;
91+
const type = item?.code;
9092
return { level, type };
9193
});
9294
let skillsTobeRemoved = extraSkillsTobeRemoved?.map(item => ({ ...item, isDeleted: true }))
@@ -180,14 +182,15 @@ export const getWageSeekerUpdatePayload = ({formData, wageSeekerDataFromAPI, ten
180182
}
181183

182184
export const getWageSeekerSkillDeletePayload = ({wageSeekerDataFromAPI, tenantId, skillsTobeRemoved}) => {
183-
let Individual = {}
185+
let Individual = {...wageSeekerDataFromAPI?.Individual}
184186
Individual.id = wageSeekerDataFromAPI?.Individual?.id
185187
Individual.tenantId = tenantId
186188
Individual.name = wageSeekerDataFromAPI?.Individual?.name
187189
Individual.rowVersion = parseInt(wageSeekerDataFromAPI?.Individual?.rowVersion)
188190
Individual.skills = skillsTobeRemoved
191+
Individual.additionalFields = wageSeekerDataFromAPI?.Individual?.additionalFields
189192
return {
190-
Individual
193+
Individual
191194
}
192195
}
193196

frontend/micro-ui/web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@egovernments/digit-ui-module-contracts": "0.4.15",
2727
"@egovernments/digit-ui-module-measurement":"0.2.18",
2828
"@egovernments/digit-ui-module-estimate": "0.4.22",
29-
"@egovernments/digit-ui-module-masters": "0.4.22",
29+
"@egovernments/digit-ui-module-masters": "0.4.23",
3030
"@egovernments/digit-ui-module-project": "0.4.17",
3131
"@egovernments/digit-ui-module-expenditure": "0.4.27",
3232
"@egovernments/digit-ui-customisation-mukta": "0.2.14",

0 commit comments

Comments
 (0)