diff --git a/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php b/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php index f3272cf5..1629d876 100644 --- a/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php +++ b/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php @@ -63,12 +63,18 @@ class PanjareVahedController extends Controller 'province' => $city->province()->first()->name_fa, ]); } - public function getAccessRoad(GetAccessRoadRequest $request, Harim $harim) + public function getAccessRoad(GetAccessRoadRequest $request) { - Harim::update([ - 'panjarevahed_id' => $request->panjarevahed_id, - 'polygon' => $request->polygon, + $state = HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value; + + Harim::query() + ->firstWhere('panjare_vahed_id', '=', $request->panjare_vahed_id) + ->update([ + 'state_id' => $state, + 'state_name' => HarimStates::name($state), + 'access_road' => $request->access_road, ]); + return $this->successResponse(); } } diff --git a/app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php b/app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php index dc14f995..35344404 100644 --- a/app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php +++ b/app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php @@ -24,10 +24,7 @@ class RoadMaintenanceStationController extends Controller public function index(Request $request): JsonResponse { $user = auth()->user(); - auth()->user()->addActivityComplete(1019); - - $allowedFilters = ['*']; - $allowedSortings = ['*']; + $user->addActivityComplete(1019); $province = $request->province; $status = $request->status; @@ -38,15 +35,15 @@ class RoadMaintenanceStationController extends Controller ->when($type, fn ($query, $type) => $query->where('type', $type)) ->when($province, fn($query, $province) => $query->where('province_id', $province)); - if ($user->hasPermissionTo('show-tollhouse-province')) { + if ($user->hasPermissionTo('show-tollhouse-province') && !$user->hasPermissionTo('show-tollhouse')) { $query->where('province_id', $user->province_id); } $data = DataTableFacade::run( $query, $request, - allowedFilters: $allowedFilters, - allowedSortings: $allowedSortings + allowedFilters: ['*'], + allowedSortings: ['*'] ); diff --git a/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetAccessRoadRequest.php b/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetAccessRoadRequest.php index cc9a5dab..d10967e2 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetAccessRoadRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetAccessRoadRequest.php @@ -23,8 +23,8 @@ class GetAccessRoadRequest extends FormRequest public function rules(): array { return [ - 'panjarevahed_id'=> 'required|string', - 'polygon' => 'required|string', + 'panjare_vahed_id' => 'required|string', + 'access_road' => 'required', ]; } } diff --git a/app/Services/Cartables/SafetyAndPrivacy/OperatorService.php b/app/Services/Cartables/SafetyAndPrivacy/OperatorService.php index 81b2ce82..39b86060 100644 --- a/app/Services/Cartables/SafetyAndPrivacy/OperatorService.php +++ b/app/Services/Cartables/SafetyAndPrivacy/OperatorService.php @@ -90,7 +90,7 @@ class OperatorService return DB::select(" WITH edareh_data AS ( SELECT - e.id AS edareh_id, + e.id AS edare_id, a.id AS axis_type_id, COALESCE(SUM(t.step = 1), 0) AS s1, COALESCE(SUM(t.step = 2), 0) AS s2, @@ -105,21 +105,21 @@ class OperatorService GROUP BY e.id, a.id ) SELECT - edareh_id, + edare_id, axis_type_id, s1, s2, s3, COALESCE( SUM(s1 + s2 + s3) - OVER (PARTITION BY edareh_id), 0 + OVER (PARTITION BY edare_id), 0 ) AS total_sum FROM edareh_data UNION ALL SELECT - -1 AS edareh_id, + -1 AS edare_id, axis_type_id, COALESCE(SUM(s1), 0) AS s1, COALESCE(SUM(s2), 0) AS s2, @@ -130,7 +130,7 @@ class OperatorService FROM edareh_data GROUP BY axis_type_id - ORDER BY edareh_id , axis_type_id + ORDER BY edare_id , axis_type_id ", [ 'provinceId' => $province_id, 'infoId' => $info_id,