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

Fix accent insensitive table search (fixes #2904)

Browse Source 
Implemented accent insensitive product name search in productpicker (closes #2905)
This commit is contained in:
Bernd Bestel 2026-04-03 21:36:06 +02:00
parent d4bf5d075a
commit 87bd971d89
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
17 changed files with 191 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog/58_2.7.0_2020-04-16.md
View File

@ -56,7 +56,7 @@
- Various display/CSS improvements (thanks @Mik-) - Various display/CSS improvements (thanks @Mik-)
- Prerequisites (PHP extensions, critical files/folders) will now be checked and properly reported if there are problems (thanks @Forceu) - Prerequisites (PHP extensions, critical files/folders) will now be checked and properly reported if there are problems (thanks @Forceu)
- Improved the the overview pages on mobile devices (main column was hidden) (thanks @Mik-) - Improved the the overview pages on mobile devices (main column was hidden) (thanks @Mik-)
- The general search field now searches accent insensitive (and table sorting is also accent insensitive) - The general table search field now searches accent insensitive (and table sorting is also accent insensitive)
- Fixed that all number inputs are always prefilled in the browser locale number format - Fixed that all number inputs are always prefilled in the browser locale number format
- Optimized the handling of settings provided by `data/settingoverrides` files (thanks @dacto) - Optimized the handling of settings provided by `data/settingoverrides` files (thanks @dacto)
- Optimized the update script (`update.sh`) to create the backup tar archive before writing to it (was a problem on Btrfs file systems) (thanks @shane-kerr) - Optimized the update script (`update.sh`) to create the backup tar archive before writing to it (was a problem on Btrfs file systems) (thanks @shane-kerr)

2
changelog/82_UNRELEASED_xxxx-xx-xx.md
View File

@ -13,6 +13,7 @@
- Fixed that changing the location on the purchase page re-initialized the due date based on product defaults (if any) - Fixed that changing the location on the purchase page re-initialized the due date based on product defaults (if any)
- Fixed that when undoing a product consume or transfer transaction, the store of the corresponding stock entry wasn't restored - Fixed that when undoing a product consume or transfer transaction, the store of the corresponding stock entry wasn't restored
- This will only apply to new consume / transfer transactions, not when undoing transactions made before using this release - This will only apply to new consume / transfer transactions, not when undoing transactions made before using this release
- The product picker now searches product names accent insensitive
### Shopping list ### Shopping list
@ -52,6 +53,7 @@
### General ### General
- Fixed accent insensitive searching using the general table search field was broken
- Fixed that it wasn't possible to log in using passwords containing special escape sequences (e.g. `<<`) - Fixed that it wasn't possible to log in using passwords containing special escape sequences (e.g. `<<`)
### API ### API

1
package.json
View File

@ -20,7 +20,6 @@
"datatables.net-bs4": "^1.10.22", "datatables.net-bs4": "^1.10.22",
"datatables.net-colreorder": "^1.5.2", "datatables.net-colreorder": "^1.5.2",
"datatables.net-colreorder-bs4": "^1.5.2", "datatables.net-colreorder-bs4": "^1.5.2",
"datatables.net-plugins": "^1.10.20",
"datatables.net-rowgroup": "<1.6.0", "datatables.net-rowgroup": "<1.6.0",
"datatables.net-rowgroup-bs4": "^1.1.2", "datatables.net-rowgroup-bs4": "^1.1.2",
"datatables.net-select": "^1.3.1", "datatables.net-select": "^1.3.1",

46
public/js/extensions.js
View File

@ -1,4 +1,4 @@
EmptyElementWhenMatches = function(selector, text) EmptyElementWhenMatches = function (selector, text)
{ {
if ($(selector).text() === text) if ($(selector).text() === text)
{ {
@ -6,22 +6,34 @@ EmptyElementWhenMatches = function(selector, text)
} }
}; };
String.prototype.contains = function(search) String.prototype.contains = function (search)
{ {
return this.toLowerCase().indexOf(search.toLowerCase()) !== -1; return this.toLowerCase().indexOf(search.toLowerCase()) !== -1;
}; };
String.prototype.replaceAll = function(search, replacement) String.prototype.replaceAll = function (search, replacement)
{ {
return this.replace(new RegExp(search, "g"), replacement); return this.replace(new RegExp(search, "g"), replacement);
}; };
String.prototype.escapeHTML = function() String.prototype.escapeHTML = function ()
{ {
return this.replace(/[&<>"'`=\/]/g, s => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;', '/': '&#x2F;', '`': '&#x60;', '=': '&#x3D;' })[s]);; return this.replace(/[&<>"'`=\/]/g, s => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;', '/': '&#x2F;', '`': '&#x60;', '=': '&#x3D;' })[s]);;
}; };
GetUriParam = function(key) // E.g. "Crème fraîche" becomes "Creme fraiche"
String.prototype.accentNeutralise = function ()
{
return this.normalize("NFD").replace(/[\u0300-\u036f]/g, "");
};
// E.g. "<div class='c'>test</div>" becomes "test"
String.prototype.stripHtml = function ()
{
return this.replace(/<.*?>/g, '');
};
GetUriParam = function (key)
{ {
var currentUri = window.location.search.substring(1); var currentUri = window.location.search.substring(1);
var vars = currentUri.split('&'); var vars = currentUri.split('&');
@ -37,21 +49,21 @@ GetUriParam = function(key)
} }
}; };
UpdateUriParam = function(key, value) UpdateUriParam = function (key, value)
{ {
var queryParameters = new URLSearchParams(location.search); var queryParameters = new URLSearchParams(location.search);
queryParameters.set(key, value); queryParameters.set(key, value);
window.history.replaceState({}, "", decodeURIComponent(`${location.pathname}?${queryParameters}`)); window.history.replaceState({}, "", decodeURIComponent(`${location.pathname}?${queryParameters}`));
}; };
RemoveUriParam = function(key) RemoveUriParam = function (key)
{ {
var queryParameters = new URLSearchParams(location.search); var queryParameters = new URLSearchParams(location.search);
queryParameters.delete(key); queryParameters.delete(key);
window.history.replaceState({}, "", decodeURIComponent(`${location.pathname}?${queryParameters}`)); window.history.replaceState({}, "", decodeURIComponent(`${location.pathname}?${queryParameters}`));
}; };
BoolVal = function(test) BoolVal = function (test)
{ {
if (!test) if (!test)
{ {
@ -69,25 +81,25 @@ BoolVal = function(test)
} }
} }
GetFileNameFromPath = function(path) GetFileNameFromPath = function (path)
{ {
return path.split("/").pop().split("\\").pop(); return path.split("/").pop().split("\\").pop();
} }
GetFileExtension = function(pathOrFileName) GetFileExtension = function (pathOrFileName)
{ {
return pathOrFileName.split(".").pop(); return pathOrFileName.split(".").pop();
} }
$.extend($.expr[":"], $.extend($.expr[":"],
{ {
"contains_case_insensitive": function(elem, i, match, array) "contains_case_insensitive": function (elem, i, match, array)
{ {
return (elem.textContent || elem.innerText || "").toLowerCase().indexOf((match[3] || "").toLowerCase()) >= 0; return (elem.textContent || elem.innerText || "").toLowerCase().indexOf((match[3] || "").toLowerCase()) >= 0;
} }
}); });
FindObjectInArrayByPropertyValue = function(array, propertyName, propertyValue) FindObjectInArrayByPropertyValue = function (array, propertyName, propertyValue)
{ {
for (var i = 0; i < array.length; i++) for (var i = 0; i < array.length; i++)
{ {
@ -100,7 +112,7 @@ FindObjectInArrayByPropertyValue = function(array, propertyName, propertyValue)
return null; return null;
} }
FindAllObjectsInArrayByPropertyValue = function(array, propertyName, propertyValue) FindAllObjectsInArrayByPropertyValue = function (array, propertyName, propertyValue)
{ {
var returnArray = []; var returnArray = [];
@ -115,7 +127,7 @@ FindAllObjectsInArrayByPropertyValue = function(array, propertyName, propertyVal
return returnArray; return returnArray;
} }
$.fn.hasAttr = function(name) $.fn.hasAttr = function (name)
{ {
return this.attr(name) !== undefined; return this.attr(name) !== undefined;
}; };
@ -135,20 +147,20 @@ function IsJsonString(text)
function Delay(callable, delayMilliseconds) function Delay(callable, delayMilliseconds)
{ {
var timer = 0; var timer = 0;
return function() return function ()
{ {
var context = this; var context = this;
var args = arguments; var args = arguments;
clearTimeout(timer); clearTimeout(timer);
timer = setTimeout(function() timer = setTimeout(function ()
{ {
callable.apply(context, args); callable.apply(context, args);
}, delayMilliseconds || 0); }, delayMilliseconds || 0);
}; };
} }
$.fn.isVisibleInViewport = function(extraHeightPadding = 0) $.fn.isVisibleInViewport = function (extraHeightPadding = 0)
{ {
var elementTop = $(this).offset().top; var elementTop = $(this).offset().top;
var viewportTop = $(window).scrollTop() - extraHeightPadding; var viewportTop = $(window).scrollTop() - extraHeightPadding;

10
public/js/grocy.js
View File

@ -850,6 +850,16 @@ $('[data-toggle="tooltip"]').tooltip();
// serializeJSON defaults // serializeJSON defaults
$.serializeJSON.defaultOptions.checkboxUncheckedValue = "0"; $.serializeJSON.defaultOptions.checkboxUncheckedValue = "0";
// bootstrap-combobox defaults
BootstrapComboboxDefaults = {
appendId: "_text_input",
bsVersion: "4",
"matcher": function (item)
{
return ~item.accentNeutralise().toLowerCase().indexOf(this.query.accentNeutralise().toLowerCase());
}
};
$(Grocy.UserPermissions).each(function (index, item) $(Grocy.UserPermissions).each(function (index, item)
{ {
if (item.has_permission == 0) if (item.has_permission == 0)

55
public/js/grocy_datatables.js
View File

@ -9,7 +9,7 @@ $.extend(true, $.fn.dataTable.defaults, {
'colReorder': true, 'colReorder': true,
'stateSave': true, 'stateSave': true,
'stateDuration': 0, 'stateDuration': 0,
'stateSaveParams': function(settings, data) 'stateSaveParams': function (settings, data)
{ {
data.search.search = ""; data.search.search = "";
@ -18,7 +18,7 @@ $.extend(true, $.fn.dataTable.defaults, {
column.search.search = ""; column.search.search = "";
}); });
}, },
'stateSaveCallback': function(settings, data) 'stateSaveCallback': function (settings, data)
{ {
var settingKey = 'datatables_state_' + settings.sTableId; var settingKey = 'datatables_state_' + settings.sTableId;
@ -49,7 +49,7 @@ $.extend(true, $.fn.dataTable.defaults, {
Grocy.FrontendHelpers.SaveUserSetting(settingKey, JSON.stringify(data)); Grocy.FrontendHelpers.SaveUserSetting(settingKey, JSON.stringify(data));
} }
}, },
'stateLoadCallback': function(settings, data) 'stateLoadCallback': function (settings, data)
{ {
var settingKey = 'datatables_state_' + settings.sTableId; var settingKey = 'datatables_state_' + settings.sTableId;
@ -62,7 +62,7 @@ $.extend(true, $.fn.dataTable.defaults, {
return JSON.parse(Grocy.UserSettings[settingKey]); 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 // Currently it is not possible to save the state of rowGroup via saveState events
var api = new $.fn.dataTable.Api(settings); var api = new $.fn.dataTable.Api(settings);
@ -99,16 +99,16 @@ $.extend(true, $.fn.dataTable.defaults, {
} }
}, },
'columnDefs': [ 'columnDefs': [
{ type: 'chinese-string', targets: '_all' } { type: 'string', targets: '_all' }
], ],
'rowGroup': { 'rowGroup': {
enable: false, enable: false,
startRender: function(rows, group) startRender: function (rows, group)
{ {
var collapsed = !!collapsedGroups[group]; var collapsed = !!collapsedGroups[group];
var toggleClass = collapsed ? "fa-caret-right" : "fa-caret-down"; var toggleClass = collapsed ? "fa-caret-right" : "fa-caret-down";
rows.nodes().each(function(row) rows.nodes().each(function (row)
{ {
row.style.display = collapsed ? "none" : ""; row.style.display = collapsed ? "none" : "";
}); });
@ -120,13 +120,13 @@ $.extend(true, $.fn.dataTable.defaults, {
} }
} }
}); });
$(document).on("click", "tr.dtrg-group", function() $(document).on("click", "tr.dtrg-group", function ()
{ {
var name = $(this).data('name'); var name = $(this).data('name');
collapsedGroups[name] = !collapsedGroups[name]; collapsedGroups[name] = !collapsedGroups[name];
$("table").DataTable().draw(); $("table").DataTable().draw();
}); });
$.fn.dataTable.ext.type.order["custom-sort-pre"] = function(data) $.fn.dataTable.ext.type.order["custom-sort-pre"] = function (data)
{ {
// Workaround for https://github.com/DataTables/ColReorder/issues/85 // Workaround for https://github.com/DataTables/ColReorder/issues/85
// //
@ -139,7 +139,24 @@ $.fn.dataTable.ext.type.order["custom-sort-pre"] = function(data)
return (Number.parseFloat($(data).get(0).innerText)); return (Number.parseFloat($(data).get(0).innerText));
}; };
$('.table').on('column-sizing.dt', function(e, settings) $.fn.dataTable.ext.type.search.string = function (s)
{
return s.accentNeutralise();
};
$.fn.dataTable.ext.type.search.html = function (s)
{
return s.stripHtml().accentNeutralise();
};
$.fn.dataTable.ext.type.order["string-pre"] = function (s)
{
return s.accentNeutralise();
};
$.fn.dataTable.ext.type.order["html-pre"] = function (s)
{
return s.stripHtml().accentNeutralise();
};
$('.table').on('column-sizing.dt', function (e, settings)
{ {
var dtScrollWidth = $('.dataTables_scroll').width(); var dtScrollWidth = $('.dataTables_scroll').width();
var tableWidth = $('.table').width() + 100; // Some extra padding, otherwise the scrollbar maybe only appears after a column is already completely out of the viewport var tableWidth = $('.table').width() + 100; // Some extra padding, otherwise the scrollbar maybe only appears after a column is already completely out of the viewport
@ -155,14 +172,14 @@ $('.table').on('column-sizing.dt', function(e, settings)
$('.dataTables_scrollBody').addClass("force-overflow-visible"); $('.dataTables_scrollBody').addClass("force-overflow-visible");
} }
}); });
$(document).on("show.bs.dropdown", "td .dropdown", function(e) $(document).on("show.bs.dropdown", "td .dropdown", function (e)
{ {
if ($('.dataTables_scrollBody').hasClass("no-force-overflow-visible")) if ($('.dataTables_scrollBody').hasClass("no-force-overflow-visible"))
{ {
$('.dataTables_scrollBody').addClass("force-overflow-visible"); $('.dataTables_scrollBody').addClass("force-overflow-visible");
} }
}); });
$(document).on("hide.bs.dropdown", "td .dropdown", function(e) $(document).on("hide.bs.dropdown", "td .dropdown", function (e)
{ {
if ($('.dataTables_scrollBody').hasClass("no-force-overflow-visible")) if ($('.dataTables_scrollBody').hasClass("no-force-overflow-visible"))
{ {
@ -170,7 +187,7 @@ $(document).on("hide.bs.dropdown", "td .dropdown", function(e)
} }
}); });
$(".change-table-columns-visibility-button").on("click", function(e) $(".change-table-columns-visibility-button").on("click", function (e)
{ {
e.preventDefault(); e.preventDefault();
@ -200,7 +217,7 @@ $(".change-table-columns-visibility-button").on("click", function(e)
</div>'; </div>';
} }
dataTable.columns().every(function() dataTable.columns().every(function ()
{ {
var index = this.index(); var index = this.index();
var indexForGrouping = index; var indexForGrouping = index;
@ -292,7 +309,7 @@ $(".change-table-columns-visibility-button").on("click", function(e)
reset: { reset: {
label: __t('Reset'), label: __t('Reset'),
className: 'btn-outline-danger float-left responsive-button', className: 'btn-outline-danger float-left responsive-button',
callback: function() callback: function ()
{ {
bootbox.confirm({ bootbox.confirm({
message: __t("Are you sure you want to reset the table options?"), message: __t("Are you sure you want to reset the table options?"),
@ -307,7 +324,7 @@ $(".change-table-columns-visibility-button").on("click", function(e)
className: 'btn-success' className: 'btn-success'
} }
}, },
callback: function(result) callback: function (result)
{ {
if (result) if (result)
{ {
@ -328,7 +345,7 @@ $(".change-table-columns-visibility-button").on("click", function(e)
ok: { ok: {
label: __t('OK'), label: __t('OK'),
className: 'btn-primary responsive-button', className: 'btn-primary responsive-button',
callback: function() callback: function ()
{ {
$(".modal").last().modal("hide"); $(".modal").last().modal("hide");
} }
@ -337,7 +354,7 @@ $(".change-table-columns-visibility-button").on("click", function(e)
}); });
}); });
$(document).on("click", ".change-table-columns-visibility-toggle", function() $(document).on("click", ".change-table-columns-visibility-toggle", function ()
{ {
var dataTableSelector = $(this).attr("data-table-selector"); var dataTableSelector = $(this).attr("data-table-selector");
var columnIndex = $(this).attr("data-column-index"); var columnIndex = $(this).attr("data-column-index");
@ -347,7 +364,7 @@ $(document).on("click", ".change-table-columns-visibility-toggle", function()
}); });
$(document).on("click", ".change-table-columns-rowgroup-toggle", function() $(document).on("click", ".change-table-columns-rowgroup-toggle", function ()
{ {
var dataTableSelector = $(this).attr("data-table-selector"); var dataTableSelector = $(this).attr("data-table-selector");
var columnIndex = $(this).attr("data-column-index"); var columnIndex = $(this).attr("data-column-index");

42
public/viewjs/batterytracking.js
View File

@ -1,4 +1,4 @@
$('#save-batterytracking-button').on('click', function(e) $('#save-batterytracking-button').on('click', function (e)
{ {
e.preventDefault(); e.preventDefault();
@ -16,13 +16,13 @@
Grocy.FrontendHelpers.BeginUiBusy("batterytracking-form"); Grocy.FrontendHelpers.BeginUiBusy("batterytracking-form");
Grocy.Api.Get('batteries/' + jsonForm.battery_id, Grocy.Api.Get('batteries/' + jsonForm.battery_id,
function(batteryDetails) function (batteryDetails)
{ {
Grocy.Api.Post('batteries/' + jsonForm.battery_id + '/charge', { 'tracked_time': $('#tracked_time').find('input').val() }, Grocy.Api.Post('batteries/' + jsonForm.battery_id + '/charge', { 'tracked_time': $('#tracked_time').find('input').val() },
function(result) function (result)
{ {
Grocy.EditObjectId = result.id; Grocy.EditObjectId = result.id;
Grocy.Components.UserfieldsForm.Save(function() Grocy.Components.UserfieldsForm.Save(function ()
{ {
Grocy.FrontendHelpers.EndUiBusy("batterytracking-form"); Grocy.FrontendHelpers.EndUiBusy("batterytracking-form");
toastr.success(__t('Tracked charge cycle of battery %1$s on %2$s', batteryDetails.battery.name, $('#tracked_time').find('input').val()) + '<br><a class="btn btn-secondary btn-sm mt-2" href="#" onclick="UndoChargeCycle(' + result.id + ')"><i class="fa-solid fa-undo"></i> ' + __t("Undo") + '</a>'); toastr.success(__t('Tracked charge cycle of battery %1$s on %2$s', batteryDetails.battery.name, $('#tracked_time').find('input').val()) + '<br><a class="btn btn-secondary btn-sm mt-2" href="#" onclick="UndoChargeCycle(' + result.id + ')"><i class="fa-solid fa-undo"></i> ' + __t("Undo") + '</a>');
@ -36,14 +36,14 @@
Grocy.FrontendHelpers.ValidateForm('batterytracking-form'); Grocy.FrontendHelpers.ValidateForm('batterytracking-form');
}); });
}, },
function(xhr) function (xhr)
{ {
Grocy.FrontendHelpers.EndUiBusy("batterytracking-form"); Grocy.FrontendHelpers.EndUiBusy("batterytracking-form");
console.error(xhr); console.error(xhr);
} }
); );
}, },
function(xhr) function (xhr)
{ {
Grocy.FrontendHelpers.EndUiBusy("batterytracking-form"); Grocy.FrontendHelpers.EndUiBusy("batterytracking-form");
console.error(xhr); console.error(xhr);
@ -51,7 +51,7 @@
); );
}); });
$('#battery_id').on('change', function(e) $('#battery_id').on('change', function (e)
{ {
var input = $('#battery_id_text_input').val().toString(); var input = $('#battery_id_text_input').val().toString();
$('#battery_id_text_input').val(input); $('#battery_id_text_input').val(input);
@ -62,7 +62,7 @@ $('#battery_id').on('change', function(e)
{ {
Grocy.Components.BatteryCard.Refresh(batteryId); Grocy.Components.BatteryCard.Refresh(batteryId);
setTimeout(function() setTimeout(function ()
{ {
$('#tracked_time').find('input').focus(); $('#tracked_time').find('input').focus();
}, Grocy.FormFocusDelay); }, Grocy.FormFocusDelay);
@ -71,28 +71,24 @@ $('#battery_id').on('change', function(e)
} }
}); });
$('.combobox').combobox({ $(".combobox").combobox(Object.assign(BootstrapComboboxDefaults, { "clearIfNoMatch": false }));
appendId: '_text_input',
bsVersion: '4',
clearIfNoMatch: false
});
$('#battery_id').val(''); $('#battery_id').val('');
$('#battery_id_text_input').val(''); $('#battery_id_text_input').val('');
$('#battery_id_text_input').trigger('change'); $('#battery_id_text_input').trigger('change');
Grocy.Components.DateTimePicker.GetInputElement().trigger('input'); Grocy.Components.DateTimePicker.GetInputElement().trigger('input');
Grocy.FrontendHelpers.ValidateForm('batterytracking-form'); Grocy.FrontendHelpers.ValidateForm('batterytracking-form');
setTimeout(function() setTimeout(function ()
{ {
$('#battery_id_text_input').focus(); $('#battery_id_text_input').focus();
}, Grocy.FormFocusDelay); }, Grocy.FormFocusDelay);
$('#batterytracking-form input').keyup(function(event) $('#batterytracking-form input').keyup(function (event)
{ {
Grocy.FrontendHelpers.ValidateForm('batterytracking-form'); Grocy.FrontendHelpers.ValidateForm('batterytracking-form');
}); });
$('#batterytracking-form input').keydown(function(event) $('#batterytracking-form input').keydown(function (event)
{ {
if (event.keyCode === 13) // Enter if (event.keyCode === 13) // Enter
{ {
@ -109,12 +105,12 @@ $('#batterytracking-form input').keydown(function(event)
} }
}); });
$('#tracked_time').find('input').on('keypress', function(e) $('#tracked_time').find('input').on('keypress', function (e)
{ {
Grocy.FrontendHelpers.ValidateForm('batterytracking-form'); Grocy.FrontendHelpers.ValidateForm('batterytracking-form');
}); });
$(document).on("Grocy.BarcodeScanned", function(e, barcode, target) $(document).on("Grocy.BarcodeScanned", function (e, barcode, target)
{ {
if (!(target == "@batterypicker" || target == "undefined" || target == undefined)) // Default target if (!(target == "@batterypicker" || target == "undefined" || target == undefined)) // Default target
{ {
@ -128,7 +124,7 @@ $(document).on("Grocy.BarcodeScanned", function(e, barcode, target)
$("#battery_id_text_input").val(barcode); $("#battery_id_text_input").val(barcode);
setTimeout(function() setTimeout(function ()
{ {
$("#battery_id_text_input").focusout(); $("#battery_id_text_input").focusout();
$("#battery_id_text_input").focus(); $("#battery_id_text_input").focus();
@ -140,18 +136,18 @@ $(document).on("Grocy.BarcodeScanned", function(e, barcode, target)
function UndoChargeCycle(chargeCycleId) function UndoChargeCycle(chargeCycleId)
{ {
Grocy.Api.Post('batteries/charge-cycles/' + chargeCycleId.toString() + '/undo', {}, Grocy.Api.Post('batteries/charge-cycles/' + chargeCycleId.toString() + '/undo', {},
function(result) function (result)
{ {
toastr.success(__t("Charge cycle successfully undone")); toastr.success(__t("Charge cycle successfully undone"));
}, },
function(xhr) function (xhr)
{ {
console.error(xhr); console.error(xhr);
} }
); );
}; };
$('#battery_id_text_input').on('blur', function(e) $('#battery_id_text_input').on('blur', function (e)
{ {
if ($('#battery_id').hasClass("combobox-menu-visible")) if ($('#battery_id').hasClass("combobox-menu-visible"))
{ {
@ -187,7 +183,7 @@ $('#battery_id_text_input').on('blur', function(e)
} }
}); });
$("#tracked_time").find("input").on("focus", function(e) $("#tracked_time").find("input").on("focus", function (e)
{ {
$(this).select(); $(this).select();
}); });

46
public/viewjs/choretracking.js
View File

@ -1,4 +1,4 @@
$('.save-choretracking-button').on('click', function(e) $('.save-choretracking-button').on('click', function (e)
{ {
e.preventDefault(); e.preventDefault();
@ -18,13 +18,13 @@
Grocy.FrontendHelpers.BeginUiBusy("choretracking-form"); Grocy.FrontendHelpers.BeginUiBusy("choretracking-form");
Grocy.Api.Get('chores/' + jsonForm.chore_id, Grocy.Api.Get('chores/' + jsonForm.chore_id,
function(choreDetails) function (choreDetails)
{ {
Grocy.Api.Post('chores/' + jsonForm.chore_id + '/execute', { 'tracked_time': Grocy.Components.DateTimePicker.GetValue(), 'done_by': $("#user_id").val(), 'skipped': skipped }, Grocy.Api.Post('chores/' + jsonForm.chore_id + '/execute', { 'tracked_time': Grocy.Components.DateTimePicker.GetValue(), 'done_by': $("#user_id").val(), 'skipped': skipped },
function(result) function (result)
{ {
Grocy.EditObjectId = result.id; Grocy.EditObjectId = result.id;
Grocy.Components.UserfieldsForm.Save(function() Grocy.Components.UserfieldsForm.Save(function ()
{ {
Grocy.FrontendHelpers.EndUiBusy("choretracking-form"); Grocy.FrontendHelpers.EndUiBusy("choretracking-form");
toastr.success(__t('Tracked execution of chore %1$s on %2$s', choreDetails.chore.name, Grocy.Components.DateTimePicker.GetValue()) + '<br><a class="btn btn-secondary btn-sm mt-2" href="#" onclick="UndoChoreExecution(' + result.id + ')"><i class="fa-solid fa-undo"></i> ' + __t("Undo") + '</a>'); toastr.success(__t('Tracked execution of chore %1$s on %2$s', choreDetails.chore.name, Grocy.Components.DateTimePicker.GetValue()) + '<br><a class="btn btn-secondary btn-sm mt-2" href="#" onclick="UndoChoreExecution(' + result.id + ')"><i class="fa-solid fa-undo"></i> ' + __t("Undo") + '</a>');
@ -38,14 +38,14 @@
Grocy.FrontendHelpers.ValidateForm('choretracking-form'); Grocy.FrontendHelpers.ValidateForm('choretracking-form');
}); });
}, },
function(xhr) function (xhr)
{ {
Grocy.FrontendHelpers.EndUiBusy("choretracking-form"); Grocy.FrontendHelpers.EndUiBusy("choretracking-form");
console.error(xhr); console.error(xhr);
} }
); );
}, },
function(xhr) function (xhr)
{ {
Grocy.FrontendHelpers.EndUiBusy("choretracking-form"); Grocy.FrontendHelpers.EndUiBusy("choretracking-form");
console.error(xhr); console.error(xhr);
@ -53,7 +53,7 @@
); );
}); });
$('#chore_id').on('change', function(e) $('#chore_id').on('change', function (e)
{ {
var input = $('#chore_id_text_input').val().toString(); var input = $('#chore_id_text_input').val().toString();
$('#chore_id_text_input').val(input); $('#chore_id_text_input').val(input);
@ -63,7 +63,7 @@ $('#chore_id').on('change', function(e)
if (choreId) if (choreId)
{ {
Grocy.Api.Get('objects/chores/' + choreId, Grocy.Api.Get('objects/chores/' + choreId,
function(chore) function (chore)
{ {
if (chore.track_date_only == 1) if (chore.track_date_only == 1)
@ -88,7 +88,7 @@ $('#chore_id').on('change', function(e)
Grocy.FrontendHelpers.ValidateForm('choretracking-form'); Grocy.FrontendHelpers.ValidateForm('choretracking-form');
}, },
function(xhr) function (xhr)
{ {
console.error(xhr); console.error(xhr);
} }
@ -96,7 +96,7 @@ $('#chore_id').on('change', function(e)
Grocy.Components.ChoreCard.Refresh(choreId); Grocy.Components.ChoreCard.Refresh(choreId);
setTimeout(function() setTimeout(function ()
{ {
Grocy.Components.DateTimePicker.GetInputElement().focus(); Grocy.Components.DateTimePicker.GetInputElement().focus();
}, Grocy.FormFocusDelay); }, Grocy.FormFocusDelay);
@ -105,26 +105,22 @@ $('#chore_id').on('change', function(e)
} }
}); });
$('.combobox').combobox({ $(".combobox").combobox(Object.assign(BootstrapComboboxDefaults, { "clearIfNoMatch": false }));
appendId: '_text_input',
bsVersion: '4',
clearIfNoMatch: false
});
$('#chore_id_text_input').trigger('change'); $('#chore_id_text_input').trigger('change');
Grocy.Components.DateTimePicker.GetInputElement().trigger('input'); Grocy.Components.DateTimePicker.GetInputElement().trigger('input');
Grocy.FrontendHelpers.ValidateForm('choretracking-form'); Grocy.FrontendHelpers.ValidateForm('choretracking-form');
setTimeout(function() setTimeout(function ()
{ {
$('#chore_id_text_input').focus(); $('#chore_id_text_input').focus();
}, Grocy.FormFocusDelay); }, Grocy.FormFocusDelay);
$('#choretracking-form input').keyup(function(event) $('#choretracking-form input').keyup(function (event)
{ {
Grocy.FrontendHelpers.ValidateForm('choretracking-form'); Grocy.FrontendHelpers.ValidateForm('choretracking-form');
}); });
$('#choretracking-form input').keydown(function(event) $('#choretracking-form input').keydown(function (event)
{ {
if (event.keyCode === 13) // Enter if (event.keyCode === 13) // Enter
{ {
@ -141,7 +137,7 @@ $('#choretracking-form input').keydown(function(event)
} }
}); });
$(document).on("Grocy.BarcodeScanned", function(e, barcode, target) $(document).on("Grocy.BarcodeScanned", function (e, barcode, target)
{ {
if (!(target == "@chorepicker" || target == "undefined" || target == undefined)) // Default target if (!(target == "@chorepicker" || target == "undefined" || target == undefined)) // Default target
{ {
@ -155,7 +151,7 @@ $(document).on("Grocy.BarcodeScanned", function(e, barcode, target)
$("#chore_id_text_input").val(barcode); $("#chore_id_text_input").val(barcode);
setTimeout(function() setTimeout(function ()
{ {
$("#chore_id_text_input").focusout(); $("#chore_id_text_input").focusout();
$("#chore_id_text_input").focus(); $("#chore_id_text_input").focus();
@ -164,7 +160,7 @@ $(document).on("Grocy.BarcodeScanned", function(e, barcode, target)
}, Grocy.FormFocusDelay); }, Grocy.FormFocusDelay);
}); });
Grocy.Components.DateTimePicker.GetInputElement().on('keypress', function(e) Grocy.Components.DateTimePicker.GetInputElement().on('keypress', function (e)
{ {
Grocy.FrontendHelpers.ValidateForm('choretracking-form'); Grocy.FrontendHelpers.ValidateForm('choretracking-form');
}); });
@ -172,18 +168,18 @@ Grocy.Components.DateTimePicker.GetInputElement().on('keypress', function(e)
function UndoChoreExecution(executionId) function UndoChoreExecution(executionId)
{ {
Grocy.Api.Post('chores/executions/' + executionId.toString() + '/undo', {}, Grocy.Api.Post('chores/executions/' + executionId.toString() + '/undo', {},
function(result) function (result)
{ {
toastr.success(__t("Chore execution successfully undone")); toastr.success(__t("Chore execution successfully undone"));
}, },
function(xhr) function (xhr)
{ {
console.error(xhr); console.error(xhr);
} }
); );
}; };
$('#chore_id_text_input').on('blur', function(e) $('#chore_id_text_input').on('blur', function (e)
{ {
if ($('#chore_id').hasClass("combobox-menu-visible")) if ($('#chore_id').hasClass("combobox-menu-visible"))
{ {
@ -218,7 +214,7 @@ $('#chore_id_text_input').on('blur', function(e)
} }
}); });
$("#tracked_time").find("input").on("focus", function(e) $("#tracked_time").find("input").on("focus", function (e)
{ {
$(this).select(); $(this).select();
}); });

18
public/viewjs/components/locationpicker.js
View File

@ -1,44 +1,40 @@
Grocy.Components.LocationPicker = {}; Grocy.Components.LocationPicker = {};
Grocy.Components.LocationPicker.GetPicker = function() Grocy.Components.LocationPicker.GetPicker = function ()
{ {
return $('#location_id'); return $('#location_id');
} }
Grocy.Components.LocationPicker.GetInputElement = function() Grocy.Components.LocationPicker.GetInputElement = function ()
{ {
return $('#location_id_text_input'); return $('#location_id_text_input');
} }
Grocy.Components.LocationPicker.GetValue = function() Grocy.Components.LocationPicker.GetValue = function ()
{ {
return $('#location_id').val(); return $('#location_id').val();
} }
Grocy.Components.LocationPicker.SetValue = function(value) Grocy.Components.LocationPicker.SetValue = function (value)
{ {
Grocy.Components.LocationPicker.GetInputElement().val(value); Grocy.Components.LocationPicker.GetInputElement().val(value);
Grocy.Components.LocationPicker.GetInputElement().trigger('change'); Grocy.Components.LocationPicker.GetInputElement().trigger('change');
} }
Grocy.Components.LocationPicker.SetId = function(value) Grocy.Components.LocationPicker.SetId = function (value)
{ {
Grocy.Components.LocationPicker.GetPicker().val(value); Grocy.Components.LocationPicker.GetPicker().val(value);
Grocy.Components.LocationPicker.GetPicker().data('combobox').refresh(); Grocy.Components.LocationPicker.GetPicker().data('combobox').refresh();
Grocy.Components.LocationPicker.GetInputElement().trigger('change'); Grocy.Components.LocationPicker.GetInputElement().trigger('change');
} }
Grocy.Components.LocationPicker.Clear = function() Grocy.Components.LocationPicker.Clear = function ()
{ {
Grocy.Components.LocationPicker.SetValue(''); Grocy.Components.LocationPicker.SetValue('');
Grocy.Components.LocationPicker.SetId(null); Grocy.Components.LocationPicker.SetId(null);
} }
$('.location-combobox').combobox({ $(".location-combobox").combobox(BootstrapComboboxDefaults);
appendId: '_text_input',
bsVersion: '4',
clearIfNoMatch: true
});
var prefillByName = Grocy.Components.LocationPicker.GetPicker().parent().data('prefill-by-name').toString(); var prefillByName = Grocy.Components.LocationPicker.GetPicker().parent().data('prefill-by-name').toString();
if (typeof prefillByName !== "undefined") if (typeof prefillByName !== "undefined")

78
public/viewjs/components/productpicker.js
View File

@ -1,56 +1,56 @@
Grocy.Components.ProductPicker = {}; Grocy.Components.ProductPicker = {};
Grocy.Components.ProductPicker.GetPicker = function() Grocy.Components.ProductPicker.GetPicker = function ()
{ {
return $('#product_id'); return $('#product_id');
} }
Grocy.Components.ProductPicker.GetInputElement = function() Grocy.Components.ProductPicker.GetInputElement = function ()
{ {
return $('#product_id_text_input'); return $('#product_id_text_input');
} }
Grocy.Components.ProductPicker.GetValue = function() Grocy.Components.ProductPicker.GetValue = function ()
{ {
return $('#product_id').val(); return $('#product_id').val();
} }
Grocy.Components.ProductPicker.SetValue = function(value) Grocy.Components.ProductPicker.SetValue = function (value)
{ {
Grocy.Components.ProductPicker.GetInputElement().val(value); Grocy.Components.ProductPicker.GetInputElement().val(value);
Grocy.Components.ProductPicker.GetInputElement().trigger('change'); Grocy.Components.ProductPicker.GetInputElement().trigger('change');
} }
Grocy.Components.ProductPicker.SetId = function(value) Grocy.Components.ProductPicker.SetId = function (value)
{ {
Grocy.Components.ProductPicker.GetPicker().val(value); Grocy.Components.ProductPicker.GetPicker().val(value);
Grocy.Components.ProductPicker.GetPicker().data('combobox').refresh(); Grocy.Components.ProductPicker.GetPicker().data('combobox').refresh();
Grocy.Components.ProductPicker.GetInputElement().trigger('change'); Grocy.Components.ProductPicker.GetInputElement().trigger('change');
} }
Grocy.Components.ProductPicker.Clear = function() Grocy.Components.ProductPicker.Clear = function ()
{ {
Grocy.Components.ProductPicker.SetValue(''); Grocy.Components.ProductPicker.SetValue('');
Grocy.Components.ProductPicker.SetId(null); Grocy.Components.ProductPicker.SetId(null);
$('#product_id').attr("barcode", "null"); $('#product_id').attr("barcode", "null");
} }
Grocy.Components.ProductPicker.InProductAddWorkflow = function() Grocy.Components.ProductPicker.InProductAddWorkflow = function ()
{ {
return GetUriParam('flow') == "InplaceNewProductWithName"; return GetUriParam('flow') == "InplaceNewProductWithName";
} }
Grocy.Components.ProductPicker.InProductModifyWorkflow = function() Grocy.Components.ProductPicker.InProductModifyWorkflow = function ()
{ {
return GetUriParam('flow') == "InplaceAddBarcodeToExistingProduct"; return GetUriParam('flow') == "InplaceAddBarcodeToExistingProduct";
} }
Grocy.Components.ProductPicker.InAnyFlow = function() Grocy.Components.ProductPicker.InAnyFlow = function ()
{ {
return Grocy.Components.ProductPicker.InProductAddWorkflow() || Grocy.Components.ProductPicker.InProductModifyWorkflow(); return Grocy.Components.ProductPicker.InProductAddWorkflow() || Grocy.Components.ProductPicker.InProductModifyWorkflow();
} }
Grocy.Components.ProductPicker.FinishFlow = function() Grocy.Components.ProductPicker.FinishFlow = function ()
{ {
if (GetUriParam("flow") == "InplaceAddBarcodeToExistingProduct") if (GetUriParam("flow") == "InplaceAddBarcodeToExistingProduct")
{ {
@ -62,37 +62,33 @@ Grocy.Components.ProductPicker.FinishFlow = function()
RemoveUriParam("product-name"); RemoveUriParam("product-name");
} }
Grocy.Components.ProductPicker.ShowCustomError = function(text) Grocy.Components.ProductPicker.ShowCustomError = function (text)
{ {
var element = $("#custom-productpicker-error"); var element = $("#custom-productpicker-error");
element.text(text); element.text(text);
element.removeClass("d-none"); element.removeClass("d-none");
} }
Grocy.Components.ProductPicker.HideCustomError = function() Grocy.Components.ProductPicker.HideCustomError = function ()
{ {
$("#custom-productpicker-error").addClass("d-none"); $("#custom-productpicker-error").addClass("d-none");
} }
Grocy.Components.ProductPicker.Disable = function() Grocy.Components.ProductPicker.Disable = function ()
{ {
Grocy.Components.ProductPicker.GetInputElement().attr("disabled", ""); Grocy.Components.ProductPicker.GetInputElement().attr("disabled", "");
$("#camerabarcodescanner-start-button").attr("disabled", ""); $("#camerabarcodescanner-start-button").attr("disabled", "");
$("#camerabarcodescanner-start-button").addClass("disabled"); $("#camerabarcodescanner-start-button").addClass("disabled");
} }
Grocy.Components.ProductPicker.Enable = function() Grocy.Components.ProductPicker.Enable = function ()
{ {
Grocy.Components.ProductPicker.GetInputElement().removeAttr("disabled"); Grocy.Components.ProductPicker.GetInputElement().removeAttr("disabled");
$("#camerabarcodescanner-start-button").removeAttr("disabled"); $("#camerabarcodescanner-start-button").removeAttr("disabled");
$("#camerabarcodescanner-start-button").removeClass("disabled"); $("#camerabarcodescanner-start-button").removeClass("disabled");
} }
$('.product-combobox').combobox({ $(".product-combobox").combobox(Object.assign(BootstrapComboboxDefaults, { "clearIfNoMatch": false }));
appendId: '_text_input',
bsVersion: '4',
clearIfNoMatch: false
});
var prefillProduct = GetUriParam('product-name'); var prefillProduct = GetUriParam('product-name');
var prefillProduct2 = Grocy.Components.ProductPicker.GetPicker().parent().data('prefill-by-name').toString(); var prefillProduct2 = Grocy.Components.ProductPicker.GetPicker().parent().data('prefill-by-name').toString();
@ -152,7 +148,7 @@ if (GetUriParam("flow") === "InplaceAddBarcodeToExistingProduct")
} }
Grocy.Components.ProductPicker.PopupOpen = false; Grocy.Components.ProductPicker.PopupOpen = false;
$('#product_id_text_input').on('blur', function(e) $('#product_id_text_input').on('blur', function (e)
{ {
if (Grocy.Components.ProductPicker.GetPicker().hasClass("combobox-menu-visible")) if (Grocy.Components.ProductPicker.GetPicker().hasClass("combobox-menu-visible"))
{ {
@ -212,10 +208,10 @@ $('#product_id_text_input').on('blur', function(e)
cancel: { cancel: {
label: __t('Cancel'), label: __t('Cancel'),
className: 'btn-secondary responsive-button productpicker-workflow-cancel-button', className: 'btn-secondary responsive-button productpicker-workflow-cancel-button',
callback: function() callback: function ()
{ {
Grocy.Components.ProductPicker.PopupOpen = false; Grocy.Components.ProductPicker.PopupOpen = false;
setTimeout(function() setTimeout(function ()
{ {
Grocy.Components.ProductPicker.GetInputElement().focus(); Grocy.Components.ProductPicker.GetInputElement().focus();
Grocy.Components.ProductPicker.GetInputElement().select(); Grocy.Components.ProductPicker.GetInputElement().select();
@ -225,7 +221,7 @@ $('#product_id_text_input').on('blur', function(e)
addnewproduct: { addnewproduct: {
label: '<strong>P</strong> ' + __t('Add as new product'), label: '<strong>P</strong> ' + __t('Add as new product'),
className: 'btn-success add-new-product-dialog-button responsive-button ' + addProductWorkflowsAdditionalCssClasses, className: 'btn-success add-new-product-dialog-button responsive-button ' + addProductWorkflowsAdditionalCssClasses,
callback: function() callback: function ()
{ {
// Not the best place here - this is only relevant when this flow is started from the shopping list item form // Not the best place here - this is only relevant when this flow is started from the shopping list item form
// (to select the correct shopping list on return) // (to select the correct shopping list on return)
@ -241,7 +237,7 @@ $('#product_id_text_input').on('blur', function(e)
addbarcode: { addbarcode: {
label: '<strong>B</strong> ' + __t('Add as barcode to existing product'), label: '<strong>B</strong> ' + __t('Add as barcode to existing product'),
className: 'btn-info add-new-barcode-dialog-button responsive-button', className: 'btn-info add-new-barcode-dialog-button responsive-button',
callback: function() callback: function ()
{ {
Grocy.Components.ProductPicker.PopupOpen = false; Grocy.Components.ProductPicker.PopupOpen = false;
window.location.href = U(Grocy.CurrentUrlRelative + '?flow=InplaceAddBarcodeToExistingProduct&barcode=' + encodeURIComponent(input) + "&" + embedded); window.location.href = U(Grocy.CurrentUrlRelative + '?flow=InplaceAddBarcodeToExistingProduct&barcode=' + encodeURIComponent(input) + "&" + embedded);
@ -250,7 +246,7 @@ $('#product_id_text_input').on('blur', function(e)
addnewproductwithbarcode: { addnewproductwithbarcode: {
label: '<strong>A</strong> ' + __t('Add as new product and prefill barcode'), label: '<strong>A</strong> ' + __t('Add as new product and prefill barcode'),
className: 'btn-warning add-new-product-with-barcode-dialog-button responsive-button ' + addProductWorkflowsAdditionalCssClasses, className: 'btn-warning add-new-product-with-barcode-dialog-button responsive-button ' + addProductWorkflowsAdditionalCssClasses,
callback: function() callback: function ()
{ {
Grocy.Components.ProductPicker.PopupOpen = false; Grocy.Components.ProductPicker.PopupOpen = false;
window.location.href = U('/product/new?flow=InplaceNewProductWithBarcode&barcode=' + encodeURIComponent(input) + '&returnto=' + encodeURIComponent(Grocy.CurrentUrlRelative + "?flow=InplaceAddBarcodeToExistingProduct&barcode=" + input + "&" + embedded) + "&" + embedded); window.location.href = U('/product/new?flow=InplaceNewProductWithBarcode&barcode=' + encodeURIComponent(input) + '&returnto=' + encodeURIComponent(Grocy.CurrentUrlRelative + "?flow=InplaceAddBarcodeToExistingProduct&barcode=" + input + "&" + embedded) + "&" + embedded);
@ -263,19 +259,19 @@ $('#product_id_text_input').on('blur', function(e)
buttons.barcodepluginlookup = { buttons.barcodepluginlookup = {
label: '<strong>E</strong> ' + __t('External barcode lookup') + ' <span class="badge badge-pill badge-light">' + Grocy.ExternalBarcodeLookupPluginName + '</span>', label: '<strong>E</strong> ' + __t('External barcode lookup') + ' <span class="badge badge-pill badge-light">' + Grocy.ExternalBarcodeLookupPluginName + '</span>',
className: 'btn-dark add-new-product-plugin-dialog-button responsive-button ' + addProductWorkflowsAdditionalCssClasses, className: 'btn-dark add-new-product-plugin-dialog-button responsive-button ' + addProductWorkflowsAdditionalCssClasses,
callback: function() callback: function ()
{ {
Grocy.Components.ProductPicker.PopupOpen = false; Grocy.Components.ProductPicker.PopupOpen = false;
Grocy.FrontendHelpers.BeginUiBusy($("form").first().attr("id")); Grocy.FrontendHelpers.BeginUiBusy($("form").first().attr("id"));
Grocy.Api.Get("stock/barcodes/external-lookup/" + encodeURIComponent(input) + "?add=true", Grocy.Api.Get("stock/barcodes/external-lookup/" + encodeURIComponent(input) + "?add=true",
function(pluginResponse) function (pluginResponse)
{ {
if (pluginResponse == null) if (pluginResponse == null)
{ {
toastr.warning(__t("Nothing was found for the given barcode")); toastr.warning(__t("Nothing was found for the given barcode"));
Grocy.FrontendHelpers.EndUiBusy($("form").first().attr("id")); Grocy.FrontendHelpers.EndUiBusy($("form").first().attr("id"));
setTimeout(function() setTimeout(function ()
{ {
Grocy.Components.ProductPicker.GetInputElement().focus(); Grocy.Components.ProductPicker.GetInputElement().focus();
Grocy.Components.ProductPicker.GetInputElement().select(); Grocy.Components.ProductPicker.GetInputElement().select();
@ -286,7 +282,7 @@ $('#product_id_text_input').on('blur', function(e)
window.location.href = U("/product/" + pluginResponse.id + "?flow=InplaceNewProductByExternalBarcodeLookupPlugin&returnto=" + encodeURIComponent(Grocy.CurrentUrlRelative + "?flow=InplaceNewProductWithName&" + embedded) + "&" + embedded); window.location.href = U("/product/" + pluginResponse.id + "?flow=InplaceNewProductByExternalBarcodeLookupPlugin&returnto=" + encodeURIComponent(Grocy.CurrentUrlRelative + "?flow=InplaceNewProductWithName&" + embedded) + "&" + embedded);
} }
}, },
function(xhr) function (xhr)
{ {
Grocy.FrontendHelpers.ShowGenericError("Error while executing the barcode lookup plugin", xhr.response); Grocy.FrontendHelpers.ShowGenericError("Error while executing the barcode lookup plugin", xhr.response);
Grocy.FrontendHelpers.EndUiBusy($("form").first().attr("id")); Grocy.FrontendHelpers.EndUiBusy($("form").first().attr("id"));
@ -301,7 +297,7 @@ $('#product_id_text_input').on('blur', function(e)
buttons.retrycamerascanning = { buttons.retrycamerascanning = {
label: '<strong>C</strong> <i class="fa-solid fa-camera"></i>', label: '<strong>C</strong> <i class="fa-solid fa-camera"></i>',
className: 'btn-primary responsive-button retry-camera-scanning-button', className: 'btn-primary responsive-button retry-camera-scanning-button',
callback: function() callback: function ()
{ {
Grocy.Components.ProductPicker.PopupOpen = false; Grocy.Components.ProductPicker.PopupOpen = false;
Grocy.Components.ProductPicker.SetValue(''); Grocy.Components.ProductPicker.SetValue('');
@ -317,7 +313,7 @@ $('#product_id_text_input').on('blur', function(e)
var existsAsProduct = false; var existsAsProduct = false;
var existsAsBarcode = false; var existsAsBarcode = false;
Grocy.Api.Get('objects/product_barcodes_view?query[]=barcode=' + input, Grocy.Api.Get('objects/product_barcodes_view?query[]=barcode=' + input,
function(barcodeResult) function (barcodeResult)
{ {
if (barcodeResult.length > 0) if (barcodeResult.length > 0)
{ {
@ -325,7 +321,7 @@ $('#product_id_text_input').on('blur', function(e)
} }
Grocy.Api.Get('objects/products?query[]=name=' + input, Grocy.Api.Get('objects/products?query[]=name=' + input,
function(productResult) function (productResult)
{ {
if (productResult.length > 0) if (productResult.length > 0)
{ {
@ -338,7 +334,7 @@ $('#product_id_text_input').on('blur', function(e)
bootbox.dialog({ bootbox.dialog({
message: __t('"%s" could not be resolved to a product, how do you want to proceed?', input), message: __t('"%s" could not be resolved to a product, how do you want to proceed?', input),
title: __t('Create or assign product'), title: __t('Create or assign product'),
onEscape: function() onEscape: function ()
{ {
$(".productpicker-workflow-cancel-button").click(); $(".productpicker-workflow-cancel-button").click();
}, },
@ -347,7 +343,7 @@ $('#product_id_text_input').on('blur', function(e)
closeButton: false, closeButton: false,
buttons: buttons, buttons: buttons,
className: "wider custom-escape-key-handling", className: "wider custom-escape-key-handling",
}).on('keypress', function(e) }).on('keypress', function (e)
{ {
if (e.key === 'B' || e.key === 'b') if (e.key === 'B' || e.key === 'b')
{ {
@ -377,19 +373,19 @@ $('#product_id_text_input').on('blur', function(e)
Grocy.Components.ProductPicker.Clear(); Grocy.Components.ProductPicker.Clear();
Grocy.FrontendHelpers.ValidateForm('consume-form'); Grocy.FrontendHelpers.ValidateForm('consume-form');
Grocy.Components.ProductPicker.ShowCustomError(__t('This product is not in stock')); Grocy.Components.ProductPicker.ShowCustomError(__t('This product is not in stock'));
setTimeout(function() setTimeout(function ()
{ {
Grocy.Components.ProductPicker.GetInputElement().focus(); Grocy.Components.ProductPicker.GetInputElement().focus();
}, Grocy.FormFocusDelay); }, Grocy.FormFocusDelay);
} }
}, },
function(xhr) function (xhr)
{ {
console.error(xhr); console.error(xhr);
} }
); );
}, },
function(xhr) function (xhr)
{ {
console.error(xhr); console.error(xhr);
} }
@ -398,7 +394,7 @@ $('#product_id_text_input').on('blur', function(e)
} }
}); });
$(document).on("Grocy.BarcodeScanned", function(e, barcode, target) $(document).on("Grocy.BarcodeScanned", function (e, barcode, target)
{ {
if (!(target == "@productpicker" || target == "undefined" || target == undefined)) // Default target if (!(target == "@productpicker" || target == "undefined" || target == undefined)) // Default target
{ {
@ -412,7 +408,7 @@ $(document).on("Grocy.BarcodeScanned", function(e, barcode, target)
Grocy.Components.ProductPicker.GetInputElement().val(barcode); Grocy.Components.ProductPicker.GetInputElement().val(barcode);
setTimeout(function() setTimeout(function ()
{ {
Grocy.Components.ProductPicker.GetInputElement().focusout(); Grocy.Components.ProductPicker.GetInputElement().focusout();
Grocy.Components.ProductPicker.GetInputElement().focus(); Grocy.Components.ProductPicker.GetInputElement().focus();
@ -420,14 +416,14 @@ $(document).on("Grocy.BarcodeScanned", function(e, barcode, target)
}, Grocy.FormFocusDelay); }, Grocy.FormFocusDelay);
}); });
$(document).on("shown.bs.modal", function(e) $(document).on("shown.bs.modal", function (e)
{ {
$(".modal-footer").addClass("d-block").addClass("d-sm-flex"); $(".modal-footer").addClass("d-block").addClass("d-sm-flex");
$(".modal-footer").find("button").addClass("mt-2").addClass("mt-sm-0"); $(".modal-footer").find("button").addClass("mt-2").addClass("mt-sm-0");
}) })
// Make that ENTER behaves the same like TAB (trigger blur to start workflows, but only when the dropdown is not opened) // Make that ENTER behaves the same like TAB (trigger blur to start workflows, but only when the dropdown is not opened)
$('#product_id_text_input').keydown(function(event) $('#product_id_text_input').keydown(function (event)
{ {
if (event.keyCode === 13) // Enter if (event.keyCode === 13) // Enter
{ {

24
public/viewjs/components/recipepicker.js
View File

@ -1,44 +1,40 @@
Grocy.Components.RecipePicker = {}; Grocy.Components.RecipePicker = {};
Grocy.Components.RecipePicker.GetPicker = function() Grocy.Components.RecipePicker.GetPicker = function ()
{ {
return $('#recipe_id'); return $('#recipe_id');
} }
Grocy.Components.RecipePicker.GetInputElement = function() Grocy.Components.RecipePicker.GetInputElement = function ()
{ {
return $('#recipe_id_text_input'); return $('#recipe_id_text_input');
} }
Grocy.Components.RecipePicker.GetValue = function() Grocy.Components.RecipePicker.GetValue = function ()
{ {
return $('#recipe_id').val(); return $('#recipe_id').val();
} }
Grocy.Components.RecipePicker.SetValue = function(value) Grocy.Components.RecipePicker.SetValue = function (value)
{ {
Grocy.Components.RecipePicker.GetInputElement().val(value); Grocy.Components.RecipePicker.GetInputElement().val(value);
Grocy.Components.RecipePicker.GetInputElement().trigger('change'); Grocy.Components.RecipePicker.GetInputElement().trigger('change');
} }
Grocy.Components.RecipePicker.SetId = function(value) Grocy.Components.RecipePicker.SetId = function (value)
{ {
Grocy.Components.RecipePicker.GetPicker().val(value); Grocy.Components.RecipePicker.GetPicker().val(value);
Grocy.Components.RecipePicker.GetPicker().data('combobox').refresh(); Grocy.Components.RecipePicker.GetPicker().data('combobox').refresh();
Grocy.Components.RecipePicker.GetInputElement().trigger('change'); Grocy.Components.RecipePicker.GetInputElement().trigger('change');
} }
Grocy.Components.RecipePicker.Clear = function() Grocy.Components.RecipePicker.Clear = function ()
{ {
Grocy.Components.RecipePicker.SetValue(''); Grocy.Components.RecipePicker.SetValue('');
Grocy.Components.RecipePicker.SetId(null); Grocy.Components.RecipePicker.SetId(null);
} }
$('.recipe-combobox').combobox({ $(".recipe-combobox").combobox(Object.assign(BootstrapComboboxDefaults, { "clearIfNoMatch": false }));
appendId: '_text_input',
bsVersion: '4',
clearIfNoMatch: false
});
var prefillByName = Grocy.Components.RecipePicker.GetPicker().parent().data('prefill-by-name').toString(); var prefillByName = Grocy.Components.RecipePicker.GetPicker().parent().data('prefill-by-name').toString();
if (typeof prefillByName !== "undefined") if (typeof prefillByName !== "undefined")
@ -67,7 +63,7 @@ if (typeof prefillById !== "undefined")
nextInputElement.focus(); nextInputElement.focus();
} }
$('#recipe_id_text_input').on('blur', function(e) $('#recipe_id_text_input').on('blur', function (e)
{ {
if ($('#recipe_id').hasClass("combobox-menu-visible")) if ($('#recipe_id').hasClass("combobox-menu-visible"))
{ {
@ -102,7 +98,7 @@ $('#recipe_id_text_input').on('blur', function(e)
} }
}); });
$(document).on("Grocy.BarcodeScanned", function(e, barcode, target) $(document).on("Grocy.BarcodeScanned", function (e, barcode, target)
{ {
if (!(target == "@recipepicker" || target == "undefined" || target == undefined)) // Default target if (!(target == "@recipepicker" || target == "undefined" || target == undefined)) // Default target
{ {
@ -116,7 +112,7 @@ $(document).on("Grocy.BarcodeScanned", function(e, barcode, target)
Grocy.Components.RecipePicker.GetInputElement().val(barcode); Grocy.Components.RecipePicker.GetInputElement().val(barcode);
setTimeout(function() setTimeout(function ()
{ {
Grocy.Components.RecipePicker.GetInputElement().focusout(); Grocy.Components.RecipePicker.GetInputElement().focusout();
Grocy.Components.RecipePicker.GetInputElement().focus(); Grocy.Components.RecipePicker.GetInputElement().focus();

18
public/viewjs/components/shoppinglocationpicker.js
View File

@ -1,44 +1,40 @@
Grocy.Components.ShoppingLocationPicker = {}; Grocy.Components.ShoppingLocationPicker = {};
Grocy.Components.ShoppingLocationPicker.GetPicker = function() Grocy.Components.ShoppingLocationPicker.GetPicker = function ()
{ {
return $('#shopping_location_id'); return $('#shopping_location_id');
} }
Grocy.Components.ShoppingLocationPicker.GetInputElement = function() Grocy.Components.ShoppingLocationPicker.GetInputElement = function ()
{ {
return $('#shopping_location_id_text_input'); return $('#shopping_location_id_text_input');
} }
Grocy.Components.ShoppingLocationPicker.GetValue = function() Grocy.Components.ShoppingLocationPicker.GetValue = function ()
{ {
return $('#shopping_location_id').val(); return $('#shopping_location_id').val();
} }
Grocy.Components.ShoppingLocationPicker.SetValue = function(value) Grocy.Components.ShoppingLocationPicker.SetValue = function (value)
{ {
Grocy.Components.ShoppingLocationPicker.GetInputElement().val(value); Grocy.Components.ShoppingLocationPicker.GetInputElement().val(value);
Grocy.Components.ShoppingLocationPicker.GetInputElement().trigger('change'); Grocy.Components.ShoppingLocationPicker.GetInputElement().trigger('change');
} }
Grocy.Components.ShoppingLocationPicker.SetId = function(value) Grocy.Components.ShoppingLocationPicker.SetId = function (value)
{ {
Grocy.Components.ShoppingLocationPicker.GetPicker().val(value); Grocy.Components.ShoppingLocationPicker.GetPicker().val(value);
Grocy.Components.ShoppingLocationPicker.GetPicker().data('combobox').refresh(); Grocy.Components.ShoppingLocationPicker.GetPicker().data('combobox').refresh();
Grocy.Components.ShoppingLocationPicker.GetInputElement().trigger('change'); Grocy.Components.ShoppingLocationPicker.GetInputElement().trigger('change');
} }
Grocy.Components.ShoppingLocationPicker.Clear = function() Grocy.Components.ShoppingLocationPicker.Clear = function ()
{ {
Grocy.Components.ShoppingLocationPicker.SetValue(''); Grocy.Components.ShoppingLocationPicker.SetValue('');
Grocy.Components.ShoppingLocationPicker.SetId(null); Grocy.Components.ShoppingLocationPicker.SetId(null);
} }
$('.shopping-location-combobox').combobox({ $(".shopping-location-combobox").combobox(BootstrapComboboxDefaults);
appendId: '_text_input',
bsVersion: '4',
clearIfNoMatch: true
});
var prefillByName = Grocy.Components.ShoppingLocationPicker.GetPicker().parent().data('prefill-by-name').toString(); var prefillByName = Grocy.Components.ShoppingLocationPicker.GetPicker().parent().data('prefill-by-name').toString();
if (typeof prefillByName !== "undefined") if (typeof prefillByName !== "undefined")

17
public/viewjs/components/userpicker.js
View File

@ -1,43 +1,40 @@
Grocy.Components.UserPicker = {}; Grocy.Components.UserPicker = {};
Grocy.Components.UserPicker.GetPicker = function() Grocy.Components.UserPicker.GetPicker = function ()
{ {
return $('#user_id'); return $('#user_id');
} }
Grocy.Components.UserPicker.GetInputElement = function() Grocy.Components.UserPicker.GetInputElement = function ()
{ {
return $('#user_id_text_input'); return $('#user_id_text_input');
} }
Grocy.Components.UserPicker.GetValue = function() Grocy.Components.UserPicker.GetValue = function ()
{ {
return $('#user_id').val(); return $('#user_id').val();
} }
Grocy.Components.UserPicker.SetValue = function(value) Grocy.Components.UserPicker.SetValue = function (value)
{ {
Grocy.Components.UserPicker.GetInputElement().val(value); Grocy.Components.UserPicker.GetInputElement().val(value);
Grocy.Components.UserPicker.GetInputElement().trigger('change'); Grocy.Components.UserPicker.GetInputElement().trigger('change');
} }
Grocy.Components.UserPicker.SetId = function(value) Grocy.Components.UserPicker.SetId = function (value)
{ {
Grocy.Components.UserPicker.GetPicker().val(value); Grocy.Components.UserPicker.GetPicker().val(value);
Grocy.Components.UserPicker.GetPicker().data('combobox').refresh(); Grocy.Components.UserPicker.GetPicker().data('combobox').refresh();
Grocy.Components.UserPicker.GetInputElement().trigger('change'); Grocy.Components.UserPicker.GetInputElement().trigger('change');
} }
Grocy.Components.UserPicker.Clear = function() Grocy.Components.UserPicker.Clear = function ()
{ {
Grocy.Components.UserPicker.SetValue(''); Grocy.Components.UserPicker.SetValue('');
Grocy.Components.UserPicker.SetId(null); Grocy.Components.UserPicker.SetId(null);
} }
$('.user-combobox').combobox({ $(".user-combobox").combobox(BootstrapComboboxDefaults);
appendId: '_text_input',
bsVersion: '4'
});
var prefillUser = Grocy.Components.UserPicker.GetPicker().parent().data('prefill-by-username').toString(); var prefillUser = Grocy.Components.UserPicker.GetPicker().parent().data('prefill-by-username').toString();
if (typeof prefillUser !== "undefined") if (typeof prefillUser !== "undefined")

2
views/components/productpicker.blade.php
View File

@ -5,9 +5,11 @@
<script src="{{ $U('/viewjs/components/productpicker.js', true) }}?v={{ $version }}"></script> <script src="{{ $U('/viewjs/components/productpicker.js', true) }}?v={{ $version }}"></script>
@endpush @endpush
@push('componentScripts') @push('componentScripts')
@if(isset($ExternalBarcodeLookupPluginName))
<script> <script>
Grocy.ExternalBarcodeLookupPluginName = "{{ $ExternalBarcodeLookupPluginName }}"; Grocy.ExternalBarcodeLookupPluginName = "{{ $ExternalBarcodeLookupPluginName }}";
</script> </script>
@endif
@endpush @endpush
@endonce @endonce

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

@ -715,8 +715,6 @@
<script src="{{ $U('/packages/datatables.net-bs4/js/dataTables.bootstrap4.min.js?v=', true) }}{{ $version }}"></script> <script src="{{ $U('/packages/datatables.net-bs4/js/dataTables.bootstrap4.min.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/packages/datatables.net-colreorder/js/dataTables.colReorder.min.js?v=', true) }}{{ $version }}"></script> <script src="{{ $U('/packages/datatables.net-colreorder/js/dataTables.colReorder.min.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/packages/datatables.net-colreorder-bs4/js/colReorder.bootstrap4.min.js?v=', true) }}{{ $version }}"></script> <script src="{{ $U('/packages/datatables.net-colreorder-bs4/js/colReorder.bootstrap4.min.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/packages/datatables.net-plugins/filtering/type-based/accent-neutralise.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/packages/datatables.net-plugins/sorting/chinese-string.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/packages/datatables.net-rowgroup/js/dataTables.rowGroup.min.js?v=', true) }}{{ $version }}"></script> <script src="{{ $U('/packages/datatables.net-rowgroup/js/dataTables.rowGroup.min.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/packages/datatables.net-rowgroup-bs4/js/rowGroup.bootstrap4.min.js?v=', true) }}{{ $version }}"></script> <script src="{{ $U('/packages/datatables.net-rowgroup-bs4/js/rowGroup.bootstrap4.min.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/packages/datatables.net-select/js/dataTables.select.min.js?v=', true) }}{{ $version }}"></script> <script src="{{ $U('/packages/datatables.net-select/js/dataTables.select.min.js?v=', true) }}{{ $version }}"></script>

3
views/mealplan.blade.php
View File

@ -281,7 +281,8 @@
@include('components.productpicker', array( @include('components.productpicker', array(
'products' => $products, 'products' => $products,
'nextInputSelector' => '#amount' 'nextInputSelector' => '#amount',
'disallowAddProductWorkflows' => true
)) ))
@include('components.productamountpicker', array( @include('components.productamountpicker', array(

22
yarn.lock
View File

@ -21,18 +21,6 @@
resolved "https://registry.yarnpkg.com/@scarf/scarf/-/scarf-1.4.0.tgz#3bbb984085dbd6d982494538b523be1ce6562972" resolved "https://registry.yarnpkg.com/@scarf/scarf/-/scarf-1.4.0.tgz#3bbb984085dbd6d982494538b523be1ce6562972"
integrity sha512-xxeapPiUXdZAE3che6f3xogoJPeZgig6omHEy1rIY5WVsB3H2BHNnZH+gHG6x91SCWyQCzWGsuL2Hh3ClO5/qQ== integrity sha512-xxeapPiUXdZAE3che6f3xogoJPeZgig6omHEy1rIY5WVsB3H2BHNnZH+gHG6x91SCWyQCzWGsuL2Hh3ClO5/qQ==
"@types/jquery@^3.5.16":
version "3.5.34"
resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.34.tgz#c1993eaac0db03cf9db974976dd8f07bbf7c5708"
integrity sha512-3m3939S3erqmTLJANS/uy0B6V7BorKx7RorcGZVjZ62dF5PAGbKEDZK1CuLtKombJkFA2T1jl8LAIIs7IV6gBQ==
dependencies:
"@types/sizzle" "*"
"@types/sizzle@*":
version "2.3.10"
resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.10.tgz#277a542aff6776d8a9b15f2ac682a663e3e94bbd"
integrity sha512-TC0dmN0K8YcWEAEfiPi5gJP14eJe30TTGjkvek3iM/1NdHHsdCA/Td6GvNndMOo/iSnIsZ4HuuhrYPDAmbxzww==
"@zxing/library@^0.21.3": "@zxing/library@^0.21.3":
version "0.21.3" version "0.21.3"
resolved "https://registry.yarnpkg.com/@zxing/library/-/library-0.21.3.tgz#0a4cb777701884131832b05922d7e88ef1b87ab4" resolved "https://registry.yarnpkg.com/@zxing/library/-/library-0.21.3.tgz#0a4cb777701884131832b05922d7e88ef1b87ab4"
@ -165,14 +153,6 @@ datatables.net-colreorder@1.7.2, datatables.net-colreorder@^1.5.2:
datatables.net "^1.13.0" datatables.net "^1.13.0"
jquery ">=1.7" jquery ">=1.7"
datatables.net-plugins@^1.10.20:
version "1.13.6"
resolved "https://registry.yarnpkg.com/datatables.net-plugins/-/datatables.net-plugins-1.13.6.tgz#7b0af0675083e2c669ccd09ef7c86878d6c9638d"
integrity sha512-CPLH+09OiEAP3PKbZH7u2qcLajgHhy4fBHCdLzjGWJwKbIkhaPu7tby4jZHQXqoolUznbm3TEpJj4eMI1eqcGw==
dependencies:
"@types/jquery" "^3.5.16"
datatables.net "^1.13.2"
datatables.net-rowgroup-bs4@^1.1.2: datatables.net-rowgroup-bs4@^1.1.2:
version "1.6.0" version "1.6.0"
resolved "https://registry.yarnpkg.com/datatables.net-rowgroup-bs4/-/datatables.net-rowgroup-bs4-1.6.0.tgz#452cd6ebb576c76d0341cf4fece21cdbd194a617" resolved "https://registry.yarnpkg.com/datatables.net-rowgroup-bs4/-/datatables.net-rowgroup-bs4-1.6.0.tgz#452cd6ebb576c76d0341cf4fece21cdbd194a617"
@ -215,7 +195,7 @@ datatables.net-select@1.7.1, datatables.net-select@^1.3.1:
datatables.net "^1.13.0" datatables.net "^1.13.0"
jquery ">=1.7" jquery ">=1.7"
datatables.net@1.13.11, datatables.net@^1.10.22, datatables.net@^1.13.0, datatables.net@^1.13.2: datatables.net@1.13.11, datatables.net@^1.10.22, datatables.net@^1.13.0:
version "1.13.11" version "1.13.11"
resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.13.11.tgz#e2a4c8b50553512f241ebfcbc078d74d551183b2" resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.13.11.tgz#e2a4c8b50553512f241ebfcbc078d74d551183b2"
integrity sha512-AE6RkMXziRaqzPcu/pl3SJXeRa6fmXQG/fVjuRESujvkzqDCYEeKTTpPMuVJSGYJpPi32WGSphVNNY1G4nSN/g== integrity sha512-AE6RkMXziRaqzPcu/pl3SJXeRa6fmXQG/fVjuRESujvkzqDCYEeKTTpPMuVJSGYJpPi32WGSphVNNY1G4nSN/g==