Merge branch 'feature/NewOptionMission' into 'develop'

create new option for mission

See merge request witelgroup/rms_v2!139
This commit is contained in:
2025-07-12 13:04:21 +00:00
6 changed files with 71 additions and 3 deletions

View File

@@ -0,0 +1,22 @@
<?php
namespace App\Enums;
enum MissionCategory: int
{
case ROAD_ITEM= 0;
case ROAD_PATROL = 1;
case ROAD_OBSERVATION = 2;
public static function name(int $state): string
{
$mapArray = [
0 => "فعالیت روزانه",
1 => "گشت راهداری",
2 => "واکنش سریع",
];
return $mapArray[$state];
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Http\Controllers\V3\Dashboard\Mission;
use App\Enums\MissionCategory;
use App\Enums\MissionStates;
use App\Enums\MissionTypes;
use App\Enums\MissionZones;
@@ -50,6 +51,10 @@ class RequestPortalController extends Controller
'description' => $request->description,
'end_point' => $request->end_point,
'area' => json_encode($request->area),
'category_id' => $request->category_id,
'category_name' => MissionCategory::name($request->category_id),
'explanation' => $request->explanation,
'code' => rand(100000, 999999),
]);
$mission->rahdaran()->attach($request->rahdaran);
@@ -81,6 +86,9 @@ class RequestPortalController extends Controller
'description' => $request->description,
'end_point' => $request->end_point,
'area' => json_encode($request->area),
'category_id' => $request->category_id,
'category_name' => MissionCategory::name($request->category_id),
'explanation' => $request->explanation,
]);
$mission->rahdaran()->sync($request->rahdaran);

View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\V3\Mission\RequestPortal;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class StoreRequest extends FormRequest
@@ -17,7 +18,7 @@ class StoreRequest extends FormRequest
/**
* Get the validation rules that apply to the request.
*
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
* @return array<string, ValidationRule|array|string>
*/
public function rules(): array
{
@@ -32,6 +33,8 @@ class StoreRequest extends FormRequest
'description' => 'string',
'end_point' => 'required|string',
'area' => 'required|array',
'explanation' => 'required|string',
'category_id' => 'required|in:1,2,3',
];
}
}

View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\Mission\RequestPortal;
use App\Enums\MissionStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class UpdateRequest extends FormRequest
@@ -18,7 +19,7 @@ class UpdateRequest extends FormRequest
/**
* Get the validation rules that apply to the request.
*
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
* @return array<string, ValidationRule|array|string>
*/
public function rules(): array
{
@@ -33,6 +34,8 @@ class UpdateRequest extends FormRequest
'description' => 'string',
'end_point' => 'required|string',
'area' => 'required|array',
'explanation' => 'required|string',
'category_id' => 'required|in:1,2,3',
];
}
}

View File

@@ -32,7 +32,8 @@ class RequestPortalService
allowedSelects: [
'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name',
'description', 'requested_machines', 'type', 'type_fa', 'start_date', 'state_id',
'end_date', 'request_date', 'end_point', 'area', 'zone', 'zone_fa', 'start_time', 'finish_time'
'end_date', 'request_date', 'end_point', 'area', 'zone', 'zone_fa', 'start_time', 'finish_time',
'code', 'category_id', 'category_name', 'explanation'
]
);
}

View File

@@ -0,0 +1,31 @@
<?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->integer('category_id')->nullable();
$table->string('category_name')->nullable();
$table->text('explanation')->nullable();
$table->string('code')->nullable();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('missions', function (Blueprint $table) {
$table->dropColumn(['category_id', 'category_name', 'explanation', 'code']);
});
}
};