diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 52e2962f01d4580e696bd539da3182ae89105c4d..91367e1a78c8cc9e2f4bc420e0a863124a87e01d 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,6 +7,7 @@ <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> <outputRelativeToContentRoot value="true" /> <module name="TastyPages" /> + <module name="tasty-pages" /> <module name="tasty-pages2" /> </profile> </annotationProcessing> diff --git a/src/main/java/mi/hdm/recipes/Categories.java b/src/main/java/mi/hdm/recipes/Categories.java new file mode 100644 index 0000000000000000000000000000000000000000..98689a76f4e51424ccff92711637a839bf9bad3c --- /dev/null +++ b/src/main/java/mi/hdm/recipes/Categories.java @@ -0,0 +1,16 @@ +package mi.hdm.recipes; + +import java.util.Set; + +public class Categories { + + private Set<Category> allCategories; + + public boolean registerCategory(String name){ + return false; + } + + public Set<Category> getAllCategories(){ + return null; + } +} diff --git a/src/main/java/mi/hdm/recipes/Category.java b/src/main/java/mi/hdm/recipes/Category.java new file mode 100644 index 0000000000000000000000000000000000000000..48a13d2d25fb80e912f788c8c6dd10a10bf6cf8c --- /dev/null +++ b/src/main/java/mi/hdm/recipes/Category.java @@ -0,0 +1,13 @@ +package mi.hdm.recipes; + +public class Category { + + private String name; + private int colourCode; //0x für Hexzahlen + + @Override public boolean equals(Object o){ + return false; + + } + +} diff --git a/src/main/java/mi/hdm/recipes/Ingredient.java b/src/main/java/mi/hdm/recipes/Ingredient.java new file mode 100644 index 0000000000000000000000000000000000000000..bf96f1917aa1f44cc2f4908163fca167b2afd1f2 --- /dev/null +++ b/src/main/java/mi/hdm/recipes/Ingredient.java @@ -0,0 +1,6 @@ +package mi.hdm.recipes; + +public class Ingredient implements RecipeComponent { + + private Measurement unit; +} diff --git a/src/main/java/mi/hdm/recipes/IngredientList.java b/src/main/java/mi/hdm/recipes/IngredientList.java new file mode 100644 index 0000000000000000000000000000000000000000..36b041b66dd972598ee565c586d827bbf71d46e9 --- /dev/null +++ b/src/main/java/mi/hdm/recipes/IngredientList.java @@ -0,0 +1,10 @@ +package mi.hdm.recipes; + +import java.util.List; + +public class IngredientList { + + private List<Ingredient> ingredients; + + public void create (String name, Measurement unit) {} +} diff --git a/src/main/java/mi/hdm/recipes/Measurement.java b/src/main/java/mi/hdm/recipes/Measurement.java new file mode 100644 index 0000000000000000000000000000000000000000..4a6a318db35c1d3a672667945367feed964fb747 --- /dev/null +++ b/src/main/java/mi/hdm/recipes/Measurement.java @@ -0,0 +1,9 @@ +package mi.hdm.recipes; + +public enum Measurement { + + PIECE, + GRAM, + MILLILITER, + PINCH +} diff --git a/src/main/java/mi/hdm/recipes/Nutrition.java b/src/main/java/mi/hdm/recipes/Nutrition.java new file mode 100644 index 0000000000000000000000000000000000000000..4d0e0b0b4742901ae81dc8fcf4cc368473c2a51d --- /dev/null +++ b/src/main/java/mi/hdm/recipes/Nutrition.java @@ -0,0 +1,12 @@ +package mi.hdm.recipes; + +public enum Nutrition { + + CALORIES, + CARBS, + FAT, + PROTEINS, + FIBERS, + SALT + +} diff --git a/src/main/java/mi/hdm/recipes/NutritionTable.java b/src/main/java/mi/hdm/recipes/NutritionTable.java new file mode 100644 index 0000000000000000000000000000000000000000..cc171df5e1165979ea8c230e72432287903e4013 --- /dev/null +++ b/src/main/java/mi/hdm/recipes/NutritionTable.java @@ -0,0 +1,12 @@ +package mi.hdm.recipes; + +import java.util.HashMap; + +public class NutritionTable { + + private HashMap<Nutrition, Double> table; + + public NutritionTable getNutritionForRecipe (Recipe recipe) { + return null; + } +} diff --git a/src/main/java/mi/hdm/recipes/Recipe.java b/src/main/java/mi/hdm/recipes/Recipe.java new file mode 100644 index 0000000000000000000000000000000000000000..1bc8990eb8dbd6be94732cec7dadf0539f358dac --- /dev/null +++ b/src/main/java/mi/hdm/recipes/Recipe.java @@ -0,0 +1,16 @@ +package mi.hdm.recipes; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Set; + +public class Recipe implements RecipeComponent { + + private HashMap<RecipeComponent, Integer> ingredients; + private String desription; + private ArrayList<String> preparation; + private Set<Category> categories; + private Integer preparationTimeMins; + private LocalDateTime created; +} diff --git a/src/main/java/mi/hdm/recipes/RecipeComponent.java b/src/main/java/mi/hdm/recipes/RecipeComponent.java new file mode 100644 index 0000000000000000000000000000000000000000..68c4492da40f7eec956523966fd6b0f5d9cdeb1e --- /dev/null +++ b/src/main/java/mi/hdm/recipes/RecipeComponent.java @@ -0,0 +1,8 @@ +package mi.hdm.recipes; + +public interface RecipeComponent { + + String getName(); + NutritionTable getNutritionTable(); + int getID(); +} diff --git a/src/main/java/mi/hdm/recipes/RecipeEditor.java b/src/main/java/mi/hdm/recipes/RecipeEditor.java new file mode 100644 index 0000000000000000000000000000000000000000..f7696a17fc491651e5e02f3bad29c69688bfe4b6 --- /dev/null +++ b/src/main/java/mi/hdm/recipes/RecipeEditor.java @@ -0,0 +1,12 @@ +package mi.hdm.recipes; + +public class RecipeEditor { + + public RecipeEditor () {} + + public RecipeEditor(Recipe r) {} + + public Recipe get() { + return null; + } +} diff --git a/src/main/java/mi/hdm/recipes/RecipeManager.java b/src/main/java/mi/hdm/recipes/RecipeManager.java new file mode 100644 index 0000000000000000000000000000000000000000..68a4bf40cd66556dc974917b01aa1e14b5bad859 --- /dev/null +++ b/src/main/java/mi/hdm/recipes/RecipeManager.java @@ -0,0 +1,14 @@ +package mi.hdm.recipes; + +import java.util.List; + +public class RecipeManager { + + private List<Recipe> recipes; + private Categories categories; + private IngredientList ingredients; + + public void addRecipe(){} + public void deleteRecipe(int i) {} + public void editRecipe (int i) {} +} diff --git a/src/main/java/mi/hdm/recipes/RecipeSearch.java b/src/main/java/mi/hdm/recipes/RecipeSearch.java new file mode 100644 index 0000000000000000000000000000000000000000..460a8fdac8536f8398865a2fb75d7146d510fb6c --- /dev/null +++ b/src/main/java/mi/hdm/recipes/RecipeSearch.java @@ -0,0 +1,17 @@ +package mi.hdm.recipes; + +import java.util.List; + +public class RecipeSearch { + List<Recipe> recipesToSearch; + + public RecipeSearch (List<Recipe> recipesToSearch) {} + + public List<Recipe> searchByQuery(String query) { + return null; + } + + public List<Recipe> searchByCategory(List<Category> categoriesToSearch) { + return null; + } +}