diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php index af30d8e234..53a7c2b2e8 100755 --- a/app/Http/Controllers/AssetsController.php +++ b/app/Http/Controllers/AssetsController.php @@ -1425,7 +1425,8 @@ class AssetsController extends Controller 'location', 'image', 'status_label', - 'assigned_to' + 'assigned_to', + 'created_at' ]; $all_custom_fields=CustomField::all(); //used as a 'cache' of custom fields throughout this page load @@ -1506,6 +1507,7 @@ class AssetsController extends Controller 'order_number' => ($asset->order_number!='') ? ''.e($asset->order_number).'' : '', 'last_checkout' => ($asset->last_checkout!='') ? e($asset->last_checkout) : '', 'expected_checkin' => ($asset->expected_checkin!='') ? e($asset->expected_checkin) : '', + 'created_at' => ($asset->created_at!='') ? e($asset->created_at->format('F j, Y h:iA')) : '', 'change' => ($inout) ? $inout : '', 'actions' => ($actions) ? $actions : '', 'companyName' => is_null($asset->company) ? '' : e($asset->company->name) diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index 597cbc3b30..862ea632b0 100755 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -887,7 +887,7 @@ class UsersController extends Controller $allowed_columns = [ 'last_name','first_name','email','username','employee_num', - 'assets','accessories', 'consumables','licenses','groups','activated' + 'assets','accessories', 'consumables','licenses','groups','activated','created_at' ]; $sort = in_array($sort, $allowed_columns) ? $sort : 'first_name'; @@ -946,6 +946,7 @@ class UsersController extends Controller 'consumables' => $user->consumables->count(), 'groups' => $group_names, 'notes' => e($user->notes), + 'created_at' => ($user->created_at!='') ? e($user->created_at->format('F j, Y h:iA')) : '', 'activated' => ($user->activated=='1') ? '' : '', 'actions' => ($actions) ? $actions : '', 'companyName' => is_null($user->company) ? '' : e($user->company->name) diff --git a/resources/views/hardware/index.blade.php b/resources/views/hardware/index.blade.php index d0241f0500..bb5b25be45 100755 --- a/resources/views/hardware/index.blade.php +++ b/resources/views/hardware/index.blade.php @@ -92,6 +92,7 @@ {{$field->name}} @endforeach {{ trans('admin/hardware/table.change') }} + {{ trans('general.created_at') }} {{ trans('table.actions') }} diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 67bbca6348..cc8d565e83 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -249,6 +249,10 @@ {{ trans('admin/hardware/form.notes') }} {{ $asset->notes }} + + {{ trans('general.created_at') }} + {{ $asset->created_at->format('F j, Y h:iA') }} + diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index e420d2defb..bb9cec7f21 100755 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -99,6 +99,7 @@ {{ trans('general.groups') }} {{ trans('general.notes') }} {{ trans('general.activated') }} + {{ trans('general.created_at') }} {{ trans('table.actions') }} diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 30d0cd5b1f..0682b787d8 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -111,6 +111,10 @@ {{ $user->userloc->name }} @endif + + {{ trans('general.created_at') }} + {{ $user->created_at->format('F j, Y h:iA') }} +