From 03f9d01aab5ec8eb7a32703677eab1be131f09d8 Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 29 Jul 2017 17:01:03 -0700 Subject: [PATCH] Fixes #3775 - added missing created_at and updated_at fields --- .../Controllers/Api/DepartmentsController.php | 4 ++- app/Http/Controllers/Api/GroupsController.php | 2 +- .../Controllers/Api/SuppliersController.php | 2 +- .../Transformers/AssetModelsTransformer.php | 25 +++++++++++++++---- .../Transformers/CustomFieldsTransformer.php | 4 ++- .../CustomFieldsetsTransformer.php | 4 ++- 6 files changed, 31 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/Api/DepartmentsController.php b/app/Http/Controllers/Api/DepartmentsController.php index 47c14c4906..eeb0fc6eac 100644 --- a/app/Http/Controllers/Api/DepartmentsController.php +++ b/app/Http/Controllers/Api/DepartmentsController.php @@ -28,7 +28,9 @@ class DepartmentsController extends Controller 'name', 'location_id', 'company_id', - 'manager_id' + 'manager_id', + 'created_at', + 'updated_at' ])->with('users')->with('location')->with('manager')->with('company')->withCount('users'); if ($request->has('search')) { diff --git a/app/Http/Controllers/Api/GroupsController.php b/app/Http/Controllers/Api/GroupsController.php index cde7b21e9b..a821b57cef 100644 --- a/app/Http/Controllers/Api/GroupsController.php +++ b/app/Http/Controllers/Api/GroupsController.php @@ -22,7 +22,7 @@ class GroupsController extends Controller $this->authorize('view', Group::class); $allowed_columns = ['id','name','created_at']; - $groups = Group::select('id','name','permissions')->withCount('users'); + $groups = Group::select('id','name','permissions','created_at','updated_at')->withCount('users'); if ($request->has('search')) { $groups = $groups->TextSearch($request->input('search')); diff --git a/app/Http/Controllers/Api/SuppliersController.php b/app/Http/Controllers/Api/SuppliersController.php index b88c8fd82e..22f35f47de 100644 --- a/app/Http/Controllers/Api/SuppliersController.php +++ b/app/Http/Controllers/Api/SuppliersController.php @@ -23,7 +23,7 @@ class SuppliersController extends Controller $allowed_columns = ['id','name','address','phone','contact','fax','email']; $suppliers = Supplier::select( - array('id','name','address','address2','city','state','country','fax', 'phone','email','contact') + array('id','name','address','address2','city','state','country','fax', 'phone','email','contact','created_at','updated_at','deleted_at') )->withCount('assets')->withCount('licenses')->whereNull('deleted_at'); diff --git a/app/Http/Transformers/AssetModelsTransformer.php b/app/Http/Transformers/AssetModelsTransformer.php index f1a8867923..2b06e6c0be 100644 --- a/app/Http/Transformers/AssetModelsTransformer.php +++ b/app/Http/Transformers/AssetModelsTransformer.php @@ -4,6 +4,7 @@ namespace App\Http\Transformers; use App\Models\AssetModel; use Illuminate\Database\Eloquent\Collection; use Gate; +use App\Helpers\Helper; class AssetModelsTransformer { @@ -23,15 +24,29 @@ class AssetModelsTransformer $array = [ 'id' => (int) $assetmodel->id, 'name' => e($assetmodel->name), - 'manufacturer' => ($assetmodel->manufacturer_id) ? $assetmodel->manufacturer : null, + 'manufacturer' => ($assetmodel->manufacturer) ? [ + 'id' => (int) $assetmodel->manufacturer->id, + 'name'=> e($assetmodel->manufacturer->name) + ] : null, 'image' => ($assetmodel->image!='') ? url('/').'/uploads/models/'.e($assetmodel->image) : null, 'model_number' => e($assetmodel->model_number), - 'depreciation' => ($assetmodel->depreciation) ? $assetmodel->depreciation : 'No', + 'depreciation' => ($assetmodel->depreciation) ? [ + 'id' => (int) $assetmodel->depreciation->id, + 'name'=> e($assetmodel->depreciation->name) + ] : null, 'assets_count' => $assetmodel->assets_count, - 'category' => ($assetmodel->category_id) ? $assetmodel->category : null, - 'fieldset' => ($assetmodel->fieldset) ? $assetmodel->fieldset : null, + 'category' => ($assetmodel->category) ? [ + 'id' => (int) $assetmodel->category->id, + 'name'=> e($assetmodel->category->name) + ] : null, + 'fieldset' => ($assetmodel->fieldset) ? [ + 'id' => (int) $assetmodel->fieldset->id, + 'name'=> e($assetmodel->fieldset->name) + ] : null, 'eol' => ($assetmodel->eol > 0) ? $assetmodel->eol .' months': 'None', - 'notes' => e($assetmodel->notes) + 'notes' => e($assetmodel->notes), + 'created_at' => Helper::getFormattedDateObject($assetmodel->created_at, 'datetime'), + 'updated_at' => Helper::getFormattedDateObject($assetmodel->updated_at, 'datetime'), ]; diff --git a/app/Http/Transformers/CustomFieldsTransformer.php b/app/Http/Transformers/CustomFieldsTransformer.php index f9c423f26f..06c28aeed3 100644 --- a/app/Http/Transformers/CustomFieldsTransformer.php +++ b/app/Http/Transformers/CustomFieldsTransformer.php @@ -25,7 +25,9 @@ class CustomFieldsTransformer 'name' => e($field->name), 'db_column_name' => e($field->db_column_name()), 'format' => e($field->format), - 'required' => $field->pivot->required + 'required' => $field->pivot->required, + 'created_at' => Helper::getFormattedDateObject($field->created_at, 'datetime'), + 'updated_at' => Helper::getFormattedDateObject($field->updated_at, 'datetime'), ]; return $array; } diff --git a/app/Http/Transformers/CustomFieldsetsTransformer.php b/app/Http/Transformers/CustomFieldsetsTransformer.php index 8076863184..040931b5e7 100644 --- a/app/Http/Transformers/CustomFieldsetsTransformer.php +++ b/app/Http/Transformers/CustomFieldsetsTransformer.php @@ -38,7 +38,9 @@ class CustomFieldsetsTransformer 'id' => (int) $fieldset->id, 'name' => e($fieldset->name), 'fields' => (new CustomFieldsTransformer)->transformCustomFields($fields, $fieldset->fields_count), - 'models' => (new DatatablesTransformer)->transformDatatables($modelsArray, $fieldset->models_count) + 'models' => (new DatatablesTransformer)->transformDatatables($modelsArray, $fieldset->models_count), + 'created_at' => Helper::getFormattedDateObject($fieldset->created_at, 'datetime'), + 'updated_at' => Helper::getFormattedDateObject($fieldset->updated_at, 'datetime'), ]; return $array; }