From ee933a3f917317d7e9e3901e0537128e0e5e0d44 Mon Sep 17 00:00:00 2001 From: amirghasempoor Date: Tue, 15 Apr 2025 15:50:14 +0330 Subject: [PATCH] order image files --- app/Facades/DataTable/DataTable.php | 2 +- .../V3/Dashboard/RoadMaintenanceStationController.php | 2 +- app/Services/Cartables/SafetyAndPrivacyTableService.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Facades/DataTable/DataTable.php b/app/Facades/DataTable/DataTable.php index 86d25fe6..63699505 100644 --- a/app/Facades/DataTable/DataTable.php +++ b/app/Facades/DataTable/DataTable.php @@ -29,7 +29,7 @@ class DataTable array $allowedRelations = [], array $allowedSortings = [], array $allowedSelects = [], - ?array $allowedGroupBy = null + array $allowedGroupBy = [] ): array { diff --git a/app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php b/app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php index 3dd07a5a..dc14f995 100644 --- a/app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php +++ b/app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php @@ -242,7 +242,7 @@ class RoadMaintenanceStationController extends Controller public function images(RahdariPoint $rahdariPoint): JsonResponse { - return $this->successResponse($rahdariPoint->files()->get(['path'])); + return $this->successResponse($rahdariPoint->files()->orderBy('id')->get(['path'])); } public function map(Request $request): JsonResponse diff --git a/app/Services/Cartables/SafetyAndPrivacyTableService.php b/app/Services/Cartables/SafetyAndPrivacyTableService.php index 33b8645a..afe8c30a 100644 --- a/app/Services/Cartables/SafetyAndPrivacyTableService.php +++ b/app/Services/Cartables/SafetyAndPrivacyTableService.php @@ -111,7 +111,7 @@ class SafetyAndPrivacyTableService public function provinceActivity(Request $request): array { $activities = []; - $provinceQuery = Province::query()->selectRaw('COUNT(*) as qty,info_id, step'); + $provinceQuery = SafetyAndPrivacy::query()->selectRaw('COUNT(*) as qty,info_id, step'); $province = DataTableFacade::run( $provinceQuery, $request,