From b5a4389815cb133e645cd0efe68a2f14df110202 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 28 Aug 2024 12:38:31 +0100 Subject: [PATCH 01/10] Added badge count, fixed model bulk edit menu Signed-off-by: snipe --- resources/views/depreciations/view.blade.php | 41 +++++++++++++++++--- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/resources/views/depreciations/view.blade.php b/resources/views/depreciations/view.blade.php index d075a31e9526..c836f86476a7 100644 --- a/resources/views/depreciations/view.blade.php +++ b/resources/views/depreciations/view.blade.php @@ -30,15 +30,38 @@
+
  • + + {{ trans('general.assets') }} + + {!! ($depreciation->assets()->AssetsForShow()->count() > 0 ) ? ''.number_format($depreciation->assets()->AssetsForShow()->count()).'' : '' !!} + +
    • +
  • + + {{ trans('general.licenses') }} + + {!! ($depreciation->licenses_count > 0 ) ? ''.number_format($depreciation->licenses_count).'' : '' !!} + +
    • +
  • + + {{ trans('general.asset_models') }} + + {!! ($depreciation->models_count > 0 ) ? ''.number_format($depreciation->models_count).'' : '' !!} + +
    • +
    + @include('partials.asset-bulk-actions', [ + 'id_divname' => 'assetsBulkEditToolbar', + 'id_formname' => 'assetsBulkForm', + 'id_button' => 'assetEditButton' + ]) 'POST', 'route' => ['models.bulkedit.index'], 'class' => 'form-inline', - 'id' => 'bulkForm'] + 'id' => 'bulkForm'] ) }}
    @@ -116,7 +143,7 @@ class="table table-striped snipe-table" - +
    @@ -134,6 +161,8 @@ class="table table-striped snipe-table" data-show-refresh="true" data-sort-order="asc" data-sort-name="name" + data-bulk-button-id="#AssetModelsBulkEditButton" + data-bulk-form-id="#bulkForm" class="table table-striped snipe-table" data-url="{{ route('api.models.index',['depreciation_id'=> $depreciation->id]) }}" data-export-options='{ From a5ff623484d066e7c29c0982a8e2df389142138c Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 28 Aug 2024 12:38:43 +0100 Subject: [PATCH 02/10] Added asset, license, model count to API Signed-off-by: snipe --- app/Presenters/DepreciationPresenter.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/app/Presenters/DepreciationPresenter.php b/app/Presenters/DepreciationPresenter.php index 9df1fe13222a..cfba53162340 100644 --- a/app/Presenters/DepreciationPresenter.php +++ b/app/Presenters/DepreciationPresenter.php @@ -46,6 +46,26 @@ public static function dataTableLayout() "title" => trans('admin/depreciations/table.depreciation_min'), "visible" => true, ], + [ + 'field' => 'assets_count', + 'searchable' => false, + 'sortable' => true, + 'title' => trans('general.assets'), + 'visible' => true, + ], + [ + 'field' => 'models_count', + 'searchable' => false, + 'sortable' => true, + 'title' => trans('general.asset_models'), + 'visible' => true, + ], [ + 'field' => 'licenses_count', + 'searchable' => false, + 'sortable' => true, + 'title' => trans('general.licenses'), + 'visible' => true, + ], [ 'field' => 'actions', 'searchable' => false, From eb5d93b3c2bf22d11063830771675c4f081eb516 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 28 Aug 2024 12:38:55 +0100 Subject: [PATCH 03/10] Added assets relationship Signed-off-by: snipe --- app/Models/Depreciation.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/Models/Depreciation.php b/app/Models/Depreciation.php index 9faa1b86e2d3..7aceddf7c461 100755 --- a/app/Models/Depreciation.php +++ b/app/Models/Depreciation.php @@ -75,4 +75,17 @@ public function licenses() { return $this->hasMany(\App\Models\License::class, 'depreciation_id'); } + + /** + * Establishes the depreciation -> assets relationship + * + * @author A. Gianotto + * @since [v5.0] + * @return \Illuminate\Database\Eloquent\Relations\Relation + */ + public function assets() + { + return $this->hasManyThrough(\App\Models\Asset::class, \App\Models\AssetModel::class, 'depreciation_id', 'model_id'); + } + } From 486cd8c8c98d4fb83f28d7f8ab32894bde93f68f Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 28 Aug 2024 12:39:09 +0100 Subject: [PATCH 04/10] Nicer formatting for searchableAttributes Signed-off-by: snipe --- app/Models/AssetModel.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/Models/AssetModel.php b/app/Models/AssetModel.php index 3c023507db2f..e9b859e12867 100755 --- a/app/Models/AssetModel.php +++ b/app/Models/AssetModel.php @@ -79,7 +79,12 @@ class AssetModel extends SnipeModel * * @var array */ - protected $searchableAttributes = ['name', 'model_number', 'notes', 'eol']; + protected $searchableAttributes = [ + 'name', + 'model_number', + 'notes', + 'eol' + ]; /** * The relations and their attributes that should be included when searching the model. From 385c4f69f7225a76bbd548ee8f34aaaf0908a4f5 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 28 Aug 2024 12:39:43 +0100 Subject: [PATCH 05/10] Added counts to depreciation transformer Signed-off-by: snipe --- app/Http/Transformers/DepreciationsTransformer.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Http/Transformers/DepreciationsTransformer.php b/app/Http/Transformers/DepreciationsTransformer.php index 87e2ddaca457..b3dc8c5aae22 100644 --- a/app/Http/Transformers/DepreciationsTransformer.php +++ b/app/Http/Transformers/DepreciationsTransformer.php @@ -28,6 +28,9 @@ public function transformDepreciation(Depreciation $depreciation) 'name' => e($depreciation->name), 'months' => $depreciation->months.' '.trans('general.months'), 'depreciation_min' => $depreciation->depreciation_type === 'percent' ? $depreciation->depreciation_min.'%' : $depreciation->depreciation_min, + 'assets_count' => $depreciation->assets_count, + 'models_count' => $depreciation->models_count, + 'licenses_count' => $depreciation->licenses_count, 'created_at' => Helper::getFormattedDateObject($depreciation->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($depreciation->updated_at, 'datetime') ]; From 63a05c89a72bb45d05c16350b9d710480fb1516f Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 28 Aug 2024 12:39:52 +0100 Subject: [PATCH 06/10] Added counts to show method Signed-off-by: snipe --- .../Controllers/DepreciationsController.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/DepreciationsController.php b/app/Http/Controllers/DepreciationsController.php index c564cc98f7fb..888f7a7e77f4 100755 --- a/app/Http/Controllers/DepreciationsController.php +++ b/app/Http/Controllers/DepreciationsController.php @@ -193,13 +193,20 @@ public function destroy($depreciationId) : RedirectResponse */ public function show($id) : View | RedirectResponse { - if (is_null($depreciation = Depreciation::find($id))) { - // Redirect to the blogs management page - return redirect()->route('depreciations.index')->with('error', trans('admin/depreciations/message.does_not_exist')); - } + $depreciation = Depreciation::withCount('assets as assets_count') + ->withCount('models as models_count') + ->withCount('licenses as licenses_count') + ->find($id); $this->authorize('view', $depreciation); - return view('depreciations/view', compact('depreciation')); + if ($depreciation) { + return view('depreciations/view', compact('depreciation')); + + } + + return redirect()->route('depreciations.index')->with('error', trans('admin/depreciations/message.does_not_exist')); + + } } From 4839181beb926bbed2ef357078ba0892340384c2 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 28 Aug 2024 12:40:01 +0100 Subject: [PATCH 07/10] Added counts to API Signed-off-by: snipe --- .../Api/DepreciationsController.php | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Api/DepreciationsController.php b/app/Http/Controllers/Api/DepreciationsController.php index 0209eae392f6..72e0f3a14a73 100644 --- a/app/Http/Controllers/Api/DepreciationsController.php +++ b/app/Http/Controllers/Api/DepreciationsController.php @@ -20,9 +20,22 @@ class DepreciationsController extends Controller public function index(Request $request) : JsonResponse | array { $this->authorize('view', Depreciation::class); - $allowed_columns = ['id','name','months','depreciation_min', 'depreciation_type','created_at']; - - $depreciations = Depreciation::select('id','name','months','depreciation_min','depreciation_type','user_id','created_at','updated_at'); + $allowed_columns = [ + 'id', + 'name', + 'months', + 'depreciation_min', + 'depreciation_type', + 'created_at', + 'assets_count', + 'models_count', + 'licenses_count', + ]; + + $depreciations = Depreciation::select('id','name','months','depreciation_min','depreciation_type','user_id','created_at','updated_at') + ->withCount('assets as assets_count') + ->withCount('models as models_count') + ->withCount('licenses as licenses_count'); if ($request->filled('search')) { $depreciations = $depreciations->TextSearch($request->input('search')); From c6ddc501c5b6f674c36363ccf301b584be817564 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 28 Aug 2024 12:40:12 +0100 Subject: [PATCH 08/10] Filter by depreciation_id Signed-off-by: snipe --- app/Http/Controllers/Api/AssetModelsController.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php index 835f4d22e00e..9f781934209f 100644 --- a/app/Http/Controllers/Api/AssetModelsController.php +++ b/app/Http/Controllers/Api/AssetModelsController.php @@ -78,6 +78,10 @@ public function index(Request $request) : JsonResponse | array $assetmodels = $assetmodels->where('models.category_id', '=', $request->input('category_id')); } + if ($request->filled('depreciation_id')) { + $assetmodels = $assetmodels->where('models.depreciation_id', '=', $request->input('depreciation_id')); + } + if ($request->filled('search')) { $assetmodels->TextSearch($request->input('search')); } From 406ff6984b7b0c41aff78f2534e76edbbe30b4b5 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 28 Aug 2024 12:42:23 +0100 Subject: [PATCH 09/10] Added click to select on models table Signed-off-by: snipe --- resources/views/depreciations/view.blade.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/views/depreciations/view.blade.php b/resources/views/depreciations/view.blade.php index c836f86476a7..b49bf0b9e156 100644 --- a/resources/views/depreciations/view.blade.php +++ b/resources/views/depreciations/view.blade.php @@ -163,6 +163,7 @@ class="table table-striped snipe-table" data-sort-name="name" data-bulk-button-id="#AssetModelsBulkEditButton" data-bulk-form-id="#bulkForm" + data-click-to-select="true" class="table table-striped snipe-table" data-url="{{ route('api.models.index',['depreciation_id'=> $depreciation->id]) }}" data-export-options='{ From d635c86e0096825f46993310facfba8b05a47822 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 28 Aug 2024 12:46:30 +0100 Subject: [PATCH 10/10] Added tests Signed-off-by: snipe --- .../Api/DepreciationsIndexTest.php | 17 ++++++++++++++ .../Ui/DepreciationsIndexTest.php | 23 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 tests/Feature/Depreciations/Api/DepreciationsIndexTest.php create mode 100644 tests/Feature/Depreciations/Ui/DepreciationsIndexTest.php diff --git a/tests/Feature/Depreciations/Api/DepreciationsIndexTest.php b/tests/Feature/Depreciations/Api/DepreciationsIndexTest.php new file mode 100644 index 000000000000..29583001ab3b --- /dev/null +++ b/tests/Feature/Depreciations/Api/DepreciationsIndexTest.php @@ -0,0 +1,17 @@ +actingAsForApi(User::factory()->create()) + ->getJson(route('api.departments.index')) + ->assertForbidden(); + } + +} diff --git a/tests/Feature/Depreciations/Ui/DepreciationsIndexTest.php b/tests/Feature/Depreciations/Ui/DepreciationsIndexTest.php new file mode 100644 index 000000000000..90cb39b4ee7c --- /dev/null +++ b/tests/Feature/Depreciations/Ui/DepreciationsIndexTest.php @@ -0,0 +1,23 @@ +actingAs(User::factory()->create()) + ->get(route('depreciations.index')) + ->assertForbidden(); + } + + public function testUserCanListDepreciations() + { + $this->actingAs(User::factory()->admin()->create()) + ->get(route('depreciations.index')) + ->assertOk(); + } +}