From a1d3b86a6958f63e52d96cb3af18b12cd888885e Mon Sep 17 00:00:00 2001
From: amirghasempoor <amirghasempoor79@gmail.com>
Date: Sat, 12 Apr 2025 12:55:33 +0330
Subject: [PATCH] add map report to safety

---
 .../Commands/RoadObservationProblems.php      |  2 +-
 app/Http/Controllers/Api/BiController.php     |  4 ++-
 .../Dashboard/SafetyAndPrivacyController.php  | 25 ++++++-------------
 routes/v3.php                                 |  2 +-
 4 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/app/Console/Commands/RoadObservationProblems.php b/app/Console/Commands/RoadObservationProblems.php
index d56da6bb..c778d66c 100755
--- a/app/Console/Commands/RoadObservationProblems.php
+++ b/app/Console/Commands/RoadObservationProblems.php
@@ -99,7 +99,7 @@ class RoadObservationProblems extends Command
                      'EndTime' => $value->EndTime ?? null,
                      'StartDate' => $value->StartDate ?? null,
                      'EndDate' => $value->EndDate ?? null,
-                     'StartTime_DateTime' => $value->StartTime_DateTime ?? null,
+                     'StartTime_DateTime' => $value->StartTime_DateTime ? Carbon::createFromFormat('m/d/Y h:i:s A', $value->StartTime_DateTime)->format('Y-m-d H:i:s') : null,
                      'StartTime_DateTime_fa' => Verta::instance($value->StartTime_DateTime) ?? null,
                      'EndTime_DateTime' => $value->EndTime_DateTime ?? null,
                      'AutoID' => $value->AutoID ?? null,
diff --git a/app/Http/Controllers/Api/BiController.php b/app/Http/Controllers/Api/BiController.php
index 91272974..ecb4de03 100644
--- a/app/Http/Controllers/Api/BiController.php
+++ b/app/Http/Controllers/Api/BiController.php
@@ -150,6 +150,7 @@ class BiController extends Controller
 
     public function getDiagram(Request $request)
     {
+        ini_set('memory_limit', '-1');
         $subjectID = $request->subject_id;
         $provinceID = $request->province_id;
         $dateFrom = $request->from_date;
@@ -1021,6 +1022,7 @@ class BiController extends Controller
 
     public function separationActivityTypeRahdariActivities(Request $request)
     {
+        ini_set('memory_limit', '-1');
         $dateFrom = $request->from_date;
         $dateTo = $request->to_date;
         $provinceID = $request->province_id ?? null;
@@ -1198,4 +1200,4 @@ class BiController extends Controller
             'data' => round($camps, 2)
         ]);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacyController.php b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacyController.php
index df748c35..ef1caacf 100644
--- a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacyController.php
+++ b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacyController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\V3\Dashboard;
 
 use App\Enums\AxisTypes;
 use App\Exports\V3\SafetyAndPrivacy\CartableReport;
+use App\Facades\DataTable\DataTableFacade;
 use App\Facades\File\FileFacade;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\V3\SafetyAndPrivacy\FirstStepStoreRequest;
@@ -205,22 +206,12 @@ class SafetyAndPrivacyController extends Controller
 
     public function map(Request $request): JsonResponse
     {
-        $province = $request->province_id;
-        $edare_shahri = $request->edare_shahri_id;
-        $step = $request->step;
-        $info_id = $request->info_id;
-        $fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
-        $toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
-
-        $activities = SafetyAndPrivacy::query()
-            ->when($province, fn ($query) => $query->where('province_id', '=', $province))
-            ->when($edare_shahri, fn($query) => $query->where('edarate_shahri_id', '=', $edare_shahri))
-            ->when($step, fn($query) => $query->where('step', '=', $step))
-            ->when($info_id, fn($query) => $query->where('info_id', '=', $info_id))
-            ->whereBetween('created_at', [$fromDate, $toDate])
-            ->select('id', 'lat', 'lon', 'step')
-            ->get();
-
-        return $this->successResponse($activities);
+        return DataTableFacade::run(
+            SafetyAndPrivacy::query(),
+            $request,
+            allowedFilters: ['*'],
+            allowedSortings: ['*'],
+            allowedSelects: ['id', 'lat', 'lon', 'step']
+        );
     }
 }
diff --git a/routes/v3.php b/routes/v3.php
index cc2cd997..cd08f3cb 100644
--- a/routes/v3.php
+++ b/routes/v3.php
@@ -341,13 +341,13 @@ Route::prefix('safety_and_privacy')
         Route::get('/excel_report', 'excelReport')->name('excelReport')->middleware('permission:show-safety-and-privacy-operator-cartable|show-safety-and-privacy-operator-cartable-province|show-safety-and-privacy-operator-cartable-edarate-shahri');
         Route::post('/first_step_store', 'firstStepStore')->name('firstStepStore')->middleware('permission:add-safety-and-privacy');
         Route::get('/sub_items', 'subItems')->name('subItems');
+        Route::get('/map', 'map')->name('map');
         Route::post('/second_step_store/{safetyAndPrivacy}', 'secondStepStore')->name('secondStepStore')->middleware('permission:add-safety-and-privacy');
         Route::post('/third_step_store/{safetyAndPrivacy}', 'thirdStepStore')->name('thirdStepStore')->middleware('permission:add-safety-and-privacy');
         Route::post('/{safetyAndPrivacy}', 'update')->name('update')->middleware('permission:update-safety-and-privacy');
         Route::get('/{safetyAndPrivacy}', 'show')->name('show');
         Route::delete('/{safetyAndPrivacy}', 'destroy')->name('destroy')->middleware('permission:delete-safety-and-privacy');
         Route::get('/deserialize/{safetyAndPrivacy}', 'deserialize')->name('deserialize');
-        Route::get('/map', 'map')->name('map');
     });
 
 Route::prefix('safety_and_privacy_report')