diff --git a/app/Http/Controllers/V3/Azmayesh/AzmayeshController.php b/app/Http/Controllers/V3/Azmayesh/AzmayeshController.php index 83802ce4..fb3fd81b 100644 --- a/app/Http/Controllers/V3/Azmayesh/AzmayeshController.php +++ b/app/Http/Controllers/V3/Azmayesh/AzmayeshController.php @@ -84,6 +84,8 @@ class AzmayeshController extends Controller 'contract_subitem_id' => $request->contract_subitem_id ]); + $user->addActivityComplete(1158); + return $this->successResponse(); } @@ -122,6 +124,8 @@ class AzmayeshController extends Controller 'contract_subitem_id' => $request->contract_subitem_id ]); + auth()->user()->addActivityComplete(1159); + return $this->successResponse(); } @@ -133,6 +137,8 @@ class AzmayeshController extends Controller try { $azmayesh->delete(); + auth()->user()->addActivityComplete(1160); + return $this->successResponse(); } catch (QueryException $exception) { diff --git a/app/Http/Controllers/V3/Azmayesh/AzmayeshTypeController.php b/app/Http/Controllers/V3/Azmayesh/AzmayeshTypeController.php index 5fd99ad0..ec450099 100644 --- a/app/Http/Controllers/V3/Azmayesh/AzmayeshTypeController.php +++ b/app/Http/Controllers/V3/Azmayesh/AzmayeshTypeController.php @@ -67,6 +67,8 @@ class AzmayeshTypeController extends Controller } $azmayeshType->azmayeshFields()->attach($fieldsID); + + auth()->user()->addActivityComplete(1162); }); return $this->successResponse(); @@ -100,6 +102,8 @@ class AzmayeshTypeController extends Controller } $azmayeshType->azmayeshFields()->sync($fieldsID); + + auth()->user()->addActivityComplete(1163); }); return $this->successResponse(); @@ -113,6 +117,8 @@ class AzmayeshTypeController extends Controller try { $azmayeshType->delete(); + auth()->user()->addActivityComplete(1164); + return $this->successResponse(); } catch (QueryException $exception) { diff --git a/app/Http/Controllers/V3/ProfileController.php b/app/Http/Controllers/V3/ProfileController.php index b5841811..930a2f0a 100644 --- a/app/Http/Controllers/V3/ProfileController.php +++ b/app/Http/Controllers/V3/ProfileController.php @@ -81,7 +81,7 @@ class ProfileController extends Controller public function addActivity(Request $request): JsonResponse { - auth()->user()->addActivityComplete($request->query('activityCode')); + auth()->user()->addActivityComplete($request->activityCode); return $this->successResponse(); } } diff --git a/app/Http/Controllers/V3/RoadPatrolProjectController.php b/app/Http/Controllers/V3/RoadPatrolProjectController.php index 0ef03630..a66cf00a 100644 --- a/app/Http/Controllers/V3/RoadPatrolProjectController.php +++ b/app/Http/Controllers/V3/RoadPatrolProjectController.php @@ -197,8 +197,8 @@ class RoadPatrolProjectController extends Controller 'description' => $request->description ?? null, ]); - $road_patrol->rahdaran()->attach($request->rahdaran_id); - $road_patrol->cmmsMachines()->attach($request->machines_id); + $road_patrol->rahdaran()->attach($request->road_patrol_rahdaran_id); + $road_patrol->cmmsMachines()->attach($request->road_patrol_machines_id); if ($request->observed_items) { foreach ($request->observed_items as $index => $item) { @@ -294,8 +294,8 @@ class RoadPatrolProjectController extends Controller ], 400); } - $road_item->rahdaran()->attach($request->rahdaran_id); - $road_item->cmmsMachines()->attach($request->machines_id); + $road_item->rahdaran()->attach($item['road_item_rahdaran_id']); + $road_item->cmmsMachines()->attach($item['road_item_machines_id']); } } } diff --git a/app/Http/Requests/V3/RoadPatrolProject/StoreRequest.php b/app/Http/Requests/V3/RoadPatrolProject/StoreRequest.php index fcdb3d2a..8a71cb1b 100644 --- a/app/Http/Requests/V3/RoadPatrolProject/StoreRequest.php +++ b/app/Http/Requests/V3/RoadPatrolProject/StoreRequest.php @@ -41,16 +41,21 @@ class StoreRequest extends FormRequest // road item projects fields 'observed_items.*.start_point' => 'required', 'observed_items.*.end_point' => '', - 'observed_items.*.amount' => 'numeric|required_if:instant_action,1', + 'observed_items.*.amount' => 'numeric|required_if:observed_items.*.instant_action,1', 'observed_items.*.before_image' => 'image|max:4096', 'observed_items.*.after_image' => 'image|max:4096', - 'observed_items.*.priority' => 'integer|in:1,2,3|required_if:instant_action,0', - 'observed_items.*.priority_fa' => 'string|required_if:instant_action,0', + 'observed_items.*.priority' => 'integer|in:1,2,3|required_if:observed_items.*.instant_action,0', + 'observed_items.*.priority_fa' => 'string|required_if:observed_items.*.instant_action,0', 'description' => 'string|required_with:observed_items', - 'machines_id' => 'required|array', - 'machines_id.*' => 'required|exists:cmms_machines,id', - 'rahdaran_id' => 'required|array', - 'rahdaran_id.*' => 'required|exists:rahdaran,id', + 'road_patrol_machines_id' => 'required|array', + 'road_patrol_machines_id.*' => 'required|exists:cmms_machines,id', + 'road_patrol_rahdaran_id' => 'required|array', + 'road_patrol_rahdaran_id.*' => 'required|exists:rahdaran,id', + + 'observed_items.*.road_item_machines_id' => 'required_if:observed_items.*.instant_action,1|array', + 'observed_items.*.road_item_machines_id.*' => 'required_if:observed_items.*.instant_action,1|exists:cmms_machines,id', + 'observed_items.*.road_item_rahdaran_id' => 'required_if:observed_items.*.instant_action,1|array', + 'observed_items.*.road_item_rahdaran_id.*' => 'required_if:observed_items.*.instant_action,1|exists:rahdaran,id', ]; } diff --git a/storage/sql-files/log_lists.sql b/storage/sql-files/log_lists.sql index 97afa167..914b9823 100644 --- a/storage/sql-files/log_lists.sql +++ b/storage/sql-files/log_lists.sql @@ -149,3 +149,15 @@ INSERT INTO log_lists (description,log_unique_code,action_type,is_done) VALUES ('ثبت فعالیت روزانه','1154','action',0), ('حذف نگهداری و حریم','1155','action',0), ('ورود به نقشه نگهداری حریم','1156','show',1); +INSERT INTO log_lists (description,log_unique_code,action_type,is_done) VALUES + ('ورود به کارتابل آزمایشات','1157','action',0), + ('ثبت آزمایش','1158','action',0), + ('ویرایش آزمایش','1159','action',0), + ('حذف آزمایش','1160','action',0), + ('ورود به کارتابل نوع آزمایشات','1161','action',0), + ('ثبت نوع آزمایش','1162','action',0), + ('ویرایش نوع آزمایش','1163','action',0), + ('حذف نوع آزمایش','1164','action',0), + ('ثبت نمونه آزمایش','1165','action',0), + ('ویرایش نمونه آزمایش','1166','action',0), + ('حذف نمونه آزمایش','1167','action',0),