ReiMerc/easyeat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change element to name for ingredient

Browse Source
This commit is contained in:
Jeas0001 2025-04-30 11:04:56 +02:00
parent 15de778225
commit 2596a9e408
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/API/BusinessLogic/RecipeLogic.cs
View File

@ -52,7 +52,7 @@ namespace API.BusinessLogic
{ {
Ingredient ingredient = new Ingredient(); Ingredient ingredient = new Ingredient();
ingredient.Unit = item.Unit; ingredient.Unit = item.Unit;
ingredient.Element = item.Element; ingredient.Name = item.Name;
ingredient.Amount = item.Amount; ingredient.Amount = item.Amount;
recipe1.Ingredients.Add(ingredient); recipe1.Ingredients.Add(ingredient);
} }
@ -80,7 +80,7 @@ namespace API.BusinessLogic
{ {
Ingredient ingredient = new Ingredient(); Ingredient ingredient = new Ingredient();
ingredient.Unit = item.Unit; ingredient.Unit = item.Unit;
ingredient.Element = item.Element; ingredient.Name = item.Name;
ingredient.Amount = item.Amount; ingredient.Amount = item.Amount;
dish.Ingredients.Add(ingredient); dish.Ingredients.Add(ingredient);
} }

6
backend/API/BusinessLogic/ShoppingListLogic.cs
View File

@ -146,9 +146,9 @@ namespace API.BusinessLogic
{ {
List<ShoppingList> shoppingList = user.ShoppingList; List<ShoppingList> shoppingList = user.ShoppingList;
if (shoppingList.Any(s => s.Name == ingredient.Element)) if (shoppingList.Any(s => s.Name == ingredient.Name))
{ {
ShoppingList item = shoppingList.Where(s => s.Name == ingredient.Element).FirstOrDefault(); ShoppingList item = shoppingList.Where(s => s.Name == ingredient.Name).FirstOrDefault();
shoppingList.Remove(item); shoppingList.Remove(item);
if (item.Unit == ingredient.Unit) if (item.Unit == ingredient.Unit)
@ -194,7 +194,7 @@ namespace API.BusinessLogic
else else
{ {
ShoppingList newItem = new ShoppingList(); ShoppingList newItem = new ShoppingList();
newItem.Name = ingredient.Element; newItem.Name = ingredient.Name;
newItem.Amount = ingredient.Amount; newItem.Amount = ingredient.Amount;
newItem.Unit = ingredient.Unit; newItem.Unit = ingredient.Unit;
newItem.Checked = false; newItem.Checked = false;

2
backend/API/Models/RecipeModels/Ingredient.cs
View File

@ -8,6 +8,6 @@
public string Unit { get; set; } public string Unit { get; set; }
public string Element { get; set; } public string Name { get; set; }
} }
} }

2
backend/API/Models/RecipeModels/IngredientDTO.cs
View File

@ -6,6 +6,6 @@
public string Unit { get; set; } public string Unit { get; set; }
public string Element { get; set; } public string Name { get; set; }
} }
} }