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

create and fix code

Browse Source
This commit is contained in:
joddyabott
2025-09-08 14:10:03 +03:30
parent 755ab2f67b
commit 52cd049e89
13 changed files with 104 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Services/Cartables/RoadItem/SupervisorService.php
View File

@@ -20,15 +20,15 @@ class SupervisorService
if ($user->hasPermissionTo('show-road-item-supervise-cartable')) {
$query = RoadItemsProject::query()
->where('is_new', 1)
->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
->with('mission:id')
->where('is_new', 1);
}
elseif ($user->hasPermissionTo('show-road-item-supervise-cartable-province')) {
throw_if(is_null($user->province_id), new ProhibitedAction('استانی برای شما در سامانه ثبت نشده است!'));
$query = RoadItemsProject::query()
->with('mission:id')
->where('is_new', 1)
->where('province_id', auth()->user()->province_id)
->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
->where('province_id', auth()->user()->province_id);
}
return DataTableFacade::run(
@@ -39,7 +39,8 @@ class SupervisorService
allowedSelects: [
'id', 'province_fa', 'edarat_name', 'item', 'item_fa', 'sub_item',
'sub_item_fa', 'sub_item_data', 'unit_fa', 'start_lat', 'start_lng',
'end_lat', 'end_lng', 'activity_date_time', 'created_at', 'status_fa', 'status'
'end_lat', 'end_lng', 'activity_date_time', 'created_at', 'status_fa',
'status', 'mission_id'
]
);
}