develop #34

Merged
amirghasempoor merged 7 commits from develop into main 2026-06-22 12:03:11 +00:00
4 changed files with 35 additions and 5 deletions
Showing only changes of commit bab99f7f89 - Show all commits

View File

@@ -2,7 +2,6 @@
namespace App\Http\Controllers\V3\Dashboard\Mission;
use App\Enums\FMSResultCode;
use App\Enums\MissionCategory;
use App\Enums\MissionStates;
use App\Enums\MissionTypes;
@@ -10,7 +9,6 @@ use App\Enums\MissionViolationStatus;
use App\Enums\MissionZones;
use App\Facades\DataTable\DataTableFacade;
use App\Http\Controllers\Controller;
use App\Http\Controllers\V3\Dashboard\RoadPatrol\OperatorController;
use App\Http\Requests\V3\Mission\RequestPortal\ChangeStateRequest;
use App\Http\Requests\V3\Mission\RequestPortal\ClarifyUnauthorizedExitRequest;
use App\Http\Requests\V3\Mission\RequestPortal\ContinueMissionRequest;
@@ -23,7 +21,6 @@ use App\Models\Mission;
use App\Models\MissionViolation;
use App\Models\Rahdaran;
use App\Models\RahdariPoint;
use App\Models\RoadObserved;
use App\Services\Cartables\Mission\RequestPortalService;
use App\Services\FMS\GetErrorRateService;
use Carbon\Carbon;
@@ -65,6 +62,8 @@ class RequestPortalController extends Controller
$user = auth()->user();
$mission = Mission::query()->create([
'item_id' => $request->item_id,
'sub_item_id' => $request->sub_item_id,
'user_id' => $user->id,
'username' => $user->username,
'province_id' => $user->province_id,
@@ -83,7 +82,7 @@ class RequestPortalController extends Controller
'start_date' => $request->start_date,
'end_date' => $request->end_date,
'request_date' => now(),
'description' => $request->description,
'description' => $request->item_str . ' - ' . $request->sub_item_str,
'end_point' => $request->end_point,
'encoded_route' => $request->encoded_route,
'category_id' => $request->category_id,

View File

@@ -25,6 +25,8 @@ class StoreRequest extends FormRequest
public function rules(): array
{
return [
'item_id' => 'required|exists:info_items,item',
'sub_item_id' => 'required|exists:info_items,sub_item',
'rahdaran' => 'array',
'rahdaran.*' => 'exists:rahdaran,id',
'requested_machines' => 'required|array',

View File

@@ -14,7 +14,7 @@ class Mission extends Model
{
use HasFactory;
protected $guarded = [];
protected $guarded = ['id'];
protected $hidden = ['pivot'];
protected $casts = [
'start_time' => 'datetime',

View File

@@ -0,0 +1,29 @@
<?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('missions', function (Blueprint $table) {
$table->unsignedInteger('item_id')->nullable();
$table->unsignedInteger('sub_item_id')->nullable();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('missions', function (Blueprint $table) {
//
});
}
};