From 2f733cd2a6945ee0e56a45f9f9beb2495b2fc612 Mon Sep 17 00:00:00 2001
From: Suphonchai Phoonsawat <suphonchai.ph@gmail.com>
Date: Wed, 10 Jan 2024 10:08:34 +0700
Subject: [PATCH] =?UTF-8?q?fix=20bug=20=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=82=E0=B9=89=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=AA=E0=B8=96=E0=B8=B2=E0=B8=99?=
 =?UTF-8?q?=E0=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BMA.EHR.Leave.Service/Controllers/LeaveController.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/BMA.EHR.Leave.Service/Controllers/LeaveController.cs b/BMA.EHR.Leave.Service/Controllers/LeaveController.cs
index b090505b..3d814cf4 100644
--- a/BMA.EHR.Leave.Service/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave.Service/Controllers/LeaveController.cs
@@ -591,7 +591,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                                 CheckInDate = d.CheckIn.Date,
                                 CheckInTime = d.CheckIn.ToString("HH:mm:ss"),
                                 CheckInLocation = d.CheckInPOI,
-                                CheckInStatus = DateTime.Parse(d.CheckIn.ToString("yyyy-MM-dd HH:mm")) >
+                                CheckInStatus = d.CheckInStatus != null || d.CheckInStatus != "" ? d.CheckInStatus :
+                                                DateTime.Parse(d.CheckIn.ToString("yyyy-MM-dd HH:mm")) >
                                                 DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}") ?
                                                "LATE" :
                                                "NORMAL",
@@ -601,6 +602,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                 CheckOutTime = d.CheckOut == null ? "" : d.CheckOut.Value.ToString("HH:mm:ss"),
                                 CheckOutLocation = d.CheckOutPOI ?? "",
                                 CheckOutStatus = d.CheckOut == null ? null :
+                                                d.CheckOutStatus != null || d.CheckOutStatus != "" ? d.CheckOutStatus :
                                                 DateTime.Parse(d.CheckOut.Value.ToString("yyyy-MM-dd HH:mm")) <
                                                 DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}") ?
                                                 "LATE" :
@@ -756,7 +758,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                     CheckInLat = d.CheckInLat,
                     CheckInLon = d.CheckInLon,
                     CheckInImg = $"{imgUrl}/{d.CheckInImageUrl}",
-                    CheckInStatus = DateTime.Parse(d.CheckIn.ToString("yyyy-MM-dd HH:mm")) >
+                    CheckInStatus = d.CheckInStatus != null || d.CheckInStatus != "" ? d.CheckInStatus :
+                                    DateTime.Parse(d.CheckIn.ToString("yyyy-MM-dd HH:mm")) >
                                     DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}") ?
                                     "LATE" :
                                     "NORMAL",
@@ -772,6 +775,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     CheckOutImg = d.CheckOut == null ? "" : $"{imgUrl}/{d.CheckOutImageUrl}",
 
                     CheckOutStatus = d.CheckOut == null ? null :
+                                     d.CheckOutStatus != null || d.CheckOutStatus != "" ? d.CheckOutStatus :
                                      DateTime.Parse(d.CheckOut.Value.ToString("yyyy-MM-dd HH:mm")) <
                                      DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}") ?
                                      "LATE" :
@@ -1576,7 +1580,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 return Error(GlobalMessages.DataNotFound);
 
             data.CheckInStatus = req.CheckInStatus;
-            data.CheckInStatus = req.CheckOutStatus;
+            data.CheckOutStatus = req.CheckOutStatus;
             data.EditReason = req.Reason;
 
             await _processUserTimeStampRepository.UpdateAsync(data);