From 837fe127f55b925c07ae7a7db33b6dd424e7d517 Mon Sep 17 00:00:00 2001 From: ilmedova Date: Wed, 23 Nov 2022 16:56:31 +0500 Subject: [PATCH 1/5] json_decode test --- app/Http/Controllers/Admin/DocumentCrudController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/DocumentCrudController.php b/app/Http/Controllers/Admin/DocumentCrudController.php index 94eef172..5b311020 100755 --- a/app/Http/Controllers/Admin/DocumentCrudController.php +++ b/app/Http/Controllers/Admin/DocumentCrudController.php @@ -75,7 +75,7 @@ public function setup() return Country::all()->pluck('name', 'id')->toArray(); }, function($values) { //$values = is_array($values)?$values:array($values); - foreach (json_decode($values) as $key => $value) { + foreach (json_decode((string)$values) as $key => $value) { $this->crud->query = $this->crud->query->whereHas('countries', function ($query) use ($value) { $query->where('country_id', $value); }); From 4c3b0afe1faf854c82312efd6165f69afcf5897e Mon Sep 17 00:00:00 2001 From: ilmedova Date: Wed, 23 Nov 2022 16:59:16 +0500 Subject: [PATCH 2/5] implode array test --- app/Http/Controllers/Admin/DocumentCrudController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/DocumentCrudController.php b/app/Http/Controllers/Admin/DocumentCrudController.php index 5b311020..d1be7e53 100755 --- a/app/Http/Controllers/Admin/DocumentCrudController.php +++ b/app/Http/Controllers/Admin/DocumentCrudController.php @@ -75,7 +75,7 @@ public function setup() return Country::all()->pluck('name', 'id')->toArray(); }, function($values) { //$values = is_array($values)?$values:array($values); - foreach (json_decode((string)$values) as $key => $value) { + foreach (json_decode(implode($values)) as $key => $value) { $this->crud->query = $this->crud->query->whereHas('countries', function ($query) use ($value) { $query->where('country_id', $value); }); From 7d1a6e87c0c873b10695ba0a41e37cff5f26d4ff Mon Sep 17 00:00:00 2001 From: ilmedova Date: Wed, 23 Nov 2022 17:01:38 +0500 Subject: [PATCH 3/5] check if values are array --- .../Admin/DocumentCrudController.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Admin/DocumentCrudController.php b/app/Http/Controllers/Admin/DocumentCrudController.php index d1be7e53..32df0bbb 100755 --- a/app/Http/Controllers/Admin/DocumentCrudController.php +++ b/app/Http/Controllers/Admin/DocumentCrudController.php @@ -74,11 +74,19 @@ public function setup() ], function() { return Country::all()->pluck('name', 'id')->toArray(); }, function($values) { - //$values = is_array($values)?$values:array($values); - foreach (json_decode(implode($values)) as $key => $value) { - $this->crud->query = $this->crud->query->whereHas('countries', function ($query) use ($value) { - $query->where('country_id', $value); - }); + if(!is_array($values)){ + foreach (json_decode($values) as $key => $value) { + $this->crud->query = $this->crud->query->whereHas('countries', function ($query) use ($value) { + $query->where('country_id', $value); + }); + } + } + else{ + foreach ($values as $key => $value) { + $this->crud->query = $this->crud->query->whereHas('countries', function ($query) use ($value) { + $query->where('country_id', $value); + }); + } } }); } From 502b28fbc567fb540aa1589030624119f38145c0 Mon Sep 17 00:00:00 2001 From: ilmedova Date: Wed, 23 Nov 2022 17:05:48 +0500 Subject: [PATCH 4/5] state new fixed --- resources/views/vendor/backpack/base/dashboard.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/vendor/backpack/base/dashboard.blade.php b/resources/views/vendor/backpack/base/dashboard.blade.php index 7b8f3d6a..efe15d5b 100644 --- a/resources/views/vendor/backpack/base/dashboard.blade.php +++ b/resources/views/vendor/backpack/base/dashboard.blade.php @@ -139,7 +139,7 @@
-
{{ App\Models\Application::where('accepted_by', null)->orWhere('accepted_by', '')->where('state', 'applied')->count() }} @lang('app.dashboard.new')
+
{{ App\Models\Application::where('state', 'new')->orWhere('state', 'New')->count() }} @lang('app.dashboard.new')
@lang('app.dashboard.new_applications') From a2784d9df21a0d0eb835769e9fedb5b26de6921e Mon Sep 17 00:00:00 2001 From: ilmedova Date: Thu, 24 Nov 2022 15:28:34 +0500 Subject: [PATCH 5/5] check if record exists at import resolutionbasis --- .../Controllers/API/ContractController.php | 3 +- ...8_add_foreign_to_resolutionbasis_table.php | 32 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 database/migrations/2022_11_24_102558_add_foreign_to_resolutionbasis_table.php diff --git a/app/Http/Controllers/API/ContractController.php b/app/Http/Controllers/API/ContractController.php index b739dcbf..e95e870b 100644 --- a/app/Http/Controllers/API/ContractController.php +++ b/app/Http/Controllers/API/ContractController.php @@ -48,8 +48,9 @@ public function resolutionBasis(Request $request){ $resolution['department_id'] = $entry['Department_ID']; $resolution['resolution_id'] = $entry['Resolution_ID']; $resolution['resolutionbasis'] = $entry['ResolutionBasis']; + $resolution['foreign_id'] = $entry['ID']; - $res = Resolutionbasis::where('contract_id', $resolution['contract_id'])->first(); + $res = Resolutionbasis::where('foreign_id', $resolution['foreign_id'])->first(); if($res == null){ Resolutionbasis::create($resolution); } diff --git a/database/migrations/2022_11_24_102558_add_foreign_to_resolutionbasis_table.php b/database/migrations/2022_11_24_102558_add_foreign_to_resolutionbasis_table.php new file mode 100644 index 00000000..3273d10a --- /dev/null +++ b/database/migrations/2022_11_24_102558_add_foreign_to_resolutionbasis_table.php @@ -0,0 +1,32 @@ +bigInteger('foreign_id')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('resolutionbasis', function (Blueprint $table) { + // + }); + } +};