Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions app/Presenters/AssetPresenter.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,29 @@ public static function dataTableLayout()
'switchable' => true,
'title' => trans('general.id'),
'visible' => false,
], [
'field' => 'company',
], [
'field' => 'asset_tag',
'searchable' => true,
'sortable' => true,
'switchable' => true,
'title' => trans('general.company'),
'visible' => false,
'formatter' => 'companiesLinkObjFormatter',
], [
'switchable' => false,
'title' => trans('admin/hardware/table.asset_tag'),
'visible' => true,
'formatter' => 'hardwareLinkFormatter',
], [
'field' => 'name',
'searchable' => true,
'sortable' => true,
'title' => trans('admin/hardware/form.name'),
'visible' => true,
'formatter' => 'hardwareLinkFormatter',
], [
'field' => 'company',
'searchable' => true,
'sortable' => true,
'switchable' => true,
'title' => trans('general.company'),
'visible' => false,
'formatter' => 'companiesLinkObjFormatter',
], [
'field' => 'image',
'searchable' => false,
Expand All @@ -53,15 +61,7 @@ public static function dataTableLayout()
'title' => trans('admin/hardware/table.image'),
'visible' => true,
'formatter' => 'imageFormatter',
], [
'field' => 'asset_tag',
'searchable' => true,
'sortable' => true,
'switchable' => false,
'title' => trans('admin/hardware/table.asset_tag'),
'visible' => true,
'formatter' => 'hardwareLinkFormatter',
], [
],[
'field' => 'serial',
'searchable' => true,
'sortable' => true,
Expand Down
31 changes: 16 additions & 15 deletions app/Presenters/UserPresenter.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@ public static function dataTableLayout()
'title' => trans('general.id'),
'visible' => false,
],
[
'field' => 'username',
'searchable' => true,
'sortable' => true,
'switchable' => false,
'title' => trans('admin/users/table.username'),
'visible' => true,
'formatter' => 'usernameRoleLinkFormatter',
],
[
'field' => 'avatar',
'searchable' => false,
Expand All @@ -44,15 +53,6 @@ public static function dataTableLayout()
'visible' => false,
'formatter' => 'imageFormatter',
],
[
'field' => 'company',
'searchable' => true,
'sortable' => true,
'switchable' => true,
'title' => trans('admin/companies/table.title'),
'visible' => false,
'formatter' => 'companiesLinkObjFormatter',
],
[
'field' => 'name',
'searchable' => true,
Expand Down Expand Up @@ -83,14 +83,15 @@ public static function dataTableLayout()
'title' => trans('admin/users/table.display_name'),
'visible' => false,
'formatter' => 'usersLinkFormatter',
], [
'field' => 'username',
],
[
'field' => 'company',
'searchable' => true,
'sortable' => true,
'switchable' => false,
'title' => trans('admin/users/table.username'),
'visible' => true,
'formatter' => 'usernameRoleLinkFormatter',
'switchable' => true,
'title' => trans('admin/companies/table.title'),
'visible' => false,
'formatter' => 'companiesLinkObjFormatter',
],
[
'field' => 'employee_num',
Expand Down
24 changes: 24 additions & 0 deletions public/css/dist/bootstrap-table.css
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,30 @@ div.fixed-table-scroll-outer {
background: #212529;
}

.fixed-columns,
.fixed-columns-right {
position: absolute;
top: 0;
height: 100%;
background-color: #fff;
box-sizing: border-box;
z-index: 1;
}

.fixed-columns {
left: 0;
}
.fixed-columns .fixed-table-body {
overflow: hidden !important;
}

.fixed-columns-right {
right: 0;
}
.fixed-columns-right .fixed-table-body {
overflow-x: hidden !important;
}

/*
* dragtable
*
Expand Down
11 changes: 11 additions & 0 deletions public/js/dist/bootstrap-table.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,6 @@
"/js/dist/bootstrap-table-locale-all.min.js": "/js/dist/bootstrap-table-locale-all.min.js?id=d300041b9e5038b45b68e036add83be4",
"/js/dist/bootstrap-table-en-US.min.js": "/js/dist/bootstrap-table-en-US.min.js?id=6d0de12d91548ba2cd80b868838ce5fa",
"/js/dist/Chart.min.js": "/js/dist/Chart.min.js?id=9b1ae20c4c7048d6e4a1b2e1aee7fb31",
"/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=9def0b5d3b891ac3669b3b7aa7e805ce",
"/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=ed9dc2e13cf495675067c4c7091b325a"
"/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=82b56573f8098e439bf14ccb4530de6e",
"/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=3ca77183321168d36eb1fac73a64e6e5"
}
1 change: 1 addition & 0 deletions resources/views/hardware/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
data-show-footer="true"
data-sort-order="asc"
data-sort-name="name"
data-fixed-number="2"
data-search-text="{{ session()->get('search') }}"
data-show-columns-search="true"
data-toolbar="#assetsBulkEditToolbar"
Expand Down
2 changes: 1 addition & 1 deletion resources/views/layouts/default.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@
background-color: #2c3b41;
}

.sidebar-menu>li>.treeview-menu,
.sidebar-menu>li>.treeview-menu
{
background-color: #1e282c;
}
Expand Down
2 changes: 2 additions & 0 deletions resources/views/partials/bootstrap-table.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ classes: 'table table-responsive table-striped snipe-table table-no-bordered',
showSearchClearButton: data_with_default('show-search-clear-button', true),
sortName: data_with_default('sort-name', 'created_at'),
sortOrder: data_with_default('sort-order', 'desc'),
fixedColumns: data_with_default('fixed-columns', 'true'),
fixedRightNumber: data_with_default('fixed-right-number', '1'),
stickyHeader: true,
stickyHeaderOffsetLeft: parseInt($('body').css('padding-left'), 10),
stickyHeaderOffsetRight: parseInt($('body').css('padding-right'), 10),
Expand Down
1 change: 1 addition & 0 deletions resources/views/users/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
data-bulk-form-id="#usersBulkForm"
data-show-columns-search="true"
id="usersTable"
data-fixed-number="2"
data-buttons="userButtons"
class="table table-striped snipe-table"
data-url="{{ route('api.users.index',
Expand Down
2 changes: 2 additions & 0 deletions webpack.mix.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ mix
[
"./node_modules/bootstrap-table/dist/bootstrap-table.css",
"./node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.css",
"./node_modules/bootstrap-table/dist/extensions/fixed-columns/bootstrap-table-fixed-columns.css",
"./resources/assets/css/dragtable.css",
],
"public/css/dist/bootstrap-table.css"
Expand All @@ -109,6 +110,7 @@ mix
'./node_modules/bootstrap-table/dist/extensions/export/bootstrap-table-export.js',
'./node_modules/bootstrap-table/dist/extensions/cookie/bootstrap-table-cookie.js',
'./node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.js',
'./node_modules/bootstrap-table/dist/extensions/fixed-columns/bootstrap-table-fixed-columns.min.js',
'./node_modules/bootstrap-table/dist/extensions/addrbar/bootstrap-table-addrbar.js',
'./node_modules/bootstrap-table/dist/extensions/print/bootstrap-table-print.min.js',
'./node_modules/bootstrap-table/dist/extensions/custom-view/bootstrap-table-custom-view.js',
Expand Down
Loading