From 13a477e883cc1007caea762a6c7b964ce06df562 Mon Sep 17 00:00:00 2001
From: nguentrungthat <entjtj2000@gmail.com>
Date: Fri, 14 Feb 2025 10:44:42 +0700
Subject: [PATCH 1/2] Update TrackingController.php

---
 .../Admin/app/Http/Controllers/TrackingController.php       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/BACKEND/Modules/Admin/app/Http/Controllers/TrackingController.php b/BACKEND/Modules/Admin/app/Http/Controllers/TrackingController.php
index f49b6b5..d75f15a 100755
--- a/BACKEND/Modules/Admin/app/Http/Controllers/TrackingController.php
+++ b/BACKEND/Modules/Admin/app/Http/Controllers/TrackingController.php
@@ -266,11 +266,11 @@ class TrackingController extends Controller
             ->where('status', 'check in');
 
         if ($startDate && $endDate) {
-            $trackingData->whereBetween('time_string', [$startDate, $endDate . ' 23:59:59']);
+            $trackingData->whereBetween('created_at', [$startDate, $endDate . ' 23:59:59']);
         } elseif ($startDate) {
-            $trackingData->where('time_string', '>=', $startDate);
+            $trackingData->where('created_at', '>=', $startDate);
         } elseif ($endDate) {
-            $trackingData->where('time_string', '<=', $endDate . ' 23:59:59');
+            $trackingData->where('created_at', '<=', $endDate . ' 23:59:59');
         }
 
         $onTimeMorning = 0;

From 73edecf3418382ce603cd41d7c240be8a9a0bee8 Mon Sep 17 00:00:00 2001
From: nguentrungthat <entjtj2000@gmail.com>
Date: Fri, 14 Feb 2025 10:49:12 +0700
Subject: [PATCH 2/2] Update select query

---
 .../Http/Controllers/TrackingController.php   | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/BACKEND/Modules/Admin/app/Http/Controllers/TrackingController.php b/BACKEND/Modules/Admin/app/Http/Controllers/TrackingController.php
index d75f15a..ffe0b34 100755
--- a/BACKEND/Modules/Admin/app/Http/Controllers/TrackingController.php
+++ b/BACKEND/Modules/Admin/app/Http/Controllers/TrackingController.php
@@ -17,6 +17,7 @@ use Illuminate\Support\Facades\Storage;
 use Modules\Admin\app\Models\Admin;
 use Modules\Admin\app\Models\MonthlyTimekeeping;
 use Modules\Admin\app\Models\Tracking;
+use Illuminate\Support\Facades\DB;
 
 class TrackingController extends Controller
 {
@@ -266,13 +267,25 @@ class TrackingController extends Controller
             ->where('status', 'check in');
 
         if ($startDate && $endDate) {
-            $trackingData->whereBetween('created_at', [$startDate, $endDate . ' 23:59:59']);
+            $trackingData->whereBetween(
+                DB::raw("STR_TO_DATE(time_string, '%Y-%m-%d %H:%i:%s')"),
+                [$startDate, $endDate . ' 23:59:59']
+            );
         } elseif ($startDate) {
-            $trackingData->where('created_at', '>=', $startDate);
+            $trackingData->where(
+                DB::raw("STR_TO_DATE(time_string, '%Y-%m-%d %H:%i:%s')"),
+                '>=',
+                $startDate
+            );
         } elseif ($endDate) {
-            $trackingData->where('created_at', '<=', $endDate . ' 23:59:59');
+            $trackingData->where(
+                DB::raw("STR_TO_DATE(time_string, '%Y-%m-%d %H:%i:%s')"),
+                '<=',
+                $endDate . ' 23:59:59'
+            );
         }
 
+
         $onTimeMorning = 0;
         $lateMorning = 0;
         $onTimeAfternoon = 0;