DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed #5872 - asset maintenances listing showing created_at instead of start_date

Browse source
This commit is contained in:
snipe 2018-07-18 02:24:53 -07:00
parent cf03d25934
commit 027edbdb21
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Transformers/AssetMaintenancesTransformer.php
View file

@ -38,9 +38,9 @@ class AssetMaintenancesTransformer
'supplier' => ($assetmaintenance->supplier) ? ['id' => $assetmaintenance->supplier->id,'name'=> e($assetmaintenance->supplier->name)] : null,
'cost' => Helper::formatCurrencyOutput($assetmaintenance->cost),
'asset_maintenance_type' => e($assetmaintenance->asset_maintenance_type),
'start_date' => Helper::getFormattedDateObject($assetmaintenance->start_date, 'datetime'),
'start_date' => Helper::getFormattedDateObject($assetmaintenance->start_date, 'date'),
'asset_maintenance_time' => $assetmaintenance->asset_maintenance_time,
'completion_date' => Helper::getFormattedDateObject($assetmaintenance->completion_date, 'datetime'),
'completion_date' => Helper::getFormattedDateObject($assetmaintenance->completion_date, 'date'),
'user_id' => ($assetmaintenance->admin) ? ['id' => $assetmaintenance->admin->id,'name'=> e($assetmaintenance->admin->getFullNameAttribute())] : null,
'created_at' => Helper::getFormattedDateObject($assetmaintenance->created_at, 'datetime'),
'updated_at' => Helper::getFormattedDateObject($assetmaintenance->updated_at, 'datetime'),

2
app/Presenters/AssetMaintenancesPresenter.php
View file

@ -70,7 +70,7 @@ class AssetMaintenancesPresenter extends Presenter
"sortable" => true,
"title" => trans('admin/asset_maintenances/form.title'),
], [
"field" => "created_at",
"field" => "start_date",
"searchable" => true,
"sortable" => true,
"title" => trans('admin/asset_maintenances/form.start_date'),