From 53f0893f556ccd5dbe3801cd6e88c6f8bf662b86 Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Wed, 25 Sep 2019 09:32:06 +0200 Subject: [PATCH] Fix unit conversion handling (factor of destination qu is always 1) (fixes #382) --- changelog/53_UNRELEASED_2019-xx-xx.md | 1 + public/viewjs/components/productamountpicker.js | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changelog/53_UNRELEASED_2019-xx-xx.md b/changelog/53_UNRELEASED_2019-xx-xx.md index b1c66d26..18f1aca8 100644 --- a/changelog/53_UNRELEASED_2019-xx-xx.md +++ b/changelog/53_UNRELEASED_2019-xx-xx.md @@ -4,6 +4,7 @@ - The calendar now also contains all planned recipes from the meal plan on the corresponding day - When adding a product to the shopping list from the new context/more menu from the stock overview page and if the product is already on the shopping list, the amount of that entry will be updated acccordingly instead of adding a new (double) shopping list item - Fixed that the browser barcode scanner button was not clickable on iOS Safari (thanks @DeeeeLAN) +- Fixed a problem regarding quantity unit conversion handling for recipe ingredients of products with no unit relations, but only a different purchase/stock quantity unit - The API Endpoint `GET /files/{group}/{fileName}` now also returns a `Cache-Control` header (defaults fixed to 30 days) to further increase page load times - Fixed that the API endpoint `/stock/shoppinglist/add-product` failed when a product should be added which was not already on the shopping list (thanks @Forceu) - Some style/CSS detail-refinements diff --git a/public/viewjs/components/productamountpicker.js b/public/viewjs/components/productamountpicker.js index ced3987c..0e34a587 100644 --- a/public/viewjs/components/productamountpicker.js +++ b/public/viewjs/components/productamountpicker.js @@ -11,7 +11,13 @@ Grocy.Components.ProductAmountPicker.Reload = function(productId, destinationQuI $("#qu_id").attr("data-destination-qu-name", FindObjectInArrayByPropertyValue(Grocy.QuantityUnits, 'id', destinationQuId).name); conversionsForProduct.forEach(conversion => { - $("#qu_id").append(''); + var factor = conversion.factor; + if (conversion.to_qu_id == destinationQuId) + { + factor = 1; + } + + $("#qu_id").append(''); }); }