github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-05 20:36:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Review

Browse Source
This commit is contained in:
Bernd Bestel 2020-12-16 18:16:55 +01:00
parent 3d1c42c6f7
commit 68e98cdf13
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
30 changed files with 84 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
grocy.openapi.json
View File

@ -1299,6 +1299,38 @@
}
}
}
},
"delete": {
"summary": "Deletes the given setting of the currently logged in user",
"tags": [
"Current user"
],
"parameters": [
{
"in": "path",
"name": "settingKey",
"required": true,
"description": "The key of the user setting",
"schema": {
"type": "string"
}
}
],
"responses": {
"204": {
"description": "The operation was successful"
},
"400": {
"description": "The operation was not successful",
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/Error400"
}
}
}
}
}
}
},
"/stock": {

10
localization/strings.pot
View File

@ -1822,7 +1822,7 @@ msgstr ""
msgid "Price per stock unit"
msgstr ""
msgid "Hide/view columns"
msgid "Table options"
msgstr ""
msgid "This product is currently on a shopping list"
@ -2021,5 +2021,11 @@ msgstr ""
msgid "Reset"
msgstr ""
msgid "Are you sure, you want reset the table?"
msgid "Are you sure to reset the table options?"
msgstr ""
msgid "Table layout configuration"
msgstr ""
msgid "Hide/view columns"
msgstr ""

20
public/js/grocy.js
View File

@ -765,17 +765,16 @@ $.extend(true, $.fn.dataTable.defaults, {
},
'preDrawCallback': function(settings)
{
//currently it is not possible to save the state of rowGroup via saveState events
// Currently it is not possible to save the state of rowGroup via saveState events
var api = new $.fn.dataTable.Api(settings);
if (typeof api.rowGroup === "function")
{
var settingKey = 'datatables_rowGroup_' + settings.sTableId;
if (Grocy.UserSettings[settingKey] !== undefined)
{
var rowGroup = JSON.parse(Grocy.UserSettings[settingKey]);
//check if there way changed. the draw event is called often therefore we have to check if it's really necessary
// Check if there way changed. the draw event is called often therefore we have to check if it's really necessary
if (rowGroup.enable !== api.rowGroup().enabled()
|| ("dataSrc" in rowGroup && rowGroup.dataSrc !== api.rowGroup().dataSrc()))
{
@ -786,7 +785,7 @@ $.extend(true, $.fn.dataTable.defaults, {
{
api.rowGroup().dataSrc(rowGroup.dataSrc);
//apply fixed order for group column
// Apply fixed order for group column
var fixedOrder = {
pre: [rowGroup.dataSrc, 'asc']
};
@ -977,11 +976,10 @@ $(".change-table-columns-visibility-button").on("click", function(e)
}
});
var message = '<div class="text-center"><h4>' + __t('Hide/view columns') + '</h4><div class="text-left form-group">' + columnCheckBoxesHtml + '</div></div>';
var message = '<div class="text-center"><h5>' + __t('Table options') + '</h5><hr><h5>' + __t('Hide/view columns') + '</h5><div class="text-left form-group">' + columnCheckBoxesHtml + '</div></div>';
if (rowGroupDefined)
{
message += '<hr><div class="text-center mt-1"><h4>' + __t('Group by') + '</h4><div class="text-left form-group">' + rowGroupRadioBoxesHtml + '</div></div>';
message += '<div class="text-center mt-1"><h5>' + __t('Group by') + '</h5><div class="text-left form-group">' + rowGroupRadioBoxesHtml + '</div></div>';
}
bootbox.dialog({
@ -993,12 +991,12 @@ $(".change-table-columns-visibility-button").on("click", function(e)
buttons: {
reset: {
label: __t('Reset'),
className: 'btn-danger responsive-button',
className: 'btn-outline-danger float-left responsive-button',
callback: function()
{
bootbox.confirm({
swapButtonOrder: true,
message: __t("Are you sure, you want reset the table?"),
message: __t("Are you sure to reset the table options?"),
buttons: {
confirm: {
label: 'Yes',
@ -1016,10 +1014,10 @@ $(".change-table-columns-visibility-button").on("click", function(e)
var dataTable = $(dataTableSelector).DataTable();
var tableId = dataTable.settings()[0].sTableId;
//Delete rowgroup settings
// Delete rowgroup settings
Grocy.FrontendHelpers.DeleteUserSetting('datatables_rowGroup_' + tableId);
//Delete state settings
// Delete state settings
dataTable.state.clear();
}
bootbox.hideAll();

2
views/batteries.blade.php
View File

@ -72,7 +72,7 @@
<tr>
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#batteries-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

2
views/batteriesjournal.blade.php
View File

@ -68,7 +68,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#batteries-journal-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

2
views/batteriesoverview.blade.php
View File

@ -90,7 +90,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#batteries-overview-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

2
views/chores.blade.php
View File

@ -73,7 +73,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#chores-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

2
views/choresjournal.blade.php
View File

@ -68,7 +68,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#chores-journal-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

2
views/choresoverview.blade.php
View File

@ -112,7 +112,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#chores-overview-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

2
views/equipment.blade.php
View File

@ -63,7 +63,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#equipment-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

2
views/locations.blade.php
View File

@ -73,7 +73,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#locations-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

2
views/manageapikeys.blade.php
View File

@ -78,7 +78,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#apikeys-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

8
views/productform.blade.php
View File

@ -468,7 +468,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#barcode-table"
href="#"><i class="fas fa-eye"></i></a>
</th>
@ -569,14 +569,14 @@
<tr>
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#qu-conversions-table-products"
href="#"><i class="fas fa-eye"></i></a>
</th>
<th>{{ $__t('Quantity unit from') }}</th>
<th>{{ $__t('Quantity unit to') }}</th>
<th>{{ $__t('Factor') }}</th>
<th>{{ $__('Group')}}</th>
<th>{{ $__t('Group')}}</th>
<th></th>
</tr>
</thead>
@ -671,4 +671,4 @@
</div>
</div>
</div>
@stop
@stop

2
views/productgroups.blade.php
View File

@ -73,7 +73,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#productgroups-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

2
views/products.blade.php
View File

@ -102,7 +102,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#products-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

2
views/quantityunitform.blade.php
View File

@ -128,7 +128,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#qu-conversions-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

2
views/quantityunits.blade.php
View File

@ -73,7 +73,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#quantityunits-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

6
views/recipeform.blade.php
View File

@ -139,7 +139,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#recipes-pos-table"
href="#"><i class="fas fa-eye"></i></a>
</th>
@ -242,7 +242,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#recipes-includes-table"
href="#"><i class="fas fa-eye"></i></a>
</th>
@ -370,4 +370,4 @@
</div>
</div>
</div>
@stop
@stop

2
views/recipes.blade.php
View File

@ -102,7 +102,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#recipes-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

5
views/shoppinglist.blade.php
View File

@ -16,6 +16,7 @@
tr.dtrg-group {
cursor: pointer;
}
</style>
@endpush
@ -173,7 +174,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#shoppinglist-table"
href="#"><i class="fas fa-eye"></i></a>
</th>
@ -391,4 +392,4 @@
</div>
</div>
</div>
@stop
@stop

2
views/shoppinglocations.blade.php
View File

@ -73,7 +73,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#shoppinglocations-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

2
views/stockentries.blade.php
View File

@ -58,7 +58,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#stockentries-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

2
views/stockjournal.blade.php
View File

@ -121,7 +121,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#stock-journal-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

2
views/stockjournalsummary.blade.php
View File

@ -96,7 +96,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#stock-journal-summary-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

2
views/stockoverview.blade.php
View File

@ -152,7 +152,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#stock-overview-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

2
views/taskcategories.blade.php
View File

@ -73,7 +73,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#taskcategories-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

4
views/tasks.blade.php
View File

@ -101,7 +101,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#tasks-table"
href="#"><i class="fas fa-eye"></i></a>
</th>
@ -198,4 +198,4 @@
</table>
</div>
</div>
@stop
@stop

2
views/userentities.blade.php
View File

@ -69,7 +69,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#userentities-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

2
views/userfields.blade.php
View File

@ -84,7 +84,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#userfields-table"
href="#"><i class="fas fa-eye"></i></a>
</th>

2
views/users.blade.php
View File

@ -69,7 +69,7 @@
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
data-toggle="tooltip"
title="{{ $__t('Hide/view columns') }}"
title="{{ $__t('Table options') }}"
data-table-selector="#users-table"
href="#"><i class="fas fa-eye"></i></a>
</th>