HLM-5926 overriding login page css

micro-ui/web/micro-ui-internals/packages/css/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-css",
-  "version": "1.0.29-microplan",
+  "version": "1.0.30-microplan",
   "license": "MIT",
   "main": "dist/index.css",
   "author": "Jagankumar <[email protected]>",

micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.scss

@@ -540,6 +540,7 @@ $border-color: rgba(214, 213, 212, 1);
         align-items: start;
         margin-top: 0.625rem;
         padding: 0.625rem 0.625rem;
+        margin-bottom: 1rem;
         flex-wrap: wrap;
         background-color: rgba(255, 225, 221, 1);
         color: rgba(212, 53, 28, 1);
@@ -2415,14 +2416,6 @@ $border-color: rgba(214, 213, 212, 1);
     color: $primary-theme-color
 }
 
-.loginFormStyleEmployee {
-    .loginCardClassName {
-      .digit-header-content {
-        &:not(label) {
-          display: flex;
-          justify-content: center;
-          font-size: 2rem;
-        }
-      }
-    }
-  }
+.digit-header-content {
+    font-size: 2rem;
+}

micro-ui/web/micro-ui-internals/packages/modules/hcm-microplanning/src/components/Hypothesis.js

@@ -511,7 +511,7 @@ const Input = React.memo(({ item, setAssumptions, t, disabled = false }) => {
 
   const inputChangeHandler = useCallback(
     (e) => {
-      if ((e.target.value <= 0 || e.target.value / 1000 >= 1) && e.target.value ) return;
+      if ((e.target.value <= 0 || e.target.value / 100000000000 >= 1) && e.target.value ) return;
       let value;
       const decimalIndex = e.target.value.indexOf(".");
       if (decimalIndex !== -1) {

micro-ui/web/micro-ui-internals/packages/modules/hcm-microplanning/src/components/MicroplanPreview.js

@@ -214,6 +214,7 @@ const MicroplanPreview = ({
       state,
       campaignType,
       navigationEvent,
+      setCheckDataCompletion,
       t
     );
 
@@ -823,7 +824,7 @@ const useHypothesis = (tempHypothesisList, hypothesisAssumptionsList) => {
       return setToast({ state: "error", message: t("HYPOTHESIS_CAN_BE_ONLY_APPLIED_ON_ADMIN_LEVEL_ZORO") });
 
     // validating user input
-    if ((e?.newValue <= 0 || e?.newValue / 1000 >= 1) && e?.newValue !== "") return;
+    if ((e?.newValue <= 0 || e?.newValue / 100000000000 >= 1) && e?.newValue !== "") return;
     let value;
     const decimalIndex = e.newValue.indexOf(".");
     if (decimalIndex !== -1) {
@@ -863,14 +864,22 @@ const updateHyothesisAPICall = async (
   state,
   campaignType,
   navigationEvent,
+  setCheckDataCompletion,
   t
 ) => {
   try {
     let body = Digit.Utils.microplan.mapDataForApi(microplanData, operatorsObject, MicroplanName, campaignId, status);
     body.PlanConfiguration["id"] = microplanData?.planConfigurationId;
     body.PlanConfiguration["auditDetails"] = microplanData?.auditDetails;
     if (!Digit.Utils.microplan.planConfigRequestBodyValidator(body, state, campaignType)) {
-      if (navigationEvent.name === "next") setCheckDataCompletion("false");
+      setLoaderActivation(false);
+      if (navigationEvent.name === "next") {
+        setToast({
+          message: t("ERROR_DATA_NOT_SAVED"),
+          state: "error",
+        });
+        setCheckDataCompletion("false")
+      }
       else setCheckDataCompletion("perform-action");
       return;
     }

micro-ui/web/micro-ui-internals/packages/modules/hcm-microplanning/src/components/Upload.js

@@ -634,7 +634,7 @@ const Upload = ({
         let index = prevFileDataList?.findIndex((item) => item.id === fileData.id);
         if(index !== -1)
           temp[index] = {...temp[index],active:false}
-        temp.puch(fileObject) 
+        temp.push(fileObject) 
         return temp;
       });
       setToast({ state: "success", message: t("FILE_UPLOADED_SUCCESSFULLY") });
@@ -684,7 +684,7 @@ const Upload = ({
       let index = prevFileDataList?.findIndex((item) => item.id === fileData.id);
       if(index !== -1)
         temp[index] = {...temp[index],active:false}
-      temp.puch(fileObject)
+      temp.push(fileObject)
       return temp;
     });
     setToast({ state: "error", message: t("ERROR_UPLOADED_FILE") });
@@ -823,6 +823,7 @@ const Upload = ({
                     onTypeError={onTypeErrorWhileFileUpload}
                     setToast={setToast}
                     template={template}
+                    campaignType={campaignType}
                   />
                 </div>
               ) : (
@@ -842,6 +843,7 @@ const Upload = ({
                     setToast={setToast}
                     template={template}
                     openDataPreview={openDataPreview}
+                    campaignType={campaignType}
                   />
                 )}
               </div>
@@ -1154,7 +1156,7 @@ const UploadComponents = ({ item, selected, uploadOptions, selectedFileType, sel
 };
 
 // Component for uploading file
-const FileUploadComponent = ({ selectedSection, selectedFileType, UploadFileToFileStorage, section, onTypeError, setToast, template }) => {
+const FileUploadComponent = ({ selectedSection, selectedFileType, UploadFileToFileStorage, section, onTypeError, setToast, template, campaignType }) => {
   if (!selectedSection || !selectedFileType) return <div></div>;
   const { t } = useTranslation();
   let types;
@@ -1202,6 +1204,7 @@ const UploadedFile = ({
   setToast,
   template,
   openDataPreview,
+  campaignType,
 }) => {
   const { t } = useTranslation();
   return (

micro-ui/web/micro-ui-internals/packages/modules/hcm-microplanning/src/configs/UICustomizations.js

@@ -236,7 +236,6 @@ export const UICustomizations = {
       // data.body.CampaignDetails.boundaryCode = boundaryCode;
       data.body.CampaignDetails.campaignName = campaignName;
       data.body.CampaignDetails.status = ["drafted"]
-      debugger
       if (startDate) {
         data.body.CampaignDetails.startDate = Digit.Utils.date.convertDateToEpoch(startDate);
       }

micro-ui/web/micro-ui-internals/packages/modules/hcm-microplanning/src/pages/employee/SavedMicroplans.js

@@ -90,7 +90,7 @@ const configs = {
           },
           {
             label: "CAMPAIGN_DATE",
-            jsonPath: "CampaignDetails.campaignDetails.startDate",
+            jsonPath: "CampaignDetails.startDate",
             additionalCustomization: true,
           },
         ],

micro-ui/web/public/index.html

@@ -16,7 +16,7 @@
     <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css/dist/index.css"/>
     <link
     rel="stylesheet"
-    href="https://unpkg.com/@egovernments/[email protected].29-microplan/dist/index.css"
+    href="https://unpkg.com/@egovernments/[email protected].30-microplan/dist/index.css"
   />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#00bcd1" />