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

Merge pull request 'remove exit station' (#21) from feature/PolyLineEncoderCommand into develop

Browse Source 
Reviewed-on: #21
This commit was merged in pull request #21.
This commit is contained in:
amirghasempoor
2026-06-14 07:51:27 +00:00
parent fc853d318e 0f65437bfa
commit 5edb061a24
5 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,8 +236,8 @@ class RequestPortalController extends Controller
{
DB::transaction(function () use ($request, $violation) {
$start = Carbon::parse($violation->exit_station);
$end = Carbon::parse($violation->enter_station);
$start = Carbon::parse($violation->exit_time);
$end = Carbon::parse($violation->enter_time);
$type = $start->diffInMinutes($end) > 480 ? MissionTypes::NO_PROCESS_ROZANE->value : MissionTypes::NO_PROCESS_SAATY->value;
$user = auth()->user();
$zone = $request->zone;
@@ -257,14 +257,14 @@ class RequestPortalController extends Controller
'encoded_route' => $request->encoded_route,
'type' => $type,
'type_fa' => MissionTypes::name($type),
'start_date' => $violation->exit_station,
'end_date' => $violation->enter_station,
'start_date' => $violation->exit_time,
'end_date' => $violation->enter_time,
'end_point' => $request->end_point,
'category_id' => $request->category_id,
'category_name' => MissionCategory::name($request->category_id),
'start_time' => $violation->exit_station,
'finish_time' => $violation->enter_station,
'mission_duration' => strtotime($violation->enter_station) - strtotime($violation->exit_station),
'start_time' => $violation->exit_time,
'finish_time' => $violation->enter_time,
'mission_duration' => strtotime($violation->enter_time) - strtotime($violation->exit_time),
'state_id' => MissionStates::END_MISSION->value,
'state_name' => MissionStates::END_MISSION->label(),
'explanation' => $request->explanation,

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

@@ -54,7 +54,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_station' => $request->exit_station,
'exit_time' => $request->exit_time,
]);
return $this->successResponse();
@@ -68,7 +68,7 @@ class ViolationManagementController extends Controller
public function update(UpdateRequest $request, MissionViolation $violation): JsonResponse
{
$violation->update([
'enter_station' => $request->enter_station,
'enter_time' => $request->enter_time,
'status' => MissionViolationStatus::BEDON_EGHDAM->value,
]);