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

create many to many relation between rahdaran and road item

Browse Source
This commit is contained in:
Witel Group
2024-12-19 08:15:40 +00:00
parent 549bd8ebe1
commit 767830cf47
7 changed files with 55 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Controllers/V3/RoadItemsProjectController.php
View File

@@ -50,14 +50,14 @@ class RoadItemsProjectController extends Controller
$query = null;
if ($user->hasPermissionTo('show-road-item-supervise-cartable')) {
$query = RoadItemsProject::query()->where('is_new', 1)->with('files');
$query = RoadItemsProject::query()->where('is_new', 1)->with('files', 'rahdaran:id,name,code');
}
elseif ($user->hasPermissionTo('show-road-item-supervise-cartable-province')) {
if (is_null($user->province_id)) {
return $this->errorResponse('استانی برای شما در سامانه ثبت نشده است!');
}
$query = RoadItemsProject::query()->where('is_new', 1)
->with('files')->where('province_id', auth()->user()->province_id);
->with('files', 'rahdaran:id,name,code')->where('province_id', auth()->user()->province_id);
}
$data = DataTableFacade::run(
@@ -154,7 +154,7 @@ class RoadItemsProjectController extends Controller
$allowedFilters = $columns;
$allowedSortings = $columns;
$query = RoadItemsProject::with('files')
$query = RoadItemsProject::with(['files', 'rahdaran:id,name,code'])
->where('is_new', 1)
->where('user_id', auth()->user()->id);
@@ -207,7 +207,6 @@ class RoadItemsProjectController extends Controller
$start_coordinates = explode(',', $request->start_point);
$end_coordinates = $info_item->needs_end_point ? explode(',', $request->end_point) : null;
$cmmsMachine = CMMSMachine::query()->find($request->cmms_machine_id);
$rahdar = Rahdaran::query()->find($request->rahdar_id);
$attributes = [
'start_lat' => $start_coordinates[0],
@@ -238,8 +237,6 @@ class RoadItemsProjectController extends Controller
'activity_time' => $request->activity_time,
'cmms_machine_id' => $cmmsMachine->id,
'cmms_machine_code' => $cmmsMachine->machine_code,
'rahdar_id' => $rahdar->id,
'rahdar_code' => $rahdar->code,
];
$after_image = ($request->has('after_image') && $info_item->needs_image) ?
@@ -252,6 +249,8 @@ class RoadItemsProjectController extends Controller
$road_item = RoadItemsProject::store($user, $attributes, $before_image, $after_image, $request->observed_item_id);
$road_item->rahdaran()->attach($request->rahdaran_id);
if ($road_item == -1) {
return response()->json([
'message' => 'اقدام مربوطه قبلا رسیدگی شده است.'
@@ -286,7 +285,6 @@ class RoadItemsProjectController extends Controller
}
$cmmsMachine = CMMSMachine::query()->find($request->cmms_machine_id);
$rahdar = Rahdaran::query()->find($request->rahdar_id);
if ($info_item->needs_image) {
if ($request->has('after_image')) {
@@ -324,10 +322,10 @@ class RoadItemsProjectController extends Controller
'status_fa' => 'در حال بررسی',
'cmms_machine_id' => $cmmsMachine->id,
'cmms_machine_code' => $cmmsMachine->machine_code,
'rahdar_id' => $rahdar->id,
'rahdar_code' => $rahdar->code,
]);
$roadItemsProject->rahdaran()->sync($request->rahdaran_id);
auth()->user()->addActivityComplete(1155);