TIMOR-TELECOM/gps-frontend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
meusinfirmary
2025-07-25 03:17:44 +07:00
parent 79596192d3
commit 5cbf7600ae
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/TrackController.php
View File

@ -131,13 +131,14 @@ class TrackController extends Controller
} }
$filter = [ $filter = [
"limit" => 500, "limit" => 10000,
]; ];
// default 500, jika ada filter date maka max 5K // default 10000, jika ada filter date maka max 100K
if ( if (
$req->start_date != null && $req->start_date != null &&
$req->start_date != "" && $req->start_date != "" &&
($req->end_date != null && $req->end_date != "") ($req->end_date != null && //
$req->end_date != "")
) { ) {
$filter["start_date"] = $req->start_date; $filter["start_date"] = $req->start_date;
$filter["end_date"] = $req->end_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["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["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); $list = Tracks::lastMoveTracks($req->vid, $filter);

6
app/Models/Tracks.php
View File

@ -556,7 +556,8 @@ class Tracks extends Model
if (isset($filter["limit"])) { if (isset($filter["limit"])) {
$query .= " LIMIT ?"; $query .= " LIMIT ?";
$params[] = $filter["limit"] ?? 1000; $params[] = $filter["limit"] ?? 10000;
// $params[] = $filter["limit"];
} }
$query .= " ;"; $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 = []) public static function nearestInCircle($lat, $lng, $rad, $filter = [])