From ab6d6f2cb0c23884219dcd2a38e66661bc06741d Mon Sep 17 00:00:00 2001 From: joddyabott Date: Mon, 4 Aug 2025 12:06:18 +0330 Subject: [PATCH] debug code --- .../V3/Dashboard/Harim/GeneralManagerController.php | 2 +- .../Controllers/V3/Dashboard/Harim/HarimOfficeController.php | 2 +- .../V3/Dashboard/Harim/ProvinceOfficeController.php | 2 +- .../V3/Dashboard/Harim/TechnicalDeputyController.php | 2 +- .../Requests/V3/Dashboard/Harim/Deputy/ConfirmRequest.php | 2 +- .../Requests/V3/Dashboard/Harim/Deputy/RejectRequest.php | 2 +- .../V3/Dashboard/Harim/GeneralManager/ConfirmRequest.php | 2 +- .../V3/Dashboard/Harim/GeneralManager/RejectRequest.php | 2 +- .../Requests/V3/Dashboard/Harim/HarimOffice/NoRequest.php | 2 +- .../Requests/V3/Dashboard/Harim/HarimOffice/YesRequest.php | 2 +- .../V3/Dashboard/Harim/ProvinceOffice/FeedBackRequest.php | 2 +- app/Models/Harim.php | 1 - database/factories/HarimFactory.php | 4 ++-- .../migrations/2025_07_30_153041_create_harims_table.php | 5 ++++- database/seeders/HarimStateSeeder.php | 2 +- 15 files changed, 18 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php b/app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php index 53b7ee9d..14bcd353 100644 --- a/app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php +++ b/app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php @@ -22,7 +22,7 @@ class GeneralManagerController extends Controller $user = auth()->user(); $query = Harim::query() ->where('state_id','=',HarimStates::Baresi_Imeni_Rah_Tavasot_Modir_Kol->value) - ->where('edare_shahri_id', '=', $user->edarate_shahri_id) + ->where('edareh_shahri_id', '=', $user->edarate_shahri_id) ->with('histories:expert_description'); $data = DataTableFacade::run( diff --git a/app/Http/Controllers/V3/Dashboard/Harim/HarimOfficeController.php b/app/Http/Controllers/V3/Dashboard/Harim/HarimOfficeController.php index 845feb18..5ffa40c6 100644 --- a/app/Http/Controllers/V3/Dashboard/Harim/HarimOfficeController.php +++ b/app/Http/Controllers/V3/Dashboard/Harim/HarimOfficeController.php @@ -23,7 +23,7 @@ class HarimOfficeController extends Controller $user = auth()->user(); $query = Harim::query() ->where('state_id','=',HarimStates::Baresi_Imeni_Rah_Tavasot_Daftar_Harim->value) - ->where('edare_shahri_id', '=', $user->edarate_shahri_id) + ->where('edareh_shahri_id', '=', $user->edarate_shahri_id) ->with('expert_description'); $data = DataTableFacade::run( $query, diff --git a/app/Http/Controllers/V3/Dashboard/Harim/ProvinceOfficeController.php b/app/Http/Controllers/V3/Dashboard/Harim/ProvinceOfficeController.php index 6953e132..0739cd31 100644 --- a/app/Http/Controllers/V3/Dashboard/Harim/ProvinceOfficeController.php +++ b/app/Http/Controllers/V3/Dashboard/Harim/ProvinceOfficeController.php @@ -22,7 +22,7 @@ class ProvinceOfficeController extends Controller $user = auth()->user(); $query = Harim::query() ->where('state_id','=',HarimStates::Baresi_Edare_Shahrestan->value) - ->where('edare_shahri_id', '=', $user->edarate_shahri_id); + ->where('edareh_shahri_id', '=', $user->edarate_shahri_id); $data = DataTableFacade::run( $query, diff --git a/app/Http/Controllers/V3/Dashboard/Harim/TechnicalDeputyController.php b/app/Http/Controllers/V3/Dashboard/Harim/TechnicalDeputyController.php index 43dc0bf3..f5c3099a 100644 --- a/app/Http/Controllers/V3/Dashboard/Harim/TechnicalDeputyController.php +++ b/app/Http/Controllers/V3/Dashboard/Harim/TechnicalDeputyController.php @@ -22,7 +22,7 @@ class TechnicalDeputyController extends Controller $user = auth()->user(); $query = Harim::query() ->where('state_id', '=', HarimStates::Baresi_Imeni_Rah_Tavasot_Moaven->value) - ->where('edare_shahri_id', '=', $user->edarate_shahri_id) + ->where('edareh_shahri_id', '=', $user->edarate_shahri_id) ->with('histories:expert_description'); $data = DataTableFacade::run( diff --git a/app/Http/Requests/V3/Dashboard/Harim/Deputy/ConfirmRequest.php b/app/Http/Requests/V3/Dashboard/Harim/Deputy/ConfirmRequest.php index e3cb82cb..3ac727b1 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/Deputy/ConfirmRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/Deputy/ConfirmRequest.php @@ -12,7 +12,7 @@ class ConfirmRequest extends FormRequest */ public function authorize(): bool { - return $this->harim->edare_shahri_id == auth()->user()->edarate_shahri_id && + return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id && $this->harim->state_id == HarimStates::Baresi_Imeni_Rah_Tavasot_Moaven->value; } diff --git a/app/Http/Requests/V3/Dashboard/Harim/Deputy/RejectRequest.php b/app/Http/Requests/V3/Dashboard/Harim/Deputy/RejectRequest.php index db73d533..b9dcf259 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/Deputy/RejectRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/Deputy/RejectRequest.php @@ -12,7 +12,7 @@ class RejectRequest extends FormRequest */ public function authorize(): bool { - return $this->harim->edare_shahri_id == auth()->user()->edarate_shahri_id && + return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id && $this->harim->state_id == HarimStates::Baresi_Imeni_Rah_Tavasot_Moaven->value; } diff --git a/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ConfirmRequest.php b/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ConfirmRequest.php index 5f93d671..145086b2 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ConfirmRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ConfirmRequest.php @@ -12,7 +12,7 @@ class ConfirmRequest extends FormRequest */ public function authorize(): bool { - return $this->harim->edare_shahri_id == auth()->user()->edarate_shahri_id && + return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id && $this->harim->state_id == HarimStates::Baresi_Imeni_Rah_Tavasot_Modir_Kol->value; } diff --git a/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/RejectRequest.php b/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/RejectRequest.php index 5a16c5b9..e81ecd88 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/RejectRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/RejectRequest.php @@ -12,7 +12,7 @@ class RejectRequest extends FormRequest */ public function authorize(): bool { - return $this->harim->edare_shahri_id == auth()->user()->edarate_shahri_id && + return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id && $this->harim->state_id == HarimStates::Baresi_Imeni_Rah_Tavasot_Modir_Kol->value; } /** diff --git a/app/Http/Requests/V3/Dashboard/Harim/HarimOffice/NoRequest.php b/app/Http/Requests/V3/Dashboard/Harim/HarimOffice/NoRequest.php index ad4b876b..ee6a53ce 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/HarimOffice/NoRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/HarimOffice/NoRequest.php @@ -12,7 +12,7 @@ class NoRequest extends FormRequest */ public function authorize(): bool { - return $this->harim->edare_shahri_id == auth()->user()->edarate_shahri_id && + return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id && $this->harim->state_id == HarimStates::Baresi_Imeni_Rah_Tavasot_Daftar_Harim->value; } diff --git a/app/Http/Requests/V3/Dashboard/Harim/HarimOffice/YesRequest.php b/app/Http/Requests/V3/Dashboard/Harim/HarimOffice/YesRequest.php index a61edd56..20b39e7e 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/HarimOffice/YesRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/HarimOffice/YesRequest.php @@ -12,7 +12,7 @@ class YesRequest extends FormRequest */ public function authorize(): bool { - return $this->harim->edare_shahri_id == auth()->user()->edarate_shahri_id && + return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id && $this->harim->state_id == HarimStates::Baresi_Imeni_Rah_Tavasot_Daftar_Harim->value; } diff --git a/app/Http/Requests/V3/Dashboard/Harim/ProvinceOffice/FeedBackRequest.php b/app/Http/Requests/V3/Dashboard/Harim/ProvinceOffice/FeedBackRequest.php index d9260edf..ce8b313d 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/ProvinceOffice/FeedBackRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/ProvinceOffice/FeedBackRequest.php @@ -12,7 +12,7 @@ class FeedBackRequest extends FormRequest */ public function authorize(): bool { - return $this->harim->edare_shahri_id == auth()->user()->edarate_shahri_id && + return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id && $this->harim->state_id == HarimStates::Baresi_Edare_Shahrestan->value; } diff --git a/app/Models/Harim.php b/app/Models/Harim.php index 655a7c84..b0e51a75 100644 --- a/app/Models/Harim.php +++ b/app/Models/Harim.php @@ -10,7 +10,6 @@ class Harim extends Model { use HasFactory; protected $guarded = []; - protected $table = 'harim'; public function histories(): HasMany { diff --git a/database/factories/HarimFactory.php b/database/factories/HarimFactory.php index 4748c539..428a416e 100644 --- a/database/factories/HarimFactory.php +++ b/database/factories/HarimFactory.php @@ -48,8 +48,8 @@ class HarimFactory extends Factory 'plan_group' => $this->faker->name, 'plan_title' => $this->faker->title, 'address' => $this->faker->address, - 'file' => $this->faker->file, - 'polygon' => $this->faker->numerify(), + 'file' => $this->faker->name, + 'polygon' => json_encode($this->faker->numerify()), ]; } } diff --git a/database/migrations/2025_07_30_153041_create_harims_table.php b/database/migrations/2025_07_30_153041_create_harims_table.php index 556bc2a5..231432fa 100644 --- a/database/migrations/2025_07_30_153041_create_harims_table.php +++ b/database/migrations/2025_07_30_153041_create_harims_table.php @@ -38,7 +38,10 @@ return new class extends Migration $table->string('plan_title'); $table->string('address'); $table->string('file'); - $table->polygon('polygon'); + $table->json('polygon'); + $table->boolean('need_road_access')->nullable(); + $table->integer('final_decision')->nullable(); + $table->string('final_description')->nullable(); $table->timestamps(); }); } diff --git a/database/seeders/HarimStateSeeder.php b/database/seeders/HarimStateSeeder.php index 96c414a2..ce564b4c 100644 --- a/database/seeders/HarimStateSeeder.php +++ b/database/seeders/HarimStateSeeder.php @@ -18,7 +18,7 @@ class HarimStateSeeder extends Seeder ['id' => 2, 'name' => 'در انتظار بررسی ایمنی راه توسط دفتر حریم', 'created_at' => now(), 'updated_at' => now(),], ['id' => 3, 'name' => 'در انتظار بررسی ایمنی راه توسط معاون', 'created_at' => now(), 'updated_at' => now(),], ['id' => 4, 'name' => 'در انتظار بررسی ایمنی راه توسط مدیر کل', 'created_at' => now(), 'updated_at' => now(),], - ['id' => 5, 'name' => 'رد به دلیل ایمنی راه', 'created_at' => now(), 'updated_at' => now(),], + ['id' => 5, 'name' => 'ارسال به پنجره واحد', 'created_at' => now(), 'updated_at' => now(),], ]); } }