From 078e7281cdb990a5f2862625ab95b53fcfc1ac17 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Mon, 28 Nov 2022 10:45:58 -0800 Subject: [PATCH 1/4] adds asset age to asset view --- resources/views/hardware/view.blade.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 2093afecbc..8c2c58e9a7 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -495,6 +495,9 @@
{{ Helper::getFormattedDateObject($asset->purchase_date, 'date', false) }} + - + {{ Carbon::parse($asset->purchase_date)->diff(Carbon::now())->format('%y years, %m months and %d days')}} +
@endif From 8d861cfd82a5c6de8bdf1a1424bacdd09c2261aa Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Mon, 28 Nov 2022 10:59:18 -0800 Subject: [PATCH 2/4] 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', From 3206929ee4e28360fa4889b88bc1390fea74d5c5 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 29 Nov 2022 09:51:42 -0800 Subject: [PATCH 3/4] adds AgeFormatter, not working yet --- app/Helpers/Helper.php | 21 +++++++++++++++++++++ app/Http/Transformers/AssetsTransformer.php | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index cfb0aa9f15..1913c86286 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -12,6 +12,7 @@ use App\Models\Statuslabel; use Crypt; use Illuminate\Contracts\Encryption\DecryptException; use Image; +use Carbon\Carbon; class Helper { @@ -1125,5 +1126,25 @@ class Helper return $settings; } + public static function AgeFormat($date) { + $year = Carbon::parse($date) + ->diff(now())->y; + $month = Carbon::parse($date) + ->diff(now())->m; + $days = Carbon::parse($date) + ->diff(now())->d; + $age=''; + if ($year) { + $age .= $year.'y '; + } + if ($month) { + $age .= $month.'m '; + } + if ($days) { + $age .= $days.'d'; + } + return $age; + + } } diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php index 97a5849444..f3a4284a26 100644 --- a/app/Http/Transformers/AssetsTransformer.php +++ b/app/Http/Transformers/AssetsTransformer.php @@ -7,7 +7,7 @@ use App\Models\Asset; use App\Models\Setting; use Gate; use Illuminate\Database\Eloquent\Collection; -use Carbon\Carbon; + class AssetsTransformer { @@ -81,7 +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'), + 'age' => $asset->purchase_date ? Helper::AgeFormat($asset->purhcase_date) : '', 'last_checkout' => Helper::getFormattedDateObject($asset->last_checkout, 'datetime'), 'expected_checkin' => Helper::getFormattedDateObject($asset->expected_checkin, 'date'), 'purchase_cost' => Helper::formatCurrencyOutput($asset->purchase_cost), From fa872b09a907016cda4e28993495f0dc2d23f61d Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Mon, 12 Dec 2022 10:38:31 -0800 Subject: [PATCH 4/4] fixes a typo, the world is great again --- app/Http/Transformers/AssetsTransformer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php index f3a4284a26..2e9fc65beb 100644 --- a/app/Http/Transformers/AssetsTransformer.php +++ b/app/Http/Transformers/AssetsTransformer.php @@ -81,7 +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' => $asset->purchase_date ? Helper::AgeFormat($asset->purhcase_date) : '', + 'age' => $asset->purchase_date ? Helper::AgeFormat($asset->purchase_date) : '', 'last_checkout' => Helper::getFormattedDateObject($asset->last_checkout, 'datetime'), 'expected_checkin' => Helper::getFormattedDateObject($asset->expected_checkin, 'date'), 'purchase_cost' => Helper::formatCurrencyOutput($asset->purchase_cost),