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 00b56c7c2fa..987bf72620b 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 d181c7f1dd2..1b510c01afb 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.84-campaign",
+ "version": "1.0.85-campaign",
"license": "MIT",
"main": "dist/index.css",
"author": "Jagankumar ",
diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplan.scss b/health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplan.scss
index 79e39271dff..d2162145adb 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplan.scss
+++ b/health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplan.scss
@@ -159,5 +159,11 @@
left: 36rem;
}
+.mc_back{
+ display:flex;
+ justify-content: right;
+ align-items: center;
+}
+
\ No newline at end of file
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Response.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Response.js
new file mode 100644
index 00000000000..bf67e3e7d5b
--- /dev/null
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Response.js
@@ -0,0 +1,63 @@
+import React, { useState, Fragment } from "react";
+import { Link, useHistory, useLocation } from "react-router-dom";
+import { useTranslation } from "react-i18next";
+import { ActionBar, SubmitBar, Button,ArrowLeft, ArrowForward } from "@egovernments/digit-ui-react-components";
+import { PanelCard } from "@egovernments/digit-ui-components";
+const Response = () => {
+
+ const { t } = useTranslation();
+ const history = useHistory();
+ const queryStrings = Digit.Hooks.useQueryParams();
+ const [campaignId, setCampaignId] = useState(queryStrings?.campaignId);
+ const [isResponseSuccess, setIsResponseSuccess] = useState(
+ queryStrings?.isSuccess === "true" ? true : queryStrings?.isSuccess === "false" ? false : true
+ );
+ const { state } = useLocation();
+ return (
+ <>
+
+ // ]}
+ footerStyles={{}}
+ iconFill=""
+ info=""
+ maxFooterButtonsAllowed={5}
+ message={state?.message}
+ multipleResponses={[]}
+ props={{}}
+ response={state?.fileName}
+ sortFooterButtons
+ style={{}}
+ type="success"
+ >
+
+
+
+
+ }
+ type="button"
+ className="dm-workbench-download-template-btn dm-hover"
+ onButtonClick={(e) => {
+
+ }}
+ />
+
+
+
+ );
+};
+
+export default Response;
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserUpload.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserUpload.js
index 3d7b3f533c6..ab44789b77c 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserUpload.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserUpload.js
@@ -411,7 +411,7 @@ const UserUpload = React.memo(() => {
setDownloadTemplateLoader(false);
return;
}
- history.push(`/${window.contextPath}/employee/microplan/upload-user-success`);
+ history.push(`/${window.contextPath}/employee/microplan/upload-user-success`, { fileName: fileName,message:"User data upload successful" });
}
else {
setShowToast({ key: "error", label: t("ERROR_MANDATORY_FIELDS_FOR_SUBMIT") });
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js
index 6eab37e7b16..48716a6a89d 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js
@@ -238,13 +238,13 @@ export const UICustomizations = {
if (!roleschosen) {
roleschosen = {};
}
- // if(Object.keys(roleschosen).length === 0){
- // for(const obj of additionalDetails["microplanData"]){
+ if(Object.keys(roleschosen).length === 0){
+ for(const obj of additionalDetails["microplanData"]){
- // roleschosen[obj["roleCode"]]=true;
+ roleschosen[obj["roleCode"]]=true;
- // }
- // }
+ }
+ }
let rolesString = "";
if (roleschosen) {
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UserManagementConfig.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UserManagementConfig.js
index e97d4bce75f..c178d2d58ce 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UserManagementConfig.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UserManagementConfig.js
@@ -147,7 +147,7 @@ export const UserManagementConfig = {
"primaryLabel": "Filter",
"minReqFields": 0,
"defaultValues": {
- "roleschosen": [],
+ "roleschosen": '',
},
"fields": [
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/UserDownload.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/UserDownload.js
index eac7f79fa01..3cc566ecb6e 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/UserDownload.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/UserDownload.js
@@ -5,24 +5,8 @@ import HeaderComp from '../../components/HeaderComp';
import { TextBlock } from '@egovernments/digit-ui-components';
const UserDownload = () => {
+
const [Files, setFile] = useState(""); // Initialize as an empty string
- const reqCriteriaResource = {
- url: "/project-factory/v1/data/_search",
- body: {
- "SearchCriteria": {
- "tenantId": Digit.ULBService.getCurrentTenantId(),
- "source": "microplan",
- "status": "completed"
- }
- },
- config: {
- enabled: true,
- select: data => {
- return data;
- }
- }
- };
-
const { data, isFetching, isLoading } = Digit.Hooks.microplanv1.useFileDownload({
@@ -55,7 +39,7 @@ const UserDownload = () => {
}
}, [data]); // Only run this effect when `data` changes
-
+
@@ -74,24 +58,26 @@ const UserDownload = () => {
- {data?.ResourceDetails &&
- data?.ResourceDetails.map((item, index) => {
- return (
- {
- Digit.Utils.campaign.downloadExcelWithCustomName({
- fileStoreId: item?.fileStoreId, customName: `FileNo${item?.fileStoreId.slice(0, 4)}`
- });
- }} // Passing the download function
- auditDetails={{userName:item?.username,lastmodTime:item?.auditDetails?.lastmodtime}}
- />
- )
-
-})
-
- }
+ {data?.ResourceDetails &&
+ [...data?.ResourceDetails].reverse().map((item, index) => {
+ let fileName = item?.additionalDetails?.fileName || `FileNo${item?.processedFilestoreId?.slice(0, 4) || ''}`;
+
+ return (
+ {
+ Digit.Utils.campaign.downloadExcelWithCustomName({
+ fileStoreId: fileName
+ });
+ }} // Passing the download function
+ auditDetails={{userName:item?.username,lastmodTime:item?.auditDetails?.lastmodtime}}
+ />
+ )
+
+ })
+
+ }
);
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/index.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/index.js
index 90e588aff1a..4ba5321f37d 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/index.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/index.js
@@ -16,6 +16,8 @@ import UserDownload from "./UserDownload";
import VillageView from "./viewVillage";
import MyMicroplans from "./MyMicroplans";
import ChooseActivity from "./ChooseActivity";
+import Response from "../../components/Response";
+
import FacilityCatchmentMapping from "./FacilityCatchmentMapping";
@@ -187,6 +189,8 @@ const App = ({ path, stateCode, userType, tenants, BOUNDARY_HIERARCHY_TYPE, hier
} />
} />
} />
+ } />
+
} />
diff --git a/health/micro-ui/web/public/index.html b/health/micro-ui/web/public/index.html
index 05451f1ac7c..43ddea5c839 100644
--- a/health/micro-ui/web/public/index.html
+++ b/health/micro-ui/web/public/index.html
@@ -12,7 +12,7 @@
-
+