From 80abb2af0cdbdddd270f9e8f91ff38a57e5cce2e Mon Sep 17 00:00:00 2001
From: HSoreide <sofie.scisly@gmail.com>
Date: Tue, 18 Apr 2023 15:08:11 +0200
Subject: [PATCH] Make ingredients sorted alphabetically
---
.../idatt1002/demo/controller/AddIngredientController.java | 2 +-
.../idatt1002/demo/controller/SuggestRecipesController.java | 6 +++---
src/main/resources/recipes/Fridge.register | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/AddIngredientController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/AddIngredientController.java
index de5d08a2..585ddf65 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/AddIngredientController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/AddIngredientController.java
@@ -65,7 +65,7 @@ public class AddIngredientController implements Initializable {
ingredientsList = stringIngredients.stream().toArray(String[] ::new);
ingredients = FXCollections.observableArrayList(stringIngredients);
// Fill list with ingredients
- listView.setItems(ingredients);
+ listView.setItems(ingredients.sorted());
}
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/SuggestRecipesController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/SuggestRecipesController.java
index 83e531dd..b75c3666 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/SuggestRecipesController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/SuggestRecipesController.java
@@ -79,7 +79,7 @@ public class SuggestRecipesController implements Initializable {
//TODO: Duplicate code and assertion.
assert ingredientsAtHand != null;
fridge = FXCollections.observableArrayList(ingredientsAtHand.getIngredientsAtHand().stream().map(foodItem -> foodItem.label).toList());
- fridgeList.setItems(fridge);
+ fridgeList.setItems(fridge.sorted());
setRecipeTiles();
}else if(clickedButton.get() == ButtonType.CANCEL) {
@@ -96,7 +96,7 @@ public class SuggestRecipesController implements Initializable {
//TODO: Remove toUppercase solution above.
//TODO: Consider factoring out to a update method.
fridge = FXCollections.observableArrayList(ingredientsAtHand.getIngredientsAtHand().stream().map(foodItem -> foodItem.label).toList());
- fridgeList.setItems(fridge);
+ fridgeList.setItems(fridge.sorted());
setRecipeTiles();
}
@@ -187,7 +187,7 @@ public class SuggestRecipesController implements Initializable {
ingredientsAtHand = FileHandler.readIngredientsAtHand("Fridge");
fridge = FXCollections.observableArrayList(ingredientsAtHand.getIngredientsAtHand().stream().map(foodItem -> foodItem.label).toList());
//List<String> fridgeLabels = fridge;
- fridgeList.setItems(fridge);
+ fridgeList.setItems(fridge.sorted());
recipeRegister = FileHandler.readRecipeRegister("Recipes");
recipes = FXCollections.observableArrayList(recipeRegister.getRecipes());
diff --git a/src/main/resources/recipes/Fridge.register b/src/main/resources/recipes/Fridge.register
index 83848d6f..0e4a95b2 100644
--- a/src/main/resources/recipes/Fridge.register
+++ b/src/main/resources/recipes/Fridge.register
@@ -1,4 +1,3 @@
-TOMATO
WHEAT_FLOUR
ONION
EGG
@@ -20,3 +19,4 @@ OLIVE_OIL
OIL
BUTTER
GARLIC_CLOVE
+HAM
--
GitLab