develop #28

Merged
amirghasempoor merged 51 commits from develop into main 2026-06-15 11:32:19 +00:00
5 changed files with 53 additions and 0 deletions
Showing only changes of commit 439f69af29 - Show all commits

View File

@@ -126,6 +126,7 @@ class RequestPortalController extends Controller
'finish_time' => now(),
'state_id' => MissionStates::END_MISSION->value,
'state_name' => MissionStates::name(MissionStates::END_MISSION->value),
'end_km' => $request->end_km,
]);
// if ($mission->category_id == 2) {
@@ -166,6 +167,8 @@ class RequestPortalController extends Controller
'station_name' => RahdariPoint::query()->find( $user->station_id)->name,
'driver_id' => $request->driver,
'driver_name' => Rahdaran::query()->find($request->driver)->name,
'km' => $request->end_km,
'requested_machines' => json_encode($mission->requested_machines),
]);
$newMission->rahdaran()->sync($request->rahdaran);
@@ -275,6 +278,7 @@ class RequestPortalController extends Controller
'station_id' => $user->station_id,
'station_name' => RahdariPoint::query()->find($user->station_id)->name,
'km' => $violation->km ?? null,
'end_km' => $violation->end_km ?? null,
'driver_id' => $request->driver,
'driver_name' => Rahdaran::query()->find($request->driver)->name,
]);

View File

@@ -70,6 +70,7 @@ class ViolationManagementController extends Controller
$violation->update([
'enter_time' => $request->enter_time,
'status' => MissionViolationStatus::BEDON_EGHDAM->value,
'end_km' => $request->end_km,
]);
return $this->successResponse();

View File

@@ -38,6 +38,7 @@ class ContinueMissionRequest extends FormRequest
'encoded_route' => 'required|string',
'explanation' => 'required|string',
'category_id' => 'required|in:1,2,3',
'end_km'=> 'required|string',
];
}
@@ -56,6 +57,18 @@ class ContinueMissionRequest extends FormRequest
);
}
}
if ($this->end_km < $this->mission->km) {
$validator->errors()->add(
'end_km',
'کیلومتر پایان باید بزرگتر از کیلومتر شروع باشد.'
);
}
if (strtotime($this->end_date) < strtotime($this->mission->start_time)) {
$validator->errors()->add(
'time',
'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.'
);
}
},
];
}

View File

@@ -27,6 +27,7 @@ class UpdateRequest extends FormRequest
{
return [
'enter_time' => 'required|date',
'end_km'=> 'required|string',
];
}
@@ -40,6 +41,12 @@ class UpdateRequest extends FormRequest
'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.'
);
}
if ($this->end_km < $this->violation->km) {
$validator->errors()->add(
'end_km',
'کیلومتر پایان باید بزرگتر از کیلومتر شروع باشد.'
);
}
}
];
}

View File

@@ -0,0 +1,28 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('mission_violations', function (Blueprint $table) {
$table->string('end_km')->nullable();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('mission_violations', function (Blueprint $table) {
$table->dropColumn('end_km');
});
}
};