Cutlery/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-06-23 15:31:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

remembered how to count over 9 (#2156)

Browse Source
This commit is contained in:
Michael Genson 2023-02-21 00:51:58 -06:00 committed by GitHub
parent eaa6ee57a9
commit fb830189d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mealie/schema/group/group_shopping_list.py
View File

@ -22,6 +22,14 @@ SUPERSCRIPT = dict(zip("1234567890", "¹²³⁴⁵⁶⁷⁸⁹⁰", strict=False
SUBSCRIPT = dict(zip("1234567890", "₁₂₃₄₅₆₇₈₉₀", strict=False)) SUBSCRIPT = dict(zip("1234567890", "₁₂₃₄₅₆₇₈₉₀", strict=False))
def display_fraction(fraction: Fraction):
return (
"".join([SUPERSCRIPT[c] for c in str(fraction.numerator)])
+ "/"
+ "".join([SUBSCRIPT[c] for c in str(fraction.denominator)])
)
class ShoppingListItemRecipeRefCreate(MealieModel): class ShoppingListItemRecipeRefCreate(MealieModel):
recipe_id: UUID4 recipe_id: UUID4
recipe_quantity: float = 0 recipe_quantity: float = 0
@ -126,7 +134,7 @@ class ShoppingListItemOut(ShoppingListItemBase):
return str(qty.numerator) return str(qty.numerator)
if qty.numerator <= qty.denominator: if qty.numerator <= qty.denominator:
return f"{SUPERSCRIPT[str(qty.numerator)]}⁄{SUBSCRIPT[str(qty.denominator)]}" return display_fraction(qty)
# convert an improper fraction into a mixed fraction (e.g. 11/4 --> 2 3/4) # convert an improper fraction into a mixed fraction (e.g. 11/4 --> 2 3/4)
whole_number = 0 whole_number = 0
@ -134,7 +142,7 @@ class ShoppingListItemOut(ShoppingListItemBase):
whole_number += 1 whole_number += 1
qty -= 1 qty -= 1
return f"{whole_number} {SUPERSCRIPT[str(qty.numerator)]}⁄{SUBSCRIPT[str(qty.denominator)]}" return f"{whole_number} {display_fraction(qty)}"
def _format_display(self) -> str: def _format_display(self) -> str:
components = [] components = []