Merge pull request #543 from odisha-muktasoft/skills-locale

added localization to skills in muster-roll view page
odisha-muktasoft · Jul 15, 2024 · 9148115 · 9148115
2 parents 275a1ce + c22197f
commit 9148115
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 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
@@ -14,7 +14,7 @@
     "@egovernments/digit-ui-module-hrms": "1.5.26",
     "@egovernments/digit-ui-module-dss": "1.5.52",
     "@egovernments/digit-ui-react-components": "^1.5.0",
-    "@egovernments/digit-ui-module-attendencemgmt": "0.4.2",
+    "@egovernments/digit-ui-module-attendencemgmt": "0.4.3",
     "@egovernments/digit-ui-module-contracts": "0.4.2",
     "@egovernments/digit-ui-module-measurement":"0.2.0",
     "@egovernments/digit-ui-module-estimate": "0.4.5",

diff --git a/...ro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Attendance/View.js b/...ro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Attendance/View.js
@@ -52,7 +52,8 @@ const getAttendanceTableData = async(data, skills, t, expenseCalculations) => {
       tableRow.actualWorkingDays = item?.actualTotalAttendance || 0
       tableRow.nameOfIndividual = item?.additionalDetails?.userName || t("NA")
       tableRow.guardianName = item?.additionalDetails?.fatherName  || t("NA")
-      tableRow.skill = skills[item?.additionalDetails?.skillCode]?.description || t("NA")
+      const skill = skills[item?.additionalDetails?.skillCode]
+      tableRow.skill = skill ? `${t(skill.sorSubType)} - ${skill.description}` : t("NA");
       tableRow.amount = skills[item?.additionalDetails?.skillCode]?.amount * item?.actualTotalAttendance || 0
       tableRow.modifiedAmount = expenseCalculations?.filter(data=>data?.payee?.identifier === item?.individualId)?.[0]?.lineItems?.[0]?.amount || 0;
       tableRow.modifiedWorkingDays = item?.modifiedTotalAttendance ? item?.modifiedTotalAttendance : item?.actualTotalAttendance
@@ -147,7 +148,8 @@ const getWageSeekerSkills = async (data) => {
             moduleName: "WORKS-SOR",
             masterDetails: [
               {
-                name: "SOR"
+                name: "SOR",
+                filter: "[?(@.sorType=='L')]"
               },
               {
                 name: "Rates"

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

diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json
@@ -23,7 +23,7 @@
     "@egovernments/digit-ui-module-core": "1.5.47",
     "@egovernments/digit-ui-module-hrms": "1.5.26",
     "@egovernments/digit-ui-module-dss": "1.5.52",
-    "@egovernments/digit-ui-module-attendencemgmt": "0.4.2",
+    "@egovernments/digit-ui-module-attendencemgmt": "0.4.3",
     "@egovernments/digit-ui-module-contracts": "0.4.2",
     "@egovernments/digit-ui-module-measurement":"0.2.0",
     "@egovernments/digit-ui-module-estimate": "0.4.5",