kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-10-03 13:48:44 +00:00
Code Issues Projects Releases Wiki Activity

Remove "Allow partial units in stock" product option / unify number input validation messages

Browse Source
This commit is contained in:
Bernd Bestel
2020-11-16 19:10:29 +01:00
parent 95fc6a6faa
commit e85b21384f
59 changed files with 191 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
public/js/grocy.js
View File

@@ -548,32 +548,38 @@ function RefreshLocaleNumberDisplay(rootSelector = "#page-content")
{
$(rootSelector + " .locale-number.locale-number-currency").each(function()
{
if (isNaN(parseFloat($(this).text())))
var text = $(this).text();
if (isNaN(text) || text.isEmpty())
{
return;
}
$(this).text(parseFloat($(this).text()).toLocaleString(undefined, { style: "currency", currency: Grocy.Currency, minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices }));
var value = parseFloat(text);
$(this).text(value.toLocaleString(undefined, { style: "currency", currency: Grocy.Currency, minimumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices }));
});
$(rootSelector + " .locale-number.locale-number-quantity-amount").each(function()
{
if (isNaN(parseFloat($(this).text())))
var text = $(this).text();
if (isNaN(text) || text.isEmpty())
{
return;
}
$(this).text(parseFloat($(this).text()).toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
var value = parseFloat(text);
$(this).text(value.toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
});
$(rootSelector + " .locale-number.locale-number-generic").each(function()
{
if (isNaN(parseFloat($(this).text())))
var text = $(this).text();
if (isNaN(text) || text.isEmpty())
{
return;
}
$(this).text(parseFloat($(this).text()).toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: 2 }));
var value = parseFloat(text);
$(this).text(value.toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: 2 }));
});
}
RefreshLocaleNumberDisplay();
@@ -583,18 +589,18 @@ function RefreshLocaleNumberInput(rootSelector = "#page-content")
$(rootSelector + " .locale-number-input.locale-number-currency").each(function()
{
var value = $(this).val();
if (isNaN(value))
if (isNaN(value) || value.toString().isEmpty())
{
return;
}
$(this).val(parseFloat(value).toLocaleString("en", { minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices, useGrouping: false }));
$(this).val(parseFloat(value).toLocaleString("en", { minimumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices, useGrouping: false }));
});
$(rootSelector + " .locale-number-input.locale-number-quantity-amount").each(function()
{
var value = $(this).val();
if (isNaN(value))
if (isNaN(value) || value.toString().isEmpty())
{
return;
}
@@ -605,7 +611,7 @@ function RefreshLocaleNumberInput(rootSelector = "#page-content")
$(rootSelector + " .locale-number-input.locale-number-generic").each(function()
{
var value = $(this).val();
if (isNaN(value))
if (isNaN(value) || value.toString().isEmpty())
{
return;
}