kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-17 11:06:36 +00:00
Code Issues Projects Releases Wiki Activity

Enable column reordering for all data tables

Browse Source
This commit is contained in:
Bernd Bestel
2018-07-14 08:48:14 +02:00
parent 594e77ca41
commit c3de4b86b0
13 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -12,6 +12,8 @@
"datatables.net-bs4": "^1.10.19", "datatables.net-bs4": "^1.10.19",
"datatables.net-responsive": "^2.2.3", "datatables.net-responsive": "^2.2.3",
"datatables.net-responsive-bs4": "^2.2.3", "datatables.net-responsive-bs4": "^2.2.3",
"datatables.net-colreorder": "^1.5.1",
"datatables.net-colreorder-bs4": "^1.5.1",
"jquery": "^3.3.1", "jquery": "^3.3.1",
"jquery-serializejson": "^2.8.1", "jquery-serializejson": "^2.8.1",
"jquery-ui-dist": "^1.12.1", "jquery-ui-dist": "^1.12.1",

3
public/viewjs/batteries.js
View File

@@ -5,7 +5,8 @@
{ 'orderable': false, 'targets': 0 } { 'orderable': false, 'targets': 0 }
], ],
'language': JSON.parse(L('datatables_localization')), 'language': JSON.parse(L('datatables_localization')),
'scrollY': false 'scrollY': false,
'colReorder': true
}); });
$("#search").on("keyup", function() $("#search").on("keyup", function()

3
public/viewjs/batteriesoverview.js
View File

@@ -5,7 +5,8 @@
{ 'orderable': false, 'targets': 0 } { 'orderable': false, 'targets': 0 }
], ],
'language': JSON.parse(L('datatables_localization')), 'language': JSON.parse(L('datatables_localization')),
'scrollY': false 'scrollY': false,
'colReorder': true
}); });
$("#search").on("keyup", function() $("#search").on("keyup", function()

3
public/viewjs/habits.js
View File

@@ -5,7 +5,8 @@
{ 'orderable': false, 'targets': 0 } { 'orderable': false, 'targets': 0 }
], ],
'language': JSON.parse(L('datatables_localization')), 'language': JSON.parse(L('datatables_localization')),
'scrollY': false 'scrollY': false,
'colReorder': true
}); });
$("#search").on("keyup", function() $("#search").on("keyup", function()

3
public/viewjs/habitsoverview.js
View File

@@ -5,7 +5,8 @@
{ 'orderable': false, 'targets': 0 } { 'orderable': false, 'targets': 0 }
], ],
'language': JSON.parse(L('datatables_localization')), 'language': JSON.parse(L('datatables_localization')),
'scrollY': false 'scrollY': false,
'colReorder': true
}); });
$("#search").on("keyup", function() $("#search").on("keyup", function()

3
public/viewjs/locations.js
View File

@@ -5,7 +5,8 @@
{ 'orderable': false, 'targets': 0 } { 'orderable': false, 'targets': 0 }
], ],
'language': JSON.parse(L('datatables_localization')), 'language': JSON.parse(L('datatables_localization')),
'scrollY': false 'scrollY': false,
'colReorder': true
}); });
$("#search").on("keyup", function() $("#search").on("keyup", function()

3
public/viewjs/manageapikeys.js
View File

@@ -5,7 +5,8 @@
{ 'orderable': false, 'targets': 0 } { 'orderable': false, 'targets': 0 }
], ],
'language': JSON.parse(L('datatables_localization')), 'language': JSON.parse(L('datatables_localization')),
'scrollY': false 'scrollY': false,
'colReorder': true
}); });
var createdApiKeyId = GetUriParam('CreatedApiKeyId'); var createdApiKeyId = GetUriParam('CreatedApiKeyId');

3
public/viewjs/products.js
View File

@@ -5,7 +5,8 @@
{ 'orderable': false, 'targets': 0 } { 'orderable': false, 'targets': 0 }
], ],
'language': JSON.parse(L('datatables_localization')), 'language': JSON.parse(L('datatables_localization')),
'scrollY': false 'scrollY': false,
'colReorder': true
}); });
$("#search").on("keyup", function() $("#search").on("keyup", function()

3
public/viewjs/quantityunits.js
View File

@@ -5,7 +5,8 @@
{ 'orderable': false, 'targets': 0 } { 'orderable': false, 'targets': 0 }
], ],
'language': JSON.parse(L('datatables_localization')), 'language': JSON.parse(L('datatables_localization')),
'scrollY': false 'scrollY': false,
'colReorder': true
}); });
$("#search").on("keyup", function() $("#search").on("keyup", function()

3
public/viewjs/shoppinglist.js
View File

@@ -5,7 +5,8 @@
{ 'orderable': false, 'targets': 0 } { 'orderable': false, 'targets': 0 }
], ],
'language': JSON.parse(L('datatables_localization')), 'language': JSON.parse(L('datatables_localization')),
'scrollY': false 'scrollY': false,
'colReorder': true
}); });
$("#search").on("keyup", function() $("#search").on("keyup", function()

3
public/viewjs/stockoverview.js
View File

@@ -6,7 +6,8 @@
{ 'visible': false, 'targets': 4 } { 'visible': false, 'targets': 4 }
], ],
'language': JSON.parse(L('datatables_localization')), 'language': JSON.parse(L('datatables_localization')),
'scrollY': false 'scrollY': false,
'colReorder': true
}); });
$("#location-filter").on("change", function() $("#location-filter").on("change", function()

5
views/layout/default.blade.php
View File

@@ -17,8 +17,9 @@
<link href="{{ $U('/node_modules/startbootstrap-sb-admin/css/sb-admin.min.css?v=', true) }}{{ $version }}" rel="stylesheet"> <link href="{{ $U('/node_modules/startbootstrap-sb-admin/css/sb-admin.min.css?v=', true) }}{{ $version }}" rel="stylesheet">
<link href="{{ $U('/node_modules/@fortawesome/fontawesome-free/css/all.css?v=', true) }}{{ $version }}" rel="stylesheet"> <link href="{{ $U('/node_modules/@fortawesome/fontawesome-free/css/all.css?v=', true) }}{{ $version }}" rel="stylesheet">
<link href="{{ $U('/node_modules/@danielfarrell/bootstrap-combobox/css/bootstrap-combobox.css?v=', true) }}{{ $version }}" rel="stylesheet"> <link href="{{ $U('/node_modules/@danielfarrell/bootstrap-combobox/css/bootstrap-combobox.css?v=', true) }}{{ $version }}" rel="stylesheet">
<link href="{{ $U('/node_modules/datatables.net-bs4/css/dataTables.bootstrap4.css?v=', true) }}{{ $version }}" rel="stylesheet"> <link href="{{ $U('/node_modules/datatables.net-bs4/css/dataTables.bootstrap4.min.css?v=', true) }}{{ $version }}" rel="stylesheet">
<link href="{{ $U('/node_modules/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css?v=', true) }}{{ $version }}" rel="stylesheet"> <link href="{{ $U('/node_modules/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css?v=', true) }}{{ $version }}" rel="stylesheet">
<link href="{{ $U('/node_modules/datatables.net-colreorder-bs4/css/colReorder.bootstrap4.min.css?v=', true) }}{{ $version }}" rel="stylesheet">
<link href="{{ $U('/node_modules/toastr/build/toastr.min.css?v=', true) }}{{ $version }}" rel="stylesheet"> <link href="{{ $U('/node_modules/toastr/build/toastr.min.css?v=', true) }}{{ $version }}" rel="stylesheet">
<link href="{{ $U('/node_modules/tagmanager/tagmanager.css?v=', true) }}{{ $version }}" rel="stylesheet"> <link href="{{ $U('/node_modules/tagmanager/tagmanager.css?v=', true) }}{{ $version }}" rel="stylesheet">
<link href="{{ $U('/node_modules/tempusdominus-bootstrap-4/build/css/tempusdominus-bootstrap-4.min.css?v=', true) }}{{ $version }}" rel="stylesheet"> <link href="{{ $U('/node_modules/tempusdominus-bootstrap-4/build/css/tempusdominus-bootstrap-4.min.css?v=', true) }}{{ $version }}" rel="stylesheet">
@@ -227,6 +228,8 @@
<script src="{{ $U('/node_modules/datatables.net-bs4/js/dataTables.bootstrap4.js?v=', true) }}{{ $version }}"></script> <script src="{{ $U('/node_modules/datatables.net-bs4/js/dataTables.bootstrap4.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/node_modules/datatables.net-responsive/js/dataTables.responsive.min.js?v=', true) }}{{ $version }}"></script> <script src="{{ $U('/node_modules/datatables.net-responsive/js/dataTables.responsive.min.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/node_modules/datatables.net-responsive-bs4/js/responsive.bootstrap4.min.js?v=', true) }}{{ $version }}"></script> <script src="{{ $U('/node_modules/datatables.net-responsive-bs4/js/responsive.bootstrap4.min.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/node_modules/datatables.net-colreorder/js/dataTables.colReorder.min.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/node_modules/datatables.net-colreorder-bs4/js/colReorder.bootstrap4.min.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/node_modules/timeago/jquery.timeago.js?v=', true) }}{{ $version }}"></script> <script src="{{ $U('/node_modules/timeago/jquery.timeago.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/node_modules', true) }}/timeago/locales/jquery.timeago.{{ $L('timeago_locale') }}.js?v={{ $version }}"></script> <script src="{{ $U('/node_modules', true) }}/timeago/locales/jquery.timeago.{{ $L('timeago_locale') }}.js?v={{ $version }}"></script>
<script src="{{ $U('/node_modules/toastr/build/toastr.min.js?v=', true) }}{{ $version }}"></script> <script src="{{ $U('/node_modules/toastr/build/toastr.min.js?v=', true) }}{{ $version }}"></script>

15
yarn.lock
View File

@@ -74,6 +74,21 @@ datatables.net-bs4@^1.10.15, datatables.net-bs4@^1.10.19:
datatables.net "1.10.19" datatables.net "1.10.19"
jquery ">=1.7" jquery ">=1.7"
datatables.net-colreorder-bs4@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/datatables.net-colreorder-bs4/-/datatables.net-colreorder-bs4-1.5.1.tgz#7ded353a68296b85f0dbfb234b8cb5d8fc2bee3c"
dependencies:
datatables.net-bs4 "^1.10.15"
datatables.net-colreorder "1.5.1"
jquery ">=1.7"
datatables.net-colreorder@1.5.1, datatables.net-colreorder@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/datatables.net-colreorder/-/datatables.net-colreorder-1.5.1.tgz#ee5eacd7178b5fd9396aab44d4907aae35086f8c"
dependencies:
datatables.net "^1.10.15"
jquery ">=1.7"
datatables.net-responsive-bs4@^2.2.3: datatables.net-responsive-bs4@^2.2.3:
version "2.2.3" version "2.2.3"
resolved "https://registry.yarnpkg.com/datatables.net-responsive-bs4/-/datatables.net-responsive-bs4-2.2.3.tgz#639de17c1d31210ebf2b3c25f1c774c13f729e94" resolved "https://registry.yarnpkg.com/datatables.net-responsive-bs4/-/datatables.net-responsive-bs4-2.2.3.tgz#639de17c1d31210ebf2b3c25f1c774c13f729e94"