Merge branch 'idkwhattonameitanymore' into 'main'
added pop up view ingredients + warnings for delete Closes #53 and #55 See merge request cse1105/2025-2026/teams/csep-team-76!48
This commit is contained in:
commit
3c33f2ff35
9 changed files with 571 additions and 8 deletions
|
|
@ -62,6 +62,8 @@ public class Ingredient {
|
|||
this.carbsPer100g = carbsPer100g;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public double kcalPer100g() {
|
||||
return proteinPer100g * KCAL_PER_GRAM_PROTEIN
|
||||
+ carbsPer100g * KCAL_PER_GRAM_CARBS
|
||||
|
|
@ -92,6 +94,10 @@ public class Ingredient {
|
|||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name){
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (o == null || getClass() != o.getClass()) return false;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue