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

add cmms machine relation

Browse Source
This commit is contained in:
amirghasempoor
2024-12-22 15:21:57 +03:30
parent e2b95f45e5
commit 945ac4269b
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ class RoadItemsProjectController extends Controller
'sub_item_data', 'created_at', 'updated_at', 'province_id', 'province_fa',
'unit_fa', 'status', 'status_fa', 'supervisor_description', 'supervising_time',
'supervisor_name', 'edarat_id', 'edarat_name', 'activity_date_time',
'cmms_machine_id', 'cmms_machine_code'
'cmms_machine_code'
);
$allowedFilters = $columns;
@@ -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');
$query = RoadItemsProject::query()->where('is_new', 1)->with(['files', 'rahdaran:id,name,code', 'cmmsMachine:id']);
}
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')->where('province_id', auth()->user()->province_id);
->with(['files', 'rahdaran:id,name,code', 'cmmsMachine:id'])->where('province_id', auth()->user()->province_id);
}
$data = DataTableFacade::run(
@@ -148,13 +148,13 @@ class RoadItemsProjectController extends Controller
'sub_item_data', 'created_at', 'updated_at', 'province_id', 'province_fa',
'unit_fa', 'status', 'status_fa', 'supervisor_description', 'supervising_time',
'supervisor_name', 'edarat_id', 'edarat_name', 'activity_date_time',
'cmms_machine_id', 'cmms_machine_code'
'cmms_machine_code'
);
$allowedFilters = $columns;
$allowedSortings = $columns;
$query = RoadItemsProject::with(['files', 'rahdaran:id,name,code'])
$query = RoadItemsProject::with(['files', 'rahdaran:id,name,code', 'cmmsMachine:id'])
->where('is_new', 1)
->where('user_id', auth()->user()->id);

6
app/Models/RoadItemsProject.php
View File

@@ -3,6 +3,7 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Http\UploadedFile;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
@@ -170,6 +171,11 @@ class RoadItemsProject extends Model
}
}
public function cmmsMachine(): HasOne
{
return $this->hasOne(CMMSMachine::class);
}
public function rahdaran(): BelongsToMany
{
return $this->belongsToMany(Rahdaran::class,'rahdaran_road_items_project');