From cb390de23d2dfaa5fec396fd716ac503fde148a8 Mon Sep 17 00:00:00 2001 From: pradeep-egov Date: Mon, 17 Jun 2024 23:07:33 +0530 Subject: [PATCH 1/4] Update V20221206104420__egbs_bill_alter_add_consumercode.sql Added consumercode not null condition. --- .../V20221206104420__egbs_bill_alter_add_consumercode.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business-services/billing-service/src/main/resources/db/migration/main/V20221206104420__egbs_bill_alter_add_consumercode.sql b/business-services/billing-service/src/main/resources/db/migration/main/V20221206104420__egbs_bill_alter_add_consumercode.sql index a8ed241df..4c2c308e6 100644 --- a/business-services/billing-service/src/main/resources/db/migration/main/V20221206104420__egbs_bill_alter_add_consumercode.sql +++ b/business-services/billing-service/src/main/resources/db/migration/main/V20221206104420__egbs_bill_alter_add_consumercode.sql @@ -1,7 +1,7 @@ ALTER TABLE egbs_bill_v1 ADD COLUMN IF NOT EXISTS consumercode CHARACTER VARYING(256); -UPDATE egbs_bill_v1 b SET consumerCode = bd.consumercode FROM egbs_billdetail_v1 bd WHERE bd.billid = b.id; +UPDATE egbs_bill_v1 b SET consumerCode = bd.consumercode FROM egbs_billdetail_v1 bd WHERE bd.billid = b.id and b.consumercode is null ; 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'; \ No newline at end of file +CREATE UNIQUE INDEX IF NOT EXISTS index_egbs_UNIQUE_ACTIVE_BILL ON egbs_bill_v1 (consumercode, tenantid, status) where status='ACTIVE'; From 8ad8c67c8093bdc79639b19feb05253c07c789a0 Mon Sep 17 00:00:00 2001 From: Hari-egov Date: Tue, 18 Jun 2024 20:12:44 +0530 Subject: [PATCH 2/4] HRMS - Prebuild Changes --- .../packages/modules/hrms/src/components/hrmscard.js | 9 +++++---- .../modules/hrms/src/pages/EditEmployee/EditForm.js | 7 ++++++- 2 files changed, 11 insertions(+), 5 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 bff488035..b2a880704 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 @@ -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/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js index 68a576d10..a657ffbcf 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js @@ -133,12 +133,17 @@ const EditForm = ({ tenantId, data }) => { } } + console.log(formData?.Jurisdictions,"roles"); + if ( 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) ) { From 2af578bbd6014c57224407b8db91966e7be38497 Mon Sep 17 00:00:00 2001 From: Hari-egov Date: Wed, 19 Jun 2024 10:50:28 +0530 Subject: [PATCH 3/4] removed console log --- .../packages/modules/hrms/src/pages/EditEmployee/EditForm.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js index a657ffbcf..098141f99 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js @@ -133,8 +133,6 @@ const EditForm = ({ tenantId, data }) => { } } - console.log(formData?.Jurisdictions,"roles"); - if ( formData?.SelectEmployeeGender?.gender.code && formData?.SelectEmployeeName?.employeeName && From f284f281d18155384e0b343c2db1e39d0f9ce5e9 Mon Sep 17 00:00:00 2001 From: Hari-egov Date: Wed, 19 Jun 2024 11:15:28 +0530 Subject: [PATCH 4/4] semi colon change --- .../main/V20221206104420__egbs_bill_alter_add_consumercode.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business-services/billing-service/src/main/resources/db/migration/main/V20221206104420__egbs_bill_alter_add_consumercode.sql b/business-services/billing-service/src/main/resources/db/migration/main/V20221206104420__egbs_bill_alter_add_consumercode.sql index 4c2c308e6..4ccd414c4 100644 --- a/business-services/billing-service/src/main/resources/db/migration/main/V20221206104420__egbs_bill_alter_add_consumercode.sql +++ b/business-services/billing-service/src/main/resources/db/migration/main/V20221206104420__egbs_bill_alter_add_consumercode.sql @@ -1,6 +1,6 @@ ALTER TABLE egbs_bill_v1 ADD COLUMN IF NOT EXISTS consumercode CHARACTER VARYING(256); -UPDATE egbs_bill_v1 b SET consumerCode = bd.consumercode FROM egbs_billdetail_v1 bd WHERE bd.billid = b.id and b.consumercode is null ; +UPDATE egbs_bill_v1 b SET consumerCode = bd.consumercode FROM egbs_billdetail_v1 bd WHERE bd.billid = b.id and b.consumercode is null; ALTER TABLE egbs_bill_v1 ALTER COLUMN consumercode SET NOT NULL;