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

Merge pull request 'Update select query' (#107) from that-fe into master 

Reviewed-on: #107
This commit is contained in:
joseph 2025-02-14 19:57:17 +11:00
parent 471cc0eb2a 73edecf341
commit f60be27969
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ use Illuminate\Support\Facades\Storage;
use Modules\Admin\app\Models\Admin; use Modules\Admin\app\Models\Admin;
use Modules\Admin\app\Models\MonthlyTimekeeping; use Modules\Admin\app\Models\MonthlyTimekeeping;
use Modules\Admin\app\Models\Tracking; use Modules\Admin\app\Models\Tracking;
use Illuminate\Support\Facades\DB;
class TrackingController extends Controller class TrackingController extends Controller
{ {
@ -266,13 +267,25 @@ class TrackingController extends Controller
->where('status', 'check in'); ->where('status', 'check in');
if ($startDate && $endDate) { if ($startDate && $endDate) {
$trackingData->whereBetween('time_string', [$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) { } elseif ($startDate) {
$trackingData->where('time_string', '>=', $startDate); $trackingData->where(
DB::raw("STR_TO_DATE(time_string, '%Y-%m-%d %H:%i:%s')"),
'>=',
$startDate
);
} elseif ($endDate) { } elseif ($endDate) {
$trackingData->where('time_string', '<=', $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; $onTimeMorning = 0;
$lateMorning = 0; $lateMorning = 0;
$onTimeAfternoon = 0; $onTimeAfternoon = 0;