From 4a9a3a2533497fe40f2490204eb8c28d42765d71 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Fri, 15 Mar 2024 17:34:19 +0800
Subject: [PATCH] show Reminder Schedule & sent on

---
 .../Details/ApplicationDetailCard.js          |  6 ++--
 src/pages/DemandNote/Details/DnDetailCard.js  | 36 +++++++++++++++++--
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/pages/DemandNote/Details/ApplicationDetailCard.js b/src/pages/DemandNote/Details/ApplicationDetailCard.js
index 8f7caed..c4e2bda 100644
--- a/src/pages/DemandNote/Details/ApplicationDetailCard.js
+++ b/src/pages/DemandNote/Details/ApplicationDetailCard.js
@@ -62,7 +62,7 @@ const ApplicationDetailCard = ({ data }) => {
                                 </Grid>
                             </Grid>
                         </Grid>
-                        <Grid item xs={12} md={5} lg={5} sx={{ mb: 1, ml: 1 }}>
+                        <Grid item xs={12} md={6} lg={6} sx={{ mb: 1 }}>
                             <Grid container alignItems={"center"}>
                                 <Grid item xs={12} md={3} lg={3}
                                     sx={{ display: 'flex', alignItems: 'center' }}>
@@ -96,7 +96,7 @@ const ApplicationDetailCard = ({ data }) => {
                                 </Grid>
                             </Grid>
                         </Grid>
-                        <Grid item xs={12} md={5} lg={5} sx={{ mb: 1, ml: 1 }}>
+                        <Grid item xs={12} md={6} lg={6} sx={{ mb: 1}}>
                             <Grid container alignItems={"center"}>
                                 <Grid item xs={12} md={4} lg={4}
                                     sx={{ display: 'flex', alignItems: 'center' }}>
@@ -126,7 +126,7 @@ const ApplicationDetailCard = ({ data }) => {
                                 </Grid>
                             </Grid>
                         </Grid>
-                        <Grid item xs={12} md={5} lg={5} sx={{ mb: 1, ml: 1 }}>
+                        <Grid item xs={12} md={6} lg={6} sx={{ mb: 1}}>
                             <Grid container alignItems={"center"}>
                                 <Grid item xs={12} md={4} lg={4}
                                     sx={{ display: 'flex', alignItems: 'center' }}>
diff --git a/src/pages/DemandNote/Details/DnDetailCard.js b/src/pages/DemandNote/Details/DnDetailCard.js
index 52507d9..ea4629d 100644
--- a/src/pages/DemandNote/Details/DnDetailCard.js
+++ b/src/pages/DemandNote/Details/DnDetailCard.js
@@ -8,6 +8,7 @@ import {
 
 import * as React from "react";
 import * as HttpUtils from "utils/HttpUtils";
+import * as DateUtils from "utils/DateUtils";
 import * as StatusUtils from "utils/statusUtils/DnStatus";
 import Loadable from 'components/Loadable';
 const MainCard = Loadable(React.lazy(() => import('components/MainCard')));
@@ -39,7 +40,7 @@ const DnDetailCard = ({ data }) => {
     };
 
     const getDisplayField = (label, value) => {
-        return <Grid item xs={12} md={5} lg={5} sx={{ mb: 1 }}>
+        return <Grid item xs={12} md={6} lg={6} sx={{ mb: 1 }}>
             <Grid container alignItems={"center"}>
                 <Grid item xs={12} md={3} lg={3}
                     sx={{ display: 'flex', alignItems: 'center' }}>
@@ -70,7 +71,7 @@ const DnDetailCard = ({ data }) => {
 
                         {getDisplayField("DN No.", dnData.dnNo)}
 
-                        <Grid item xs={12} md={5} lg={5} sx={{ mb: 1, ml: 1 }}>
+                        <Grid item xs={12} md={6} lg={6} sx={{ mb: 1}}>
                             <Grid container alignItems={"center"}>
                                 <Grid item xs={12} md={3} lg={3}
                                     sx={{ display: 'flex', alignItems: 'center' }}>
@@ -89,7 +90,7 @@ const DnDetailCard = ({ data }) => {
 
                         {getDisplayField("Issue Date", dnData.issueDate)}
 
-                        {getDisplayField("DN Sent", dnData?.sentDate ? dnData.sentDate + " - " + dnData.sentBy : "--")}
+                        {getDisplayField("DN Sent", dnData?.sentDate ? dnData.sentDate + " - " + (dnData.sentBy == null ? "System" : dnData.sentBy) : "--")}
 
                     </Grid>
                     <Grid container direction="row" justifyContent="space-between" alignItems="center">
@@ -120,6 +121,35 @@ const DnDetailCard = ({ data }) => {
                             </Grid>
                         </Grid>
                     </Grid>
+
+                    <Grid container direction="row" justifyContent="space-between" alignItems="center">
+                        {getDisplayField("Reminder Schedule", "")}
+                        {getDisplayField("Sent on", "")}
+                    </Grid>
+                    <Grid container direction="row" justifyContent="space-between" alignItems="center">
+                        {getDisplayField("Reminder 1", DateUtils.dateStr(dnData.expectReminder1))}
+                        {getDisplayField("Reminder 1", dnData?.reminder1 ? DateUtils.datetimeStr(dnData.reminder1) : "--")}
+                    </Grid>
+
+                    <Grid container direction="row" justifyContent="space-between" alignItems="center">
+                        {getDisplayField("Reminder 2",  DateUtils.dateStr(dnData.expectReminder2))}
+                        {getDisplayField("Reminder 2", dnData?.reminder2 ? DateUtils.datetimeStr(dnData.reminder2) : "--")}
+                    </Grid>
+                    <Grid container direction="row" justifyContent="space-between" alignItems="center">
+                        {getDisplayField("Reminder 3",  DateUtils.dateStr(dnData.expectReminder3))}
+                        {getDisplayField("Reminder 3", dnData?.reminder3 ? DateUtils.datetimeStr(dnData.reminder3) : "--")}
+                    </Grid>
+                    <Grid container direction="row" justifyContent="space-between" alignItems="center">
+                        {getDisplayField("Reminder 4",  DateUtils.dateStr(dnData.expectReminder4))}
+                        {getDisplayField("Reminder 4", dnData?.reminder4 ? DateUtils.datetimeStr(dnData.reminder4) : "--")}
+                    </Grid>
+                    <Grid container direction="row" justifyContent="space-between" alignItems="center">
+                        {getDisplayField("Reminder Final",  DateUtils.dateStr(dnData.expectReminderFinal))}
+                        {getDisplayField("Reminder Final", dnData?.reminderFinal ? DateUtils.datetimeStr(dnData.reminderFinal) : "--")}
+                    </Grid>
+
+
+
                 </Grid>
             </Grid>
         </MainCard>