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 b9864f1244..7620c8dc7a 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,7 @@ - + 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 cd48a7481e..3fdf247b52 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.68-campaign", + "version": "1.0.69-campaign", "license": "MIT", "main": "dist/index.css", "author": "Jagankumar ", diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaign.scss b/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaign.scss index 8d63e0ff3c..343b4417b9 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaign.scss +++ b/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaign.scss @@ -131,6 +131,7 @@ flex-direction: row; gap: 1.5rem; align-items: stretch; + height: 31.25rem; } .stepper-card{ height: 36.5rem; @@ -139,3 +140,10 @@ .stepper-subheader{ color: theme(digitv2.lightTheme.header-sidenav); } +.container-full{ + display: flex; + flex-direction: row; + gap: 1.5rem; + align-items: stretch; + height: 100%; +} 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 595bb5f4a2..30638c2d4c 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 @@ -828,13 +828,17 @@ tbody { padding: 1rem; } .card-container{ - height: 50rem; + height: 100%; } .card-container2{ width: -webkit-fill-available; padding-bottom: 1.5rem; } +.card-container-delivery{ + height: 100%; + width: -webkit-fill-available; +} .parent{ color: theme(digitv2.lightTheme.header-sidenav); diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryDetailsSummary.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryDetailsSummary.js index a7568320d9..9d83bfaea6 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryDetailsSummary.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryDetailsSummary.js @@ -58,6 +58,7 @@ const BoundaryDetailsSummary = (props) => { text={t(boundary.code)} onClick={() => {}} className="multiselectdropdown-tag" + hideClose={true} /> ))} {groupedByParent[parentKey].length > 10 && ( diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UpdateBoundaryWrapper.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UpdateBoundaryWrapper.js index 403546eef2..d644841bcf 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UpdateBoundaryWrapper.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UpdateBoundaryWrapper.js @@ -3,19 +3,21 @@ import { UploadIcon, FileIcon, DeleteIconv2, Toast, Card, Header } from "@egover import { useTranslation } from "react-i18next"; import { useLocation , useHistory } from "react-router-dom"; import { Wrapper } from "./SelectingBoundaryComponent"; +import { Loader } from "@egovernments/digit-ui-components"; const UpdateBoundaryWrapper = ({ ...props }) => { const { t } = useTranslation(); const tenantId = Digit.ULBService.getStateId(); const searchParams = new URLSearchParams(location.search); const id = searchParams.get("id"); - const hierarchyType = props?.props?.hierarchyType; + // const hierarchyType = props?.props?.hierarchyType; const { data: hierarchyConfig } = Digit.Hooks.useCustomMDMS(tenantId, "HCM-ADMIN-CONSOLE", [{ name: "hierarchyConfig" }]); const lowestHierarchy = useMemo(() => { return hierarchyConfig?.["HCM-ADMIN-CONSOLE"]?.hierarchyConfig?.find((item) => item.isActive)?.lowestHierarchy; }, [hierarchyConfig]); - const [boundaryOptions, setBoundaryOptions] = useState( ); + const [boundaryOptions, setBoundaryOptions] = useState({}); const [selectedData, setSelectedData] = useState([]); + const [hierarchyType , SetHierarchyType] = useState(props?.props?.hierarchyType); const reqCriteriaCampaign = { url: `/project-factory/v1/project-type/search`, @@ -29,7 +31,7 @@ const UpdateBoundaryWrapper = ({ ...props }) => { const { data: CampaignData } = Digit.Hooks.useCustomAPIHook(reqCriteriaCampaign); - const hierarchyData = Digit.Hooks.campaign.useBoundaryRelationshipSearch({hierarchyType,tenantId}); + const hierarchyData = Digit.Hooks.campaign.useBoundaryRelationshipSearch({BOUNDARY_HIERARCHY_TYPE: hierarchyType,tenantId}); const handleBoundaryChange =(value) =>{ setBoundaryOptions(value?.boundaryOptions); @@ -38,6 +40,7 @@ const UpdateBoundaryWrapper = ({ ...props }) => { useEffect (() => { setSelectedData(CampaignData?.CampaignDetails?.[0]?.boundaries); + SetHierarchyType(CampaignData?.CampaignDetails?.[0]?.hierarchyType); },[CampaignData]) return ( @@ -47,8 +50,9 @@ const UpdateBoundaryWrapper = ({ ...props }) => { { handleBoundaryChange(value); diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js index ca68cadb6f..b7aaefd838 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js @@ -1039,7 +1039,7 @@ const UploadData = ({ formData, onSelect, ...props }) => { return ( <> -
+
{ return ( <> -
+
@@ -277,7 +277,7 @@ const MultiTab = ({ tabCount = 3, subTabCount = 2 }) => { />
-
+
{t( `CAMPAIGN_PROJECT_${ diff --git a/health/micro-ui/web/public/index.html b/health/micro-ui/web/public/index.html index 0c35fe0cf5..b996a4e8fc 100644 --- a/health/micro-ui/web/public/index.html +++ b/health/micro-ui/web/public/index.html @@ -11,7 +11,8 @@ - + +