diff --git a/public/js/grocy.js b/public/js/grocy.js index 7b0607a0..46a5b5e8 100644 --- a/public/js/grocy.js +++ b/public/js/grocy.js @@ -965,7 +965,7 @@ $(".change-table-columns-visibility-button").on("click", function(e) return; } - var shadowColumnIndex = $(this.header()).attr("data-shodow-rowgroup-column"); + var shadowColumnIndex = $(this.header()).attr("data-shadow-rowgroup-column"); if (shadowColumnIndex) { index = shadowColumnIndex; diff --git a/public/viewjs/tasks.js b/public/viewjs/tasks.js index 662b627d..f0f02afa 100644 --- a/public/viewjs/tasks.js +++ b/public/viewjs/tasks.js @@ -3,13 +3,8 @@ 'columnDefs': [ { 'orderable': false, 'targets': 0 }, { 'searchable': false, "targets": 0 }, - { 'visible': false, 'targets': 3 }, { "type": "html", "targets": 2 } - ].concat($.fn.dataTable.defaults.columnDefs), - 'rowGroup': { - enable: true, - dataSrc: 3 - } + ].concat($.fn.dataTable.defaults.columnDefs) }); $('#tasks-table tbody').removeClass("d-none"); tasksTable.columns.adjust().draw(); diff --git a/views/stockentries.blade.php b/views/stockentries.blade.php index 95ff26e5..4c4816b6 100644 --- a/views/stockentries.blade.php +++ b/views/stockentries.blade.php @@ -69,7 +69,7 @@ {{ $__t('Location') }} {{ $__t('Store') }} {{ $__t('Price') }} - {{ $__t('Purchased date') }} + {{ $__t('Purchased date') }} Hidden purchased_date @include('components.userfields_thead', array( diff --git a/views/tasks.blade.php b/views/tasks.blade.php index f162aea3..1ea9d6f2 100644 --- a/views/tasks.blade.php +++ b/views/tasks.blade.php @@ -107,9 +107,10 @@ {{ $__t('Task') }} {{ $__t('Due') }} - {{ $__t('Category') }} + {{ $__t('Category') }} {{ $__t('Assigned to') }} Hidden status + Hidden category_id @include('components.userfields_thead', array( 'userfields' => $userfields @@ -187,10 +188,14 @@ duesoon @endif - @include('components.userfields_tbody', - array( 'userfields'=> $userfields, - 'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $task->id) - )) + + @if($task->category_id != null) {{ FindObjectInArrayByPropertyValue($taskCategories, 'id', $task->category_id)->name }} @else {{ $__t('Uncategorized') }} @endif + + @include('components.userfields_tbody', + array( 'userfields'=> $userfields, + 'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $task->id) + )) @endforeach