From 1be0b626bffaff8c44654146120ff860cd098081 Mon Sep 17 00:00:00 2001 From: suryansh-egov Date: Wed, 13 Nov 2024 18:25:38 +0530 Subject: [PATCH 1/3] not selected added in single value list --- .../campaign-manager/src/pages/employee/CreateChecklist.js | 4 ++++ .../campaign-manager/src/pages/employee/UpdateChecklist.js | 3 +++ 2 files changed, 7 insertions(+) diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/CreateChecklist.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/CreateChecklist.js index 46eb57e98f0..6aeace3ffd8 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/CreateChecklist.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/CreateChecklist.js @@ -329,6 +329,10 @@ const CreateChecklist = () => { return upperCaseString.replace(/ /g, '_'); }); } + console.log("hieeee", String(item?.type?.code)); + if(String(item?.type?.code) === "SingleValueList"){ + labelsArray.push("NOT_SELECTED"); + } const questionObject = { id: item.id, diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/UpdateChecklist.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/UpdateChecklist.js index c688118aab5..c03561d8ebc 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/UpdateChecklist.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/UpdateChecklist.js @@ -276,6 +276,9 @@ const UpdateChecklist = () => { return upperCaseString.replace(/ /g, '_'); }); } + if(String(item?.type?.code) === "SingleValueList"){ + labelsArray.push("NOT_SELECTED"); + } const questionObject = { id: item.id, From e1e08be7e7f858ec5b039b220d405fa81be206a5 Mon Sep 17 00:00:00 2001 From: suryansh-egov Date: Wed, 13 Nov 2024 18:45:23 +0530 Subject: [PATCH 2/3] isActive added --- .../modules/campaign-manager/src/components/CreateQuestion.js | 1 + .../campaign-manager/src/configs/checklistSearchConfig.js | 1 + .../campaign-manager/src/pages/employee/CreateChecklist.js | 4 ++-- .../campaign-manager/src/pages/employee/SearchChecklist.js | 4 +++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CreateQuestion.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CreateQuestion.js index bb3132edac3..99f0ce78019 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CreateQuestion.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CreateQuestion.js @@ -256,6 +256,7 @@ const CreateQuestion = ({ onSelect, className, level = 1, initialQuestionData, p MdmsCriteria: { tenantId: tenantId, schemaCode: "HCM-ADMIN-CONSOLE.appFieldTypes", + isActive: true } } }), [tenantId]); // Only recreate if tenantId changes diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/checklistSearchConfig.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/checklistSearchConfig.js index 37d54ca10e1..066a5b4b2bc 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/checklistSearchConfig.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/checklistSearchConfig.js @@ -15,6 +15,7 @@ MdmsCriteria: { tenantId: tenantId, schemaCode: `HCM-ADMIN-CONSOLE.ChecklistTemplates`, + isActive: true, filters : {}, limit: 10, offset: 0, diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/CreateChecklist.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/CreateChecklist.js index 6aeace3ffd8..3cd1ecb0ceb 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/CreateChecklist.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/CreateChecklist.js @@ -72,7 +72,8 @@ const CreateChecklist = () => { filters: { role: role, checklistType: checklistType - } + }, + isActive: true } }, }); @@ -329,7 +330,6 @@ const CreateChecklist = () => { return upperCaseString.replace(/ /g, '_'); }); } - console.log("hieeee", String(item?.type?.code)); if(String(item?.type?.code) === "SingleValueList"){ labelsArray.push("NOT_SELECTED"); } diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SearchChecklist.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SearchChecklist.js index 195641941cd..5c2b8c9df52 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SearchChecklist.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SearchChecklist.js @@ -50,6 +50,7 @@ const SearchChecklist = () => { MdmsCriteria: { tenantId: tenantId, schemaCode: `${CONSOLE_MDMS_MODULENAME}.rolesForChecklist`, + isActive: true } } }; @@ -71,7 +72,8 @@ const SearchChecklist = () => { MdmsCriteria: { tenantId: tenantId, schemaCode: "HCM.CHECKLIST_TYPES", - filters: {"type": "DEFAULT"} + filters: {"type": "DEFAULT"}, + isActive: true } }, changeQueryName: "HCM" From 146fa6291f16ed2d07f33d696dd13783dbfe13d1 Mon Sep 17 00:00:00 2001 From: suryansh-egov Date: Wed, 13 Nov 2024 18:53:11 +0530 Subject: [PATCH 3/3] one more fix --- .../modules/campaign-manager/src/hooks/useBoundaryHome.js | 1 + 1 file changed, 1 insertion(+) diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useBoundaryHome.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useBoundaryHome.js index 3498ebe3234..ff7091efa06 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useBoundaryHome.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useBoundaryHome.js @@ -81,6 +81,7 @@ const useBoundaryHome = ({ screenType = "campaign", defaultHierarchyType = "", h MdmsCriteria: { tenantId: tenantId, schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema`, + isActive: true }, }, });