From 876052da374fd0a3afaa49954277676dd1bf80ca Mon Sep 17 00:00:00 2001
From: Robert Resch <robert@resch.dev>
Date: Wed, 16 Dec 2020 15:00:32 +0000
Subject: [PATCH] activate rowGroup for all datatables

---
 public/js/grocy.js             |  7 +++++--
 public/viewjs/productform.js   |  1 +
 public/viewjs/recipeform.js    |  1 +
 public/viewjs/shoppinglist.js  |  1 +
 public/viewjs/tasks.js         |  1 +
 views/layout/default.blade.php | 10 +++++++---
 views/productform.blade.php    |  4 ----
 views/recipeform.blade.php     | 10 ----------
 views/shoppinglist.blade.php   |  4 ----
 views/tasks.blade.php          |  7 -------
 10 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/public/js/grocy.js b/public/js/grocy.js
index 4d5b79d1..2c12bdec 100644
--- a/public/js/grocy.js
+++ b/public/js/grocy.js
@@ -734,7 +734,7 @@ $.extend(true, $.fn.dataTable.defaults, {
 			return JSON.parse(Grocy.UserSettings[settingKey]);
 		}
 	},
-	"preDrawCallback": function(settings)
+	'preDrawCallback': function(settings)
 	{
 		//currently it is not possible to save the state of rowGroup via saveState events
 		var api = new $.fn.dataTable.Api(settings);
@@ -770,7 +770,10 @@ $.extend(true, $.fn.dataTable.defaults, {
 	},
 	'columnDefs': [
 		{ type: 'chinese-string', targets: '_all' }
-	]
+	],
+	'rowGroup': {
+		enable: false
+	}
 });
 
 // serializeJSON defaults
diff --git a/public/viewjs/productform.js b/public/viewjs/productform.js
index 3d402fb4..3d0db6a5 100644
--- a/public/viewjs/productform.js
+++ b/public/viewjs/productform.js
@@ -293,6 +293,7 @@ var quConversionsTable = $('#qu-conversions-table-products').DataTable({
 		{ 'visible': false, 'targets': 4 }
 	].concat($.fn.dataTable.defaults.columnDefs),
 	'rowGroup': {
+		enable: true,
 		dataSrc: 4
 	}
 });
diff --git a/public/viewjs/recipeform.js b/public/viewjs/recipeform.js
index 0df9a397..4833dac5 100644
--- a/public/viewjs/recipeform.js
+++ b/public/viewjs/recipeform.js
@@ -82,6 +82,7 @@ var recipesPosTables = $('#recipes-pos-table').DataTable({
 		{ 'visible': false, 'targets': 4 }
 	].concat($.fn.dataTable.defaults.columnDefs),
 	'rowGroup': {
+		enable: true,
 		dataSrc: 4
 	}
 });
diff --git a/public/viewjs/shoppinglist.js b/public/viewjs/shoppinglist.js
index 35fb577b..084b7438 100644
--- a/public/viewjs/shoppinglist.js
+++ b/public/viewjs/shoppinglist.js
@@ -9,6 +9,7 @@ var shoppingListTable = $('#shoppinglist-table').DataTable({
 		{ 'visible': false, 'targets': 3 }
 	].concat($.fn.dataTable.defaults.columnDefs),
 	'rowGroup': {
+		enable: true,
 		dataSrc: 3,
 		startRender: function(rows, group)
 		{
diff --git a/public/viewjs/tasks.js b/public/viewjs/tasks.js
index 29cdb4e7..0f28445b 100644
--- a/public/viewjs/tasks.js
+++ b/public/viewjs/tasks.js
@@ -6,6 +6,7 @@
 		{ 'visible': false, 'targets': 3 }
 	].concat($.fn.dataTable.defaults.columnDefs),
 	'rowGroup': {
+		enable: true,
 		dataSrc: 3
 	}
 });
diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php
index 173b20f8..9c4d1238 100644
--- a/views/layout/default.blade.php
+++ b/views/layout/default.blade.php
@@ -65,6 +65,8 @@
 		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/datatables.net-rowgroup-bs4/css/rowGroup.bootstrap4.min.css?v=', true) }}{{ $version }}"
+		rel="stylesheet">
 	<link href="{{ $U('/node_modules/datatables.net-select-bs4/css/select.bootstrap4.min.css?v=', true) }}{{ $version }}"
 		rel="stylesheet">
 	<link href="{{ $U('/node_modules/toastr/build/toastr.min.css?v=', true) }}{{ $version }}"
@@ -684,10 +686,12 @@
 	<script src="{{ $U('/node_modules/datatables.net-bs4/js/dataTables.bootstrap4.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/datatables.net-select/js/dataTables.select.min.js?v=', true) }}{{ $version }}"></script>
-	<script src="{{ $U('/node_modules/datatables.net-select-bs4/js/select.bootstrap4.min.js?v=', true) }}{{ $version }}"></script>
 	<script src="{{ $U('/node_modules/datatables.net-plugins/filtering/type-based/accent-neutralise.js?v=', true) }}{{ $version }}"></script>
 	<script src="{{ $U('/node_modules/datatables.net-plugins/sorting/chinese-string.js?v=', true) }}{{ $version }}"></script>
+	<script src="{{ $U('/node_modules/datatables.net-rowgroup/js/dataTables.rowGroup.min.js?v=', true) }}{{ $version }}"></script>
+	<script src="{{ $U('/node_modules/datatables.net-rowgroup-bs4/js/rowGroup.bootstrap4.min.js?v=', true) }}{{ $version }}"></script>
+	<script src="{{ $U('/node_modules/datatables.net-select/js/dataTables.select.min.js?v=', true) }}{{ $version }}"></script>
+	<script src="{{ $U('/node_modules/datatables.net-select-bs4/js/select.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', true) }}/timeago/locales/jquery.timeago.{{ $__t('timeago_locale') }}.js?v={{ $version }}"></script>
 	<script src="{{ $U('/node_modules/toastr/build/toastr.min.js?v=', true) }}{{ $version }}"></script>
@@ -746,4 +750,4 @@
 	@endif
 </body>
 
-</html>
+</html>
\ No newline at end of file
diff --git a/views/productform.blade.php b/views/productform.blade.php
index 0e812096..8da88cc2 100644
--- a/views/productform.blade.php
+++ b/views/productform.blade.php
@@ -10,15 +10,11 @@
 
 @push('pageScripts')
 <script src="{{ $U('/node_modules/TagManager/tagmanager.js?v=', true) }}{{ $version }}"></script>
-<script src="{{ $U('/node_modules/datatables.net-rowgroup/js/dataTables.rowGroup.min.js?v=', true) }}{{ $version }}"></script>
-<script src="{{ $U('/node_modules/datatables.net-rowgroup-bs4/js/rowGroup.bootstrap4.min.js?v=', true) }}{{ $version }}"></script>
 @endpush
 
 @push('pageStyles')
 <link href="{{ $U('/node_modules/TagManager/tagmanager.css?v=', true) }}{{ $version }}"
 	rel="stylesheet">
-<link href="{{ $U('/node_modules/datatables.net-rowgroup-bs4/css/rowGroup.bootstrap4.min.css?v=', true) }}{{ $version }}"
-	rel="stylesheet">
 @endpush
 
 @section('content')
diff --git a/views/recipeform.blade.php b/views/recipeform.blade.php
index c954dd93..d7986412 100644
--- a/views/recipeform.blade.php
+++ b/views/recipeform.blade.php
@@ -8,16 +8,6 @@
 
 @section('viewJsName', 'recipeform')
 
-@push('pageScripts')
-<script src="{{ $U('/node_modules/datatables.net-rowgroup/js/dataTables.rowGroup.min.js?v=', true) }}{{ $version }}"></script>
-<script src="{{ $U('/node_modules/datatables.net-rowgroup-bs4/js/rowGroup.bootstrap4.min.js?v=', true) }}{{ $version }}"></script>
-@endpush
-
-@push('pageStyles')
-<link href="{{ $U('/node_modules/datatables.net-rowgroup-bs4/css/rowGroup.bootstrap4.min.css?v=', true) }}{{ $version }}"
-	rel="stylesheet">
-@endpush
-
 @section('content')
 <div class="row">
 	<div class="col">
diff --git a/views/shoppinglist.blade.php b/views/shoppinglist.blade.php
index e6d14cf4..439c0e3d 100644
--- a/views/shoppinglist.blade.php
+++ b/views/shoppinglist.blade.php
@@ -5,16 +5,12 @@
 @section('viewJsName', 'shoppinglist')
 
 @push('pageScripts')
-<script src="{{ $U('/node_modules/datatables.net-rowgroup/js/dataTables.rowGroup.min.js?v=', true) }}{{ $version }}"></script>
-<script src="{{ $U('/node_modules/datatables.net-rowgroup-bs4/js/rowGroup.bootstrap4.min.js?v=', true) }}{{ $version }}"></script>
 <script src="{{ $U('/viewjs/purchase.js?v=', true) }}{{ $version }}"></script>
 @endpush
 
 @push('pageStyles')
 <link href="{{ $U('/node_modules/animate.css/animate.min.css?v=', true) }}{{ $version }}"
 	rel="stylesheet">
-<link href="{{ $U('/node_modules/datatables.net-rowgroup-bs4/css/rowGroup.bootstrap4.min.css?v=', true) }}{{ $version }}"
-	rel="stylesheet">
 
 <style>
 	tr.dtrg-group {
diff --git a/views/tasks.blade.php b/views/tasks.blade.php
index 223a5687..f014c666 100644
--- a/views/tasks.blade.php
+++ b/views/tasks.blade.php
@@ -4,16 +4,9 @@
 @section('activeNav', 'tasks')
 @section('viewJsName', 'tasks')
 
-@push('pageScripts')
-<script src="{{ $U('/node_modules/datatables.net-rowgroup/js/dataTables.rowGroup.min.js?v=', true) }}{{ $version }}"></script>
-<script src="{{ $U('/node_modules/datatables.net-rowgroup-bs4/js/rowGroup.bootstrap4.min.js?v=', true) }}{{ $version }}"></script>
-@endpush
-
 @push('pageStyles')
 <link href="{{ $U('/node_modules/animate.css/animate.min.css?v=', true) }}{{ $version }}"
 	rel="stylesheet">
-<link href="{{ $U('/node_modules/datatables.net-rowgroup-bs4/css/rowGroup.bootstrap4.min.css?v=', true) }}{{ $version }}"
-	rel="stylesheet">
 @endpush
 
 @section('content')