github/mealie
1
0
Fork 0
mirror of https://github.com/hay-kot/mealie.git synced 2025-08-22 14:33:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

add carbs

Browse source
This commit is contained in:
hay-kot 2021-04-27 22:13:02 -08:00
commit 109cb7af1b
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mealie/db/models/recipe/nutrition.py
View file

@ -10,6 +10,7 @@ class Nutrition(SqlAlchemyBase):
fatContent = sa.Column(sa.String) fatContent = sa.Column(sa.String)
fiberContent = sa.Column(sa.String) fiberContent = sa.Column(sa.String)
proteinContent = sa.Column(sa.String) proteinContent = sa.Column(sa.String)
carbohydrateContent = sa.Column(sa.String)
sodiumContent = sa.Column(sa.String) sodiumContent = sa.Column(sa.String)
sugarContent = sa.Column(sa.String) sugarContent = sa.Column(sa.String)
@ -21,6 +22,7 @@ class Nutrition(SqlAlchemyBase):
proteinContent=None, proteinContent=None,
sodiumContent=None, sodiumContent=None,
sugarContent=None, sugarContent=None,
carbohydrateContent=None,
) -> None: ) -> None:
self.calories = calories self.calories = calories
self.fatContent = fatContent self.fatContent = fatContent
@ -28,3 +30,4 @@ class Nutrition(SqlAlchemyBase):
self.proteinContent = proteinContent self.proteinContent = proteinContent
self.sodiumContent = sodiumContent self.sodiumContent = sodiumContent
self.sugarContent = sugarContent self.sugarContent = sugarContent
self.carbohydrateContent = carbohydrateContent

8
mealie/schema/recipe.py
View file

@ -22,12 +22,18 @@ class RecipeStep(BaseModel):
class Config: class Config:
orm_mode = True orm_mode = True
class RecipeAsset(BaseModel):
name: str
icon: str
path: str
class Nutrition(BaseModel): class Nutrition(BaseModel):
calories: Optional[str] calories: Optional[str]
fatContent: Optional[str] fatContent: Optional[str]
fiberContent: Optional[str]
proteinContent: Optional[str] proteinContent: Optional[str]
carbohydrateContent: Optional[str]
fiberContent: Optional[str]
sodiumContent: Optional[str] sodiumContent: Optional[str]
sugarContent: Optional[str] sugarContent: Optional[str]