joseph
/
ManagementSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Update' (#106) from that-fe into master 

Reviewed-on: #106
This commit is contained in:
joseph 2025-02-14 14:35:08 +11:00
parent 9b472544b6 1887f2805f
commit 471cc0eb2a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BACKEND/Modules/Admin/app/Http/Controllers/TrackingController.php
View File

@ -266,11 +266,11 @@ class TrackingController extends Controller
->where('status', 'check in'); ->where('status', 'check in');
if ($startDate && $endDate) { if ($startDate && $endDate) {
$trackingData->whereBetween('updated_at', [$startDate, $endDate . ' 23:59:59']); $trackingData->whereBetween('time_string', [$startDate, $endDate . ' 23:59:59']);
} elseif ($startDate) { } elseif ($startDate) {
$trackingData->where('updated_at', '>=', $startDate); $trackingData->where('time_string', '>=', $startDate);
} elseif ($endDate) { } elseif ($endDate) {
$trackingData->where('updated_at', '<=', $endDate . ' 23:59:59'); $trackingData->where('time_string', '<=', $endDate . ' 23:59:59');
} }
$onTimeMorning = 0; $onTimeMorning = 0;