kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 17:45:39 +00:00
Code Issues Projects Releases Wiki Activity

Support transitive QU conversions on the frontend (references #2056, closes #1360)

Browse Source
This commit is contained in:
Bernd Bestel 2022-12-04 13:12:01 +01:00
parent df39f94fca
commit daa0a59c5f
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
migrations/0203.sql
View File

@ -151,6 +151,8 @@ AS (
AND c.path LIKE ('%/' || s.from_qu_id || '/' || s.to_qu_id || '/%') AND c.path LIKE ('%/' || s.from_qu_id || '/' || s.to_qu_id || '/%')
) )
SELECT *
FROM (
SELECT DISTINCT SELECT DISTINCT
-1 AS id, -- Dummy, LessQL needs an id column -1 AS id, -- Dummy, LessQL needs an id column
c.product_id, c.product_id,
@ -167,4 +169,23 @@ JOIN quantity_units qu_from
ON c.from_qu_id = qu_from.id ON c.from_qu_id = qu_from.id
JOIN quantity_units qu_to JOIN quantity_units qu_to
ON c.to_qu_id = qu_to.id ON c.to_qu_id = qu_to.id
ORDER BY product_id, from_qu_id, to_qu_id;
UNION
-- Also return a conversion from/to the products stock QU (with a factor of 1)
SELECT
-1 AS id, -- Dummy, LessQL needs an id column
p.id AS product_id,
p.qu_id_stock AS from_qu_id,
qu.name AS from_qu_name,
qu.name_plural AS from_qu_name_plural,
p.qu_id_stock AS to_qu_id,
qu.name AS to_qu_name,
qu.name_plural AS to_qu_name_plural,
1.0 AS factor,
'/' || p.qu_id_stock AS source
FROM products p
JOIN quantity_units qu
ON p.qu_id_stock = qu.id
) x
ORDER BY x.product_id, x.from_qu_id, x.to_qu_id;

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

@ -14,12 +14,10 @@ Grocy.Components.ProductAmountPicker.Reload = function(productId, destinationQuI
conversionsForProduct.forEach(conversion => conversionsForProduct.forEach(conversion =>
{ {
var factor = parseFloat(conversion.factor); var factor = parseFloat(conversion.factor);
if (conversion.to_qu_id == destinationQuId)
{
factor = 1;
}
if (!$('#qu_id option[value="' + conversion.to_qu_id + '"]').length) // Don't add the destination QU multiple times // Only conversions related to the destination QU are needed
// + only add one conversion per to_qu_id (multiple ones can be a result of contradictory definitions = user input bullshit)
if (conversion.from_qu_id == destinationQuId && !$('#qu_id option[value="' + conversion.to_qu_id + '"]').length)
{ {
$("#qu_id").append('<option value="' + conversion.to_qu_id + '" data-qu-factor="' + factor + '" data-qu-name-plural="' + conversion.to_qu_name_plural + '">' + conversion.to_qu_name + '</option>'); $("#qu_id").append('<option value="' + conversion.to_qu_id + '" data-qu-factor="' + factor + '" data-qu-name-plural="' + conversion.to_qu_name_plural + '">' + conversion.to_qu_name + '</option>');
} }
@ -33,7 +31,7 @@ Grocy.Components.ProductAmountPicker.Reload = function(productId, destinationQuI
if (!Grocy.Components.ProductAmountPicker.InitialValueSet) if (!Grocy.Components.ProductAmountPicker.InitialValueSet)
{ {
var convertedAmount = $("#display_amount").val() * $("#qu_id option:selected").attr("data-qu-factor"); var convertedAmount = ($("#display_amount").val() * $("#qu_id option:selected").attr("data-qu-factor")).toLocaleString({ minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts });
$("#display_amount").val(convertedAmount); $("#display_amount").val(convertedAmount);
Grocy.Components.ProductAmountPicker.InitialValueSet = true; Grocy.Components.ProductAmountPicker.InitialValueSet = true;