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

prefix some item

Browse Source
This commit is contained in:
joddyabott
2025-05-31 15:23:37 +03:30
parent e50b9e1113
commit da26d28396
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Services/Cartables/RoadObservation/OperatorService.php
View File

@@ -27,14 +27,14 @@ class OperatorService
->whereNotNull('road_observeds.province_id') ->whereNotNull('road_observeds.province_id')
->whereNotNull('status') ->whereNotNull('status')
->leftJoin('edarate_shahri', 'road_observeds.edarate_shahri_id', '=', 'edarate_shahri.id') ->leftJoin('edarate_shahri', 'road_observeds.edarate_shahri_id', '=', 'edarate_shahri.id')
->where('edarate_shahri_id', $user->edarate_shahri_id) ->where('edarate_shahri_id', $user->edarate_shahri_id);
->select($fields);
return DataTableFacade::run( return DataTableFacade::run(
$query, $query,
$request, $request,
allowedFilters: ['*'], allowedFilters: ['*'],
allowedSortings: ['*']); allowedSortings: ['*'],
allowedSelects: $fields);
} }
/** /**
@@ -44,9 +44,10 @@ class OperatorService
{ {
$user = auth()->user(); $user = auth()->user();
$fields = ['fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms, StartTime_DateTime, $fields = ['fk_RegisteredEventMessage', 'road_observeds.id', 'Title', 'FeatureTypeTitle', 'MobileForSendEventSms', 'StartTime_DateTime',
road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status, edarate_shahri_id, 'road_observeds.created_at', 'rms_last_activity', 'rms_last_activity_fa', 'status', 'edarate_shahri_id',
status_fa, supervisor_description, rms_description, province_fa, city_id, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng']; 'status_fa', 'supervisor_description', 'rms_description', 'province_fa', 'city_id', 'city_fa', 'Description',
'edarate_shahri.name_fa as edarate_shahri_name_fa', 'lat', 'lng'];
if ($user->hasPermissionTo('show-fast-react')) { if ($user->hasPermissionTo('show-fast-react')) {
$query = RoadObserved::query()->leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id') $query = RoadObserved::query()->leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id')