From 4557502b1d4b3cd3ca7f7943ae3f9813c00a5f59 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 17 Jul 2015 14:15:08 -0700 Subject: [PATCH 1/5] Added notes/order number to controller --- app/controllers/admin/AssetsController.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index df71ba4ee1..aceaad06fc 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -998,7 +998,7 @@ class AssetsController extends AdminController public function getDatatable($status = null) { - $assets = Asset::with('model','assigneduser','assigneduser.userloc','assetstatus','defaultLoc','assetlog','model','model.category')->Hardware()->select(array('id', 'name','model_id','assigned_to','asset_tag','serial','status_id','purchase_date','deleted_at','rtd_location_id')); + $assets = Asset::with('model','assigneduser','assigneduser.userloc','assetstatus','defaultLoc','assetlog','model','model.category')->Hardware()->select(array('id', 'name','model_id','assigned_to','asset_tag','serial','status_id','purchase_date','deleted_at','rtd_location_id','notes','order_number')); switch ($status) { @@ -1108,6 +1108,16 @@ class AssetsController extends AdminController return $assets->eol_date(); }) + ->addColumn('order_number',function($assets) + { + return $assets->order_number; + }) + + ->addColumn('notes',function($assets) + { + return $assets->notes; + }) + ->addColumn('checkout_date',function($assets) { @@ -1118,8 +1128,8 @@ class AssetsController extends AdminController }) ->addColumn($inout) ->addColumn($actions) - ->searchColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date', 'inout','category') - ->orderColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date', 'inout') + ->searchColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date', 'inout','category','notes','order_number') + ->orderColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date', 'inout','notes','order_number') ->make(); } From 38c9d8d6caf9c3b19496dcbaaa6466f8599edaf3 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 17 Jul 2015 14:18:08 -0700 Subject: [PATCH 2/5] Added notes/order number to asset view --- app/controllers/admin/AssetsController.php | 13 +++++----- app/views/backend/hardware/index.blade.php | 30 ++++++++++++---------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index aceaad06fc..5ac3af02a1 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -1108,16 +1108,15 @@ class AssetsController extends AdminController return $assets->eol_date(); }) + ->addColumn('notes',function($assets) + { + return $assets->notes; + }) + ->addColumn('order_number',function($assets) { return $assets->order_number; - }) - - ->addColumn('notes',function($assets) - { - return $assets->notes; - }) - + }) ->addColumn('checkout_date',function($assets) { diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php index 4be4f6a11c..c1b58d314a 100755 --- a/app/views/backend/hardware/index.blade.php +++ b/app/views/backend/hardware/index.blade.php @@ -1,7 +1,7 @@ @extends('backend/layouts/default') @section('title0') - + @if (Input::get('status')) @if (Input::get('status')=='Pending') @lang('general.pending') @@ -57,16 +57,18 @@ {{ Datatable::table() - ->addColumn('',Lang::get('admin/hardware/form.name'), - Lang::get('admin/hardware/table.asset_tag'), + ->addColumn('
',Lang::get('admin/hardware/form.name'), + Lang::get('admin/hardware/table.asset_tag'), Lang::get('admin/hardware/table.serial'), Lang::get('admin/hardware/form.model'), Lang::get('admin/hardware/table.status'), Lang::get('admin/hardware/table.location'), Lang::get('general.category'), Lang::get('admin/hardware/table.eol'), - Lang::get('admin/hardware/table.checkout_date'), - Lang::get('admin/hardware/table.change'), + Lang::get('general.notes'), + Lang::get('admin/hardware/form.order'), + Lang::get('admin/hardware/table.checkout_date'), + Lang::get('admin/hardware/table.change'), Lang::get('table.actions')) ->setOptions( array( @@ -75,8 +77,8 @@ 'lengthMenu' => Lang::get('general.page_menu'), 'loadingRecords' => Lang::get('general.loading'), 'zeroRecords' => Lang::get('general.no_results'), - 'info' => Lang::get('general.pagination_info'), - 'processing' => Lang::get('general.processing'), + 'info' => Lang::get('general.pagination_info'), + 'processing' => ' '.Lang::get('general.processing'), 'paginate'=> array( 'first'=>Lang::get('general.first'), 'previous'=>Lang::get('general.previous'), @@ -84,10 +86,10 @@ 'last'=>Lang::get('general.last'), ), ), - 'sAjaxSource'=> route('api.hardware.list', Input::get('status')), + 'sAjaxSource'=> route('api.hardware.list', array(''=>Input::get('status'),'order_number'=>Input::get('order_number'))), 'dom' =>'CT<"clear">lfrtip', - 'colVis'=> array('showAll'=>'Show All','restore'=>'Restore','exclude'=>array(0,10,11),'activate'=>'mouseover'), - 'columnDefs'=> array(array('visible'=>false,'targets'=>array(7,8,9)),array('orderable'=>false,'targets'=>array(0,10,11))), + 'colVis'=> array('showAll'=>'Show All','restore'=>'Restore','exclude'=>array(0,12,13),'activate'=>'mouseover'), + 'columnDefs'=> array(array('visible'=>false,'targets'=>array(7,8,9)),array('orderable'=>false,'targets'=>array(0,12,13))), 'order'=>array(array(1,'asc')), ) ) @@ -112,17 +114,17 @@ $('#bulkEdit').attr('disabled', 'disabled'); } } - + $('table').on('change','input.one_required',checkForChecked); - + $("#checkAll").change(function () { $("input:checkbox").prop('checked', $(this).prop("checked")); checkForChecked(); }); }); - - + + From f8ecbed8294aed75a8014e2c9e734bc33b461bb7 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 17 Jul 2015 16:25:20 -0700 Subject: [PATCH 3/5] Added purchase date to importer --- app/commands/ImportCommand.php | 37 ++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/app/commands/ImportCommand.php b/app/commands/ImportCommand.php index f4cbce8aba..83d9cc543a 100644 --- a/app/commands/ImportCommand.php +++ b/app/commands/ImportCommand.php @@ -123,6 +123,11 @@ class ImportCommand extends Command { $user_asset_notes = ''; } + if (array_key_exists('9',$row)) { + $user_asset_purchase_date = date("Y-m-d 00:00:01", strtotime($row[10])); + } else { + $user_asset_purchase_date = ''; + } // A number was given instead of a name if (is_numeric($user_name)) { @@ -131,6 +136,8 @@ class ImportCommand extends Command { } elseif ($user_name=='') { $this->comment('No user data provided - skipping user creation, just adding asset'); + $first_name = ''; + $last_name = ''; } else { $name = explode(" ", $user_name); @@ -169,24 +176,27 @@ class ImportCommand extends Command { $user_email = str_replace("'",'',$email); } - $this->comment('Full Name: '.$user_name); - $this->comment('First Name: '.$first_name); - $this->comment('Last Name: '.$last_name); - $this->comment('Email: '.$user_email); - $this->comment('Category Name: '.$user_asset_category); - $this->comment('Item: '.$user_asset_name); - $this->comment('Manufacturer ID: '.$user_asset_mfgr); - $this->comment('Model No: '.$user_asset_modelno); - $this->comment('Serial No: '.$user_asset_serial); - $this->comment('Asset Tag: '.$user_asset_tag); - $this->comment('Location: '.$user_asset_location); - $this->comment('Notes: '.$user_asset_notes); + } + $this->comment('Full Name: '.$user_name); + $this->comment('First Name: '.$first_name); + $this->comment('Last Name: '.$last_name); + $this->comment('Email: '.$user_email); + $this->comment('Category Name: '.$user_asset_category); + $this->comment('Item: '.$user_asset_name); + $this->comment('Manufacturer ID: '.$user_asset_mfgr); + $this->comment('Model No: '.$user_asset_modelno); + $this->comment('Serial No: '.$user_asset_serial); + $this->comment('Asset Tag: '.$user_asset_tag); + $this->comment('Location: '.$user_asset_location); + $this->comment('Purchase Date: '.$user_asset_purchase_date); + $this->comment('Notes: '.$user_asset_notes); + $this->comment('------------- Action Summary ----------------'); - if (isset($user_email)) { + if ($user_email!='') { if ($user = User::where('email', $user_email)->first()) { $this->comment('User '.$user_email.' already exists'); } else { @@ -304,6 +314,7 @@ class ImportCommand extends Command { $asset->rtd_location_id = $location->id; $asset->user_id = 1; $asset->status_id = $status_id; + $asset->purchase_date = $user_asset_purchase_date; $asset->notes = e($user_asset_notes); if ($asset->save()) { From d26c40b26e3daf0ac47eb0064a6d5c88dedd1ec8 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 23 Jul 2015 12:28:26 -0700 Subject: [PATCH 4/5] Fixed issue where email not saved on edit --- app/controllers/admin/UsersController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php index 5f510b0216..a7706b09f0 100755 --- a/app/controllers/admin/UsersController.php +++ b/app/controllers/admin/UsersController.php @@ -287,6 +287,7 @@ class UsersController extends AdminController $user->first_name = Input::get('first_name'); $user->last_name = Input::get('last_name'); $user->employee_num = Input::get('employee_num'); + $user->email = Input::get('email'); $user->activated = Input::get('activated', $user->activated); $user->permissions = Input::get('permissions'); $user->jobtitle = Input::get('jobtitle'); From e455b2af6eb1212a39459caf8cbfd1a110042445 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 23 Jul 2015 12:30:44 -0700 Subject: [PATCH 5/5] Only update email if password locking isn't set to true --- app/controllers/admin/UsersController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php index a7706b09f0..ddd039e046 100755 --- a/app/controllers/admin/UsersController.php +++ b/app/controllers/admin/UsersController.php @@ -287,7 +287,6 @@ class UsersController extends AdminController $user->first_name = Input::get('first_name'); $user->last_name = Input::get('last_name'); $user->employee_num = Input::get('employee_num'); - $user->email = Input::get('email'); $user->activated = Input::get('activated', $user->activated); $user->permissions = Input::get('permissions'); $user->jobtitle = Input::get('jobtitle'); @@ -310,6 +309,11 @@ class UsersController extends AdminController $user->password = $password; } + // Do we want to update the user email? + if (!Config::get('app.lock_passwords')) { + $user->email = Input::get('email'); + } + // Get the current user groups $userGroups = $user->groups()->lists('group_id', 'group_id');