From 496d9446890336c37c7c31153b2fd484ae931011 Mon Sep 17 00:00:00 2001 From: joddyabott Date: Tue, 23 Sep 2025 16:08:49 +0330 Subject: [PATCH] change some action --- .../V3/Dashboard/Mission/ControlUnitController.php | 3 ++- .../V3/Dashboard/Mission/RequestPortalController.php | 6 ------ .../V3/Dashboard/Mission/SendDataToFMSListener.php | 4 ++-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php b/app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php index 506861fe..d9ca292f 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php @@ -57,7 +57,8 @@ class ControlUnitController extends Controller $mission->update([ 'state_id' => $state, 'state_name' => MissionStates::name($state), - 'finish_time' => now() + 'finish_time' => now(), + 'mission_duration' => strtotime(now()) - strtotime($mission->start_time), ]); }); diff --git a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php index e8e4e72d..23d8bd74 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php @@ -37,11 +37,6 @@ class RequestPortalController extends Controller $state = MissionStates::REQUEST_CREATED->value; $category = $request->category_id; - $start_timestamp = strtotime($request->start_date); - $end_timestamp = strtotime($request->end_date); - - $mission_duration = $end_timestamp - $start_timestamp; - $mission = Mission::query()->create([ 'user_id' => $user->id, 'username' => $user->username, @@ -66,7 +61,6 @@ class RequestPortalController extends Controller 'category_name' => MissionCategory::name($category), 'explanation' => $request->explanation, 'code' => rand(100000, 999999), - 'mission_duration' => $mission_duration, ]); $mission->rahdaran()->sync($request->rahdaran); diff --git a/app/Listeners/V3/Dashboard/Mission/SendDataToFMSListener.php b/app/Listeners/V3/Dashboard/Mission/SendDataToFMSListener.php index 22812e63..7d16db5c 100644 --- a/app/Listeners/V3/Dashboard/Mission/SendDataToFMSListener.php +++ b/app/Listeners/V3/Dashboard/Mission/SendDataToFMSListener.php @@ -29,8 +29,8 @@ class SendDataToFMSListener implements ShouldQueue $this->getErrorRateService->setInputParameters([ 'missionArea' => $mission->area['coordinates'], - 'missionStartDT' => $mission->start_date->format('Y-m-d\TH:i:s'), - 'missionEndDT' => $mission->end_date->format('Y-m-d\TH:i:s'), + 'missionStartDT' => $mission->start_time->format('Y-m-d\TH:i:s'), + 'missionEndDT' => $mission->finish_time->format('Y-m-d\TH:i:s'), 'machineCode' => $mission->machines()->first('cmms_machines.machine_code'), 'areaType' => $mission->area['type'] === 'polygon' ? 1 : 2, ]);