diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index be49a30f0..0c5f7c013 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -122,6 +122,11 @@ class AssetsController extends Controller $assets->where('assets.supplier_id', '=', $request->input('supplier_id')); } + if (($request->has('assigned_to')) && ($request->has('assigned_type'))) { + $assets->where('assets.assigned_to', '=', $request->input('assigned_to')) + ->where('assets.assigned_type', '=', $request->input('assigned_type')); + } + if ($request->has('company_id')) { $assets->where('assets.company_id', '=', $request->input('company_id')); } @@ -243,7 +248,8 @@ class AssetsController extends Controller $assets->orderBy($column_sort, $order); break; } - + + $total = $assets->count(); $assets = $assets->skip($offset)->take($limit)->get(); return (new AssetsTransformer)->transformAssets($assets, $total); diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.php index 894d0daa1..8e557df6a 100644 --- a/app/Http/Controllers/Api/ComponentsController.php +++ b/app/Http/Controllers/Api/ComponentsController.php @@ -31,6 +31,10 @@ class ComponentsController extends Controller $components = $components->TextSearch($request->input('search')); } + if ($request->has('company_id')) { + $components->where('company_id','=',$request->input('company_id')); + } + $offset = request('offset', 0); $limit = request('limit', 50); diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index fd6f0ca75..489f9829f 100755 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -480,6 +480,11 @@ class UsersController extends Controller if ($request->has('company_id')) { $update_array['company_id'] = $request->input('company_id'); } + if ($request->has('locale')) { + $update_array['locale'] = $request->input('locale'); + } + + if ($request->has('manager_id')) { diff --git a/resources/views/companies/view.blade.php b/resources/views/companies/view.blade.php index 259817e1f..81ddec696 100644 --- a/resources/views/companies/view.blade.php +++ b/resources/views/companies/view.blade.php @@ -49,6 +49,23 @@ +
  • + + + + +
  • + +
  • + + + + +
  • + + @@ -61,53 +78,44 @@ name="companyAssets" class="table table-striped snipe-table" id="table" + data-search="true" data-url="{{route('api.assets.index',['company_id' => $company->id]) }}" + data-export-file="{{ str_slug($company->name) }}-assets" data-cookie="true" - data-cookie-id-table="companyAssetsTable-{{ config('version.hash_version') }}"> - - - {{ trans('general.id') }} - {{ trans('admin/hardware/form.name') }} - {{ trans('general.image') }} - {{ trans('admin/hardware/form.model') }} - {{ trans('admin/hardware/form.tag') }} - {{ trans('admin/hardware/form.serial') }} - Checkin/Checkout - {{ trans('general.action') }} - - + data-cookie-id-table="companyAssetsTable" + data-show-footer="true" + data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"> +
    - - - - - - - - - - - +
    {{ trans('general.name') }}{{ trans('admin/hardware/form.serial') }}{{ trans('general.action') }}
    - - - - - - - - - +
    NameActions
    @@ -115,23 +123,54 @@
    - - - - - - - - - - +
    {{ trans('general.name') }}{{ trans('general.date') }}
    - +
    +
    + +
    +
    +
    + +
    +
    + +
    +
    +
    + + + -
    @@ -139,7 +178,7 @@ @stop @section('moar_scripts') - @include ('partials.bootstrap-table', ['exportFile' => 'companies-export', 'search' => true]) + @include ('partials.bootstrap-table') @stop diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php index a2397a687..d65ee4dc0 100755 --- a/resources/views/hardware/edit.blade.php +++ b/resources/views/hardware/edit.blade.php @@ -105,9 +105,15 @@ @section('moar_scripts')