RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'add time for type 2' (#15) from feature/MissionMachinesReport into develop

Browse Source 
Reviewed-on: #15
This commit was merged in pull request #15.
This commit is contained in:
amirghasempoor
2026-06-10 11:56:23 +00:00
parent 1937f57dd3 55b40eb0cc
commit 1e106a0c87
13 changed files with 80 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php
View File

@@ -66,7 +66,7 @@ class RequestPortalController extends Controller
'request_date' => now(),
'description' => $request->description,
'end_point' => $request->end_point,
'area' => $request->area,
'encoded_route' => $request->encoded_route,
'category_id' => $request->category_id,
'category_name' => MissionCategory::name($request->category_id),
'explanation' => $request->explanation,
@@ -136,7 +136,7 @@ class RequestPortalController extends Controller
'request_date' => now(),
'description' => $request->description,
'end_point' => $request->end_point,
'area' => $request->area,
'encoded_route' => $request->encoded_route,
'category_id' => $request->category_id,
'category_name' => MissionCategory::name($request->category_id),
'explanation' => $request->explanation,
@@ -174,7 +174,7 @@ class RequestPortalController extends Controller
'end_date' => $request->end_date,
'description' => $request->description,
'end_point' => $request->end_point,
'area' => $request->area,
'encoded_route' => $request->encoded_route,
'category_id' => $request->category_id,
'category_name' => MissionCategory::name($request->category_id),
'explanation' => $request->explanation,

20
app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php
View File

@@ -43,8 +43,8 @@ class ViolationManagementController extends Controller
{
DB::transaction(function () use ($request, $violation) {
$start = Carbon::parse($request->start_date);
$end = Carbon::parse($request->end_date);
$start = Carbon::parse($violation->exit_station);
$end = Carbon::parse($violation->enter_station);
$type = $start->diffInMinutes($end) > 480 ? MissionTypes::NO_PROCESS_ROZANE->value : MissionTypes::NO_PROCESS_SAATY->value;
$user = auth()->user();
$zone = $request->zone;
@@ -61,16 +61,17 @@ class ViolationManagementController extends Controller
'edare_shahri_name' => $user->edarate_shahri_name ?? null,
'zone' => $zone,
'zone_fa' => MissionZones::name($zone),
'area' => $request->area,
'encoded_route' => $request->encoded_route,
'type' => $type,
'type_fa' => MissionTypes::name($type),
'start_date' => $request->start_date,
'end_date' => $request->end_date,
'start_date' => $violation->exit_station,
'end_date' => $violation->enter_station,
'end_point' => $request->end_point,
'category_id' => $request->category_id,
'category_name' => MissionCategory::name($request->category_id),
'start_time' => $request->start_date,
'finish_time' => $request->end_date,
'start_time' => $violation->exit_station,
'finish_time' => $violation->enter_station,
'mission_duration' => strtotime($violation->enter_station) - strtotime($violation->exit_station),
'state_id' => MissionStates::END_MISSION->value,
'state_name' => MissionStates::END_MISSION->label(),
'explanation' => $request->explanation,
@@ -114,7 +115,7 @@ class ViolationManagementController extends Controller
'city_name' => $user->city_fa,
'station_id' => $user->station_id,
'station_name' => RahdariPoint::query()->find($user->station_id)->name,
'exit_time' => $request->exit_time,
'exit_station' => $request->exit_station,
]);
return $this->successResponse();
@@ -128,7 +129,8 @@ class ViolationManagementController extends Controller
public function update(UpdateRequest $request, MissionViolation $violation): JsonResponse
{
$violation->update([
'enter_time' => $request->enter_time,
'enter_station' => $request->enter_station,
'status' => MissionViolationStatus::BEDON_EGHDAM->value,
]);
return $this->successResponse();