diff --git a/health/micro-ui/web/micro-ui-internals/example/public/index.html b/health/micro-ui/web/micro-ui-internals/example/public/index.html index c0f9a417067..115d6d69ce2 100644 --- a/health/micro-ui/web/micro-ui-internals/example/public/index.html +++ b/health/micro-ui/web/micro-ui-internals/example/public/index.html @@ -18,7 +18,8 @@ - + + diff --git a/health/micro-ui/web/micro-ui-internals/package.json b/health/micro-ui/web/micro-ui-internals/package.json index bdb7f282deb..40cc3ebd8b0 100644 --- a/health/micro-ui/web/micro-ui-internals/package.json +++ b/health/micro-ui/web/micro-ui-internals/package.json @@ -48,11 +48,13 @@ "*.{js,css,md}": "prettier --write" }, "dependencies": { + "@egovernments/digit-ui-components": "0.0.2-beta.40", + "@egovernments/digit-ui-react-components": "1.8.2-beta.11", "ajv": "8.12.0", + "exceljs": "^4.4.0", + "file-saver": "^2.0.5", "lodash": "4.17.21", "microbundle-crl": "0.13.11", - "@egovernments/digit-ui-react-components": "1.8.2-beta.11", - "@egovernments/digit-ui-components": "0.0.2-beta.40", "react": "17.0.2", "react-dom": "17.0.2", "react-hook-form": "6.15.8", diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/package.json b/health/micro-ui/web/micro-ui-internals/packages/css/package.json index 6d9c079ee8f..f15541c8d32 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/css/package.json +++ b/health/micro-ui/web/micro-ui-internals/packages/css/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-css", - "version": "1.0.78-campaign", + "version": "1.0.79-campaign", "license": "MIT", "main": "dist/index.css", "author": "Jagankumar ", diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss b/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss index 31464fd3354..1e16f909cf1 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss +++ b/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss @@ -953,4 +953,23 @@ tbody { } } } +}.custom-popup-boundary{ + max-width: 100%; + height: 11rem; +} + + + + +.dustbin-icon{ + margin-bottom: 1rem; + margin-top: 0.7rem; +} + +.custom-action-bar .digit-action-bar-fields{ + display: contents; +} + +.digit-action-bar-wrap div { + width: 100%; } \ No newline at end of file diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/Module.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/Module.js index 2d849b8ebe7..92f72e83a42 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/Module.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/Module.js @@ -49,6 +49,10 @@ import CampaignUpdateSummary from "./components/CampaignUpdateSummary"; import XlsPreview from "./components/XlsPreview"; import BulkUpload from "./components/BulkUpload"; import BoundarySummary from "./components/BoundarySummary"; +import Boundary from "./pages/employee/Boundary"; +import GeoPode from "./pages/employee/GeoPode"; +import ViewBoundary from "./pages/employee/ViewBoundary"; +import ViewHierarchy from "./pages/employee/ViewHierarchy"; import MultiSelectDropdown from "./components/MultiSelectDropdown"; /** @@ -137,6 +141,10 @@ const componentsToRegister = { CampaignUpdateSummary, XlsPreview, MultiSelectDropdownBoundary:MultiSelectDropdown, + Boundary, + GeoPode, + ViewBoundary, + ViewHierarchy, // SelectingBoundaryComponent BoundarySummary }; diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryPopup.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryPopup.js new file mode 100644 index 00000000000..f39a1304d6a --- /dev/null +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryPopup.js @@ -0,0 +1,55 @@ +import React from "react"; +import { PopUp, Button } from "@egovernments/digit-ui-components"; +import { useTranslation } from "react-i18next"; + +const BoundaryPopup = ({ showPopUp, setShowPopUp, callGeoPode, geoPodeData })=> { + const { t } = useTranslation(); + return ( + showPopUp && ( + { + setShowPopUp(false); + }} + style={{ + height:"11rem", + width: "48rem" + }} + footerChildren={[ + ]} + sortFooterChildren={true} + > +
+
+
+ + ) + ); +}; + +export default BoundaryPopup; \ No newline at end of file diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignCard.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignCard.js index 8a98736d247..26a3d37db77 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignCard.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignCard.js @@ -67,6 +67,12 @@ const CampaignCard = () => { link: "/digit-ui/employee/dss/landing/national-health-dashboard", roles: ROLES.NATIONAL_SUPERVISOR, // count: isLoading?"-":data + }, + { + label: t("BOUNDARY_MANAGEMENT"), + link: `/${window?.contextPath}/employee/campaign/boundary-management?defaultHierarchyType=HIERARCHYTEST&hierarchyType=DEMOTEST6`, + roles: ROLES.CAMPAIGN_MANAGER, + // count: isLoading?"-":data } ]; diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/FinalPopup.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/FinalPopup.js new file mode 100644 index 00000000000..873e2f895cd --- /dev/null +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/FinalPopup.js @@ -0,0 +1,58 @@ +import React from "react"; +import { PopUp, Button } from "@egovernments/digit-ui-components"; +import { useTranslation } from "react-i18next"; + +const FinalPopup = ({ showFinalPopUp, setShowFinalPopup, addParents, createNewHierarchy })=> { + const { t } = useTranslation(); + return ( + showFinalPopUp && ( + { + setShowFinalPopup(false); + }} + onOverlayClick={()=>{ + setShowFinalPopup(false); + }} + style={{ + // height:"11rem" + width: "50rem" + }} + footerChildren={[ +