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

add mission id to road item

Browse Source
This commit is contained in:
amirghasempoor
2025-06-16 12:06:35 +03:30
committed by joddyabott
parent c9cc74ec48
commit 6df79c320e
7 changed files with 161 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php Normal file
View File

@@ -0,0 +1,51 @@
<?php
namespace App\Http\Requests\V3\RoadItem\Operator;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
class StoreRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, ValidationRule|array|string>
*/
public function rules(): array
{
return [
'mission_id' => 'required|integer|exists:missions,id',
'start_point' => 'required',
'item_id' => 'required|integer',
'sub_item_id' => 'required|integer',
'amount' => 'required|numeric',
'observed_item_id' => 'integer|exists:observed_items,id',
'activity_date' => 'required|date_format:Y-m-d',
'activity_time' => 'required|date_format:H:i',
'before_image' => 'image|max:4096',
'after_image' => 'image|max:4096',
'machines_id' => 'required|array',
'machines_id.*' => 'required|exists:cmms_machines,id',
'rahdaran_id' => 'required|array',
'rahdaran_id.*' => 'required|exists:rahdaran,id',
];
}
public function attributes(): array
{
return [
'activity_date' => 'تاریخ فعالیت',
'activity_time' => 'ساعت فعالیت',
];
}
}

25
app/Http/Requests/V3/RoadItem/UpdateRequest.php → app/Http/Requests/V3/RoadItem/Operator/UpdateRequest.php
View File

@@ -1,13 +1,10 @@
<?php
namespace App\Http\Requests\V3\RoadItem;
namespace App\Http\Requests\V3\RoadItem\Operator;
use App\Models\InfoItem;
use App\Models\User;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
use Symfony\Component\Finder\Exception\AccessDeniedException;
class UpdateRequest extends FormRequest
{
@@ -16,19 +13,25 @@ class UpdateRequest extends FormRequest
*/
public function authorize(): bool
{
return !($this->roadItemsProject->user_id != auth()->user()->id || $this->roadItemsProject->status != 2);
return true;
}
/**
* 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
{
return [
'mission_id' => 'required|integer|exists:missions,id',
'start_point' => 'required',
'item_id' => 'required|integer',
'sub_item_id' => 'required|integer',
'amount' => 'required|numeric',
'observed_item_id' => 'integer|exists:observed_items,id',
'activity_date' => 'required|date_format:Y-m-d',
'activity_time' => 'required|date_format:H:i',
'before_image' => 'image|max:4096',
'after_image' => 'image|max:4096',
'machines_id' => 'required|array',
@@ -37,4 +40,12 @@ class UpdateRequest extends FormRequest
'rahdaran_id.*' => 'required|exists:rahdaran,id',
];
}
public function attributes(): array
{
return [
'activity_date' => 'تاریخ فعالیت',
'activity_time' => 'ساعت فعالیت',
];
}
}

77
app/Http/Requests/V3/RoadItem/StoreRequest.php
View File

@@ -1,77 +0,0 @@
<?php
namespace App\Http\Requests\V3\RoadItem;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Validator;
class StoreRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
*/
public function rules(): array
{
return [
'start_point' => 'required',
'item_id' => 'required|integer',
'sub_item_id' => 'required|integer',
'amount' => 'required|numeric',
'observed_item_id' => 'integer|exists:observed_items,id',
'activity_date' => 'required|date_format:Y-m-d',
'activity_time' => 'required|date_format:H:i',
'before_image' => 'image|max:4096',
'after_image' => 'image|max:4096',
'machines_id' => 'required|array',
'machines_id.*' => 'required|exists:cmms_machines,id',
'rahdaran_id' => 'required|array',
'rahdaran_id.*' => 'required|exists:rahdaran,id',
];
}
public function attributes(): array
{
return [
'activity_date' => 'تاریخ فعالیت',
'activity_time' => 'ساعت فعالیت',
];
}
// public function after(): array
// {
// return [
// function (Validator $validator) {
// if ($this->has(['item_id', 'sub_item_id'])) {
//
// $info_item = InfoItem::query()
// ->where('item', $this->item_id)
// ->where('sub_item', $this->sub_item_id)
// ->firstOrFail();
//
// if ($info_item->needs_end_point && !$this->filled('end_point')) {
// $validator->errors()->add('end_point', __('validation.required'));
// }
//
// if ($info_item->needs_image) {
// if (!$this->hasFile('before_image')) {
// $validator->errors()->add('before_image', __('validation.required'));
// }
// if (!$this->hasFile('after_image')) {
// $validator->errors()->add('after_image', __('validation.required'));
// }
// }
// }
// }
// ];
// }
}

35
app/Http/Requests/V3/RoadItem/VerifyBySupervisorRequest.php
View File

@@ -1,35 +0,0 @@
<?php
namespace App\Http\Requests\V3\RoadItem;
use App\Models\InfoItem;
use App\Models\User;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Gate;
use Illuminate\Validation\Rule;
use Symfony\Component\Finder\Exception\AccessDeniedException;
class VerifyBySupervisorRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return Gate::allows('gate-supervise-road-item', $this->roadItemsProject);
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
*/
public function rules(): array
{
return [
'verify' => 'required|in:1,2',
'description' => 'nullable|string',
];
}
}