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

refactore the relation

Browse Source
This commit is contained in:
Witel Group
2024-12-22 12:55:55 +00:00
parent 945ac4269b
commit 7c63cc1e14
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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', 'rahdaran:id,name,code', 'cmmsMachine:id']);
$query = RoadItemsProject::query()->where('is_new', 1)->with(['files', 'rahdaran:id,name,code', 'cmmsMachine:id,machine_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', 'rahdaran:id,name,code', 'cmmsMachine:id'])->where('province_id', auth()->user()->province_id);
->with(['files', 'rahdaran:id,name,code', 'cmmsMachine:id,machine_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', 'rahdaran:id,name,code', 'cmmsMachine:id'])
$query = RoadItemsProject::with(['files', 'rahdaran:id,name,code', 'cmmsMachine:id,machine_code'])
->where('is_new', 1)
->where('user_id', auth()->user()->id);

2
app/Models/RoadItemsProject.php
View File

@@ -173,7 +173,7 @@ class RoadItemsProject extends Model
public function cmmsMachine(): HasOne
{
return $this->hasOne(CMMSMachine::class);
return $this->hasOne(CMMSMachine::class, 'id', 'cmms_machine_id');
}
public function rahdaran(): BelongsToMany