From f01a6235e7bd13b873d6efb61051845538d86dca Mon Sep 17 00:00:00 2001
From: "kartik.sharma" <kartik.sharma@marcoaiot.com>
Date: Wed, 21 May 2025 16:27:45 +0530
Subject: [PATCH 1/2] Adding Date Box in Check-in and Check-out popup from
 Attendence component.

---
 src/components/Activities/CheckCheckOutForm.jsx | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/components/Activities/CheckCheckOutForm.jsx b/src/components/Activities/CheckCheckOutForm.jsx
index ccce971f..6455d9f4 100644
--- a/src/components/Activities/CheckCheckOutForm.jsx
+++ b/src/components/Activities/CheckCheckOutForm.jsx
@@ -21,6 +21,7 @@ const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm, }) => {
   const [isLoading, setIsLoading] = useState(false);
   const coords = usePositionTracker();
   const dispatch = useDispatch()
+const today = new Date().toISOString().split('T')[0];
 
   const {
     register,
@@ -72,7 +73,21 @@ const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm, }) => {
           {modeldata?.checkInTime && !modeldata?.checkOutTime ? 'Check-out :' : 'Check-in :'}
         </label>
       </div>
-      <div className="col-12 col-md-12">
+
+      <div className="col-6 col-md-6 ">
+        <label className="form-label" htmlFor="checkInDate">
+          {modeldata?.checkInTime && !modeldata?.checkOutTime ? 'Check-out Date' : 'Check-in Date'}
+        </label>
+        <input
+          type="text"
+          id="checkInDate"
+          className="form-control"
+          value={today}
+          disabled
+        />
+      </div>
+
+      <div className="col-6 col-md-6">
         <TimePicker
           label="Choose a time"
           onChange={(e) => setValue("markTime", e)}

From 279f2403d220d9231d377ec716454827abdc3ae3 Mon Sep 17 00:00:00 2001
From: "kartik.sharma" <kartik.sharma@marcoaiot.com>
Date: Thu, 22 May 2025 14:20:51 +0530
Subject: [PATCH 2/2] Correction in date box in checkin checkout popup from
 Attendence component.

---
 src/components/Activities/CheckCheckOutForm.jsx | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/components/Activities/CheckCheckOutForm.jsx b/src/components/Activities/CheckCheckOutForm.jsx
index 6455d9f4..fe12730b 100644
--- a/src/components/Activities/CheckCheckOutForm.jsx
+++ b/src/components/Activities/CheckCheckOutForm.jsx
@@ -21,7 +21,15 @@ const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm, }) => {
   const [isLoading, setIsLoading] = useState(false);
   const coords = usePositionTracker();
   const dispatch = useDispatch()
-const today = new Date().toISOString().split('T')[0];
+  const today = new Date().toISOString().split('T')[0];
+
+    const formatDate = (dateString) => {
+    if (!dateString) {
+      return '';
+    }
+    const [year, month, day] = dateString.split('-');
+    return `${day}-${month}-${year}`;
+  };
 
   const {
     register,
@@ -82,7 +90,11 @@ const today = new Date().toISOString().split('T')[0];
           type="text"
           id="checkInDate"
           className="form-control"
-          value={today}
+          value={
+            modeldata?.checkInTime && !modeldata?.checkOutTime
+              ? formatDate(modeldata?.checkInTime?.split('T')[0]) || ''
+              : formatDate(today)
+          }
           disabled
         />
       </div>