From 3f60a7283b9c413caee6da0db275a2001a814f78 Mon Sep 17 00:00:00 2001 From: mukund-egov Date: Wed, 11 Sep 2024 13:55:43 +0530 Subject: [PATCH 1/2] corrected a mistake --- .../packages/modules/hrms/src/components/hrmscard.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js index b0d48476a..4c40da348 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js @@ -92,13 +92,12 @@ const HRMSCard = () => { ? {} : { label: t("HR_STATE_ REPORTS"), - link: "https://mgramseva-dwss.punjab.gov.in/kibana/app/r/s/JNF2x?auth_provider_hint=anonymous1", + link: `/${window?.contextPath}/employee/hrms/dashboard?moduleName=dashboard&pageName=state`, category: t("HR_DASHBOARD_HEADER"), }, { label: t("HR_RATE_DASHBOARD"), - link: - "https://mgramseva-dwss.punjab.gov.in/kibana/app/dashboards#/view/22ed8660-39cf-11ef-841e-251f7e3bc6c7?[…]!t,value:60000),time:(from:now-15m,to:now))", + link: `/${window?.contextPath}/employee/hrms/dashboard?moduleName=dashboard&pageName=rate-master`, category: t("HR_DASHBOARD_HEADER"), }, ...moduleForSomeDIVAdmin, From fa1b329a3894dda77576edcce6bef6098000d0a7 Mon Sep 17 00:00:00 2001 From: Hari-egov Date: Wed, 11 Sep 2024 14:09:53 +0530 Subject: [PATCH 2/2] div code filter added --- .../packages/modules/payment/src/configs/UICustomizations.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/payment/src/configs/UICustomizations.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/payment/src/configs/UICustomizations.js index ec8df4ce6..07d9858ff 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/payment/src/configs/UICustomizations.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/payment/src/configs/UICustomizations.js @@ -178,8 +178,8 @@ export const UICustomizations = { } }); result.sort((a, b) => { - const nameA = (a.name || "").toLowerCase().trim(); - const nameB = (b?.name || "").toLowerCase().trim(); + const nameA = (a.divisionName || "").toLowerCase().trim(); + const nameB = (b?.divisionName || "").toLowerCase().trim(); return nameA.localeCompare(nameB); }); return result;