kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 12:20:22 +00:00
Code Issues Projects Releases Wiki Activity

Use the proper plural QU form in productamountpicker

Browse Source
This commit is contained in:
Bernd Bestel
2020-11-10 21:41:12 +01:00
parent d863e33343
commit d816be6908
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/viewjs/components/productamountpicker.js
View File

@@ -9,6 +9,8 @@ Grocy.Components.ProductAmountPicker.Reload = function(productId, destinationQuI
{ {
$("#qu_id").find("option").remove().end(); $("#qu_id").find("option").remove().end();
$("#qu_id").attr("data-destination-qu-name", FindObjectInArrayByPropertyValue(Grocy.QuantityUnits, 'id', destinationQuId).name); $("#qu_id").attr("data-destination-qu-name", FindObjectInArrayByPropertyValue(Grocy.QuantityUnits, 'id', destinationQuId).name);
$("#qu_id").attr("data-destination-qu-name-plural", FindObjectInArrayByPropertyValue(Grocy.QuantityUnits, 'id', destinationQuId).name_plural);
conversionsForProduct.forEach(conversion => conversionsForProduct.forEach(conversion =>
{ {
var factor = parseFloat(conversion.factor); var factor = parseFloat(conversion.factor);
@@ -86,11 +88,11 @@ Grocy.Components.ProductAmountPicker.Reset = function()
$(".input-group-productamountpicker").on("change", function() $(".input-group-productamountpicker").on("change", function()
{ {
var destinationQuName = $("#qu_id").attr("data-destination-qu-name");
var selectedQuName = $("#qu_id option:selected").text(); var selectedQuName = $("#qu_id option:selected").text();
var quFactor = $("#qu_id option:selected").attr("data-qu-factor"); var quFactor = $("#qu_id option:selected").attr("data-qu-factor");
var amount = $("#display_amount").val(); var amount = $("#display_amount").val();
var destinationAmount = amount / quFactor; var destinationAmount = amount / quFactor;
var destinationQuName = __n(destinationAmount, $("#qu_id").attr("data-destination-qu-name"), $("#qu_id").attr("data-destination-qu-name-plural"))
if (destinationQuName == selectedQuName || Grocy.Components.ProductAmountPicker.AllowAnyQuEnabled || amount.toString().isEmpty() || selectedQuName.toString().isEmpty()) if (destinationQuName == selectedQuName || Grocy.Components.ProductAmountPicker.AllowAnyQuEnabled || amount.toString().isEmpty() || selectedQuName.toString().isEmpty())
{ {