From 8d861cfd82a5c6de8bdf1a1424bacdd09c2261aa Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Mon, 28 Nov 2022 10:59:18 -0800 Subject: [PATCH] adds age to the asset table --- app/Http/Transformers/AssetsTransformer.php | 2 ++ app/Presenters/AssetPresenter.php | 6 ++++++ resources/lang/en/general.php | 1 + 3 files changed, 9 insertions(+) diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php index 30744c92c0..97a5849444 100644 --- a/app/Http/Transformers/AssetsTransformer.php +++ b/app/Http/Transformers/AssetsTransformer.php @@ -7,6 +7,7 @@ use App\Models\Asset; use App\Models\Setting; use Gate; use Illuminate\Database\Eloquent\Collection; +use Carbon\Carbon; class AssetsTransformer { @@ -80,6 +81,7 @@ class AssetsTransformer 'next_audit_date' => Helper::getFormattedDateObject($asset->next_audit_date, 'date'), 'deleted_at' => Helper::getFormattedDateObject($asset->deleted_at, 'datetime'), 'purchase_date' => Helper::getFormattedDateObject($asset->purchase_date, 'date'), + 'age' => Carbon::parse($asset->purchase_date)->diff(Carbon::now())->format('%y years, %m months and %d days'), 'last_checkout' => Helper::getFormattedDateObject($asset->last_checkout, 'datetime'), 'expected_checkin' => Helper::getFormattedDateObject($asset->expected_checkin, 'date'), 'purchase_cost' => Helper::formatCurrencyOutput($asset->purchase_cost), diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php index bd03f29a17..5db653c7cb 100644 --- a/app/Presenters/AssetPresenter.php +++ b/app/Presenters/AssetPresenter.php @@ -140,6 +140,12 @@ class AssetPresenter extends Presenter 'visible' => false, 'title' => trans('general.purchase_date'), 'formatter' => 'dateDisplayFormatter', + ], [ + 'field' => 'age', + 'searchable' => true, + 'sortable' => true, + 'visible' => false, + 'title' => trans('general.age'), ], [ 'field' => 'purchase_cost', 'searchable' => true, diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index bcc08dafd4..f0b6a3f2cf 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -11,6 +11,7 @@ return [ 'admin' => 'Admin', 'administrator' => 'Administrator', 'add_seats' => 'Added seats', + 'age' => "Age", 'all_assets' => 'All Assets', 'all' => 'All', 'archived' => 'Archived',