lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #11608 from snipe/features/add_time_diff_to_eol

Browse source 
Added time diff to EOL in asset view
This commit is contained in:
snipe 2022-08-02 19:40:10 -07:00 • committed by GitHub
commit 5fe8db541e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/ReportsController.php
View file

@ -789,7 +789,7 @@ class ReportsController extends Controller
if ($request->filled('warranty')) { if ($request->filled('warranty')) {
$row[] = ($asset->warranty_months) ? $asset->warranty_months : ''; $row[] = ($asset->warranty_months) ? $asset->warranty_months : '';
$row[] = $asset->present()->warrantee_expires(); $row[] = $asset->present()->warranty_expires();
} }
if ($request->filled('depreciation')) { if ($request->filled('depreciation')) {

4
app/Presenters/AssetPresenter.php
View file

@ -498,10 +498,10 @@ class AssetPresenter extends Presenter
} }
/** /**
* Date the warantee expires. * Date the warranty expires.
* @return false|string * @return false|string
*/ */
public function warrantee_expires() public function warranty_expires()
{ {
if (($this->purchase_date) && ($this->warranty_months)) { if (($this->purchase_date) && ($this->warranty_months)) {
$date = date_create($this->purchase_date); $date = date_create($this->purchase_date);

2
app/Presenters/DepreciationReportPresenter.php
View file

@ -371,7 +371,7 @@ class DepreciationReportPresenter extends Presenter
* Date the warantee expires. * Date the warantee expires.
* @return false|string * @return false|string
*/ */
public function warrantee_expires() public function warranty_expires()
{ {
if (($this->purchase_date) && ($this->warranty_months)) { if (($this->purchase_date) && ($this->warranty_months)) {
$date = date_create($this->purchase_date); $date = date_create($this->purchase_date);

49
resources/views/hardware/view.blade.php
View file

@ -574,7 +574,7 @@
@if ($asset->warranty_months) @if ($asset->warranty_months)
<div class="row{!! $asset->present()->warrantee_expires() < date("Y-m-d") ? ' warning' : '' !!}"> <div class="row">
<div class="col-md-2"> <div class="col-md-2">
<strong> <strong>
{{ trans('admin/hardware/form.warranty') }} {{ trans('admin/hardware/form.warranty') }}
@ -584,10 +584,26 @@
{{ $asset->warranty_months }} {{ $asset->warranty_months }}
{{ trans('admin/hardware/form.months') }} {{ trans('admin/hardware/form.months') }}
({{ trans('admin/hardware/form.expires') }}
{{ $asset->present()->warrantee_expires() }})
</div> </div>
</div> </div>
<div class="row">
<div class="col-md-2">
<strong>
{{ trans('admin/hardware/form.warranty_expires') }}
{!! $asset->present()->warranty_expires() < date("Y-m-d") ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
</strong>
</div>
<div class="col-md-6">
{{ Helper::getFormattedDateObject($asset->present()->warranty_expires(), 'date', false) }}
-
{{ Carbon::parse($asset->present()->warranty_expires())->diffForHumans() }}
</div>
</div>
@endif @endif
@if (($asset->model) && ($asset->depreciation)) @if (($asset->model) && ($asset->depreciation))
@ -600,8 +616,7 @@
<div class="col-md-6"> <div class="col-md-6">
{{ $asset->depreciation->name }} {{ $asset->depreciation->name }}
({{ $asset->depreciation->months }} ({{ $asset->depreciation->months }}
{{ trans('admin/hardware/form.months') }} {{ trans('admin/hardware/form.months') }})
)
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@ -611,13 +626,10 @@
</strong> </strong>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
@if ($asset->time_until_depreciated()->y > 0) {{ Helper::getFormattedDateObject($asset->depreciated_date()->format('Y-m-d'), 'date', false) }}
{{ $asset->time_until_depreciated()->y }} -
{{ trans('admin/hardware/form.years') }}, {{ Carbon::parse($asset->depreciated_date())->diffForHumans() }}
@endif
{{ $asset->time_until_depreciated()->m }}
{{ trans('admin/hardware/form.months') }}
({{ $asset->depreciated_date()->format('Y-m-d') }})
</div> </div>
</div> </div>
@endif @endif
@ -644,19 +656,8 @@
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
{{ Helper::getFormattedDateObject($asset->present()->eol_date(), 'date', false) }} {{ Helper::getFormattedDateObject($asset->present()->eol_date(), 'date', false) }}
@if ($asset->present()->months_until_eol())
- -
@if ($asset->present()->months_until_eol()->y > 0) {{ Carbon::parse($asset->present()->eol_date())->diffForHumans() }}
{{ $asset->present()->months_until_eol()->y }}
{{ trans('general.years') }},
@endif
{{ $asset->present()->months_until_eol()->m }}
{{ trans('general.months') }}
@endif
</div> </div>
</div> </div>

4
resources/views/notifications/markdown/report-expiring-assets.blade.php
View file

@ -6,8 +6,8 @@
<tr><td>&nbsp;</td><td>{{ trans('mail.name') }}</td><td>{{ trans('mail.Days') }}</td><td>{{ trans('mail.expires') }}</td><td>{{ trans('mail.supplier') }}</td><td>{{ trans('mail.assigned_to') }}</td></tr> <tr><td>&nbsp;</td><td>{{ trans('mail.name') }}</td><td>{{ trans('mail.Days') }}</td><td>{{ trans('mail.expires') }}</td><td>{{ trans('mail.supplier') }}</td><td>{{ trans('mail.assigned_to') }}</td></tr>
@foreach ($assets as $asset) @foreach ($assets as $asset)
@php @php
$expires = Helper::getFormattedDateObject($asset->present()->warrantee_expires, 'date'); $expires = Helper::getFormattedDateObject($asset->present()->warranty_expires, 'date');
$diff = round(abs(strtotime($asset->present()->warrantee_expires) - strtotime(date('Y-m-d')))/86400); $diff = round(abs(strtotime($asset->present()->warranty_expires) - strtotime(date('Y-m-d')))/86400);
$icon = ($diff <= ($threshold / 2)) ? '🚨' : (($diff <= $threshold) ? '⚠️' : ' '); $icon = ($diff <= ($threshold / 2)) ? '🚨' : (($diff <= $threshold) ? '⚠️' : ' ');
@endphp @endphp
<tr><td>{{ $icon }} </td><td> <a href="{{ route('hardware.show', $asset->id) }}">{{ $asset->present()->name }}</a> </td><td> {{ $diff }} {{ trans('mail.Days') }} </td><td> {{ $expires['formatted'] }} </td><td> {{ ($asset->supplier ? e($asset->supplier->name) : '') }} </td><td> {{ ($asset->assignedTo ? e($asset->assignedTo->present()->name()) : '') }} </td></tr> <tr><td>{{ $icon }} </td><td> <a href="{{ route('hardware.show', $asset->id) }}">{{ $asset->present()->name }}</a> </td><td> {{ $diff }} {{ trans('mail.Days') }} </td><td> {{ $expires['formatted'] }} </td><td> {{ ($asset->supplier ? e($asset->supplier->name) : '') }} </td><td> {{ ($asset->assignedTo ? e($asset->assignedTo->present()->name()) : '') }} </td></tr>