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

Merge branch 'feature/ManageTime' into 'develop'

Browse Source 
fix time for hour's mission

See merge request witelgroup/rms_v2!140
This commit is contained in:
amirghasempoor
2025-07-13 11:06:07 +00:00
parent 7ab5f7496b 0e275f8e61
commit 8fb05fd8ee
5 changed files with 68 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Enums/MissionCategory.php
View File

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

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

@@ -58,6 +58,9 @@ class RequestPortalController extends Controller
]);
$mission->rahdaran()->attach($request->rahdaran);
if ($request->category_id == 3){
$mission->roadObserved()->attach($request->road_observed_id);
}
});
return $this->successResponse();
@@ -92,6 +95,9 @@ class RequestPortalController extends Controller
]);
$mission->rahdaran()->sync($request->rahdaran);
if ($request->category_id == 3){
$mission->roadObserved()->attach($request->road_observed_id);
}
});
return $this->successResponse();

26
app/Http/Requests/V3/Mission/RequestPortal/StoreRequest.php
View File

@@ -2,8 +2,10 @@
namespace App\Http\Requests\V3\Mission\RequestPortal;
use Carbon\Carbon;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Validator;
class StoreRequest extends FormRequest
{
@@ -33,8 +35,32 @@ class StoreRequest extends FormRequest
'description' => 'string',
'end_point' => 'required|string',
'area' => 'required|array',
'area.type' => 'required|string',
'area.coordinates' => 'required|array',
'explanation' => 'required|string',
'category_id' => 'required|in:1,2,3',
'road_observed_id' => 'required_if:category_id,3|exists:road_observed,id',
];
}
public function after(): array
{
return [
function (Validator $validator) {
if ($this->type === 1){
$start = Carbon::parse($this->start_date);
$end = Carbon::parse($this->end_date);
if ($start->diffInMinutes($end) > 480 ){
$validator->errors()->add(
'end_date',
'مدت مأموریت روزانه نباید بیشتر از ۸ ساعت باشد.'
);
}
}
}
];
}
}

27
app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php
View File

@@ -3,8 +3,10 @@
namespace App\Http\Requests\V3\Mission\RequestPortal;
use App\Enums\MissionStates;
use Carbon\Carbon;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Validator;
class UpdateRequest extends FormRequest
{
@@ -34,8 +36,33 @@ class UpdateRequest extends FormRequest
'description' => 'string',
'end_point' => 'required|string',
'area' => 'required|array',
'area.type' => 'required|string',
'area.coordinates' => 'required|array',
'explanation' => 'required|string',
'category_id' => 'required|in:1,2,3',
'road_observed_id' => 'required_if:category_id,3|exists:road_observed,id',
];
}
public function after(): array
{
return [
function (Validator $validator) {
if ($this->type === 1){
$start = Carbon::parse($this->start_date);
$end = Carbon::parse($this->end_date);
if ($start->diffInMinutes($end) > 480 ){
$validator->errors()->add(
'end_date',
'مدت مأموریت روزانه نباید بیشتر از ۸ ساعت باشد.'
);
}
}
}
];
}
}

5
app/Models/Mission.php
View File

@@ -67,8 +67,9 @@ class Mission extends Model
'rahdar_id',
);
}
public function road_patrol():HasMany
public function roadObserved(): MorphToMany
{
return $this->hasMany(RoadPatrol::class);
return $this->morphToMany(RoadObserved::class, 'missionable');
}
}