diff --git a/app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php b/app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php index fac204b1..fa18738d 100644 --- a/app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php +++ b/app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php @@ -37,7 +37,7 @@ class GeneralManagerController extends Controller $query = Harim::query() ->where('province_id', '=', auth()->user()->province_id) ->orderByRaw(" - CASE state + CASE state_id WHEN 4 THEN 1 WHEN 7 THEN 2 WHEN 15 THEN 3 diff --git a/app/Http/Controllers/V3/Dashboard/Harim/HarimOfficeController.php b/app/Http/Controllers/V3/Dashboard/Harim/HarimOfficeController.php index 0aa2b0ad..1978b02c 100644 --- a/app/Http/Controllers/V3/Dashboard/Harim/HarimOfficeController.php +++ b/app/Http/Controllers/V3/Dashboard/Harim/HarimOfficeController.php @@ -30,7 +30,7 @@ class HarimOfficeController extends Controller $query = Harim::query() ->where('province_id', '=', auth()->user()->province_id) ->orderByRaw(" - CASE state + CASE state_id WHEN 2 THEN 1 WHEN 5 THEN 2 WHEN 13 THEN 3 diff --git a/app/Http/Controllers/V3/Dashboard/Harim/ProvinceOfficeController.php b/app/Http/Controllers/V3/Dashboard/Harim/ProvinceOfficeController.php index 6a3af315..ac05c5c9 100644 --- a/app/Http/Controllers/V3/Dashboard/Harim/ProvinceOfficeController.php +++ b/app/Http/Controllers/V3/Dashboard/Harim/ProvinceOfficeController.php @@ -24,7 +24,7 @@ class ProvinceOfficeController extends Controller $query = Harim::query() ->where('edareh_shahri_id', '=', $user->edarate_shahri_id) ->orderByRaw(" - CASE state + CASE state_id WHEN 1 THEN 1 ELSE 2 END diff --git a/app/Http/Controllers/V3/Dashboard/Harim/TechnicalDeputyController.php b/app/Http/Controllers/V3/Dashboard/Harim/TechnicalDeputyController.php index 52ba8c02..87fee162 100644 --- a/app/Http/Controllers/V3/Dashboard/Harim/TechnicalDeputyController.php +++ b/app/Http/Controllers/V3/Dashboard/Harim/TechnicalDeputyController.php @@ -28,7 +28,7 @@ class TechnicalDeputyController extends Controller $query = Harim::query() ->where('province_id', '=', auth()->user()->province_id) ->orderByRaw(" - CASE state + CASE state_id WHEN 3 THEN 1 WHEN 6 THEN 2 WHEN 14 THEN 3 diff --git a/app/Models/Harim.php b/app/Models/Harim.php index 95f97ebf..aa5a1e41 100644 --- a/app/Models/Harim.php +++ b/app/Models/Harim.php @@ -69,4 +69,25 @@ class Harim extends Model ->latestOfMany() ->value('expert_description'); } + + protected function forbiddenArea(): Attribute + { + return Attribute::make( + get: fn($value) => json_decode($value) + ); + } + + protected function finalArea(): Attribute + { + return Attribute::make( + get: fn($value) => json_decode($value) + ); + } + + protected function finalPlan(): Attribute + { + return Attribute::make( + get: fn($value) => json_decode($value) + ); + } }