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

remove exit station #21

Merged
amirghasempoor merged 1 commits from feature/PolyLineEncoderCommand into develop 2026-06-14 07:51:27 +00:00
Conversation 0 Commits 1 Files Changed 5 +13 -15
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) { DB::transaction(function () use ($request, $violation) {
$start = Carbon::parse($violation->exit_station); $start = Carbon::parse($violation->exit_time);
$end = Carbon::parse($violation->enter_station); $end = Carbon::parse($violation->enter_time);
$type = $start->diffInMinutes($end) > 480 ? MissionTypes::NO_PROCESS_ROZANE->value : MissionTypes::NO_PROCESS_SAATY->value; $type = $start->diffInMinutes($end) > 480 ? MissionTypes::NO_PROCESS_ROZANE->value : MissionTypes::NO_PROCESS_SAATY->value;
$user = auth()->user(); $user = auth()->user();
$zone = $request->zone; $zone = $request->zone;
@@ -257,14 +257,14 @@ class RequestPortalController extends Controller
'encoded_route' => $request->encoded_route, 'encoded_route' => $request->encoded_route,
'type' => $type, 'type' => $type,
'type_fa' => MissionTypes::name($type), 'type_fa' => MissionTypes::name($type),
'start_date' => $violation->exit_station, 'start_date' => $violation->exit_time,
'end_date' => $violation->enter_station, 'end_date' => $violation->enter_time,
'end_point' => $request->end_point, 'end_point' => $request->end_point,
'category_id' => $request->category_id, 'category_id' => $request->category_id,
'category_name' => MissionCategory::name($request->category_id), 'category_name' => MissionCategory::name($request->category_id),
'start_time' => $violation->exit_station, 'start_time' => $violation->exit_time,
'finish_time' => $violation->enter_station, 'finish_time' => $violation->enter_time,
'mission_duration' => strtotime($violation->enter_station) - strtotime($violation->exit_station), 'mission_duration' => strtotime($violation->enter_time) - strtotime($violation->exit_time),
'state_id' => MissionStates::END_MISSION->value, 'state_id' => MissionStates::END_MISSION->value,
'state_name' => MissionStates::END_MISSION->label(), 'state_name' => MissionStates::END_MISSION->label(),
'explanation' => $request->explanation, '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, 'city_name' => $user->city_fa,
'station_id' => $user->station_id, 'station_id' => $user->station_id,
'station_name' => RahdariPoint::query()->find($user->station_id)->name, 'station_name' => RahdariPoint::query()->find($user->station_id)->name,
'exit_station' => $request->exit_station, 'exit_time' => $request->exit_time,
]); ]);
return $this->successResponse(); return $this->successResponse();
@@ -68,7 +68,7 @@ class ViolationManagementController extends Controller
public function update(UpdateRequest $request, MissionViolation $violation): JsonResponse public function update(UpdateRequest $request, MissionViolation $violation): JsonResponse
{ {
$violation->update([ $violation->update([
'enter_station' => $request->enter_station, 'enter_time' => $request->enter_time,
'status' => MissionViolationStatus::BEDON_EGHDAM->value, 'status' => MissionViolationStatus::BEDON_EGHDAM->value,
]); ]);

2
app/Http/Requests/V3/Mission/Violation/StoreRequest.php
View File

@@ -25,7 +25,7 @@ class StoreRequest extends FormRequest
public function rules(): array public function rules(): array
{ {
return [ return [
'exit_station' => 'required|date', 'exit_time' => 'required|date',
'machine_code' => 'required', 'machine_code' => 'required',
'km'=> 'string', 'km'=> 'string',
]; ];

4
app/Http/Requests/V3/Mission/Violation/UpdateRequest.php
View File

@@ -26,7 +26,7 @@ class UpdateRequest extends FormRequest
public function rules(): array public function rules(): array
{ {
return [ return [
'enter_station' => 'required|date', 'enter_time' => 'required|date',
]; ];
} }
@@ -34,7 +34,7 @@ class UpdateRequest extends FormRequest
{ {
return [ return [
function (Validator $validator) { function (Validator $validator) {
if (strtotime($this->violation->exit_station) < strtotime($this->enter_station)) { if (strtotime($this->violation->exit_time) < strtotime($this->enter_time)) {
$validator->errors()->add( $validator->errors()->add(
'time', 'time',
'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.' 'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.'

4
database/migrations/2026_06_10_144529_add_column_to_mission_violations_table.php
View File

@@ -12,8 +12,6 @@ return new class extends Migration
public function up(): void public function up(): void
{ {
Schema::table('mission_violations', function (Blueprint $table) { Schema::table('mission_violations', function (Blueprint $table) {
$table->dateTime('exit_station')->nullable();
$table->dateTime('enter_station')->nullable();
$table->unsignedInteger('station_id')->nullable(); $table->unsignedInteger('station_id')->nullable();
$table->string('station_name')->nullable(); $table->string('station_name')->nullable();
}); });
@@ -25,7 +23,7 @@ return new class extends Migration
public function down(): void public function down(): void
{ {
Schema::table('mission_violations', function (Blueprint $table) { Schema::table('mission_violations', function (Blueprint $table) {
$table->dropColumn(['exit_station', 'enter_station']); $table->dropColumn(['station_id', 'station_name']);
}); });
} }
}; };