Merge pull request #818 from egovernments/HRMS-Chnages-Prebuiild

Hrms chnages prebuiild
egovernments · Jun 19, 2024 · 0bba1d2 · 0bba1d2
2 parents bd0aa85 + f284f28
commit 0bba1d2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/...rc/main/resources/db/migration/main/V20221206104420__egbs_bill_alter_add_consumercode.sql b/...rc/main/resources/db/migration/main/V20221206104420__egbs_bill_alter_add_consumercode.sql
@@ -4,4 +4,4 @@ UPDATE egbs_bill_v1 b SET consumerCode = bd.consumercode FROM egbs_billdetail_v1
 
 ALTER TABLE egbs_bill_v1 ALTER COLUMN consumercode SET NOT NULL;
 
-CREATE UNIQUE INDEX IF NOT EXISTS index_egbs_UNIQUE_ACTIVE_BILL ON egbs_bill_v1 (consumercode, tenantid, status) where status='ACTIVE';
+CREATE UNIQUE INDEX IF NOT EXISTS index_egbs_UNIQUE_ACTIVE_BILL ON egbs_bill_v1 (consumercode, tenantid, status) where status='ACTIVE';
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
@@ -24,7 +24,8 @@ const HRMSCard = () => {
   const { isLoading, isError, error, data, ...rest } = Digit.Hooks.hrms.useHRMSCount(tenantId, roles);
 
   const moduleForSomeDIVAdmin =
-    DIV_ADMIN && MDMS_ADMIN
+
+  DIV_ADMIN && MDMS_ADMIN
       ? [
           {
             label: t("WORK_BENCH_URL_MASTER_DATA"),
@@ -38,10 +39,10 @@ const HRMSCard = () => {
       : [];
 
   const moduleForSomeSTATEUser =
-    STATE_ADMIN && MDMS_ADMIN
+    STATE_ADMIN && MDMS_ADMIN 
       ? [
           {
-            label: t("WORK_BENCH_URL_MASTER_DATA"),
+            label: t("WORK_BENCH_URL_VILLAGE_MASTER_DATA"),
             link: `${window?.location?.origin}/workbench-ui/employee/workbench/mdms-search-v2?moduleName=tenant&masterName=tenants`,
           },
         ]
@@ -82,7 +83,7 @@ const HRMSCard = () => {
         label: STATE_ADMIN ? t("HR_COMMON_CREATE_DIVISION_EMPLOYEE_HEADER") : t("HR_COMMON_CREATE_EMPLOYEE_HEADER"),
         link: `/${window?.contextPath}/employee/hrms/create`,
       },
-      {
+      DIV_ADMIN ?  {}: {
         label: t("HR_STATE_ REPORTS"),
         link: "https://ifix-dwss.psegs.in/digit-ui/employee/dss/dashboard/ifix",
       },

diff --git a/.../micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js b/.../micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js
@@ -137,8 +137,11 @@ const EditForm = ({ tenantId, data }) => {
       formData?.SelectEmployeeGender?.gender.code &&
       formData?.SelectEmployeeName?.employeeName &&
       formData?.SelectEmployeePhoneNumber?.mobileNumber &&
+
+
+      formData?.Jurisdictions.length &&
+      (formData?.Jurisdictions.filter((juris) => juris?.roles?.length).length > 0 || formData?.Jurisdictions.filter((juris) => juris?.divisionBoundary?.length).length > 0) &&
       checkfield &&
-      // setassigncheck &&
       phonecheck &&
       checkMailNameNum(formData)
     ) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ UPDATE egbs_bill_v1 b SET consumerCode = bd.consumercode FROM egbs_billdetail_v1

		ALTER TABLE egbs_bill_v1 ALTER COLUMN consumercode SET NOT NULL;

		CREATE UNIQUE INDEX IF NOT EXISTS index_egbs_UNIQUE_ACTIVE_BILL ON egbs_bill_v1 (consumercode, tenantid, status) where status='ACTIVE';
		CREATE UNIQUE INDEX IF NOT EXISTS index_egbs_UNIQUE_ACTIVE_BILL ON egbs_bill_v1 (consumercode, tenantid, status) where status='ACTIVE';