jacob/munch-ease-frontend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More unit conversion stuff

Browse source
This commit is contained in:
jableader 2024-05-19 22:04:20 +10:00
parent a9b18051f7
commit 4664cc96f3
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/components/shopping/ShoppingListItem.vue
View file

@ -77,7 +77,6 @@
color: white; color: white;
font-weight: bold; font-weight: bold;
z-index: 1000; z-index: 1000;
opacity: 0.6;
} }
.found-marker.found { .found-marker.found {

13
src/components/shopping/shopping.js
View file

@ -103,7 +103,20 @@ function groupBy(groups, keyFn) {
return grouped; return grouped;
} }
function convertToBaseUnits(total) {
const baseUnits = {};
for (const unit in total) {
const conversion = units.getConversionFactor(unit) ?? { unit, factor: 1 };
baseUnits[conversion.unit] = (baseUnits[conversion.unit] ?? 0) + total[unit] / conversion.factor;
}
return baseUnits;
}
function getRemainingIngredients(requiredTotals, foundTotals) { function getRemainingIngredients(requiredTotals, foundTotals) {
requiredTotals = convertToBaseUnits(requiredTotals);
foundTotals = convertToBaseUnits(foundTotals);
const remaining = {}; const remaining = {};
for (const unit in requiredTotals) { for (const unit in requiredTotals) {
const required = requiredTotals[unit]; const required = requiredTotals[unit];