Improved number input initial value decimal handling

public/js/grocy.js

@@ -553,7 +553,7 @@ function RefreshLocaleNumberDisplay(rootSelector = "#page-content")
 			return;
 		}
 
-		$(this).text(parseFloat($(this).text()).toLocaleString(undefined, { style: "currency", currency: Grocy.Currency, minimumFractionDigits: 2, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices }));
+		$(this).text(parseFloat($(this).text()).toLocaleString(undefined, { style: "currency", currency: Grocy.Currency, minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices }));
 	});
 
 	$(rootSelector + " .locale-number.locale-number-quantity-amount").each(function()
@@ -578,6 +578,40 @@ function RefreshLocaleNumberDisplay(rootSelector = "#page-content")
 }
 RefreshLocaleNumberDisplay();
 
+function RefreshLocaleNumberInput(rootSelector = "#page-content")
+{
+	$(rootSelector + " .locale-number-input.locale-number-currency").each(function()
+	{
+		if (isNaN(parseFloat($(this).val())))
+		{
+			return;
+		}
+
+		$(this).val(parseFloat($(this).val()).toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices }));
+	});
+
+	$(rootSelector + " .locale-number-input.locale-number-quantity-amount").each(function()
+	{
+		if (isNaN(parseFloat($(this).val())))
+		{
+			return;
+		}
+
+		$(this).val(parseFloat($(this).val()).toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
+	});
+
+	$(rootSelector + " .locale-number-input.locale-number-generic").each(function()
+	{
+		if (isNaN(parseFloat($(this).val())))
+		{
+			return;
+		}
+
+		$(this).val(parseFloat($(this).val()).toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: 2 }));
+	});
+}
+RefreshLocaleNumberInput();
+
 $(document).on("click", ".easy-link-copy-textbox", function()
 {
 	$(this).select();

public/viewjs/batteriessettings.js

@@ -1 +1,3 @@
 $("#batteries_due_soon_days").val(Grocy.UserSettings.batteries_due_soon_days);
+
+RefreshLocaleNumberInput();

public/viewjs/choressettings.js

@@ -1 +1,3 @@
 $("#chores_due_soon_days").val(Grocy.UserSettings.chores_due_soon_days);
+
+RefreshLocaleNumberInput();

public/viewjs/consume.js

@@ -97,6 +97,7 @@
 						$("#display_amount").attr("step", "1");
 						$("#display_amount").parent().find(".invalid-feedback").text(__t('The amount cannot be lower than %s', '1'));
 						$('#display_amount').val(parseFloat(Grocy.UserSettings.stock_default_consume_amount).toLocaleString({ minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
+						RefreshLocaleNumberInput();
 						$(".input-group-productamountpicker").trigger("change");
 						$("#tare-weight-handling-info").addClass("d-none");
 						Grocy.Components.ProductPicker.Clear();
@@ -162,6 +163,7 @@ $('#save-mark-as-open-button').on('click', function(e)
 					toastr.success(__t('Marked %1$s of %2$s as opened', jsonForm.amount + " " + __n(jsonForm.amount, productDetails.quantity_unit_stock.name, productDetails.quantity_unit_stock.name_plural), productDetails.product.name) + '<br><a class="btn btn-secondary btn-sm mt-2" href="#" onclick="UndoStockTransaction(\'' + result.transaction_id + '\')"><i class="fas fa-undo"></i> ' + __t("Undo") + '</a>');
 
 					$('#display_amount').val(parseFloat(Grocy.UserSettings.stock_default_consume_amount).toLocaleString({ minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
+					RefreshLocaleNumberInput();
 					$(".input-group-productamountpicker").trigger("change");
 					Grocy.Components.ProductPicker.Clear();
 					Grocy.Components.ProductPicker.GetInputElement().focus();
@@ -275,6 +277,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
 				Grocy.Components.ProductAmountPicker.Reload(productDetails.product.id, productDetails.quantity_unit_stock.id);
 				Grocy.Components.ProductAmountPicker.SetQuantityUnit(productDetails.quantity_unit_stock.id);
 				$('#display_amount').val(parseFloat(Grocy.UserSettings.stock_default_consume_amount).toLocaleString({ minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
+				RefreshLocaleNumberInput();
 				$(".input-group-productamountpicker").trigger("change");
 
 				$("#location_id").find("option").remove().end().append("<option></option>");
@@ -312,6 +315,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
 						if (BoolVal(Grocy.UserSettings.scan_mode_consume_enabled))
 						{
 							$("#display_amount").val(1);
+							RefreshLocaleNumberInput();
 							$(".input-group-productamountpicker").trigger("change");
 
 							Grocy.FrontendHelpers.ValidateForm("consume-form");

public/viewjs/inventory.js

@@ -163,6 +163,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
 				}
 
 				$('#price').val(parseFloat(productDetails.last_price).toLocaleString({ minimumFractionDigits: 2, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices }));
+				RefreshLocaleNumberInput();
 				if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING)
 				{
 					Grocy.Components.ShoppingLocationPicker.SetId(productDetails.last_shopping_location_id);
@@ -173,6 +174,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
 				}
 
 				$('#display_amount').val(productDetails.stock_amount);
+				RefreshLocaleNumberInput();
 				$(".input-group-productamountpicker").trigger("change");
 				$('#display_amount').focus();
 				$('#display_amount').trigger('keyup');

public/viewjs/mealplan.js

@@ -777,6 +777,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
 				Grocy.Components.ProductAmountPicker.Reload(productDetails.product.id, productDetails.quantity_unit_stock.id);
 
 				$('#display_amount').val(1);
+				RefreshLocaleNumberInput();
 				$(".input-group-productamountpicker").trigger("change");
 				$('#display_amount').focus();
 				$('#display_amount').select();

public/viewjs/productform.js

@@ -256,6 +256,9 @@ $("#allow_partial_units_in_stock").on("click", function()
 		$("#qu_factor_purchase_to_stock").attr("min", "0." + "0".repeat(parseInt(Grocy.UserSettings.stock_decimal_places_amounts) - 1) + "1");
 		$("#qu_factor_purchase_to_stock").attr("step", "." + "0".repeat(parseInt(Grocy.UserSettings.stock_decimal_places_amounts) - 1) + "1");
 		$("#qu_factor_purchase_to_stock").parent().find(".invalid-feedback").text(__t('This cannot be lower than %1$s and must be a valid number with max. %2$s decimal places', "0." + "0".repeat(parseInt(Grocy.UserSettings.stock_decimal_places_amounts) - 1) + "1", Grocy.UserSettings.stock_decimal_places_amounts));
+		$("#quick_consume_amount").attr("min", "0." + "0".repeat(parseInt(Grocy.UserSettings.stock_decimal_places_amounts) - 1) + "1");
+		$("#quick_consume_amount").attr("step", "." + "0".repeat(parseInt(Grocy.UserSettings.stock_decimal_places_amounts) - 1) + "1");
+		$("#quick_consume_amount").parent().find(".invalid-feedback").text(__t('This cannot be lower than %1$s and must be a valid number with max. %2$s decimal places', "0." + "0".repeat(parseInt(Grocy.UserSettings.stock_decimal_places_amounts) - 1) + "1", Grocy.UserSettings.stock_decimal_places_amounts));
 	}
 	else
 	{
@@ -264,6 +267,9 @@ $("#allow_partial_units_in_stock").on("click", function()
 		$("#qu_factor_purchase_to_stock").attr("min", "1");
 		$("#qu_factor_purchase_to_stock").attr("step", "1");
 		$("#qu_factor_purchase_to_stock").parent().find(".invalid-feedback").text(__t('This cannot be lower than %1$s and must be a valid number with max. %2$s decimal places', '1', '0'));
+		$("#quick_consume_amount").attr("min", "1");
+		$("#quick_consume_amount").attr("step", "1");
+		$("#quick_consume_amount").parent().find(".invalid-feedback").text(__t('This cannot be lower than %1$s and must be a valid number with max. %2$s decimal places', '1', '0'));
 	}
 
 	Grocy.FrontendHelpers.ValidateForm("product-form");

public/viewjs/purchase.js

@@ -204,7 +204,15 @@ if (Grocy.Components.ProductPicker !== undefined)
 						Grocy.Components.LocationPicker.SetId(productDetails.location.id);
 					}
 
+					if (productDetails.last_price == null)
+					{
+						$("#price").val("")
+					}
+					else
+					{
 						$('#price').val(parseFloat(productDetails.last_price / $("#qu_id option:selected").attr("data-qu-factor")).toLocaleString({ minimumFractionDigits: 2, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices }));
+						RefreshLocaleNumberInput();
+					}
 
 					var priceTypeUnitPrice = $("#price-type-unit-price");
 					var priceTypeUnitPriceLabel = $("[for=" + priceTypeUnitPrice.attr("id") + "]");
@@ -267,6 +275,7 @@ if (Grocy.Components.ProductPicker !== undefined)
 					if (BoolVal(Grocy.UserSettings.scan_mode_purchase_enabled))
 					{
 						$("#display_amount").val(1);
+						RefreshLocaleNumberInput();
 						$(".input-group-productamountpicker").trigger("change");
 
 						Grocy.FrontendHelpers.ValidateForm("purchase-form");
@@ -332,6 +341,7 @@ if (Grocy.Components.ProductPicker !== undefined)
 }
 
 $('#display_amount').val(parseFloat(Grocy.UserSettings.stock_default_purchase_amount).toLocaleString({ minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
+RefreshLocaleNumberInput();
 $(".input-group-productamountpicker").trigger("change");
 Grocy.FrontendHelpers.ValidateForm('purchase-form');
 

public/viewjs/recipessettings.js

@@ -2,3 +2,5 @@
 {
 	$("#recipe_ingredients_group_by_product_group").prop("checked", true);
 }
+
+RefreshLocaleNumberInput();

public/viewjs/shoppinglistitemform.js

@@ -212,6 +212,7 @@ if (GetUriParam("list") !== undefined)
 if (GetUriParam("amount") !== undefined)
 {
 	$("#display_amount").val(parseFloat(GetUriParam("amount")).toLocaleString({ minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
+	RefreshLocaleNumberInput();
 	$(".input-group-productamountpicker").trigger("change");
 	Grocy.FrontendHelpers.ValidateForm('shoppinglist-form');
 }

public/viewjs/shoppinglistsettings.js

@@ -7,3 +7,5 @@ if (BoolVal(Grocy.UserSettings.shopping_list_show_calendar))
 {
 	$("#shopping-list-show-calendar").prop("checked", true);
 }
+
+RefreshLocaleNumberInput();

public/viewjs/stockentryform.js

@@ -109,6 +109,8 @@ Grocy.Api.Get('stock/products/' + Grocy.EditObjectProductId,
 			$("#amount").attr("step", "1");
 			$("#amount").parent().find(".invalid-feedback").text(__t('The amount cannot be lower than %1$s', '1'));
 		}
+
+		RefreshLocaleNumberInput();
 	},
 	function(xhr)
 	{

public/viewjs/stocksettings.js

@@ -20,3 +20,5 @@ if (BoolVal(Grocy.UserSettings.show_warning_on_purchase_when_best_before_date_is
 {
 	$("#show_warning_on_purchase_when_best_before_date_is_earlier_than_next").prop("checked", true);
 }
+
+RefreshLocaleNumberInput();

public/viewjs/taskssettings.js

@@ -1 +1,3 @@
 $("#tasks_due_soon_days").val(Grocy.UserSettings.tasks_due_soon_days);
+
+RefreshLocaleNumberInput();

public/viewjs/transfer.js

@@ -94,6 +94,7 @@
 						$("#display_amount").attr("step", "1");
 						$("#display_amount").parent().find(".invalid-feedback").text(__t('The amount cannot be lower than %s', '1'));
 						$('#display_amount').val(parseFloat(Grocy.UserSettings.stock_default_transfer_amount).toLocaleString({ minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
+						RefreshLocaleNumberInput();
 						$(".input-group-productamountpicker").trigger("change");
 						$("#tare-weight-handling-info").addClass("d-none");
 						Grocy.Components.ProductPicker.Clear();

public/viewjs/usersettings.js

@@ -1 +1,3 @@
 $("#locale").val(Grocy.UserSettings.locale);
+
+RefreshLocaleNumberInput();

views/choreform.blade.php

@@ -260,7 +260,8 @@
 			'decimals' => $userSettings['stock_decimal_places_amounts'],
 			'invalidFeedback' => $__t('The amount cannot be lower than %s', '1'),
 			'isRequired' => false,
-			'value' => $value
+			'value' => $value,
+			'additionalCssClasses' => 'locale-number-input locale-number-quantity-amount'
 			))
 			@endif
 

views/components/productamountpicker.blade.php

@@ -23,7 +23,7 @@
 			'value' => $value,
 			'invalidFeedback' => $__t('This cannot be negative and must be an integral number'),
 			'additionalGroupCssClasses' => 'col-sm-5 col-xs-12 my-0',
-			'additionalCssClasses' => 'input-group-productamountpicker',
+			'additionalCssClasses' => 'input-group-productamountpicker locale-number-input locale-number-quantity-amount',
 			'additionalHtmlContextHelp' => '',
 			'additionalHtmlElements' => ''
 			))

views/inventory.blade.php

@@ -90,7 +90,8 @@
 				data-toggle="tooltip"
 				title="' . $__t('This will apply to added products') . '"></i>',
 			'invalidFeedback' => $__t('The price cannot be lower than %s', '0'),
-			'isRequired' => false
+			'isRequired' => false,
+			'additionalCssClasses' => 'locale-number-input locale-number-currency'
 			))
 
 			@include('components.shoppinglocationpicker', array(

views/mealplan.blade.php

@@ -65,7 +65,8 @@
 					'min' => '0.' . str_repeat('0', $userSettings['stock_decimal_places_amounts'] - 1) . '1',
 					'decimals' => $userSettings['stock_decimal_places_amounts'],
 					'value' => '1',
-					'invalidFeedback' => $__t('This cannot be lower than %s', '1')
+					'invalidFeedback' => $__t('This cannot be lower than %s', '1'),
+					'additionalCssClasses' => 'locale-number-input locale-number-quantity-amount'
 					))
 
 					<input type="hidden"

views/productform.blade.php

@@ -146,7 +146,8 @@
 			'decimals' => $userSettings['stock_decimal_places_amounts'],
 			'value' => $value,
 			'invalidFeedback' => $__t('The amount cannot be lower than %s', '0'),
-			'additionalGroupCssClasses' => 'mb-1'
+			'additionalGroupCssClasses' => 'mb-1',
+			'additionalCssClasses' => 'locale-number-input locale-number-quantity-amount'
 			))
 
 			<div class="form-group">
@@ -251,7 +252,7 @@
 			'decimals' => $userSettings['stock_decimal_places_amounts'],
 			'value' => $value,
 			'invalidFeedback' => $__t('The amount cannot be lower than %s', '1'),
-			'additionalCssClasses' => 'input-group-qu',
+			'additionalCssClasses' => 'input-group-qu locale-number-input locale-number-quantity-amount',
 			'additionalHtmlElements' => '<p id="qu-conversion-info"
 				class="form-text text-info d-none"></p>'
 			))
@@ -290,7 +291,8 @@
 			'value' => $value,
 			'invalidFeedback' => $__t('This cannot be lower than %s', '0'),
 			'additionalAttributes' => $additionalAttributes,
-			'contextInfoId' => 'tare_weight_qu_info'
+			'contextInfoId' => 'tare_weight_qu_info',
+			'additionalCssClasses' => 'locale-number-input locale-number-quantity-amount'
 			))
 			@php $additionalAttributes = '' @endphp
 
@@ -318,7 +320,8 @@
 			'value' => $value,
 			'invalidFeedback' => $__t('The amount cannot be lower than %s', '0'),
 			'hint' => $__t('Per stock quantity unit'),
-			'isRequired' => false
+			'isRequired' => false,
+			'additionalCssClasses' => 'locale-number-input locale-number-quantity-amount'
 			))
 			@endif
 
@@ -359,7 +362,8 @@
 			'value' => $value,
 			'invalidFeedback' => $__t('The amount cannot be lower than %s', '0'),
 			'hint' => $__t('This amount is used for the "quick consume/open buttons" on the stock overview page (related to quantity unit stock)'),
-			'contextInfoId' => 'quick_consume_qu_info'
+			'contextInfoId' => 'quick_consume_qu_info',
+			'additionalCssClasses' => 'locale-number-input locale-number-quantity-amount'
 			))
 
 			@include('components.userfieldsform', array(

views/purchase.blade.php

@@ -107,7 +107,8 @@
 			'contextInfoId' => 'price-hint',
 			'invalidFeedback' => $__t('The price cannot be lower than %s', '0'),
 			'isRequired' => false,
-			'additionalGroupCssClasses' => 'mb-1'
+			'additionalGroupCssClasses' => 'mb-1',
+			'additionalCssClasses' => 'locale-number-input locale-number-currency'
 			))
 
 			<div class="form-check form-check-inline mb-3">

views/quantityunitconversionform.blade.php

@@ -91,7 +91,7 @@
 			'invalidFeedback' => $__t('This cannot be lower than %1$s and must be a valid number with max. %2$s decimal places', '0', $userSettings['stock_decimal_places_amounts']),
 			'additionalHtmlElements' => '<p id="qu-conversion-info"
 				class="form-text text-info d-none"></p>',
-			'additionalCssClasses' => 'input-group-qu'
+			'additionalCssClasses' => 'input-group-qu locale-number-input locale-number-quantity-amount'
 			))
 
 			<div class="form-group @if($mode == 'edit') d-none @endif">

views/quantityunitpluraltesting.blade.php

@@ -43,7 +43,8 @@
 			'min' => '0.' . str_repeat('0', $userSettings['stock_decimal_places_amounts'] - 1) . '1',
 			'decimals' => $userSettings['stock_decimal_places_amounts'],
 			'isRequired' => false,
-			'value' => 1
+			'value' => 1,
+			'additionalCssClasses' => 'locale-number-input locale-number-quantity-amount'
 			))
 
 		</form>

views/recipeform.blade.php

@@ -69,7 +69,8 @@
 			'decimals' => $userSettings['stock_decimal_places_amounts'],
 			'value' => $value,
 			'invalidFeedback' => $__t('This cannot be lower than %s', '1'),
-			'hint' => $__t('The ingredients listed here result in this amount of servings')
+			'hint' => $__t('The ingredients listed here result in this amount of servings'),
+			'additionalCssClasses' => 'locale-number-input locale-number-quantity-amount'
 			))
 
 			<div class="form-group">
@@ -364,7 +365,8 @@
 					'min' => '0.' . str_repeat('0', $userSettings['stock_decimal_places_amounts'] - 1) . '1',
 					'decimals' => $userSettings['stock_decimal_places_amounts'],
 					'value' => '1',
-					'invalidFeedback' => $__t('This cannot be lower than %s', '1')
+					'invalidFeedback' => $__t('This cannot be lower than %s', '1'),
+					'additionalCssClasses' => 'locale-number-input locale-number-quantity-amount'
 					))
 
 				</form>

views/recipeposform.blade.php

@@ -115,7 +115,8 @@
 			'hint' => $__t('The resulting price of this ingredient will be multiplied by this factor'),
 			'invalidFeedback' => $__t('This cannot be lower than %s', '0'),
 			'isRequired' => true,
-			'value' => $value
+			'value' => $value,
+			'additionalCssClasses' => 'locale-number-input locale-number-quantity-amount'
 			))
 			@else
 			<input type="hidden"

views/recipes.blade.php

@@ -335,7 +335,8 @@
 								'value' => $recipe->desired_servings,
 								'invalidFeedback' => $__t('This cannot be lower than %s', '1'),
 								'additionalAttributes' => 'data-recipe-id="' . $recipe->id . '"',
-								'hint' => $__t('Base: %s', $recipe->base_servings)
+								'hint' => $__t('Base: %s', $recipe->base_servings),
+								'additionalCssClasses' => 'locale-number-input locale-number-quantity-amount'
 								))
 							</div>
 							@endif

views/stockentryform.blade.php

@@ -60,6 +60,7 @@
 			'contextInfoId' => 'amount_qu_unit',
 			'invalidFeedback' => $__t('The amount cannot be lower than %s', '0'),
 			'additionalAttributes' => 'data-not-equal="-1"',
+			'additionalCssClasses' => 'locale-number-input locale-number-quantity-amount'
 			))
 
 			@if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING)
@@ -81,7 +82,8 @@
 			'decimals' => $userSettings['stock_decimal_places_prices'],
 			'hint' => $__t('Per stock quantity unit'),
 			'invalidFeedback' => $__t('The price cannot be lower than %s', '0'),
-			'isRequired' => false
+			'isRequired' => false,
+			'additionalCssClasses' => 'locale-number-input locale-number-currency'
 			))
 			@include('components.shoppinglocationpicker', array(
 			'label' => 'Store',

views/stocksettings.blade.php

@@ -88,7 +88,7 @@
 		'min' => 0,
 		'decimals' => $userSettings['stock_decimal_places_amounts'],
 		'invalidFeedback' => $__t('This cannot be lower than %s', '1'),
-		'additionalCssClasses' => 'user-setting-control'
+		'additionalCssClasses' => 'user-setting-control locale-number-input locale-number-quantity-amount',
 		))
 
 		<div class="form-group">
@@ -125,7 +125,7 @@
 		'min' => 0,
 		'decimals' => $userSettings['stock_decimal_places_amounts'],
 		'invalidFeedback' => $__t('This cannot be lower than %s', '1'),
-		'additionalCssClasses' => 'user-setting-control'
+		'additionalCssClasses' => 'user-setting-control locale-number-input locale-number-quantity-amount'
 		))
 
 		<h4 class="mt-2">{{ $__t('Common') }}</h4>