From 5cbf7600ae4647646adbdc35ef14056b35b793f6 Mon Sep 17 00:00:00 2001 From: meusinfirmary Date: Fri, 25 Jul 2025 03:17:44 +0700 Subject: [PATCH] update --- app/Http/Controllers/TrackController.php | 15 +++++++++++---- app/Models/Tracks.php | 6 ++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/TrackController.php b/app/Http/Controllers/TrackController.php index 214a7b1..d6cccaf 100755 --- a/app/Http/Controllers/TrackController.php +++ b/app/Http/Controllers/TrackController.php @@ -131,13 +131,14 @@ class TrackController extends Controller } $filter = [ - "limit" => 500, + "limit" => 10000, ]; - // default 500, jika ada filter date maka max 5K + // default 10000, jika ada filter date maka max 100K if ( $req->start_date != null && $req->start_date != "" && - ($req->end_date != null && $req->end_date != "") + ($req->end_date != null && // + $req->end_date != "") ) { $filter["start_date"] = $req->start_date; $filter["end_date"] = $req->end_date; @@ -145,7 +146,13 @@ class TrackController extends Controller $filter["start_date"] = strtotime(gmdate("Y-m-d H:i:s", $req->start_date)); $filter["end_date"] = strtotime(gmdate("Y-m-d H:i:s", $req->end_date)); - $filter["limit"] = 5000; + $filter["limit"] = 100000; + } else { + $todayStart = strtotime(gmdate("Y-m-d 00:00:00")); + $todayEnd = strtotime(gmdate("Y-m-d 23:59:59")); + + $filter["start_date"] = $todayStart; + $filter["end_date"] = $todayEnd; } $list = Tracks::lastMoveTracks($req->vid, $filter); diff --git a/app/Models/Tracks.php b/app/Models/Tracks.php index f793377..50d3842 100755 --- a/app/Models/Tracks.php +++ b/app/Models/Tracks.php @@ -556,7 +556,8 @@ class Tracks extends Model if (isset($filter["limit"])) { $query .= " LIMIT ?"; - $params[] = $filter["limit"] ?? 1000; + $params[] = $filter["limit"] ?? 10000; + // $params[] = $filter["limit"]; } $query .= " ;"; @@ -615,7 +616,8 @@ class Tracks extends Model } } - return $filtered->take(500); + // return $filtered->take(500); + return $filtered; } public static function nearestInCircle($lat, $lng, $rad, $filter = [])