handleRedirect(4)}>
+
handleRedirect(2)}>
{t(`CAMPAIGN_EDIT`)}
@@ -234,15 +234,15 @@ const CampaignUpdateSummary = (props) => {
navigationKey: "card2",
sections: [
{
- name: "facility",
+ name: "user",
type: "COMPONENT",
component: "CampaignDocumentsPreview",
props: {
- documents: data?.[0]?.resources?.filter((i) => i.type === "facility"),
+ documents: data?.[0]?.resources?.filter((i) => i.type === "user"),
},
- cardHeader: { value: t("FACILITY_DETAILS"), inlineStyles: { marginTop: 0, fontSize: "1.5rem" } },
+ cardHeader: { value: t("USER_DETAILS"), inlineStyles: { marginTop: 0, fontSize: "1.5rem" } },
cardSecondaryAction: noAction !== "false" && (
-
handleRedirect(2)}>
+
handleRedirect(3)}>
{t(`CAMPAIGN_EDIT`)}
@@ -254,15 +254,15 @@ const CampaignUpdateSummary = (props) => {
navigationKey: "card2",
sections: [
{
- name: "user",
+ name: "target",
type: "COMPONENT",
component: "CampaignDocumentsPreview",
props: {
- documents: data?.[0]?.resources?.filter((i) => i.type === "user"),
+ documents: data?.[0]?.resources?.filter((i) => i?.type === "boundaryWithTarget"),
},
- cardHeader: { value: t("USER_DETAILS"), inlineStyles: { marginTop: 0, fontSize: "1.5rem" } },
+ cardHeader: { value: t("TARGET_DETAILS"), inlineStyles: { marginTop: 0, fontSize: "1.5rem" } },
cardSecondaryAction: noAction !== "false" && (
-
handleRedirect(3)}>
+
handleRedirect(4)}>
{t(`CAMPAIGN_EDIT`)}
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 64fb391927d..0d122068fe8 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
@@ -1,5 +1,5 @@
import { Header, InboxSearchComposer } from "@egovernments/digit-ui-react-components";
-import { Dropdown, ViewCardFieldPair, Toast, Card, TextBlock, Button, PopUp, CardText, Stepper } from "@egovernments/digit-ui-components";
+import { Dropdown, ViewCardFieldPair, Toast, Card, TextBlock, Button, PopUp, CardText, Stepper} from "@egovernments/digit-ui-components";
import React, { useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
import { useHistory } from "react-router-dom";
@@ -12,6 +12,7 @@ const SearchChecklist = () => {
const tenantId = Digit.ULBService.getCurrentTenantId();
const searchParams = new URLSearchParams(location.search);
const id = searchParams.get("campaignId");
+ const [showToast, setShowToast] = useState(null);
const [campaignName, setCampaignName] = useState(searchParams.get("name"));
const stateData = window.history.state;
@@ -86,7 +87,9 @@ const SearchChecklist = () => {
}, [HCM]);
const onStepClick = (step) => {
- history.push(`/${window.contextPath}/employee/campaign/setup-campaign?id=${id}&preview=true&action=false&actionBar=true&key=13&summary=true`);
+ setShowToast({ key: "error", label: "CAMPAIGN_CANNOT_CLICK" });
+ return;
+ // history.push(`/${window.contextPath}/employee/campaign/setup-campaign?id=${id}&preview=true&action=false&actionBar=true&key=13&summary=true`);
};
// useEffect(() => {
// setListsOpt(HCM?.HCM?.CHECKLIST_TYPES?.map((item) => ({ list: `HCM_CHECKLIST_TYPE_${item.code}` })));
@@ -101,6 +104,10 @@ const SearchChecklist = () => {
setList(data);
};
+ const closeToast = () => {
+ setShowToast(null);
+ };
+
checklistSearchConfig[0].sections.search.uiConfig.fields[0].populators.options = codesopt;
checklistSearchConfig[0].sections.search.uiConfig.fields[1].populators.options = listsopt;
checklistSearchConfig[0].additionalDetails = { campaignName };
@@ -225,6 +232,14 @@ const SearchChecklist = () => {
>
+ {showToast && (
+
+ )}
);
}
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js
index d2cf21b89f8..6a954494c2a 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js
@@ -671,8 +671,11 @@ const SetupCampaign = ({ hierarchyType, hierarchyData }) => {
message: t("ES_CAMPAIGN_CREATE_SUCCESS_RESPONSE"),
text: t("ES_CAMPAIGN_CREATE_SUCCESS_RESPONSE_TEXT"),
info: t("ES_CAMPAIGN_SUCCESS_INFO_TEXT"),
- actionLabel: t("HCM_CAMPAIGN_SUCCESS_RESPONSE_ACTION"),
- actionLink: `/${window.contextPath}/employee/campaign/my-campaign`,
+ actionLabel: t("HCM_CONFIGURE_APP_RESPONSE_ACTION"),
+ actionLink: `/${window.contextPath}/employee/campaign/checklist/search?name=${data?.CampaignDetails?.campaignName}&campaignId=${data?.CampaignDetails?.id}`,
+ name: data?.CampaignDetails?.campaignName,
+ projectId: data?.CampaignDetails?.projectId,
+ data: data,
}
);
Digit.SessionStorage.del("HCM_CAMPAIGN_MANAGER_FORM_DATA");
@@ -1374,7 +1377,7 @@ const SetupCampaign = ({ hierarchyType, hierarchyData }) => {
setCurrentKey(14);
setCurrentStep(5);
} else if (step === 1 && totalFormData["HCM_CAMPAIGN_NAME"] && totalFormData["HCM_CAMPAIGN_TYPE"] && totalFormData["HCM_CAMPAIGN_DATE"]) {
- setCurrentKey(5);
+ setCurrentKey(4);
setCurrentStep(1);
} else if (!totalFormData["HCM_CAMPAIGN_NAME"] || !totalFormData["HCM_CAMPAIGN_NAME"]) {
// Do not set stepper and key
@@ -1537,7 +1540,7 @@ const SetupCampaign = ({ hierarchyType, hierarchyData }) => {
{noAction !== "false" && (
(
@@ -820,19 +820,11 @@ const AddDeliveryRule = ({ targetedData, deliveryRules, setDeliveryRules, index,
index={index}
key={key}
/>
-
+
{delivery?.products?.length > 0 &&
delivery?.products?.map((i) => {
return i?.value && i?.count ? (
- removeProduct(i)}
- />
+ removeProduct(i)} className="multiselectdropdown-tag" hideClose={false} />
) : null;
})}
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/deliveryRule/AddProductscontext.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/deliveryRule/AddProductscontext.js
index bace53a2027..f3243725739 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/deliveryRule/AddProductscontext.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/deliveryRule/AddProductscontext.js
@@ -1,8 +1,8 @@
-import { AddIcon, Button, CardText, Label, LabelFieldPair } from "@egovernments/digit-ui-react-components";
+import { AddIcon, CardText, Label, LabelFieldPair } from "@egovernments/digit-ui-react-components";
import React, { Fragment, useContext, useEffect, useState } from "react";
import PlusMinusInput from "../../../components/PlusMinusInput";
import { useTranslation } from "react-i18next";
-import { Dropdown, TextInput, Toast } from "@egovernments/digit-ui-components";
+import { Dropdown, TextInput, Toast ,Button } from "@egovernments/digit-ui-components";
import { Link } from "react-router-dom";
import { CycleContext } from ".";
import { PRIMARY_COLOR } from "../../../utils";
@@ -231,9 +231,20 @@ function AddProducts({ stref, selectedDelivery, showToast, closeToast, selectedP
{t(`CAMPAIGN_RESOURCE`)} {c + 1}
{products?.length > 1 ? (
-
deleteItem(i, c)}>
-
-
+ //
deleteItem(i, c)}>
+ //
+ //
+
@@ -265,8 +276,8 @@ function AddProducts({ stref, selectedDelivery, showToast, closeToast, selectedP
variation="secondary"
label={t(`CAMPAIGN_PRODUCTS_MODAL_SECONDARY_ACTION`)}
className={"add-rule-btn hover"}
- icon={
}
- onButtonClick={add}
+ icon="AddIcon"
+ onClick={add}
/>
)}
- {t(`CAMPAIGN_TAB_TEXT`)}
- {t(`CAMPAIGN_TAB_SUB_TEXT_${project?.code ? project?.code?.toUpperCase() : project?.toUpperCase()}`)}
+ {/* {t(`CAMPAIGN_TAB_TEXT`)} */}
+ {t(`CAMPAIGN_DELIVERY_TAB_SUB_TEXT_${project?.code ? project?.code?.toUpperCase() : project?.toUpperCase()}`)}
{/* Add content specific to each tab as needed */}
{/*
-
+
DIGIT HCM