Update date change screen date logic fix, info added, hard reload iss…

…ue fix (#1206) Co-authored-by: nabeelmd-eGov <[email protected]>
egovernments · Aug 1, 2024 · 39b03e6 · 39b03e6
1 parent 821232c
commit 39b03e6
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 11 deletions.
diff --git a/...b/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryWithDate.js b/...b/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryWithDate.js
@@ -28,7 +28,7 @@ const BoundaryWithDate = ({ project, props, onSelect, dateReducerDispatch, canDe
   }, [project]);
 
   const handleDateChange = ({ date, endDate = false, cycleDate = false, cycleIndex }) => {
-    if (typeof date === "undefined") {
+    if (typeof date === "undefined" || date <= today) {
       return null;
     }
     if (!endDate) {
@@ -47,7 +47,7 @@ const BoundaryWithDate = ({ project, props, onSelect, dateReducerDispatch, canDe
   };
 
   const handleCycleDateChange = ({ date, endDate = false, cycleIndex }) => {
-    if (typeof date === "undefined") {
+    if (typeof date === "undefined" || date <= today) {
       return null;
     }
     if (!endDate) {
@@ -169,7 +169,13 @@ const BoundaryWithDate = ({ project, props, onSelect, dateReducerDispatch, canDe
                   withoutLabel={true}
                   type="date"
                   value={item?.endDate}
-                  nonEditable={item?.endDate?.length > 0 && today >= item?.endDate && today >= cycleDates?.[index + 1]?.startDate ? true : false}
+                  nonEditable={
+                    item?.endDate?.length > 0 &&
+                    today >= item?.endDate &&
+                    (cycleDates?.[index + 1] ? today >= cycleDates?.[index + 1]?.startDate : true)
+                      ? true
+                      : false
+                  }
                   placeholder={t("HCM_END_DATE")}
                   populators={{
                     validation: {

diff --git a/.../web/micro-ui-internals/packages/modules/campaign-manager/src/configs/UICustomizations.js b/.../web/micro-ui-internals/packages/modules/campaign-manager/src/configs/UICustomizations.js
@@ -1,4 +1,4 @@
-import { Link, useHistory } from "react-router-dom";
+import { Link } from "react-router-dom";
 import _ from "lodash";
 import React from "react";
 import { Fragment } from "react";
@@ -118,8 +118,8 @@ export const UICustomizations = {
               "",
               `/${window.contextPath}/employee/campaign/update-dates-boundary?id=${row?.id}`
             );
-            window.location.href = `/${window.contextPath}/employee/campaign/update-dates-boundary?id=${row?.id}`;
-
+            const navEvent = new PopStateEvent("popstate");
+            window.dispatchEvent(navEvent);
             break;
           case "ACTION_LABEL_VIEW_TIMELINE":
             setTimeline(true);
@@ -393,8 +393,8 @@ export const UICustomizations = {
               "",
               `/${window.contextPath}/employee/campaign/update-dates-boundary?id=${row?.id}`
             );
-            window.location.href = `/${window.contextPath}/employee/campaign/update-dates-boundary?id=${row?.id}`;
-
+            const navEvent = new PopStateEvent("popstate");
+            window.dispatchEvent(navEvent);
             break;
           case "ACTION_LABEL_VIEW_TIMELINE":
             setTimeline(true);

diff --git a/...o-ui-internals/packages/modules/campaign-manager/src/pages/employee/DateAndCycleUpdate.js b/...o-ui-internals/packages/modules/campaign-manager/src/pages/employee/DateAndCycleUpdate.js
@@ -160,7 +160,7 @@ const DateAndCycleUpdate = ({ onSelect, formData, ...props }) => {
   };
 
   const handleCycleDateChange = ({ date, endDate = false, cycleIndex }) => {
-    if (typeof date === "undefined") {
+    if (typeof date === "undefined" || date <= today) {
       return null;
     }
     if (!endDate) {
@@ -278,7 +278,14 @@ const DateAndCycleUpdate = ({ onSelect, formData, ...props }) => {
                   withoutLabel={true}
                   type="date"
                   value={item?.endDate}
-                  nonEditable={item?.endDate && item?.endDate?.length > 0 && today >= item?.endDate ? true : false}
+                  nonEditable={
+                    item?.endDate &&
+                    item?.endDate?.length > 0 &&
+                    today >= item?.endDate &&
+                    (cycleDates?.[index + 1] ? today >= cycleDates?.[index + 1]?.startDate : true)
+                      ? true
+                      : false
+                  }
                   placeholder={t("HCM_END_DATE")}
                   populators={{
                     validation: {

diff --git a/...ternals/packages/modules/campaign-manager/src/pages/employee/UpdateDatesWithBoundaries.js b/...ternals/packages/modules/campaign-manager/src/pages/employee/UpdateDatesWithBoundaries.js
@@ -3,7 +3,7 @@ import React, { useState, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { useHistory, useLocation } from "react-router-dom";
 import { dateChangeBoundaryConfig, dateChangeConfig } from "../../configs/dateChangeBoundaryConfig";
-import { Button, PopUp, Toast } from "@egovernments/digit-ui-components";
+import { Button, InfoCard, PopUp, Toast } from "@egovernments/digit-ui-components";
 
 function UpdateDatesWithBoundaries() {
   const { t } = useTranslation();
@@ -152,6 +152,17 @@ function UpdateDatesWithBoundaries() {
         actionClassName={"dateUpdateAction"}
         noCardStyle={true}
       />
+      <InfoCard
+        className={"infoClass"}
+        populators={{
+          name: "infocard",
+        }}
+        variant="default"
+        style={{ marginBottom: "1.5rem", marginTop: "1.5rem", marginLeft: "0rem", maxWidth: "100%" }}
+        additionalElements={[<span style={{ color: "#505A5F" }}>{t(`UPDATE_DATE_CHANGE_INFO_TEXT`)}</span>]}
+        label={"Info"}
+        headerClassName={"headerClassName"}
+      />
       {showPopUp && (
         <PopUp
           className={"boundaries-pop-module"}