User download changes

health/micro-ui/web/micro-ui-internals/example/public/index.html

@@ -18,7 +18,7 @@
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
 
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].84-campaign/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].85-campaign/dist/index.css" />
 
 
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />

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 <[email protected]>",

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;
+}
+
 
 

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Response.js

@@ -0,0 +1,90 @@
+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";
+// console.log(state," ssssssssssssssssssssssssss")
+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();
+    console.log(state, " ssssssssssssssssssssssssss")
+
+    const isMobile = window.Digit.Utils.browser.isMobile();
+
+    const navigate = (page) => {
+        switch (page) {
+            case "contracts-inbox": {
+                history.push(`/${window.contextPath}/employee/tqm/summary`);
+            }
+        }
+    };
+
+    const children = [
+        <div style={{ display: "flex" }} key="response-text">
+            {state?.boldText ? (
+                <p style={{ margin: "0rem" }}>
+                    {t(state?.preText)}
+                    <b> {t(state?.boldText)} </b>
+                    {t(state?.postText)}
+                </p>
+            ) : (
+                t(state?.text, { CAMPAIGN_ID: campaignId })
+            )}
+        </div>,
+    ];
+
+    return (
+        <>
+            <PanelCard
+                animationProps={{
+                    loop: false,
+                    noAutoplay: false
+                }}
+                cardClassName=""
+                cardStyles={{}}
+                className=""
+                customIcon=""
+                description="The user data uploaded will be available in your microplan user assignment section"
+                // footerChildren={[
+                //     <Button label="OK" onClick={function noRefCheck() { }} type="button" />
+                // ]}
+                footerStyles={{}}
+                iconFill=""
+                info=""
+                maxFooterButtonsAllowed={5}
+                message={state.message}
+                multipleResponses={[]}
+                props={{}}
+                response={state.fileName}
+                sortFooterButtons
+                style={{}}
+                type="success"
+            >
+
+            </PanelCard>
+            <ActionBar className="mc_back">
+                <Link to={`/${window.contextPath}/employee/microplan/upload-user`}>
+                    <Button
+                        label={t("GO_BACK_TO_USER_MANAGEMENT")}
+                        variation="secondary"
+                        icon={<ArrowLeft styles={{ height: "1.25rem", width: "2.5rem" }} />}
+                        type="button"
+                        className="dm-workbench-download-template-btn dm-hover"
+                        onButtonClick={(e) => {
+
+                        }}
+                    />
+                </Link>
+            </ActionBar>
+        </>
+    );
+};
+
+export default Response;

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") });

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) {

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": [
 

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,30 @@ const UserDownload = () => {
             <Card>
                 <HeaderComp title="DOWNLOAD_USER_DATA" styles={{ color: "black" }} />
                 <TextBlock body="DOWNLOAD_DESC" />
-                {data?.ResourceDetails &&
-                    data?.ResourceDetails.map((item, index) => {
-                        return (
-                        <FileComponent
-                            title=""
-                            fileName={`FileNo${item?.fileStoreId.slice(0, 4)}`}
-                            downloadHandler={() => {
-                                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=`FileNo${item?.processedFilestoreId.slice(0, 4)}`
+                            if ((data?.ResourceDetails?.additionalDetails?.fileName)){
+                                fileName=data?.ResourceDetails?.additionalDetails?.fileName;
+
+                            }
+
+                            return (
+                            <FileComponent
+                                title=""
+                                fileName={`FileNo${item?.fileStoreId.slice(0, 4)}`}
+                                downloadHandler={() => {
+                                    Digit.Utils.campaign.downloadExcelWithCustomName({
+                                        fileStoreId: fileName
+                                    });
+                                }} // Passing the download function
+                                auditDetails={{userName:item?.username,lastmodTime:item?.auditDetails?.lastmodtime}}
+                            />
+                            )
+
+    })
+
+                    }
             </Card>
         </div>
     );

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
         <PrivateRoute path={`${path}/upload-user`} component={() => <UserUpload />} />
         <PrivateRoute path={`${path}/village-view`} component={() => <VillageView />} />
         <PrivateRoute path={`${path}/my-microplans`} component={() => <MyMicroplans/>} /> 
+        <PrivateRoute path={`${path}/upload-user-success`} component={() => <Response/>} /> 
+
          <PrivateRoute path={`${path}/assign-facilities-to-villages`} component={() => <FacilityCatchmentMapping/>} />
 
 

health/micro-ui/web/public/index.html

@@ -12,7 +12,7 @@
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
   <!-- added below css for hcm-workbench module inclusion-->
 
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].84-campaign/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].85-campaign/dist/index.css" />
 
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />