This commit is contained in:
2025-02-25 15:58:46 +03:30
parent a47f4cac48
commit c4a50de162
4 changed files with 18 additions and 16 deletions

View File

@@ -66,11 +66,7 @@ class RoadObservationTableService
->whereNotNull('road_observeds.province_id')
->whereNotNull('status')
->leftJoin('edarate_shahri', 'road_observeds.edarate_shahri_id', '=', 'edarate_shahri.id')
->select($fields)
->addSelect([
DB::raw("CONCAT('https://rms.rmto.ir/', image_before) as image_before"),
DB::raw("CONCAT('https://rms.rmto.ir/', image_after) as image_after")
]);
->select($fields);
if ($user->hasPermissionTo('show-fast-react-province')) {
if (is_null($user->province_id)) {
@@ -101,7 +97,8 @@ class RoadObservationTableService
->whereNotNull('edarate_shahri_id')
->selectRaw('fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status,
status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng');
status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng'
);
}
elseif ($user->hasPermissionTo('show-fast-react-province')) {
@@ -115,7 +112,8 @@ class RoadObservationTableService
->where('road_observeds.province_id', '=', $user->province_id)
->selectRaw('fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status,
status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng');
status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng'
);
}
elseif ($user->hasPermissionTo('show-fast-react-edarate-shahri')) {
@@ -130,7 +128,8 @@ class RoadObservationTableService
->where('edarate_shahri_id', '=', $user->edarate_shahri_id)
->selectRaw('fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status,
status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng');
status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng'
);
}