Merge remote-tracking branch 'origin/develop'

app/Presenters/AccessoryPresenter.php

@@ -41,6 +41,7 @@ class AccessoryPresenter extends Presenter
                 'field' => 'name',
                 'searchable' => true,
                 'sortable' => true,
+                'switchable' => false,
                 'title' => trans('general.name'),
                 'formatter' => 'accessoriesLinkFormatter',
             ], [

app/Presenters/AssetMaintenancesPresenter.php

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

app/Presenters/AssetModelPresenter.php

@@ -35,6 +35,7 @@ class AssetModelPresenter extends Presenter
                 'field' => 'name',
                 'searchable' => true,
                 'sortable' => true,
+                'switchable' => false,
                 'visible' => true,
                 'title' => trans('general.name'),
                 'formatter' => 'modelsLinkFormatter',

app/Presenters/AssetPresenter.php

@@ -55,6 +55,7 @@ class AssetPresenter extends Presenter
                 'field' => 'asset_tag',
                 'searchable' => true,
                 'sortable' => true,
+                'switchable' => false,
                 'title' => trans('admin/hardware/table.asset_tag'),
                 'visible' => true,
                 'formatter' => 'hardwareLinkFormatter',
@@ -316,7 +317,7 @@ class AssetPresenter extends Presenter
             'field' => 'checkincheckout',
             'searchable' => false,
             'sortable' => false,
-            'switchable' => true,
+            'switchable' => false,
             'title' => trans('general.checkin').'/'.trans('general.checkout'),
             'visible' => true,
             'formatter' => 'hardwareInOutFormatter',

app/Presenters/CategoryPresenter.php

@@ -25,6 +25,7 @@ class CategoryPresenter extends Presenter
                 'field' => 'name',
                 'searchable' => true,
                 'sortable' => true,
+                'switchable' => false,
                 'title' => trans('general.name'),
                 'visible' => true,
                 'formatter' => 'categoriesLinkFormatter',

app/Presenters/CompanyPresenter.php

@@ -25,7 +25,7 @@ class CompanyPresenter extends Presenter
                 'field' => 'name',
                 'searchable' => true,
                 'sortable' => true,
-                'switchable' => true,
+                'switchable' => false,
                 'title' => trans('admin/companies/table.name'),
                 'visible' => true,
                 'formatter' => 'companiesLinkFormatter',

app/Presenters/ComponentPresenter.php

@@ -126,7 +126,7 @@ class ComponentPresenter extends Presenter
             'field' => 'checkincheckout',
             'searchable' => false,
             'sortable' => false,
-            'switchable' => true,
+            'switchable' => false,
             'title' => trans('general.checkin').'/'.trans('general.checkout'),
             'visible' => true,
             'formatter' => 'componentsInOutFormatter',

app/Presenters/ConsumablePresenter.php

@@ -35,6 +35,7 @@ class ConsumablePresenter extends Presenter
                 'field' => 'name',
                 'searchable' => true,
                 'sortable' => true,
+                'switchable' => false,
                 'title' => trans('general.name'),
                 'visible' => true,
                 'formatter' => 'consumablesLinkFormatter',

app/Presenters/DepreciationPresenter.php

@@ -25,6 +25,7 @@ class DepreciationPresenter extends Presenter
                 'field' => 'name',
                 'searchable' => true,
                 'sortable' => true,
+                'switchable' => false,
                 'title' => trans('general.name'),
                 'visible' => true,
                 'formatter' => 'depreciationsLinkFormatter',

app/Presenters/DepreciationReportPresenter.php

@@ -34,6 +34,7 @@ class DepreciationReportPresenter extends Presenter
                 "field" => "name",
                 "searchable" => true,
                 "sortable" => true,
+                'switchable' => false,
                 "title" => trans('admin/hardware/form.name'),
                 "visible" => false,
             ], [

app/Presenters/LicensePresenter.php

@@ -33,6 +33,7 @@ class LicensePresenter extends Presenter
                 'field' => 'name',
                 'searchable' => true,
                 'sortable' => true,
+                'switchable' => false,
                 'title' => trans('general.name'),
                 'formatter' => 'licensesLinkFormatter',
             ], [
@@ -186,7 +187,7 @@ class LicensePresenter extends Presenter
             'field' => 'checkincheckout',
             'searchable' => false,
             'sortable' => false,
-            'switchable' => true,
+            'switchable' => false,
             'title' => trans('general.checkin').'/'.trans('general.checkout'),
             'visible' => true,
             'formatter' => 'licensesInOutFormatter',
@@ -280,7 +281,7 @@ class LicensePresenter extends Presenter
                 'field' => 'checkincheckout',
                 'searchable' => false,
                 'sortable' => false,
-                'switchable' => true,
+                'switchable' => false,
                 'title' => trans('general.checkin').'/'.trans('general.checkout'),
                 'visible' => true,
                 'formatter' => 'licenseSeatInOutFormatter',

app/Presenters/LocationPresenter.php

@@ -31,6 +31,7 @@ class LocationPresenter extends Presenter
                 'field' => 'name',
                 'searchable' => true,
                 'sortable' => true,
+                'switchable' => false,
                 'title' => trans('admin/locations/table.name'),
                 'visible' => true,
                 'formatter' => 'locationsLinkFormatter',

app/Presenters/ManufacturerPresenter.php

@@ -27,6 +27,7 @@ class ManufacturerPresenter extends Presenter
                 'field' => 'name',
                 'searchable' => true,
                 'sortable' => true,
+                'switchable' => false,
                 'title' => trans('admin/manufacturers/table.name'),
                 'visible' => true,
                 'formatter' => 'manufacturersLinkFormatter',

app/Presenters/UserPresenter.php

@@ -38,7 +38,7 @@ class UserPresenter extends Presenter
                 'searchable' => false,
                 'sortable' => false,
                 'switchable' => true,
-                'title' => 'Avatar',
+                'title' => trans('general.importer.avatar'),
                 'visible' => false,
                 'formatter' => 'imageFormatter',
             ],
@@ -175,7 +175,7 @@ class UserPresenter extends Presenter
                 'field' => 'username',
                 'searchable' => true,
                 'sortable' => true,
-                'switchable' => true,
+                'switchable' => false,
                 'title' => trans('admin/users/table.username'),
                 'visible' => true,
                 'formatter' => 'usersLinkFormatter',

resources/views/partials/bootstrap-table.blade.php

@@ -46,12 +46,14 @@
             stickyHeader: true,
             stickyHeaderOffsetLeft: parseInt($('body').css('padding-left'), 10),
             stickyHeaderOffsetRight: parseInt($('body').css('padding-right'), 10),
-            locale: locale,
+            locale: '{{ app()->getLocale() }}',
             undefinedText: '',
             iconsPrefix: 'fa',
             cookieStorage: '{{ config('session.bs_table_storage') }}',
             cookie: true,
             cookieExpire: '2y',
+            showColumnsToggleAll: true,
+            minimumCountColumns: 2,
             mobileResponsive: true,
             maintainSelected: true,
             trimOnSearch: false,
@@ -85,7 +87,7 @@
                 export: 'fa-download',
                 clearSearch: 'fa-times'
             },
-                exportOptions: export_options,
+            exportOptions: export_options,
             exportTypes: ['xlsx', 'excel', 'csv', 'pdf','json', 'xml', 'txt', 'sql', 'doc' ],
             onLoadSuccess: function () {
                 $('[data-tooltip="true"]').tooltip(); // Needed to attach tooltips after ajax call