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

fix(consume): do not convert dimensionless min amount to selected unit

Browse Source
This commit is contained in:
Luca 2024-07-07 14:44:48 +02:00
parent 2782b29731
commit febab530d5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/viewjs/consume.js
View File

@ -1,4 +1,4 @@
$('#save-consume-button').on('click', function(e) $('#save-consume-button').on('click', function(e)
{ {
e.preventDefault(); e.preventDefault();
@ -102,7 +102,7 @@
Grocy.Components.ProductPicker.FinishFlow(); Grocy.Components.ProductPicker.FinishFlow();
Grocy.Components.ProductAmountPicker.Reset(); Grocy.Components.ProductAmountPicker.Reset();
$("#display_amount").attr("min", Grocy.DefaultMinAmount * $("#qu_id option:selected").attr("data-qu-factor")); $("#display_amount").attr("min", Grocy.DefaultMinAmount);
$("#display_amount").removeAttr("max"); $("#display_amount").removeAttr("max");
if (BoolVal(Grocy.UserSettings.stock_default_consume_amount_use_quick_consume_amount)) if (BoolVal(Grocy.UserSettings.stock_default_consume_amount_use_quick_consume_amount))
{ {
@ -482,7 +482,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
} }
else else
{ {
$("#display_amount").attr("min", Grocy.DefaultMinAmount * $("#qu_id option:selected").attr("data-qu-factor")); $("#display_amount").attr("min", Grocy.DefaultMinAmount);
$("#tare-weight-handling-info").addClass("d-none"); $("#tare-weight-handling-info").addClass("d-none");
} }
@ -708,8 +708,8 @@ function RefreshForm()
{ {
$("#tare-weight-handling-info").addClass("d-none"); $("#tare-weight-handling-info").addClass("d-none");
$("#display_amount").attr("min", Grocy.DefaultMinAmount * $("#qu_id option:selected").attr("data-qu-factor")); $("#display_amount").attr("min", Grocy.DefaultMinAmount);
$("#display_amount").attr("max", sumValue * $("#qu_id option:selected").attr("data-qu-factor")); $('#display_amount').attr('max', sumValue * $("#qu_id option:selected").attr("data-qu-factor"));
if (sumValue == 0) if (sumValue == 0)
{ {