remove duplicate filtering

src/main/java/ch/zhaw/gartenverwaltung/CropDetailController.java

@@ -1,6 +1,5 @@
 package ch.zhaw.gartenverwaltung;
 
-import ch.zhaw.gartenverwaltung.bootstrap.AppLoader;
 import ch.zhaw.gartenverwaltung.bootstrap.Inject;
 import ch.zhaw.gartenverwaltung.io.PlantList;
 import ch.zhaw.gartenverwaltung.models.Garden;
@@ -11,18 +10,13 @@ import ch.zhaw.gartenverwaltung.types.Crop;
 import ch.zhaw.gartenverwaltung.types.Pest;
 import ch.zhaw.gartenverwaltung.types.Plant;
 import ch.zhaw.gartenverwaltung.types.Task;
-import javafx.beans.property.ListProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.collections.FXCollections;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.geometry.Pos;
-import javafx.scene.control.*;
+import javafx.scene.control.Button;
-import javafx.scene.image.Image;
+import javafx.scene.control.Label;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 
 import java.io.IOException;
@@ -40,12 +34,7 @@ public class CropDetailController {
     @Inject
     private Garden garden;
 
-    @Inject
-    AppLoader appLoader;
-
     private static final Logger LOG = Logger.getLogger(CropDetailController.class.getName());
-    private final ListProperty<Task> taskListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ListProperty<Pest> pestListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
 
     @FXML
     private ImageView imageView;
@@ -62,6 +51,9 @@ public class CropDetailController {
     @FXML
     private Label description_label;
 
+    @FXML
+    private VBox growthPhases_vbox;
+
     @FXML
     private Label location_label;
 
@@ -71,6 +63,9 @@ public class CropDetailController {
     @FXML
     private Button location_button;
 
+    @FXML
+    private VBox pests_vbox;
+
     @FXML
     private Label soil_label;
 
@@ -78,50 +73,26 @@ public class CropDetailController {
     private Label spacing_label;
 
     @FXML
-    private Button addTask_button;
+    void editTaskList() {
 
-    @FXML
-    private ListView<Task> taskList_listView;
-
-    @FXML
-    private ListView<Pest> pests_listView;
-
-    @FXML
-    void addTask() throws IOException {
-        createTaskDialog(true, null);
     }
 
-    /**
-     * close Window
-     */
     @FXML
     void goBack() {
         Stage stage = (Stage) imageView.getScene().getWindow();
         stage.close();
     }
 
-    /**
-     * open dialog to set area
-     */
     @FXML
     void setArea() {
 
     }
 
-    /**
-     * open dialog to set location
-     */
     @FXML
     void setLocation() {
 
     }
 
-    /**
-     * set labels and image from selected {@link Crop}
-     * set icons for buttons
-     * @param crop {@link Crop} which will be displayed
-     * @throws PlantNotFoundException exception
-     */
     public void setPlantFromCrop(Crop crop) throws PlantNotFoundException {
         this.crop = crop;
         try {
@@ -138,65 +109,22 @@ public class CropDetailController {
             }
             area_label.setText("");
             location_label.setText("");
-
+            createTaskLists(crop);
-            setTaskListProperty(crop);
+            createPestList(plant);
-            taskList_listView.itemsProperty().bind(taskListProperty);
-
-            pestListProperty.addAll(plant.pests());
-            pests_listView.itemsProperty().bind(pestListProperty);
-
-
         } catch (HardinessZoneNotSetException | IOException e) {
             throw new PlantNotFoundException();
         }
-        setIconToButton(addTask_button, "addIcon.png");
-        setIconToButton(area_button, "areaIcon.png");
-        setIconToButton(location_button, "locationIcon.png");
-        setCellFactoryPests();
-        setCellFactoryTasks();
     }
 
-    private void setCellFactoryTasks() {
+    private void createTaskLists(Crop crop) {
-        taskList_listView.setCellFactory(param -> new ListCell<>() {
-            @Override
-            protected void updateItem(Task task, boolean empty) {
-                super.updateItem(task, empty);
-
-                if (empty || task == null) {
-                    setText(null);
-                    setGraphic(null);
-                } else {
-                    setText("");
-                    setGraphic(createTaskHBox(task));
-                }
-            }
-        });
-    }
-
-    private void setCellFactoryPests() {
-        pests_listView.setCellFactory(param -> new ListCell<>() {
-            @Override
-            protected void updateItem(Pest pest, boolean empty) {
-                super.updateItem(pest, empty);
-
-                if (empty || pest == null) {
-                    setText(null);
-                    setGraphic(null);
-                } else {
-                    setText("");
-                    setGraphic(createPestHBox(pest));
-                }
-            }
-        });
-    }
-
-    private void setTaskListProperty(Crop crop) {
         crop.getCropId().ifPresent(id -> {
             List<Task> taskList;
             try {
                 taskList = gardenSchedule.getTaskListForCrop(id);
-                taskListProperty.clear();
+                for (Task task : taskList) {
-                taskListProperty.addAll(taskList);
+                    Label label = new Label(task.getDescription());
+                    growthPhases_vbox.getChildren().add(label);
+                }
             } catch (IOException e) {
                 // TODO: Alert
                 LOG.log(Level.SEVERE, "Could not get task list for crop", e.getCause());
@@ -204,26 +132,9 @@ public class CropDetailController {
         });
     }
 
-    private HBox createTaskHBox(Task task) {
+    private void createPestList(Plant plant) {
-        HBox hBox = new HBox();
+        List<Pest> pests = plant.pests();
-        Label taskName = new Label(task.getName()+": ");
+        for (Pest pest : pests) {
-        taskName.setStyle("-fx-font-weight: bold");
-        Label taskDescription = new Label(task.getDescription());
-        taskDescription.setWrapText(true);
-        taskDescription.setMaxWidth(2000);
-        HBox.setHgrow(taskDescription, Priority.ALWAYS);
-
-        Button edit = new Button();
-        Button delete = new Button();
-        setIconToButton(edit, "editIcon.png");
-        setIconToButton(delete, "deleteIcon.png");
-        edit.setOnAction(getEditTaskEvent(task));
-
-        hBox.getChildren().addAll(taskName, taskDescription, edit, delete);
-        return hBox;
-    }
-
-    private HBox createPestHBox(Pest pest) {
             Label label = new Label(pest.name() + ":");
             label.setStyle("-fx-font-weight: bold");
             HBox hBox = new HBox();
@@ -232,72 +143,10 @@ public class CropDetailController {
             label1.setAlignment(Pos.TOP_LEFT);
             label1.setWrapText(true);
             label1.setMaxWidth(600);
+            label1.setMaxHeight(100);
             Button button = new Button("Get Counter Measures");
-        hBox.getChildren().addAll(label, label1, button);
+            hBox.getChildren().addAll(label1, button);
-        return hBox;
+            pests_vbox.getChildren().addAll(label, hBox);
         }
-
-    /**
-     * adds icon to button
-     * @param button the button which get the icon
-     * @param iconFileName file name of icon
-     */
-    private void setIconToButton(Button button, String iconFileName) {
-        Image img = new Image(String.valueOf(getClass().getResource("icons/" + iconFileName)));
-        ImageView imageView = new ImageView(img);
-        imageView.setFitHeight(20);
-        imageView.setPreserveRatio(true);
-        button.setGraphic(imageView);
-    }
-
-    private EventHandler<ActionEvent> getEditTaskEvent(Task task) {
-        return (event) -> {
-            try {
-                createTaskDialog(false, task);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        };
-    }
-
-    private void createTaskDialog(boolean newTask, Task givenTask) throws IOException {
-        Dialog<Task> dialog = new Dialog<>();
-        dialog.setTitle("Set Task");
-        dialog.setHeaderText("Add/Edit Task:");
-        dialog.setResizable(false);
-
-        DialogPane dialogPane = dialog.getDialogPane();
-
-        ButtonType saveTask;
-        if(newTask) {
-            saveTask = new ButtonType("Add", ButtonBar.ButtonData.OK_DONE);
-        } else {
-            saveTask = new ButtonType("Save", ButtonBar.ButtonData.OK_DONE);
-        }
-        dialogPane.getButtonTypes().addAll(saveTask, ButtonType.CANCEL);
-
-        if (appLoader.loadPaneToDialog("TaskFormular.fxml", dialogPane) instanceof TaskFormularController controller) {
-            controller.setCorp(this.crop);
-            if (!newTask) {
-                controller.setTaskValue(givenTask);
-            }
-            dialog.setResultConverter(button -> button.equals(saveTask) ? controller.returnResult() : null);
-
-            dialog.showAndWait()
-                    .ifPresent(task -> {
-                        if (newTask) {
-                            try {
-                                gardenSchedule.addTask(task);
-                                setTaskListProperty(this.crop);
-                            } catch (IOException e) {
-                                e.printStackTrace();
-                            }
-                        } else {
-                            //ToDo method to edit task
-                            setTaskListProperty(this.crop);
-                        }
-                    });
-        }
-
     }
 }

src/main/java/ch/zhaw/gartenverwaltung/HomeController.java

@@ -1,47 +1,5 @@
 package ch.zhaw.gartenverwaltung;
 
-import javafx.fxml.FXML;
+public class HomeController
-import javafx.fxml.Initializable;
+{
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-
-import java.net.URL;
-import java.util.ResourceBundle;
-
-public class HomeController implements Initializable {
-
-    @FXML
-    private ImageView imageViewDavid;
-
-    @FXML
-    private ImageView imageViewElias;
-
-    @FXML
-    private ImageView imageViewGian;
-
-    @FXML
-    private ImageView imageViewPhilippe;
-
-    @FXML
-    private ImageView imageViewRoman;
-
-    @Override
-    public void initialize(URL location, ResourceBundle resources) {
-        setImages(imageViewDavid, "");
-        setImages(imageViewElias, "");
-        setImages(imageViewGian, "");
-        setImages(imageViewRoman, "");
-        setImages(imageViewPhilippe, "");
 }
-
-    private void setImages(ImageView imageView, String photoName) {
-        Image img;
-        if (photoName.equals("")) {
-            img = new Image(String.valueOf(getClass().getResource("icons/userIcon.png")));
-        } else {
-            img = new Image(String.valueOf(getClass().getResource("icons/" + photoName)));
-        }
-        imageView.setImage(img);
-    }
-}
-

src/main/java/ch/zhaw/gartenverwaltung/MainFXMLController.java

@@ -6,14 +6,9 @@ import ch.zhaw.gartenverwaltung.bootstrap.ChangeViewEvent;
 import ch.zhaw.gartenverwaltung.bootstrap.Inject;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
-import javafx.scene.control.*;
+import javafx.scene.control.Button;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.Pane;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
-import javafx.stage.WindowEvent;
 
 import java.io.IOException;
 import java.util.logging.Level;
@@ -38,86 +33,30 @@ public class MainFXMLController {
     private Button mySchedule_button;
 
     @FXML
-    private Button settings_button;
+    private Button plants_button;
 
-    @FXML
-    private Button tutorial_button;
-
-    private final Stage tutorialModal = new Stage();
-
-
-    /**
-     * go to home pane
-     */
     @FXML
     void goToHome() {
         showPaneAsMainView("Home.fxml");
         styleChangeButton(home_button);
     }
 
-    /**
-     * go to my garden pane
-     */
     @FXML
     void goToMyPlants() {
         showPaneAsMainView("MyGarden.fxml");
         styleChangeButton(myGarden_button);
     }
 
-    /**
-     * go to the schedule pane
-     */
     @FXML
     void goToMySchedule() {
         showPaneAsMainView("MySchedule.fxml");
         styleChangeButton(mySchedule_button);
     }
 
-    /**
-     * open dialog of the settings
-     * @throws IOException exception
-     */
     @FXML
-    public void openSettings() throws IOException {
+    void goToPlants() {
-        Dialog<ButtonType> dialog = new Dialog<>();
+        showPaneAsMainView("Plants.fxml");
-        dialog.setTitle("Settings");
+        styleChangeButton(plants_button);
-        dialog.setHeaderText("Settings");
-        dialog.setResizable(false);
-
-        DialogPane dialogPane = dialog.getDialogPane();
-
-        ButtonType saveSettings = new ButtonType("Save", ButtonBar.ButtonData.OK_DONE);
-        dialogPane.getButtonTypes().addAll(saveSettings, ButtonType.CANCEL);
-
-        if (appLoader.loadPaneToDialog("Settings.fxml", dialogPane) instanceof SettingsController controller) {
-
-            dialog.showAndWait()
-                    .ifPresent(button -> {
-                        if (button.equals(saveSettings)) {
-                            controller.saveSettings();
-                        }
-                    });
-        }
-    }
-
-    /**
-     * Show the tutorial window
-     */
-    public void showTutorial() {
-        if (!tutorialModal.isShowing()) {
-            if (tutorialModal.getScene() == null) {
-                try {
-                    appLoader.loadSceneToStage("Tutorial.fxml", tutorialModal);
-                    tutorialModal.initModality(Modality.NONE);
-                    tutorialModal.setResizable(false);
-                    tutorialModal.sizeToScene();
-                } catch (IOException e) {
-                    LOG.log(Level.SEVERE, "Could not load Tutorial");
-                }
-            }
-            tutorialModal.show();
-        }
-        tutorialModal.requestFocus();
     }
 
     /**
@@ -142,10 +81,6 @@ public class MainFXMLController {
 
     private final EventHandler<ChangeViewEvent> changeMainViewHandler = (ChangeViewEvent event) -> showPaneAsMainView(event.view());
 
-    /**
-     * preload all menu bar panes
-     * @throws IOException exception
-     */
     private void preloadPanes() throws IOException {
         appLoader.loadAndCacheFxml("MyGarden.fxml");
         appLoader.loadAndCacheFxml("MySchedule.fxml");
@@ -165,31 +100,11 @@ public class MainFXMLController {
     public void init() {
         try {
             preloadPanes();
-            showPaneAsMainView("MyGarden.fxml");
+            showPaneAsMainView("Home.fxml");
-            styleChangeButton(myGarden_button);
+            styleChangeButton(home_button);
         } catch (IOException e) {
             LOG.log(Level.SEVERE, "Failed to load FXML-Pane!", e);
         }
-        mainPane.getScene().getWindow().setOnCloseRequest(this::closeWindowHandler);
+    }
-        setIconToButton(home_button, "homeIcon.png");
-        setIconToButton(settings_button, "settingsIcon.png");
-        tutorial_button.visibleProperty().bind(Settings.getInstance().getShowTutorialProperty());
 }
 
-    private void closeWindowHandler(WindowEvent windowEvent) {
-        tutorialModal.close();
-    }
-
-    /**
-     * adds icon to given button
-     * @param button the button which get the icon
-     * @param iconFileName file name of icon
-     */
-    private void setIconToButton(Button button, String iconFileName) {
-        Image img = new Image(String.valueOf(getClass().getResource("icons/" + iconFileName)));
-        ImageView imageView = new ImageView(img);
-        imageView.setFitHeight(20);
-        imageView.setPreserveRatio(true);
-        button.setGraphic(imageView);
-    }
-}

src/main/java/ch/zhaw/gartenverwaltung/MyGardenController.java

@@ -13,12 +13,15 @@ import ch.zhaw.gartenverwaltung.types.Plant;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
-import javafx.scene.control.*;
+import javafx.scene.control.Alert;
-import javafx.scene.image.Image;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.Label;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 
@@ -39,64 +42,39 @@ public class MyGardenController {
     @FXML
     public AnchorPane myGardenRoot;
     @FXML
-    private Button addPlant_button;
+    private VBox myPlants_vbox;
-    @FXML
-    private ListView<Crop> myGarden_listView;
 
-    /**
-     * initialize crop list
-     * add listener for crop list
-     * set icon for button
-     */
     @AfterInject
     @SuppressWarnings("unused")
     public void init() {
-        System.out.println("once");
+        garden.getPlantedCrops().addListener((observable, oldValue, newValue) -> {
-        setIconToButton(addPlant_button, "addIcon.png");
+            try {
-        myGarden_listView.itemsProperty().bind(garden.getPlantedCrops());
+                createPlantView(newValue);
-        setCellFactory();
+            } catch (HardinessZoneNotSetException | IOException e) {
+                LOG.log(Level.SEVERE, "Could not update view of croplist!", e);
+            }
+        });
+        try {
+            createPlantView(garden.getPlantedCrops());
+        } catch (HardinessZoneNotSetException | IOException e) {
+            LOG.log(Level.SEVERE, "Could not update view of croplist!", e);
+        }
     }
 
-    /**
-     * redirect to plant fxml file
-     */
     @FXML
     void addPlant() {
         myGardenRoot.fireEvent(new ChangeViewEvent(ChangeViewEvent.CHANGE_MAIN_VIEW, "Plants.fxml"));
     }
 
-    /**
+    private void createPlantView(List<Crop> crops) throws HardinessZoneNotSetException, IOException {
-     * set cell factory to load {@link HBox} as list view content
+        myPlants_vbox.getChildren().clear();
-     */
+        for (Crop crop : crops) {
-    private void setCellFactory() {
+            HBox hBox = createPlantView(crop);
-        myGarden_listView.setCellFactory(param -> new ListCell<>() {
+            myPlants_vbox.getChildren().add(hBox);
-            @Override
-            protected void updateItem(Crop crop, boolean empty) {
-                super.updateItem(crop, empty);
-
-                if (empty || crop == null) {
-                    setText(null);
-                    setGraphic(null);
-                } else {
-                    try {
-                        setText("");
-                        setGraphic(createHBoxForListView(crop));
-                    } catch (HardinessZoneNotSetException | IOException e) {
-                        LOG.log(Level.WARNING, "Could not get plant for Cell", e);
         }
     }
-            }
-        });
-    }
 
-    /**
+    private HBox createPlantView(Crop crop) throws HardinessZoneNotSetException, IOException {
-     * Creates and returns HBox of the crop
-     * @param crop {@link Crop} which is selected
-     * @return {@link HBox} of the {@link Crop}
-     * @throws HardinessZoneNotSetException exception
-     * @throws IOException exception
-     */
-    private HBox createHBoxForListView(Crop crop) throws HardinessZoneNotSetException, IOException {
         //ToDo add better design
         Plant plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).get();
         HBox hBox = new HBox(10);
@@ -113,10 +91,8 @@ public class MyGardenController {
         label.setMaxWidth(2000);
         HBox.setHgrow(label, Priority.ALWAYS);
 
-        Button details = new Button();
+        Button details = new Button("Details");
-        Button delete = new Button();
+        Button delete = new Button("delete");
-        setIconToButton(details, "detailsIcon.png");
-        setIconToButton(delete, "deleteIcon.png");
         details.setOnAction(getGoToCropDetailEvent(crop));
         delete.setOnAction(getDeleteCropEvent(crop));
         
@@ -124,24 +100,6 @@ public class MyGardenController {
         return hBox;
     }
 
-    /**
-     * adds icon to button
-     * @param button the button which get the icon
-     * @param iconFileName file name of icon
-     */
-    private void setIconToButton(Button button, String iconFileName) {
-        Image img = new Image(String.valueOf(getClass().getResource("icons/" + iconFileName)));
-        ImageView imageView = new ImageView(img);
-        imageView.setFitHeight(20);
-        imageView.setPreserveRatio(true);
-        button.setGraphic(imageView);
-    }
-
-    /**
-     * open detail window of the selected {@link Crop}
-     * @param crop {@link Crop} which is selected
-     * @return {@link EventHandler} for button
-     */
     private EventHandler<ActionEvent> getGoToCropDetailEvent(Crop crop) {
         return (event) -> {
             try {
@@ -159,11 +117,6 @@ public class MyGardenController {
         };
     }
 
-    /**
-     * open alert for deleting the selected {@link Crop}
-     * @param crop {@link Crop} which is selected
-     * @return {@link EventHandler} for button
-     */
     private EventHandler<ActionEvent> getDeleteCropEvent(Crop crop) {
         return (event) -> {
             try {
@@ -174,16 +127,9 @@ public class MyGardenController {
         };
     }
 
-    /**
-     * Alert to confirm that the crop can be deleted.
-     * @param crop {@link Crop} which is selected
-     * @throws IOException exception
-     * @throws HardinessZoneNotSetException exception
-     */
     private void showConfirmation(Crop crop) throws IOException, HardinessZoneNotSetException {
-        Plant plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).get();
         Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
-        alert.setTitle("Delete " + plant.name());
+        alert.setTitle("Delete Crop");
         alert.setHeaderText("Are you sure want to delete this Crop?");
         alert.setContentText("Deleting this crop will remove all associated tasks from your schedule.");
 

src/main/java/ch/zhaw/gartenverwaltung/PlantsController.java

@@ -41,6 +41,7 @@ public class PlantsController {
     private Plant selectedPlant = null;
     private final HardinessZone DEFAULT_HARDINESS_ZONE = HardinessZone.ZONE_8A;
 
+    // TODO: move to model
     private final ListProperty<Plant> plantListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
 
     @FXML
@@ -268,7 +269,7 @@ public class PlantsController {
         list_plants.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
             if (newValue != null) {
                 selectedPlant = newValue;
-                description_plant.setText(getPlantDescription());
+                description_plant.setText(selectedPlant.description());
                 selectSowDay_button.setDisable(false);
                 Image img1;
                 if (selectedPlant.image() != null) {
@@ -287,20 +288,6 @@ public class PlantsController {
         });
     }
 
-    /**
-     * creates {@link String} of the plant information.
-     * @return return {@link Plant} description
-     */
-    private String getPlantDescription() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Name:            ").append(selectedPlant.name())
-                .append("\nDescription:\n").append(selectedPlant.description())
-                .append("\nLight Level:    ").append(selectedPlant.light())
-                .append("\nSoil:               ").append(selectedPlant.soil())
-                .append("\nSpacing:        ").append(selectedPlant.spacing());
-        return sb.toString();
-    }
-
 
     /**
      * clears the ListView of entries

src/main/java/ch/zhaw/gartenverwaltung/SelectSowDayController.java

@@ -21,11 +21,6 @@ public class SelectSowDayController {
     @FXML
     public ToggleGroup phase_group;
 
-    /**
-     * if sow date radio button was selected return sow date
-     * if sow date was not selected get sow from harvest day and return sow date
-     * @return {@link LocalDate} of the sow date
-     */
     public LocalDate retrieveResult() {
         LocalDate sowDate = datepicker.getValue();
         if (harvest_radio.isSelected()) {
@@ -58,10 +53,6 @@ public class SelectSowDayController {
         harvest_radio.setUserData(GrowthPhaseType.HARVEST);
     }
 
-    /**
-     * Disable save button when date picker is empty
-     * @param saveButton {@link Button} to be disabled
-     */
     public void initSaveButton(Button saveButton) {
         saveButton.disableProperty().bind(datepicker.valueProperty().isNull());
     }

src/main/java/ch/zhaw/gartenverwaltung/Settings.java

@@ -1,13 +1,10 @@
 package ch.zhaw.gartenverwaltung;
 
 import ch.zhaw.gartenverwaltung.types.HardinessZone;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
 
 public class Settings {
     private HardinessZone currentHardinessZone = HardinessZone.ZONE_8A;
     private static Settings instance;
-    private final BooleanProperty showTutorial = new SimpleBooleanProperty(false);
 
     static {
         instance = new Settings();
@@ -26,16 +23,4 @@ public class Settings {
     public void setCurrentHardinessZone(HardinessZone currentHardinessZone) {
         this.currentHardinessZone = currentHardinessZone;
     }
-
-    public void setShowTutorial (boolean showTutorial) {
-        this.showTutorial.setValue(showTutorial);
-    }
-
-    public BooleanProperty getShowTutorialProperty() {
-        return this.showTutorial;
-    }
-
-    public boolean getShowTutorial() {
-        return this.showTutorial.get();
-    }
 }

src/main/java/ch/zhaw/gartenverwaltung/SettingsController.java

@@ -1,40 +0,0 @@
-package ch.zhaw.gartenverwaltung;
-
-import ch.zhaw.gartenverwaltung.types.HardinessZone;
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.ComboBox;
-
-import java.net.URL;
-import java.util.ResourceBundle;
-
-public class SettingsController implements Initializable {
-    Settings settings = Settings.getInstance();
-
-    @FXML
-    private ComboBox<HardinessZone> selectHardinessZone_comboBox;
-
-    @FXML
-    private CheckBox showTutorial_checkBox;
-
-    /**
-     * save selected values to {@link Settings}
-     */
-    public void saveSettings() {
-        settings.setShowTutorial(showTutorial_checkBox.isSelected());
-        settings.setCurrentHardinessZone(selectHardinessZone_comboBox.getValue());
-    }
-
-    /**
-     * save default values form {@link Settings}
-     * @param location location
-     * @param resources resources
-     */
-    @Override
-    public void initialize(URL location, ResourceBundle resources) {
-        showTutorial_checkBox.setSelected(settings.getShowTutorial());
-        selectHardinessZone_comboBox.getItems().addAll(HardinessZone.values());
-        selectHardinessZone_comboBox.setValue(settings.getCurrentHardinessZone());
-    }
-}

src/main/java/ch/zhaw/gartenverwaltung/TaskFormularController.java

@@ -1,86 +0,0 @@
-package ch.zhaw.gartenverwaltung;
-
-import ch.zhaw.gartenverwaltung.types.Crop;
-import ch.zhaw.gartenverwaltung.types.Task;
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.scene.control.DateCell;
-import javafx.scene.control.DatePicker;
-import javafx.scene.control.TextArea;
-import javafx.scene.control.TextField;
-import javafx.util.Callback;
-
-import java.net.URL;
-import java.time.LocalDate;
-import java.util.ResourceBundle;
-
-public class TaskFormularController implements Initializable {
-    private Crop crop;
-
-    @FXML
-    private TextArea description_area;
-
-    @FXML
-    private DatePicker end_datePicker;
-
-    @FXML
-    private TextField interval_field;
-
-    @FXML
-    private DatePicker start_datePicker;
-
-    @FXML
-    private TextField taskName_field;
-
-
-    public Task returnResult() {
-        Task task = new Task(taskName_field.getText(), description_area.getText(),
-                start_datePicker.getValue(), end_datePicker.getValue(),
-                Integer.parseInt(interval_field.getText()), crop.getCropId().get());
-        return task;
-    }
-
-    public void setCorp(Crop crop) {
-        this.crop = crop;
-    }
-
-    public void setTaskValue(Task task) {
-        taskName_field.setText(task.getName());
-        description_area.setText(task.getDescription());
-        start_datePicker.setValue(task.getStartDate());
-        end_datePicker.setValue(task.getEndDate().orElse(null));
-        if(task.getInterval().orElse(null)!=null) {
-            interval_field.setText(task.getInterval().get().toString());
-        } else {
-            interval_field.setText(null);
-        }
-    }
-
-    private Callback<DatePicker, DateCell> getDayCellFactory() {
-
-        return (datePicker) -> new DateCell() {
-            private final LocalDate today = LocalDate.now();
-
-            @Override
-            public void updateItem(LocalDate item, boolean empty) {
-                super.updateItem(item, empty);
-                setDisable(true);
-                setStyle("-fx-background-color: #ffc0cb;");
-
-                if (item.compareTo(today) > 0 && item.compareTo(crop.getStartDate()) > 0) {
-                    setDisable(false);
-                    setStyle("-fx-background-color: #32CD32;");
-                }
-            }
-        };
-    }
-
-    @Override
-    public void initialize(URL location, ResourceBundle resources) {
-        start_datePicker.setDayCellFactory(getDayCellFactory());
-        start_datePicker.setEditable(false);
-
-        end_datePicker.setDayCellFactory(getDayCellFactory());
-        end_datePicker.setEditable(false);
-    }
-}

src/main/java/ch/zhaw/gartenverwaltung/TutorialController.java

@@ -1,61 +0,0 @@
-package ch.zhaw.gartenverwaltung;
-
-
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.layout.StackPane;
-import javafx.stage.Stage;
-
-public class TutorialController {
-
-    @FXML
-    public Button previousPageButton;
-    @FXML
-    public Button nextPageButton;
-    @FXML
-    public StackPane tourPages;
-    public ImageView imgAddNewPlant;
-    public ImageView imgTaskList;
-    public ImageView imgSelectDate;
-
-    private int page = 0;
-
-    @FXML
-    public void initialize() {
-        switchViews();
-        setButtonAbilities();
-
-        Image placeholder = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
-        imgAddNewPlant.setImage(placeholder);
-        imgSelectDate.setImage(placeholder);
-        imgTaskList.setImage(placeholder);
-    }
-
-    public void viewNextPage() {
-        page++;
-        switchViews();
-        setButtonAbilities();
-    }
-    public void viewPreviousPage() {
-        page--;
-        switchViews();
-        setButtonAbilities();
-    }
-
-    private void setButtonAbilities() {
-        previousPageButton.setDisable(page <= 0);
-        nextPageButton.setDisable(page >= tourPages.getChildren().size() - 1);
-    }
-
-    private void switchViews() {
-        tourPages.getChildren().forEach(node -> node.setOpacity(0));
-        tourPages.getChildren().get(page).setOpacity(1);
-    }
-
-    public void closeTutorial() {
-        Stage root = (Stage) tourPages.getScene().getWindow();
-        root.close();
-    }
-}

src/main/java/ch/zhaw/gartenverwaltung/io/JsonTaskList.java

@@ -86,7 +86,13 @@ public class JsonTaskList implements TaskList {
         if(taskMap.isEmpty()) {
             loadTaskListFromFile();
         }
-        taskMap.values().removeIf(task -> task.getCropId() == cropId);
+
+        List<Task> temptasks = taskMap.values().stream().
+                filter(task -> { return task.getCropId() == cropId;}).toList();
+        for (Task task : temptasks ) {
+                taskMap.remove(task.getId());
+        }
+        writeTaskListToFile();
     }
 
     /**
@@ -103,9 +109,10 @@ public class JsonTaskList implements TaskList {
         if(taskMap.isEmpty()) {
             loadTaskListFromFile();
         }
-        long id = task.getId().orElse(idProvider.incrementAndGet());
+        if(task.getId() == 0) {
-
+            task.withId(idProvider.incrementAndGet());
-        taskMap.put(id, task.withId(id));
+        }
+        taskMap.put(task.getId(),task);
         writeTaskListToFile();
     }
 
@@ -121,9 +128,8 @@ public class JsonTaskList implements TaskList {
         if(taskMap.isEmpty()) {
             loadTaskListFromFile();
         }
-        Long taskId = task.getId().orElseThrow(IOException::new);
+        if(taskMap.containsKey(task.getId())){
-        if(taskMap.containsKey(taskId)){
+            taskMap.remove(task.getId());
-            taskMap.remove(taskId);
             writeTaskListToFile();
         }
     }
@@ -163,7 +169,7 @@ public class JsonTaskList implements TaskList {
 
             taskMap = result.stream()
                     .collect(HashMap::new,
-                        (res, task) -> res.put(task.getId().orElse(0L), task),
+                        (res, task) -> res.put(task.getId(), task),
                         (existing, replacement) -> {});
         }
 

src/main/java/ch/zhaw/gartenverwaltung/types/Task.java

@@ -9,7 +9,7 @@ import java.util.Optional;
  * May be created using the builder pattern.
  */
 public class Task {
-    private Long id;
+    private long id;
     private final String name;
     private final String description;
     private final LocalDate startDate;
@@ -62,7 +62,7 @@ public class Task {
     }
 
     // Getters
-    public Optional<Long> getId() { return Optional.ofNullable(id); }
+    public long getId() { return id; }
     public String getName() { return name; }
     public String getDescription() { return description; }
     public LocalDate getStartDate() { return startDate; }

src/main/java/ch/zhaw/gartenverwaltung/types/TaskTemplate.java

@@ -34,7 +34,6 @@ public class TaskTemplate {
     public void setRelativeEndDate(Integer relativeEndDate) {
         this.relativeEndDate = relativeEndDate;
     }
-
     public void setInterval(Integer interval) {
         this.interval = interval;
     }
@@ -46,10 +45,13 @@ public class TaskTemplate {
     }
 
     public Task generateTask(LocalDate realStartDate, long cropId) {
-        LocalDate endDate = relativeEndDate != null ? realStartDate.plusDays(relativeEndDate) : null;
+        Task task = new Task(name, description, realStartDate.plusDays(relativeStartDate), cropId);
-
+        if (relativeEndDate != null) {
-        return new Task(name, description, realStartDate.plusDays(relativeStartDate), cropId)
+            task.withEndDate(realStartDate.plusDays(relativeEndDate));
-                .withInterval(interval)
+        }
-                .withEndDate(endDate);
+        if (interval != null) {
+            task.withInterval(interval);
+        }
+        return task;
     }
 }

src/main/resources/ch/zhaw/gartenverwaltung/CropDetail.fxml

@@ -3,7 +3,6 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ListView?>
 <?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
@@ -13,11 +12,13 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="785.0" prefWidth="899.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.CropDetailController">
+
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="785.0" prefWidth="899.0"
+            xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.CropDetailController">
    <children>
       <ScrollPane fitToWidth="true" prefHeight="759.0" prefWidth="664.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <content>
-            <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="781.0" prefWidth="897.0">
+            <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="503.0" prefWidth="897.0">
                <padding>
                   <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                </padding>
@@ -79,27 +80,27 @@
                         <ImageView fx:id="imageView" fitHeight="300.0" fitWidth="300.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER" />
                      </children>
                   </HBox>
-                  <Label text="Tasks:">
+                  <Label text="Growth Phases:">
                      <VBox.margin>
                         <Insets bottom="10.0" />
                      </VBox.margin>
                   </Label>
-                  <ListView fx:id="taskList_listView" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="877.0" VBox.vgrow="ALWAYS">
+                  <VBox fx:id="growthPhases_vbox" prefHeight="135.0" prefWidth="879.0">
                      <VBox.margin>
                         <Insets bottom="10.0" />
                      </VBox.margin>
-                  </ListView>
+                  </VBox>
-                  <Button fx:id="addTask_button" mnemonicParsing="false" onAction="#addTask" prefHeight="25.0" prefWidth="45.0">
+                  <Button mnemonicParsing="false" onAction="#editTaskList" prefHeight="25.0" prefWidth="92.0" text="Edit Tasklist">
                      <VBox.margin>
                         <Insets bottom="10.0" />
                      </VBox.margin>
                   </Button>
                   <Label text="Pests:" />
-                  <ListView fx:id="pests_listView" maxHeight="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+                  <VBox fx:id="pests_vbox" prefHeight="200.0" prefWidth="100.0">
                      <VBox.margin>
                         <Insets bottom="10.0" />
                      </VBox.margin>
-                  </ListView>
+                  </VBox>
                   <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="NEVER">
                      <children>
                         <Label text="Area:">
@@ -112,7 +113,7 @@
                               <Insets right="10.0" />
                            </HBox.margin>
                         </Label>
-                        <Button fx:id="area_button" mnemonicParsing="false" onAction="#setArea" prefHeight="25.0" prefWidth="116.0" text="Set Area" />
+                        <Button fx:id="area_button" mnemonicParsing="false" onAction="#setArea" prefHeight="25.0" prefWidth="116.0" text="Add Area" />
                      </children>
                      <VBox.margin>
                         <Insets bottom="10.0" />
@@ -130,7 +131,7 @@
                               <Insets right="10.0" />
                            </HBox.margin>
                         </Label>
-                        <Button fx:id="location_button" mnemonicParsing="false" onAction="#setLocation" prefHeight="25.0" prefWidth="115.0" text="Set Location" />
+                        <Button fx:id="location_button" mnemonicParsing="false" onAction="#setLocation" prefHeight="25.0" prefWidth="115.0" text="Add Location" />
                      </children>
                   </HBox>
                </children>

src/main/resources/ch/zhaw/gartenverwaltung/Home.fxml

@@ -2,210 +2,42 @@
 
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="1091.0" prefWidth="1060.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.HomeController">
+
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="729.0" prefWidth="1060.0"
+            xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.HomeController">
    <children>
-      <ScrollPane fitToWidth="true" prefHeight="1157.0" prefWidth="1060.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <VBox layoutX="75.0" layoutY="73.0" prefHeight="729.0" prefWidth="1060.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-         <content>
-            <VBox prefHeight="1091.0" prefWidth="1058.0">
          <children>
-                  <Pane prefHeight="1085.0" prefWidth="1018.0">
+            <Label text="Gartenverwaltung">
-                     <children>
-                        <VBox prefHeight="1047.0" prefWidth="1019.0">
-                           <children>
-                              <Label text="Garden Management">
                <font>
                   <Font size="34.0" />
                </font>
-                                 <VBox.margin>
-                                    <Insets bottom="30.0" />
-                                 </VBox.margin>
             </Label>
-                              <Label alignment="TOP_LEFT" prefHeight="22.0" prefWidth="1039.0" text="This Application was created to help the user manage his or her garden. For this the Application has many functionalities:" wrapText="true">
+            <Label prefHeight="106.0" prefWidth="1040.0" text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet." wrapText="true" />
+            <Label text="Tutorial">
                <font>
-                                    <Font size="14.0" />
+                  <Font name="System Bold" size="18.0" />
-                                 </font>
-                                 <VBox.margin>
-                                    <Insets bottom="10.0" />
-                                 </VBox.margin>
-                              </Label>
-                              <Label text="Base Functionalities:">
-                                 <font>
-                                    <Font name="System Bold" size="14.0" />
                </font>
             </Label>
-                              <Label text="- The user can select a plant he wants to cultivate.">
+            <Pane prefHeight="200.0" prefWidth="200.0">
-                                 <font>
-                                    <Font size="14.0" />
-                                 </font>
-                              </Label>
-                              <Label layoutX="10.0" layoutY="62.0" text="- The user can filter the plants according to seasons, hardiness zone and search query">
-                                 <font>
-                                    <Font size="14.0" />
-                                 </font>
-                              </Label>
-                              <Label layoutX="10.0" layoutY="62.0" text="- The user can select the harverst or sow date. ">
-                                 <font>
-                                    <Font size="14.0" />
-                                 </font>
-                              </Label>
-                              <Label layoutX="10.0" layoutY="102.0" text="- The user can get a detailed information of the plant he wants to harvest.">
-                                 <font>
-                                    <Font size="14.0" />
-                                 </font>
-                              </Label>
-                              <Label layoutX="10.0" layoutY="122.0" text="- The user can get view the task list of the given plant.">
-                                 <font>
-                                    <Font size="14.0" />
-                                 </font>
-                              </Label>
-                              <Label layoutX="10.0" layoutY="142.0" text="- The user can get the tasks of the next seven days in the scheduler.">
-                                 <font>
-                                    <Font size="14.0" />
-                                 </font>
-                                 <VBox.margin>
-                                    <Insets bottom="10.0" />
-                                 </VBox.margin>
-                              </Label>
-                              <Label layoutX="10.0" layoutY="42.0" text="Advanced Functionalities:">
-                                 <font>
-                                    <Font name="System Bold" size="14.0" />
-                                 </font>
-                              </Label>
-                              <Label layoutX="10.0" layoutY="62.0" text="- The user can edit the task list and add custom tasks.">
-                                 <font>
-                                    <Font size="14.0" />
-                                 </font>
-                              </Label>
-                              <Label layoutX="10.0" layoutY="212.0" text="- The user can set the area (sqare meter) for the plants.">
-                                 <font>
-                                    <Font size="14.0" />
-                                 </font>
-                              </Label>
-                              <Label layoutX="10.0" layoutY="232.0" text="- The user can set the location (PLZ) for the plants.">
-                                 <font>
-                                    <Font size="14.0" />
-                                 </font>
-                              </Label>
-                              <Label layoutX="10.0" layoutY="162.0" text="- The user can set the pesticide which will be used, which will create additonal tasks.">
-                                 <font>
-                                    <Font size="14.0" />
-                                 </font>
-                                 <VBox.margin>
-                                    <Insets bottom="10.0" />
-                                 </VBox.margin>
-                              </Label>
-                              <Label layoutX="10.0" layoutY="192.0" text="Weather Forcast:">
-                                 <font>
-                                    <Font name="System Bold" size="14.0" />
-                                 </font>
-                              </Label>
-                              <Label layoutX="10.0" layoutY="212.0" text="- According to the location the weather forcast will crate or delete tasks.">
-                                 <font>
-                                    <Font size="14.0" />
-                                 </font>
-                              </Label>
-                              <Label layoutX="10.0" layoutY="272.0" text="- The user receives notifications that aditional tasks werde created or some tasks were deleted.">
-                                 <font>
-                                    <Font size="14.0" />
-                                 </font>
-                                 <VBox.margin>
-                                    <Insets bottom="10.0" />
-                                 </VBox.margin>
-                              </Label>
-                              <Label text="Created by:">
-                                 <font>
-                                    <Font name="System Bold" size="14.0" />
-                                 </font>
-                                 <VBox.margin>
-                                    <Insets bottom="10.0" />
-                                 </VBox.margin>
-                              </Label>
-                              <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0">
                <children>
-                                    <ImageView fx:id="imageViewElias" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER">
+                  <VBox prefHeight="200.0" prefWidth="1040.0">
-                                       <HBox.margin>
-                                          <Insets right="30.0" />
-                                       </HBox.margin>
-                                    </ImageView>
-                                    <Label text="Elias Csomor" />
-                                 </children>
-                                 <VBox.margin>
-                                    <Insets bottom="15.0" />
-                                 </VBox.margin>
-                              </HBox>
-                              <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0">
                      <children>
-                                    <ImageView fx:id="imageViewPhilippe" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER">
+                        <Label text="Task 1" wrapText="true" />
-                                       <HBox.margin>
+                        <Label text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet." wrapText="true" />
-                                          <Insets right="30.0" />
-                                       </HBox.margin>
-                                    </ImageView>
-                                    <Label text="Philippe Giavarini" />
-                                 </children>
-                                 <VBox.margin>
-                                    <Insets bottom="15.0" />
-                                 </VBox.margin>
-                              </HBox>
-                              <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0">
-                                 <children>
-                                    <ImageView fx:id="imageViewDavid" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER">
-                                       <HBox.margin>
-                                          <Insets right="30.0" />
-                                       </HBox.margin>
-                                    </ImageView>
-                                    <Label text="David Guler" />
-                                 </children>
-                                 <VBox.margin>
-                                    <Insets bottom="15.0" />
-                                 </VBox.margin>
-                              </HBox>
-                              <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0">
-                                 <children>
-                                    <ImageView fx:id="imageViewGian" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER">
-                                       <HBox.margin>
-                                          <Insets right="30.0" />
-                                       </HBox.margin>
-                                    </ImageView>
-                                    <Label text="Gian-Andrea Hutter" />
-                                 </children>
-                                 <VBox.margin>
-                                    <Insets bottom="15.0" />
-                                 </VBox.margin>
-                              </HBox>
-                              <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0">
-                                 <children>
-                                    <ImageView fx:id="imageViewRoman" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER">
-                                       <HBox.margin>
-                                          <Insets right="30.0" />
-                                       </HBox.margin>
-                                    </ImageView>
-                                    <Label text="Roman Schenk" />
-                                 </children>
-                                 <VBox.margin>
-                                    <Insets bottom="15.0" />
-                                 </VBox.margin>
-                              </HBox>
                      </children>
                   </VBox>
                </children>
-                     <VBox.margin>
-                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                     </VBox.margin>
             </Pane>
          </children>
          <padding>
             <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
          </padding>
       </VBox>
-         </content>
-      </ScrollPane>
    </children>
 </AnchorPane>

src/main/resources/ch/zhaw/gartenverwaltung/MainFXML.fxml

@@ -9,12 +9,11 @@
    <children>
       <HBox maxWidth="35.0" minHeight="35.0" prefHeight="38.0" prefWidth="1110.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
-            <Button fx:id="home_button" mnemonicParsing="false" onAction="#goToHome" prefHeight="38.0" prefWidth="40.0" HBox.hgrow="NEVER" />
+            <Button fx:id="home_button" mnemonicParsing="false" onAction="#goToHome" prefHeight="38.0" prefWidth="121.0" text="Home" HBox.hgrow="NEVER" />
+            <Button fx:id="plants_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#goToPlants" prefHeight="38.0" prefWidth="121.0" text="Plants" />
             <Button fx:id="myGarden_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#goToMyPlants" prefHeight="38.0" prefWidth="121.0" text="My Garden" />
             <Button fx:id="mySchedule_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#goToMySchedule" prefHeight="38.0" prefWidth="121.0" text="My Schedule" />
-            <Button fx:id="tutorial_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#showTutorial" prefHeight="38.0" prefWidth="121.0" text="Tutorial" />
             <Pane maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS" />
-            <Button fx:id="settings_button" maxHeight="1.7976931348623157E308" mnemonicParsing="false" onAction="#openSettings" prefHeight="38.0" prefWidth="40.0" HBox.hgrow="NEVER" />
          </children>
       </HBox>
       <AnchorPane fx:id="mainPane" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="35.0" />

src/main/resources/ch/zhaw/gartenverwaltung/MyGarden.fxml

@@ -3,12 +3,11 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ListView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="myGardenRoot" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="655.0" prefWidth="1175.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.MyGardenController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="655.0" prefWidth="1175.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.MyGardenController" fx:id="myGardenRoot">
    <children>
       <VBox layoutY="49.0" prefHeight="655.0" prefWidth="1175.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
@@ -20,7 +19,7 @@
                   <Insets bottom="10.0" />
                </VBox.margin>
             </Label>
-            <ListView fx:id="myGarden_listView" maxHeight="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS" />
+            <VBox fx:id="myPlants_vbox" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="100.0" VBox.vgrow="ALWAYS" />
             <Button fx:id="addPlant_button" mnemonicParsing="false" onAction="#addPlant" prefHeight="45.0" prefWidth="155.0" text="Add new Plant">
                <VBox.margin>
                   <Insets top="10.0" />

src/main/resources/ch/zhaw/gartenverwaltung/Plants.fxml

@@ -63,7 +63,7 @@
                               <Font name="System Bold" size="17.0" />
                            </font>
                         </Label>
-                        <TitledPane animated="false" text="Seasons">
+                        <TitledPane animated="false" text="Saison">
                           <content>
                             <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
                                  <children>

src/main/resources/ch/zhaw/gartenverwaltung/Settings.fxml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.CheckBox?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-
-
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="80.0" prefWidth="374.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.SettingsController">
-   <children>
-      <VBox layoutX="14.0" layoutY="14.0" prefHeight="73.0" prefWidth="374.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-         <children>
-            <HBox prefHeight="23.0" prefWidth="334.0">
-               <children>
-                  <Label maxWidth="1.7976931348623157E308" text="Show Tutorial Menu" HBox.hgrow="ALWAYS" />
-                  <CheckBox fx:id="showTutorial_checkBox" mnemonicParsing="false" />
-               </children>
-               <VBox.margin>
-                  <Insets left="10.0" right="10.0" top="10.0" />
-               </VBox.margin>
-            </HBox>
-            <HBox alignment="CENTER_LEFT" layoutX="20.0" layoutY="20.0" prefHeight="23.0" prefWidth="334.0">
-               <children>
-                  <Label maxWidth="1.7976931348623157E308" text="Select Default Hardiness Zone" HBox.hgrow="ALWAYS" />
-                  <ComboBox fx:id="selectHardinessZone_comboBox" prefWidth="150.0" promptText="Hardniness Zone" />
-               </children>
-               <VBox.margin>
-                  <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-               </VBox.margin>
-            </HBox>
-         </children>
-      </VBox>
-   </children>
-</AnchorPane>

src/main/resources/ch/zhaw/gartenverwaltung/TaskFormular.fxml

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.DatePicker?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextArea?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-
-
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="259.0" prefWidth="390.0" xmlns="http://javafx.com/javafx/17"
-            xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.TaskFormularController">
-   <children>
-      <VBox layoutX="14.0" layoutY="14.0" prefHeight="272.0" prefWidth="390.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-         <padding>
-            <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
-         </padding>
-         <children>
-            <HBox alignment="CENTER_LEFT" prefHeight="35.0" prefWidth="560.0">
-               <children>
-                  <Label maxWidth="1.7976931348623157E308" text="Task name:" HBox.hgrow="ALWAYS" />
-                  <TextField fx:id="taskName_field" promptText="Task Name" />
-               </children>
-            </HBox>
-            <HBox prefHeight="77.0" prefWidth="350.0">
-               <children>
-                  <Label maxWidth="1.7976931348623157E308" text="Description:" HBox.hgrow="ALWAYS" />
-                  <TextArea fx:id="description_area" prefHeight="73.0" prefWidth="206.0" promptText="Description" />
-               </children>
-            </HBox>
-            <HBox alignment="CENTER_LEFT" layoutX="30.0" layoutY="30.0" prefHeight="35.0" prefWidth="560.0">
-               <children>
-                  <Label maxWidth="1.7976931348623157E308" text="Start Date:" HBox.hgrow="ALWAYS" />
-                  <DatePicker fx:id="start_datePicker" />
-               </children>
-            </HBox>
-            <HBox alignment="CENTER_LEFT" layoutX="30.0" layoutY="143.0" prefHeight="35.0" prefWidth="560.0">
-               <children>
-                  <Label maxWidth="1.7976931348623157E308" text="End Date:" HBox.hgrow="ALWAYS" />
-                  <DatePicker fx:id="end_datePicker" />
-               </children>
-            </HBox>
-            <HBox alignment="CENTER_LEFT" layoutX="30.0" layoutY="30.0" prefHeight="35.0" prefWidth="560.0">
-               <children>
-                  <Label maxWidth="1.7976931348623157E308" text="Interval:" HBox.hgrow="ALWAYS" />
-                  <TextField fx:id="interval_field" promptText="Interval (e.g. 0, 1, 3 ...)" />
-               </children>
-            </HBox>
-         </children>
-      </VBox>
-   </children>
-</AnchorPane>

src/main/resources/ch/zhaw/gartenverwaltung/Tutorial.fxml

@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ButtonBar?>
-<?import javafx.scene.control.CheckBox?>
-<?import javafx.scene.control.Separator?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.StackPane?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
-<?import javafx.scene.text.TextFlow?>
-
-<BorderPane maxHeight="470.0" maxWidth="724.0" minHeight="470.0" minWidth="724.0" prefHeight="470.0" prefWidth="724.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.TutorialController">
-   <bottom>
-      <HBox alignment="CENTER" prefHeight="0.0" prefWidth="724.0" BorderPane.alignment="CENTER">
-         <children>
-            <CheckBox mnemonicParsing="false" text="Don't show again" />
-            <Separator prefWidth="50.0" visible="false" HBox.hgrow="ALWAYS" />
-            <ButtonBar prefHeight="40.0" prefWidth="200.0">
-              <buttons>
-                  <Button cancelButton="true" contentDisplay="CENTER" graphicTextGap="5.0" mnemonicParsing="false" text="Close" onAction="#closeTutorial"/>
-                <Button fx:id="previousPageButton" mnemonicParsing="false" text="Previous" onAction="#viewPreviousPage"/>
-                  <Button fx:id="nextPageButton" defaultButton="true" mnemonicParsing="false" text="Next" onAction="#viewNextPage" />
-              </buttons>
-            </ButtonBar>
-         </children>
-         <padding>
-            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-         </padding>
-      </HBox>
-   </bottom>
-   <center>
-      <StackPane fx:id="tourPages" prefHeight="150.0" prefWidth="200.0" BorderPane.alignment="CENTER">
-         <children>
-            <VBox layoutX="30.0" layoutY="26.0" opacity="0.0" prefHeight="200.0" prefWidth="100.0">
-               <children>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Managing Your Crops">
-                     <font>
-                        <Font size="24.0" />
-                     </font>
-                  </Text>
-                  <Separator prefWidth="200.0">
-                     <VBox.margin>
-                        <Insets bottom="15.0" top="10.0" />
-                     </VBox.margin>
-                  </Separator>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="In the &quot;My Garden&quot; tab, you can see all of the plants you're planning on growing.">
-                     <VBox.margin>
-                        <Insets bottom="20.0" />
-                     </VBox.margin>
-                  </Text>
-                  <HBox prefHeight="100.0" prefWidth="200.0">
-                     <children>
-                        <TextFlow lineSpacing="4.0" prefHeight="90.0" prefWidth="500.0">
-                           <children>
-                              <Text strokeType="OUTSIDE" strokeWidth="0.0" text="To get started, click on the &quot;Add new Plant&quot; button in the bottom left. This will open a list of all the plants you can grow.&#10;Use the search bar at the top, the filters on the left, or simply browse the list until you've found a plant you want to grow in your garden." wrappingWidth="345.80316162109375" />
-                           </children>
-                           <HBox.margin>
-                              <Insets bottom="20.0" />
-                           </HBox.margin>
-                        </TextFlow>
-                        <Separator prefWidth="200.0" visible="false" HBox.hgrow="ALWAYS" />
-                        <ImageView fx:id="imgAddNewPlant" fitHeight="98.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" />
-                     </children>
-                  </HBox>
-                  <HBox prefHeight="100.0" prefWidth="200.0">
-                     <children>
-                        <TextFlow lineSpacing="4.0" prefHeight="200.0" prefWidth="500.0">
-                           <children>
-                              <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Once you've found what you're looking for, click the &quot;Select Sow/Harvest Date&quot; button at the bottom of the window.&#10;In the subsequently shown dialog, you can select the date you'd like to sow or harvest the crop. The date selector shows possible dates in green. Confirm your selection with the &quot;Save&quot; button." />
-                           </children>
-                        </TextFlow>
-                        <Separator prefWidth="200.0" visible="false" HBox.hgrow="ALWAYS" />
-                        <ImageView fx:id="imgSelectDate" fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" />
-                     </children>
-                  </HBox>
-               </children>
-               <opaqueInsets>
-                  <Insets />
-               </opaqueInsets>
-            </VBox>
-            <VBox prefHeight="200.0" prefWidth="100.0">
-               <children>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Managing Your Tasks">
-                     <font>
-                        <Font size="24.0" />
-                     </font>
-                  </Text>
-                  <Separator prefWidth="200.0">
-                     <VBox.margin>
-                        <Insets bottom="15.0" top="10.0" />
-                     </VBox.margin>
-                  </Separator>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="In the &quot;My Schedule&quot; tab, you can see all of the tasks you need to complete for a successful harvest.">
-                     <VBox.margin>
-                        <Insets bottom="20.0" />
-                     </VBox.margin>
-                  </Text>
-                  <HBox prefHeight="100.0" prefWidth="200.0">
-                     <children>
-                        <TextFlow lineSpacing="4.0" prefHeight="90.0" prefWidth="500.0">
-                           <children>
-                              <Text strokeType="OUTSIDE" strokeWidth="0.0" text="You can view the tasks for a specific crop by selecting it from the left sidebar.&#10;To see all tasks again, click the &quot;Clear Filter&quot; button at the bottom." wrappingWidth="345.80316162109375" />
-                           </children>
-                           <HBox.margin>
-                              <Insets bottom="20.0" />
-                           </HBox.margin>
-                        </TextFlow>
-                        <Separator prefWidth="200.0" visible="false" HBox.hgrow="ALWAYS" />
-                        <ImageView fx:id="imgTaskList" fitHeight="98.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" />
-                     </children>
-                  </HBox>
-                  <HBox prefHeight="100.0" prefWidth="200.0">
-                     <children>
-                        <TextFlow lineSpacing="4.0" prefHeight="200.0" prefWidth="500.0">
-                           <children>
-                              <Text strokeType="OUTSIDE" strokeWidth="0.0" text="You can also add your own custom tasks, by clicking the &quot;Add Task&quot; button.&#10;In the subsequently shown dialog, you can enter the corresponding details.&#10;&#10;Note: If you want to make a task recurring, you need to set both an interval (in days) AND an end date, so the task won't repeat for all eternity." />
-                           </children>
-                        </TextFlow>
-                        <Separator prefWidth="200.0" visible="false" HBox.hgrow="ALWAYS" />
-                        <ImageView fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" />
-                     </children></HBox>
-               </children>
-               <opaqueInsets>
-                  <Insets />
-               </opaqueInsets>
-            </VBox>
-         </children>
-         <BorderPane.margin>
-            <Insets />
-         </BorderPane.margin>
-         <padding>
-            <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
-         </padding>
-      </StackPane>
-   </center>
-</BorderPane>

src/main/resources/ch/zhaw/gartenverwaltung/io/plantdb.json

@@ -184,14 +184,15 @@
           "litersPerSqM": 15,
           "interval": 4,
           "notes": [
+
           ]
         },
         "taskTemplates": [
           {
-            "name": "Plant Sets",
+            "name": "hilling",
             "relativeStartDate": 0,
             "relativeEndDate": 0,
-            "description": "Plant the sets about 5cm deep into the soil.",
+            "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
             "interval": null,
             "isOptional": false
           }
@@ -231,6 +232,7 @@
           "litersPerSqM": 0,
           "interval": null,
           "notes": [
+
           ]
         },
         "taskTemplates": [

src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskListTest.java

@@ -47,17 +47,16 @@ public class JsonTaskListTest {
 
     }
 
-    @Disabled("disabled until adding works.")
     @Test
     @DisplayName("Add task.")
     void addTask() {
-        Task task = new Task("Testtask", "This is a test Task.", LocalDate.parse("01.05.2022", formatter), 1);
+        Task task = new Task("Testtask", "This is a test Task.", LocalDate.parse("2022-05-01", formatter), 1);
         try {
             testDatabase.saveTask(task);
             List<Task> taskList;
             try {
-                taskList = testDatabase.getTaskList(LocalDate.parse("30.04.2022", formatter),
+                taskList = testDatabase.getTaskList(LocalDate.parse("2022-04-30", formatter),
-                        LocalDate.parse("31.05.2022", formatter));
+                        LocalDate.parse("2022-05-31", formatter));
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
@@ -72,8 +71,7 @@ public class JsonTaskListTest {
     @Test
     @DisplayName("Remove task.")
     void removeTask() {
-        Task task = new Task("Dummy", "Dummy", LocalDate.parse("2022-05-31", formatter), 1)
+        Task task = new Task("Dummy", "Dummy", LocalDate.parse("2022-05-31", formatter), 1).withId(2);
-                .withId(2);
         try {
             testDatabase.removeTask(task);
             List<Task> taskList;
@@ -102,7 +100,6 @@ public class JsonTaskListTest {
 
     }
 
-    @Disabled("Disabled until removing works")
     @Test
     void removeTasksForCrop() {
         List<Task> taskList;

src/test/java/ch/zhaw/gartenverwaltung/models/GardenPlanModelTest.java

@@ -55,8 +55,8 @@ public class GardenPlanModelTest {
                         new GrowthPhase(MonthDay.of(2, 8), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
                         new GrowthPhase(MonthDay.of(10, 2), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())));
 
-        exampleCropOnion = new Crop(examplePlantOnion.id(), LocalDate.of(2023, 3, 1))
+        exampleCropOnion = new Crop(examplePlantOnion.id(),  LocalDate.of(2023,3,1));
-                .withId(3);
+        exampleCropOnion.withId(3);
         examplePlantCarrot = new Plant(
                 1,
                 "Early Carrot",
@@ -67,18 +67,18 @@ public class GardenPlanModelTest {
                 "sandy to loamy, loose soil, free of stones",
                 new ArrayList<>(),
                 List.of(new GrowthPhase(MonthDay.of(4, 4), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())));
-        exampleCropCarrot = new Crop(examplePlantCarrot.id(), LocalDate.now())
+        exampleCropCarrot = new Crop(examplePlantCarrot.id(), LocalDate.now());
-                .withId(5);
+        exampleCropCarrot.withId(5);
 
-        exampleCrop1 = new Crop(1, LocalDate.of(2023, 2, 25))
+        exampleCrop1 = new Crop(1, LocalDate.of(2023,2,25));
-                .withId(0)
+        exampleCrop1.withId(0);
-                .withArea(0.5);
+        exampleCrop1.withArea(0.5);
-        exampleCrop2 = new Crop(1, LocalDate.of(2023, 3, 1))
+        exampleCrop2 = new Crop(1,LocalDate.of(2023,3,1));
-                .withId(1)
+        exampleCrop2.withId(1);
-                .withArea(0.5);
+        exampleCrop2.withArea(0.5);
-        exampleCrop3 = new Crop(0, LocalDate.of(2023, 3, 1))
+        exampleCrop3 = new Crop(0,LocalDate.of(2023,3,1));
-                .withId(2)
+        exampleCrop3.withId(2);
-                .withArea(1.0);
+        exampleCrop3.withArea(1.0);
 
         exampleCrops = new ArrayList<>();
         exampleCrops.add(exampleCrop1);