add activity for azmayesh

This commit is contained in:
2024-12-31 11:11:12 +03:30
parent 7d874adc8a
commit b507e706d0
6 changed files with 41 additions and 12 deletions

View File

@@ -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) {

View File

@@ -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) {

View File

@@ -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();
}
}

View File

@@ -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']);
}
}
}

View File

@@ -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',
];
}