Merge branch 'Kartik_Enhancement#319' into Issue_May_4W

# Conflicts:
#	src/components/Activities/CheckCheckOutForm.jsx

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>