fix: fixed fxml version warning

Feature gui overhaul m3

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Create a report to document bugs.
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Class / Methods**
+List of classes or methods which contains the bug. (If known)
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Features to implement
+title: "[FEATURE]"
+labels: feature
+assignees: ''
+
+---
+
+**Description of Usecase**
+A clear and concise description of what the feature allows to do.
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**List of Classes and Methods to implement**
+List all Classes and Methods which have to be implemented.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/tests.md

@@ -0,0 +1,20 @@
+---
+name: Tests
+about: Tests to implement
+title: "[TEST]"
+labels: Tests
+assignees: ''
+
+---
+
+**Feature description**
+A clear and concise description of the functionality which have to be tested.
+
+**Test cases**
+A list of cases which have to be tested.
+
+**List of affected Classes and Methods**
+A clear and concise list of the classes and methods which have to be tested.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

build.gradle

@@ -3,6 +3,7 @@ plugins {
     id 'application'
     id 'org.openjfx.javafxplugin' version '0.0.13'
     id 'org.beryx.jlink' version '2.25.0'
+    id 'jacoco'
 }
 
 group 'ch.zhaw.gartenverwaltung'
@@ -45,6 +46,15 @@ dependencies {
 
 test {
     useJUnitPlatform()
+    finalizedBy jacocoTestReport
+}
+
+jacocoTestReport {
+    dependsOn test
+}
+
+jacoco {
+    toolVersion = "0.8.8"
 }
 
 jlink {

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

@@ -1,19 +0,0 @@
-package ch.zhaw.gartenverwaltung;
-
-import ch.zhaw.gartenverwaltung.types.HardinessZone;
-
-public class Config {
-    private static HardinessZone currentHardinessZone;
-
-    static {
-        currentHardinessZone = HardinessZone.ZONE_8A;
-    }
-
-    public static HardinessZone getCurrentHardinessZone() {
-        return currentHardinessZone;
-    }
-
-    public static void setCurrentHardinessZone(HardinessZone currentHardinessZone) {
-        Config.currentHardinessZone = currentHardinessZone;
-    }
-}

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

@@ -1,16 +1,54 @@
 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;
+import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
+import ch.zhaw.gartenverwaltung.models.GardenSchedule;
+import ch.zhaw.gartenverwaltung.models.PlantNotFoundException;
 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.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.layout.VBox;
+import javafx.geometry.Pos;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class CropDetailController {
-    private Crop crop = null;
-    private Plant plant = null;
+    private Crop crop;
+
+    @Inject
+    private PlantList plantList;
+    @Inject
+    private GardenSchedule gardenSchedule;
+    @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;
 
     @FXML
     private Button area_button;
@@ -24,9 +62,6 @@ public class CropDetailController {
     @FXML
     private Label description_label;
 
-    @FXML
-    private VBox growthPhases_vbox;
-
     @FXML
     private Label location_label;
 
@@ -36,9 +71,6 @@ public class CropDetailController {
     @FXML
     private Button location_button;
 
-    @FXML
-    private VBox pests_vbox;
-
     @FXML
     private Label soil_label;
 
@@ -46,27 +78,226 @@ public class CropDetailController {
     private Label spacing_label;
 
     @FXML
-    void editTaskList(ActionEvent event) {
-
-    }
+    private Button addTask_button;
 
     @FXML
-    void goBack(ActionEvent event) {
-
-    }
+    private ListView<Task> taskList_listView;
 
     @FXML
-    void setArea(ActionEvent event) {
-
-    }
+    private ListView<Pest> pests_listView;
 
     @FXML
-    void setLocation(ActionEvent event) {
+    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() {
 
     }
 
-    public void setPlantFromCrop(Crop crop) {
+    /**
+     * 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;
-        this.plant = null;
+        try {
+            Plant plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId())
+                    .orElseThrow(PlantNotFoundException::new);
+
+            cropName_label.setText(plant.name());
+            description_label.setText(plant.description());
+            light_label.setText(String.valueOf(plant.light()));
+            soil_label.setText(plant.soil());
+            spacing_label.setText(plant.spacing());
+            if (plant.image() != null) {
+                imageView.setImage(plant.image());
+            }
+            area_label.setText("");
+            location_label.setText("");
+
+            setTaskListProperty(crop);
+            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() {
+        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();
+                taskListProperty.addAll(taskList);
+            } catch (IOException e) {
+                // TODO: Alert
+                LOG.log(Level.SEVERE, "Could not get task list for crop", e.getCause());
+            }
+        });
+    }
+
+    private HBox createTaskHBox(Task task) {
+        HBox hBox = new HBox();
+        Label taskName = new Label(task.getName()+": ");
+        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();
+        hBox.fillHeightProperty();
+        Label label1 = new Label(pest.description());
+        label1.setAlignment(Pos.TOP_LEFT);
+        label1.setWrapText(true);
+        label1.setMaxWidth(600);
+        Button button = new Button("Get Counter Measures");
+        hBox.getChildren().addAll(label, label1, button);
+        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);
+    }
+
+    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/HelloApplication.java

@@ -1,8 +1,7 @@
 package ch.zhaw.gartenverwaltung;
 
+import ch.zhaw.gartenverwaltung.bootstrap.AppLoader;
 import javafx.application.Application;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Scene;
 import javafx.stage.Stage;
 
 import java.io.IOException;
@@ -10,10 +9,11 @@ import java.io.IOException;
 public class HelloApplication extends Application {
     @Override
     public void start(Stage stage) throws IOException {
-        FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("MainFXML.fxml"));
-        Scene scene = new Scene(fxmlLoader.load());
+        AppLoader appLoader = new AppLoader();
+
+        appLoader.loadSceneToStage("MainFXML.fxml", stage);
+
         stage.setTitle("Gartenverwaltung");
-        stage.setScene(scene);
         stage.show();
     }
 

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

@@ -1,5 +1,47 @@
 package ch.zhaw.gartenverwaltung;
 
-public class HomeController
-{
+import javafx.fxml.FXML;
+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

@@ -1,25 +1,29 @@
 package ch.zhaw.gartenverwaltung;
 
-import javafx.event.ActionEvent;
+import ch.zhaw.gartenverwaltung.bootstrap.AfterInject;
+import ch.zhaw.gartenverwaltung.bootstrap.AppLoader;
+import ch.zhaw.gartenverwaltung.bootstrap.ChangeViewEvent;
+import ch.zhaw.gartenverwaltung.bootstrap.Inject;
+import javafx.event.EventHandler;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.fxml.Initializable;
-import javafx.scene.Node;
-import javafx.scene.control.Button;
+import javafx.scene.control.*;
+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.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.ResourceBundle;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
-public class MainFXMLController implements Initializable {
-    /**
-     * Caching the panes
-     */
-    private final Map<String, AnchorPane> panes = new HashMap<>();
+public class MainFXMLController {
+    private static final Logger LOG = Logger.getLogger(MainFXMLController.class.getName());
+
+    @Inject
+    AppLoader appLoader;
 
     @FXML
     private Button home_button;
@@ -28,36 +32,92 @@ public class MainFXMLController implements Initializable {
     private AnchorPane mainPane;
 
     @FXML
-    private Button myPlants_button;
+    private Button myGarden_button;
 
     @FXML
     private Button mySchedule_button;
 
     @FXML
-    private Button plants_button;
+    private Button settings_button;
 
     @FXML
-    void goToHome(ActionEvent event) throws IOException {
-        loadPane("Home.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(ActionEvent event) throws IOException {
-        loadPane("MyPlants.fxml");
-        styleChangeButton(myPlants_button);
+    void goToMyPlants() {
+        showPaneAsMainView("MyGarden.fxml");
+        styleChangeButton(myGarden_button);
     }
 
+    /**
+     * go to the schedule pane
+     */
     @FXML
-    void goToMySchedule(ActionEvent event) throws IOException {
-        loadPane("MySchedule.fxml");
+    void goToMySchedule() {
+        showPaneAsMainView("MySchedule.fxml");
         styleChangeButton(mySchedule_button);
     }
 
+    /**
+     * open dialog of the settings
+     * @throws IOException exception
+     */
     @FXML
-    void goToPlants(ActionEvent event) throws IOException {
-        loadPane("Plants.fxml");
-        styleChangeButton(plants_button);
+    public void openSettings() throws IOException {
+        Dialog<ButtonType> dialog = new Dialog<>();
+        dialog.setTitle("Settings");
+        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();
     }
 
     /**
@@ -65,25 +125,31 @@ public class MainFXMLController implements Initializable {
      * set HGrow and VGrow to parent AnchorPane.
      * Sends MainController to other Controllers.
      * @param fxmlFile string of fxml file
-     * @throws IOException exception when file does not exist
      */
-    public void loadPane(String fxmlFile) throws IOException {
+    public void showPaneAsMainView(String fxmlFile) {
+        try {
+            Pane anchorPane = appLoader.loadPane(fxmlFile);
+            mainPane.getChildren().setAll(anchorPane);
+            anchorPane.prefWidthProperty().bind(mainPane.widthProperty());
+            anchorPane.prefHeightProperty().bind(mainPane.heightProperty());
 
-        AnchorPane anchorPane = panes.get(fxmlFile);
-        if (anchorPane == null) {
-            FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(HelloApplication.class.getResource(fxmlFile)));
-            anchorPane = loader.load();
-            panes.put(fxmlFile, anchorPane);
-
-            if(fxmlFile.equals("MyPlants.fxml")) {
-                MyPlantsController myPlantsController = loader.getController();
-                myPlantsController.getMainController(this);
-            }
+            anchorPane.removeEventHandler(ChangeViewEvent.CHANGE_MAIN_VIEW, changeMainViewHandler);
+            anchorPane.addEventHandler(ChangeViewEvent.CHANGE_MAIN_VIEW, changeMainViewHandler);
+        } catch (IOException e) {
+            LOG.log(Level.SEVERE, "Could not load pane.", e);
         }
-        mainPane.getChildren().setAll(anchorPane);
-        anchorPane.prefWidthProperty().bind(mainPane.widthProperty());
-        anchorPane.prefHeightProperty().bind(mainPane.heightProperty());
+    }
 
+    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");
+        appLoader.loadAndCacheFxml("Plants.fxml");
     }
 
     private void styleChangeButton(Button button) {
@@ -94,14 +160,36 @@ public class MainFXMLController implements Initializable {
      * loads the default FXML File
      * {@inheritDoc}
      */
-    @Override
-    public void initialize(URL url, ResourceBundle resourceBundle) {
+    @AfterInject
+    @SuppressWarnings("unused")
+    public void init() {
         try {
-            loadPane("Home.fxml");
-            styleChangeButton(home_button);
+            preloadPanes();
+            showPaneAsMainView("MyGarden.fxml");
+            styleChangeButton(myGarden_button);
         } catch (IOException e) {
-            e.printStackTrace();
+            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

@@ -0,0 +1,202 @@
+package ch.zhaw.gartenverwaltung;
+
+import ch.zhaw.gartenverwaltung.bootstrap.AfterInject;
+import ch.zhaw.gartenverwaltung.bootstrap.AppLoader;
+import ch.zhaw.gartenverwaltung.bootstrap.ChangeViewEvent;
+import ch.zhaw.gartenverwaltung.bootstrap.Inject;
+import ch.zhaw.gartenverwaltung.io.PlantList;
+import ch.zhaw.gartenverwaltung.models.Garden;
+import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
+import ch.zhaw.gartenverwaltung.models.PlantNotFoundException;
+import ch.zhaw.gartenverwaltung.types.Crop;
+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.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class MyGardenController {
+    private static final Logger LOG = Logger.getLogger(MyGardenController.class.getName());
+    @Inject
+    AppLoader appLoader;
+    @Inject
+    private Garden garden;
+    @Inject
+    private PlantList plantList;
+
+    @FXML
+    public AnchorPane myGardenRoot;
+    @FXML
+    private Button addPlant_button;
+    @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");
+        setIconToButton(addPlant_button, "addIcon.png");
+        myGarden_listView.itemsProperty().bind(garden.getPlantedCrops());
+        setCellFactory();
+    }
+
+    /**
+     * redirect to plant fxml file
+     */
+    @FXML
+    void addPlant() {
+        myGardenRoot.fireEvent(new ChangeViewEvent(ChangeViewEvent.CHANGE_MAIN_VIEW, "Plants.fxml"));
+    }
+
+    /**
+     * set cell factory to load {@link HBox} as list view content
+     */
+    private void setCellFactory() {
+        myGarden_listView.setCellFactory(param -> new ListCell<>() {
+            @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);
+                    }
+                }
+            }
+        });
+    }
+
+    /**
+     * 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);
+        ImageView imageView = new ImageView();
+        imageView.setPreserveRatio(false);
+        imageView.setFitHeight(100);
+        imageView.setFitWidth(100);
+        imageView.maxHeight(100);
+        if (plant.image() != null) {
+            imageView.setImage(plant.image());
+        }
+        hBox.setMinHeight(100);
+        Label label = new Label(plant.name());
+        label.setMaxWidth(2000);
+        HBox.setHgrow(label, Priority.ALWAYS);
+
+        Button details = new Button();
+        Button delete = new Button();
+        setIconToButton(details, "detailsIcon.png");
+        setIconToButton(delete, "deleteIcon.png");
+        details.setOnAction(getGoToCropDetailEvent(crop));
+        delete.setOnAction(getDeleteCropEvent(crop));
+        
+        hBox.getChildren().addAll(imageView, label, details, delete);
+        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 {
+                Stage stage = new Stage();
+                if (appLoader.loadSceneToStage("CropDetail.fxml", stage) instanceof CropDetailController controller) {
+                    controller.setPlantFromCrop(crop);
+                }
+                stage.initModality(Modality.APPLICATION_MODAL);
+                stage.setResizable(true);
+                stage.showAndWait();
+            } catch (IOException | PlantNotFoundException e) {
+                // TODO: show error alert
+                LOG.log(Level.SEVERE, "Could not load plant details.", e);
+            }
+        };
+    }
+
+    /**
+     * 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 {
+                showConfirmation(crop);
+            } catch (IOException | HardinessZoneNotSetException e) {
+                e.printStackTrace();
+            }
+        };
+    }
+
+    /**
+     * 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.setHeaderText("Are you sure want to delete this Crop?");
+        alert.setContentText("Deleting this crop will remove all associated tasks from your schedule.");
+
+        alert.showAndWait()
+                .ifPresent(buttonType -> {
+                    if (buttonType == ButtonType.OK) {
+                        try {
+                            garden.removeCrop(crop);
+                        } catch (IOException e) {
+                            // TODO: Show error alert
+                            LOG.log(Level.SEVERE, "Could not remove crop.", e);
+                        }
+                    }
+                });
+    }
+}

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

@@ -1,140 +0,0 @@
-package ch.zhaw.gartenverwaltung;
-
-import ch.zhaw.gartenverwaltung.gardenplan.Gardenplanmodel;
-import ch.zhaw.gartenverwaltung.taskList.TaskListModel;
-import ch.zhaw.gartenverwaltung.types.Crop;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
-import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.fxml.Initializable;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
-import javafx.scene.control.Alert;
-import javafx.scene.control.Button;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.Label;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.VBox;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.*;
-
-public class MyPlantsController implements Initializable {
-    MainFXMLController mainController;
-    private final TaskListModel taskListModel = new TaskListModel();
-    private final Gardenplanmodel gardenplanmodel = new Gardenplanmodel(taskListModel);
-
-    @FXML
-    private VBox myPlants_vbox;
-
-    public MyPlantsController() throws IOException {
-    }
-
-    @FXML
-    void addPlant(ActionEvent event) throws IOException {
-        mainController.loadPane("Plants.fxml");
-    }
-
-    @Override
-    public void initialize(URL url, ResourceBundle resourceBundle) {
-        loadCropList();
-    }
-
-    private void loadCropList() {
-        List<Crop> cropList = new LinkedList<>();
-        try {
-            cropList = getCropList();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        createPlantView(cropList);
-    }
-
-    private void createPlantView(List<Crop> crops) {
-        myPlants_vbox.getChildren().clear();
-        for(Crop crop : crops) {
-            HBox hBox = createPlantView(crop);
-            myPlants_vbox.getChildren().add(hBox);
-        }
-    }
-
-    public void getMainController(MainFXMLController controller) {
-        mainController = controller;
-    }
-
-    private List<Crop> getCropList() throws IOException {
-        List<Crop> cropList;
-        cropList = gardenplanmodel.getCrops();
-        return cropList;
-    }
-
-    private HBox createPlantView(Crop crop) {
-        //ToDo add good design
-        //ToDo get plant information from crop
-        HBox hBox = new HBox();
-        Label label = new Label("Placeholder");
-        Button details = new Button("Details");
-        Button delete = new Button("delete");
-        details.setOnAction(getGoToCropDetailEvent(crop));
-        delete.setOnAction(getDeleteCropEvent(crop));
-        hBox.getChildren().addAll(label, details, delete);
-        return hBox;
-    }
-
-    private EventHandler<ActionEvent> getGoToCropDetailEvent(Crop crop) {
-        EventHandler<ActionEvent> event = new EventHandler<ActionEvent>() {
-            @Override
-            public void handle(ActionEvent event) {
-                Parent root;
-                FXMLLoader fxmlLoader = new FXMLLoader(Objects.requireNonNull(getClass().getResource("CropDetail.fxml")));
-                try {
-                    root = fxmlLoader.load();
-                    CropDetailController controller = fxmlLoader.getController();
-                    controller.setPlantFromCrop(crop);
-                    Stage stage = new Stage();
-                    stage.setScene(new Scene(root));
-                    stage.initModality(Modality.APPLICATION_MODAL);
-                    stage.setResizable(true);
-                    stage.showAndWait();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        };
-        return event;
-    }
-
-    private EventHandler<ActionEvent> getDeleteCropEvent(Crop crop) {
-        EventHandler<ActionEvent> event = new EventHandler<ActionEvent>() {
-            @Override
-            public void handle(ActionEvent event) {
-                try {
-                    showConfirmation(crop);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        };
-        return event;
-    }
-
-    private void showConfirmation(Crop crop) throws IOException {
-        Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
-        alert.setTitle("Delete Crop");
-        alert.setHeaderText("Are you sure want to delete this Crop?");
-        alert.setContentText("placeholder");
-
-        Optional<ButtonType> option = alert.showAndWait();
-
-        if (option.get() == ButtonType.OK) {
-            //ToDo uncomment, when error from JsonTaskDatabase.java loadTaskListFromFile() is fixed.
-            //gardenplanmodel.removeCrop(crop);
-            loadCropList();
-            System.out.println("Delete Crop");
-        }
-    }
-}

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

@@ -1,16 +1,15 @@
 package ch.zhaw.gartenverwaltung;
 
-import ch.zhaw.gartenverwaltung.gardenplan.Gardenplanmodel;
-import ch.zhaw.gartenverwaltung.taskList.TaskListModel;
+import ch.zhaw.gartenverwaltung.bootstrap.AfterInject;
+import ch.zhaw.gartenverwaltung.bootstrap.Inject;
+import ch.zhaw.gartenverwaltung.io.PlantList;
+import ch.zhaw.gartenverwaltung.models.Garden;
+import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
+import ch.zhaw.gartenverwaltung.models.GardenSchedule;
 import ch.zhaw.gartenverwaltung.types.Crop;
+import ch.zhaw.gartenverwaltung.types.Plant;
 import ch.zhaw.gartenverwaltung.types.Task;
-import javafx.beans.property.ListProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
 import javafx.scene.control.Label;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
@@ -18,18 +17,22 @@ import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 
 import java.io.IOException;
-import java.net.URL;
 import java.time.LocalDate;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.ResourceBundle;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class MyScheduleController {
+    private static final Logger LOG = Logger.getLogger(MyScheduleController.class.getName());
 
-public class MyScheduleController implements Initializable {
     private Crop selectedCrop = null;
-    private final TaskListModel taskListModel = new TaskListModel();
-    private final Gardenplanmodel gardenplanmodel = new Gardenplanmodel(taskListModel);
 
-    private final ListProperty<Crop> cropListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
+    @Inject
+    private GardenSchedule gardenSchedule;
+    @Inject
+    private Garden garden;
+    @Inject
+    private PlantList plantList;
 
     @FXML
     private Label day1_label;
@@ -79,21 +82,11 @@ public class MyScheduleController implements Initializable {
     @FXML
     private ListView<Crop> scheduledPlants_listview;
 
-    public MyScheduleController() throws IOException {
-    }
-
-    @Override
-    public void initialize(URL location, ResourceBundle resources) {
-        //ToDo method to load crop list
-        List<Crop> cropList;
-        try {
-            cropList = gardenplanmodel.getCrops();
-            cropListProperty.addAll(cropList);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+    @AfterInject
+    @SuppressWarnings("unused")
+    public void init() {
         setCellFactoryListView();
-        scheduledPlants_listview.itemsProperty().bind(cropListProperty);
+        scheduledPlants_listview.itemsProperty().bind(garden.getPlantedCrops());
         lookForSelectedListEntries();
         setDayLabels();
         information_label.setText("");
@@ -105,15 +98,12 @@ public class MyScheduleController implements Initializable {
     }
 
     private void lookForSelectedListEntries() {
-        scheduledPlants_listview.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<Crop>() {
-            @Override
-            public void changed(ObservableValue<? extends Crop> observable, Crop oldValue, Crop newValue) {
-                selectedCrop = newValue;
-                try {
-                    loadTaskList();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
+        scheduledPlants_listview.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+            selectedCrop = newValue;
+            try {
+                loadTaskList();
+            } catch (IOException e) {
+                e.printStackTrace();
             }
         });
     }
@@ -130,7 +120,7 @@ public class MyScheduleController implements Initializable {
     }
 
     private void setCellFactoryListView() {
-        scheduledPlants_listview.setCellFactory(param -> new ListCell<Crop>() {
+        scheduledPlants_listview.setCellFactory(param -> new ListCell<>() {
             @Override
             protected void updateItem(Crop crop, boolean empty) {
                 super.updateItem(crop, empty);
@@ -138,19 +128,25 @@ public class MyScheduleController implements Initializable {
                 if (empty || crop == null) {
                     setText(null);
                 } else {
-                    setText("placeholder");
+                    try {
+                        String text = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId())
+                                .map(Plant::name)
+                                .orElse("");
+                        setText(text);
+                    } catch (HardinessZoneNotSetException | IOException e) {
+                        LOG.log(Level.WARNING, "Could not get plant for Cell", e);
+                    }
                 }
             }
         });
     }
 
     private void loadTaskList() throws IOException {
-        List<List<Task>> taskLists = new LinkedList<>();
-        //ToDo uncomment, when error from JsonTaskDatabase.java loadTaskListFromFile() is fixed.
+        List<List<Task>> taskLists;
         if (selectedCrop != null) {
-            //taskLists = taskListModel.getTasksUpcomingWeekForCrop(selectedCrop.getCropId().get());
+            taskLists = gardenSchedule.getTasksUpcomingWeekForCrop(selectedCrop.getCropId().get());
         } else {
-            //taskLists = taskListModel.getTasksUpcomingWeek();
+            taskLists = gardenSchedule.getTasksUpcomingWeek();
         }
         if (!taskLists.isEmpty()) {
             viewTaskListOfDay(day1_pane, taskLists.get(0));
@@ -167,7 +163,7 @@ public class MyScheduleController implements Initializable {
         //ToDo update pane with task list
         VBox vBox = new VBox();
         for (Task task : tasks) {
-            Label label = new Label("placeholder");
+            Label label = new Label(task.getDescription());
             vBox.getChildren().add(label);
         }
         pane.getChildren().add(vBox);

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

@@ -1,43 +1,51 @@
 package ch.zhaw.gartenverwaltung;
 
+import ch.zhaw.gartenverwaltung.bootstrap.AfterInject;
+import ch.zhaw.gartenverwaltung.bootstrap.AppLoader;
+import ch.zhaw.gartenverwaltung.bootstrap.ChangeViewEvent;
+import ch.zhaw.gartenverwaltung.bootstrap.Inject;
 import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
-import ch.zhaw.gartenverwaltung.plantList.PlantListModel;
+import ch.zhaw.gartenverwaltung.models.Garden;
+import ch.zhaw.gartenverwaltung.models.PlantListModel;
+import ch.zhaw.gartenverwaltung.models.PlantNotFoundException;
 import ch.zhaw.gartenverwaltung.types.HardinessZone;
 import ch.zhaw.gartenverwaltung.types.Plant;
 import ch.zhaw.gartenverwaltung.types.Seasons;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
-import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.fxml.Initializable;
 import javafx.geometry.Insets;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
 import javafx.scene.control.*;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
+import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.VBox;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
 
 import java.io.IOException;
-import java.net.URL;
+import java.time.LocalDate;
 import java.util.List;
-import java.util.Objects;
-import java.util.ResourceBundle;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class PlantsController {
+    private static final Logger LOG = Logger.getLogger(PlantsController.class.getName());
+
+    @Inject
+    private PlantListModel plantListModel;
+    @Inject
+    private AppLoader appLoader;
+    @Inject
+    private Garden garden;
 
-public class PlantsController implements Initializable {
-    private final PlantListModel plantListModel = new PlantListModel();
     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
+    public AnchorPane plantsRoot;
+
     @FXML
     private VBox seasons;
 
@@ -61,20 +69,34 @@ public class PlantsController implements Initializable {
 
     /**
      * open new window to select sow or harvest day to save the crop
-     * @param event event
      */
     @FXML
-    void selectSowDate(ActionEvent event) throws IOException {
-        Parent root;
-        FXMLLoader fxmlLoader = new FXMLLoader(Objects.requireNonNull(getClass().getResource("SelectSowDay.fxml")));
-        root = fxmlLoader.load();
-        SelectSowDayController controller = fxmlLoader.getController();
-        controller.getSelectedPlant(selectedPlant);
-        Stage stage = new Stage();
-        stage.setScene(new Scene(root));
-        stage.initModality(Modality.APPLICATION_MODAL);
-        stage.setResizable(false);
-        stage.showAndWait();
+    void selectSowDate() throws IOException {
+        Dialog<LocalDate> dateSelection = new Dialog<>();
+        dateSelection.setTitle("Select Date");
+        dateSelection.setHeaderText(String.format("Select Harvest/Sow Date for %s:", selectedPlant.name()));
+        dateSelection.setResizable(false);
+
+        DialogPane dialogPane = dateSelection.getDialogPane();
+
+        ButtonType sowButton = new ButtonType("Save", ButtonBar.ButtonData.OK_DONE);
+        dialogPane.getButtonTypes().addAll(sowButton, ButtonType.CANCEL);
+
+        if (appLoader.loadPaneToDialog("SelectSowDay.fxml", dialogPane) instanceof SelectSowDayController controller) {
+            controller.initSaveButton((Button) dialogPane.lookupButton(sowButton));
+            controller.setSelectedPlant(selectedPlant);
+            dateSelection.setResultConverter(button -> button.equals(sowButton) ? controller.retrieveResult() : null);
+
+            dateSelection.showAndWait()
+                    .ifPresent(date -> {
+                        try {
+                            garden.plantAsCrop(selectedPlant, date);
+                        } catch (IOException | HardinessZoneNotSetException | PlantNotFoundException e) {
+                            LOG.log(Level.SEVERE, "Couldn't save Crop", e);
+                        }
+                        plantsRoot.fireEvent(new ChangeViewEvent(ChangeViewEvent.CHANGE_MAIN_VIEW, "MyGarden.fxml"));
+                    });
+        }
     }
 
     /**
@@ -84,8 +106,9 @@ public class PlantsController implements Initializable {
      * create event listener for selected list entry and search by query
      * {@inheritDoc}
      */
-    @Override
-    public void initialize(URL url, ResourceBundle resourceBundle) {
+    @AfterInject
+    @SuppressWarnings("unused")
+    public void init() {
         setListCellFactory();
         fillPlantListWithHardinessZone();
         list_plants.itemsProperty().bind(plantListProperty);
@@ -96,18 +119,21 @@ public class PlantsController implements Initializable {
         createFilterSeasons();
         createFilterHardinessZone();
         lookForSelectedListEntry();
+
         try {
             viewFilteredListBySearch();
-        } catch (HardinessZoneNotSetException | IOException e) {
-            e.printStackTrace();
+        } catch (HardinessZoneNotSetException e) {
+            LOG.log(Level.WARNING, "Hardiness Zone not set!");
+        } catch (IOException e) {
+            LOG.log(Level.WARNING, "Could not retrieve data!", e);
         }
     }
 
     /**
-     *  set text of list view to plant name
+     * set text of list view to plant name
      */
     private void setListCellFactory() {
-        list_plants.setCellFactory(param -> new ListCell<Plant>() {
+        list_plants.setCellFactory(param -> new ListCell<>() {
             @Override
             protected void updateItem(Plant plant, boolean empty) {
                 super.updateItem(plant, empty);
@@ -124,9 +150,10 @@ public class PlantsController implements Initializable {
     /**
      * get plant list according to param season and hardiness zone
      * fill list view with plant list
+     *
      * @param season enum of seasons
      * @throws HardinessZoneNotSetException throws exception
-     * @throws IOException throws exception
+     * @throws IOException                  throws exception
      */
     private void viewFilteredListBySeason(Seasons season) throws HardinessZoneNotSetException, IOException {
         clearListView();
@@ -136,20 +163,23 @@ public class PlantsController implements Initializable {
     /**
      * get plant list filtered by search plant entry and hardiness zone
      * fill list view with plant list
+     *
      * @throws HardinessZoneNotSetException throws exception when no hardiness zone is defined
-     * @throws IOException throws exception
+     * @throws IOException                  throws exception
      */
     private void viewFilteredListBySearch() throws HardinessZoneNotSetException, IOException {
         search_plants.textProperty().addListener((observable, oldValue, newValue) -> {
             if (newValue.isEmpty()) {
                 fillPlantListWithHardinessZone();
-            }else {
+            } else {
                 try {
                     List<Plant> filteredPlants = plantListModel.getFilteredPlantListByString(DEFAULT_HARDINESS_ZONE, newValue);
                     clearListView();
                     plantListProperty.addAll(filteredPlants);
-                } catch (HardinessZoneNotSetException | IOException e) {
-                    e.printStackTrace();
+                } catch (HardinessZoneNotSetException e) {
+                    LOG.log(Level.WARNING, "Hardiness Zone not set!");
+                } catch (IOException e) {
+                    LOG.log(Level.WARNING, "Could not retrieve data!", e);
                 }
             }
         });
@@ -163,8 +193,10 @@ public class PlantsController implements Initializable {
         try {
             clearListView();
             plantListProperty.addAll(plantListModel.getPlantList(plantListModel.getCurrentZone()));
-        } catch (HardinessZoneNotSetException | IOException e) {
-            e.printStackTrace();
+        } catch (HardinessZoneNotSetException e) {
+            LOG.log(Level.WARNING, "Hardiness Zone not set!");
+        } catch (IOException e) {
+            LOG.log(Level.WARNING, "Could not retrieve data!", e);
         }
     }
 
@@ -178,16 +210,13 @@ public class PlantsController implements Initializable {
         for (HardinessZone zone : HardinessZone.values()) {
             RadioButton radioButton = new RadioButton(zone.name());
             radioButton.setToggleGroup(hardinessGroup);
-            radioButton.setPadding(new Insets(0,0,10,0));
+            radioButton.setPadding(new Insets(0, 0, 10, 0));
             if (zone.equals(DEFAULT_HARDINESS_ZONE)) {
                 radioButton.setSelected(true);
             }
-            radioButton.selectedProperty().addListener(new ChangeListener<Boolean>() {
-                @Override
-                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
-                    plantListModel.setCurrentZone(zone);
-                    fillPlantListWithHardinessZone();
-                }
+            radioButton.selectedProperty().addListener((observable, oldValue, newValue) -> {
+                plantListModel.setCurrentZone(zone);
+                fillPlantListWithHardinessZone();
             });
             climate_zones.getChildren().add(radioButton);
         }
@@ -203,24 +232,23 @@ public class PlantsController implements Initializable {
         for (Seasons season : Seasons.values()) {
             RadioButton radioButton = new RadioButton(season.getName());
             radioButton.setToggleGroup(seasonGroup);
-            radioButton.setPadding(new Insets(0,0,10,0));
+            radioButton.setPadding(new Insets(0, 0, 10, 0));
             if (season.equals(Seasons.AllSEASONS)) {
                 radioButton.setSelected(true);
             }
-            radioButton.selectedProperty().addListener(new ChangeListener<Boolean>() {
-                @Override
-                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
-                    if (season.equals(Seasons.AllSEASONS)) {
-                        fillPlantListWithHardinessZone();
-                    } else {
-                        try {
-                            viewFilteredListBySeason(season);
-                        } catch (HardinessZoneNotSetException | IOException e) {
-                            e.printStackTrace();
-                        }
+            radioButton.selectedProperty().addListener((observable, oldValue, newValue) -> {
+                if (season.equals(Seasons.AllSEASONS)) {
+                    fillPlantListWithHardinessZone();
+                } else {
+                    try {
+                        viewFilteredListBySeason(season);
+                    } catch (HardinessZoneNotSetException e) {
+                        LOG.log(Level.WARNING, "Hardiness Zone not set!");
+                    } catch (IOException e) {
+                        LOG.log(Level.WARNING, "Could not retrieve data!", e);
                     }
-
                 }
+
             });
             seasons.getChildren().add(radioButton);
         }
@@ -237,31 +265,42 @@ public class PlantsController implements Initializable {
         selectSowDay_button.setDisable(true);
         Image img = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
         img_plant.setImage(img);
-        list_plants.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<Plant>() {
-            @Override
-            public void changed(ObservableValue<? extends Plant> observable, Plant oldValue, Plant newValue) {
-                if(newValue != null) {
-                    selectedPlant = newValue;
-                    description_plant.setText(selectedPlant.description());
-                    selectSowDay_button.setDisable(false);
-                    Image img;
-                    if(selectedPlant.image() != null) {
-                        img = selectedPlant.image();
-                    } else {
-                        img = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
-                    }
-                    img_plant.setImage(img);
+        list_plants.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+            if (newValue != null) {
+                selectedPlant = newValue;
+                description_plant.setText(getPlantDescription());
+                selectSowDay_button.setDisable(false);
+                Image img1;
+                if (selectedPlant.image() != null) {
+                    img1 = selectedPlant.image();
                 } else {
-                    selectedPlant = null;
-                    description_plant.setText("");
-                    selectSowDay_button.setDisable(true);
-                    Image img = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
-                    img_plant.setImage(img);
+                    img1 = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
                 }
+                img_plant.setImage(img1);
+            } else {
+                selectedPlant = null;
+                description_plant.setText("");
+                selectSowDay_button.setDisable(true);
+                Image img1 = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
+                img_plant.setImage(img1);
             }
         });
     }
 
+    /**
+     * 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

@@ -1,175 +1,103 @@
 package ch.zhaw.gartenverwaltung;
 
-import ch.zhaw.gartenverwaltung.gardenplan.Gardenplanmodel;
-import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
-import ch.zhaw.gartenverwaltung.taskList.PlantNotFoundException;
-import ch.zhaw.gartenverwaltung.taskList.TaskListModel;
 import ch.zhaw.gartenverwaltung.types.GrowthPhaseType;
 import ch.zhaw.gartenverwaltung.types.Plant;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
 import javafx.scene.control.*;
-import javafx.stage.Stage;
 import javafx.util.Callback;
 
-import java.io.IOException;
-import java.net.URL;
 import java.time.LocalDate;
-import java.util.List;
-import java.util.ResourceBundle;
 
-public class SelectSowDayController implements Initializable {
-    private Plant selectedPlant = null;
-    private final TaskListModel taskListModel = new TaskListModel();
-    private final Gardenplanmodel gardenplanmodel = new Gardenplanmodel(taskListModel);
+public class SelectSowDayController {
+    private Plant selectedPlant;
 
     @FXML
     private DatePicker datepicker;
 
     @FXML
-    private Label popup_label;
-
-    @FXML
-    private Button save_button;
-
+    private RadioButton harvest_radio;
     @FXML
     private RadioButton sow_radio;
-
-    public SelectSowDayController() throws IOException {}
+    @FXML
+    public ToggleGroup phase_group;
 
     /**
-     * close the date selector window
-     * @param event event
+     * 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
      */
-    @FXML
-    void cancel(ActionEvent event) {
-        closeWindow();
-    }
-
-    /**
-     * get sow date from datePicker or calculate sow date from harvest date
-     * save selected plant and sow date
-     * @param event event
-     */
-    @FXML
-    void save(ActionEvent event) throws HardinessZoneNotSetException, IOException, PlantNotFoundException {
-        LocalDate sowDate;
-        if (sow_radio.isSelected()) {
-            sowDate = datepicker.getValue();
-        } else {
-            //ToDo method to get current lifecycle group in plant
-            sowDate = selectedPlant.sowDateFromHarvestDate(datepicker.getValue(), 0);
+    public LocalDate retrieveResult() {
+        LocalDate sowDate = datepicker.getValue();
+        if (harvest_radio.isSelected()) {
+            sowDate = selectedPlant.sowDateFromHarvestDate(sowDate);
         }
-        //ToDo uncomment, when error from JsonTaskDatabase.java loadTaskListFromFile() is fixed.
-        //gardenplanmodel.plantAsCrop(selectedPlant, sowDate);
-        closeWindow();
+        return sowDate;
     }
 
     /**
-     * save the plant which will be planted and update label
+     * Set the {@link Plant} for which a date should be selected.
+     *
      * @param plant Plant
      */
-    public void getSelectedPlant(Plant plant) {
+    public void setSelectedPlant(Plant plant) {
         selectedPlant = plant;
-        popup_label.setText("Select Harvest/Sow Date for" + selectedPlant.name());
     }
 
     /**
      * add listener and set default values
-     * {@inheritDoc}
-     * @param location location
-     * @param resources resources
      */
-    @Override
-    public void initialize(URL location, ResourceBundle resources) {
+    @FXML
+    public void initialize() {
         clearDatePickerEntries();
 
-        Callback<DatePicker, DateCell> dayCellFactory= getDayCellFactory();
+        Callback<DatePicker, DateCell> dayCellFactory = getDayCellFactory();
         datepicker.setDayCellFactory(dayCellFactory);
-        datepicker.getEditor().setEditable(false);
+        datepicker.setEditable(false);
 
-        enableDisableSaveButton();
+        sow_radio.setUserData(GrowthPhaseType.SOW);
+        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());
     }
 
     /**
      * clear date picker editor when radio button is changed
      */
     private void clearDatePickerEntries() {
-        sow_radio.selectedProperty().addListener(new ChangeListener<Boolean>() {
-            @Override
-            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean isNowSelected) {
-                datepicker.getEditor().clear();
-            }
-        });
+        harvest_radio.selectedProperty().addListener((observable, oldValue, isNowSelected) -> datepicker.setValue(null));
     }
 
     /**
      * date picker disable/enable dates according to selected plant: sow or harvest day
+     *
      * @return cellFactory of datePicker
      */
     private Callback<DatePicker, DateCell> getDayCellFactory() {
 
-        final Callback<DatePicker, DateCell> dayCellFactory = new Callback<DatePicker, DateCell>() {
+        return (datePicker) -> new DateCell() {
+            private final LocalDate today = LocalDate.now();
 
             @Override
-            public DateCell call(final DatePicker datePicker) {
-                return new DateCell() {
-                    @Override
-                    public void updateItem(LocalDate item, boolean empty) {
-                        super.updateItem(item, empty);
-                        setDisable(true);
-                        setStyle("-fx-background-color: #ffc0cb;");
-                        List<LocalDate> dates;
-                        LocalDate today = LocalDate.now();
-                        if (sow_radio.isSelected()) {
-                            dates = selectedPlant.getDateListOfGrowthPhase(GrowthPhaseType.SOW);
-                        } else {
-                            dates = selectedPlant.getDateListOfGrowthPhase(GrowthPhaseType.HARVEST);
-                        }
-                        for (LocalDate date : dates) {
-                            if (item.getMonth() == date.getMonth()
-                                    && item.getDayOfMonth() == date.getDayOfMonth()
-                                    && item.compareTo(today) > 0) {
-                                setDisable(false);
-                                setStyle("-fx-background-color: #32CD32;");
-                            }
-                        }
-                        if ((!sow_radio.isSelected() && selectedPlant.sowDateFromHarvestDate(item, 0).compareTo(today) < 0)) {
-                            setDisable(true);
-                            setStyle("-fx-background-color: #ffc0cb;");
-                        }
+            public void updateItem(LocalDate item, boolean empty) {
+                super.updateItem(item, empty);
+                setDisable(true);
+                setStyle("-fx-background-color: #ffc0cb;");
+
+                if (item.compareTo(today) > 0 && (!harvest_radio.isSelected() || selectedPlant.sowDateFromHarvestDate(item).compareTo(today) >= 0)) {
+                    GrowthPhaseType selectedPhase = (GrowthPhaseType) phase_group.getSelectedToggle().getUserData();
+
+                    if (selectedPlant.isDateInPhase(item, selectedPhase)) {
+                        setDisable(false);
+                        setStyle("-fx-background-color: #32CD32;");
                     }
-                };
-            }
-        };
-        return dayCellFactory;
-    }
-
-    /**
-     * close date picker window
-     */
-    private void closeWindow() {
-        Stage stage = (Stage) save_button.getScene().getWindow();
-        stage.close();
-    }
-
-    /**
-     * disable save button, when there is no date selected in date picker
-     */
-    private void enableDisableSaveButton() {
-        save_button.setDisable(true);
-        datepicker.getEditor().textProperty().addListener(new ChangeListener<String>() {
-            @Override
-            public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
-                if (newValue == null || newValue.equals("")) {
-                    save_button.setDisable(true);
-                } else {
-                    save_button.setDisable(false);
                 }
             }
-        });
+        };
     }
 }

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

@@ -0,0 +1,41 @@
+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();
+    }
+
+    public static Settings getInstance() {
+        return Settings.instance;
+    }
+
+    private Settings() {}
+
+    public HardinessZone getCurrentHardinessZone() {
+        return currentHardinessZone;
+    }
+
+    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

@@ -0,0 +1,40 @@
+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

@@ -0,0 +1,86 @@
+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

@@ -0,0 +1,61 @@
+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/bootstrap/AfterInject.java

@@ -0,0 +1,14 @@
+package ch.zhaw.gartenverwaltung.bootstrap;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotates a method to be executed after all dependencies annotates with {@link Inject}
+ * have been injected.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface AfterInject { }

src/main/java/ch/zhaw/gartenverwaltung/bootstrap/AppLoader.java

@@ -0,0 +1,157 @@
+package ch.zhaw.gartenverwaltung.bootstrap;
+
+import ch.zhaw.gartenverwaltung.HelloApplication;
+import ch.zhaw.gartenverwaltung.io.CropList;
+import ch.zhaw.gartenverwaltung.io.JsonCropList;
+import ch.zhaw.gartenverwaltung.io.JsonPlantList;
+import ch.zhaw.gartenverwaltung.io.JsonTaskList;
+import ch.zhaw.gartenverwaltung.io.PlantList;
+import ch.zhaw.gartenverwaltung.io.TaskList;
+import ch.zhaw.gartenverwaltung.models.Garden;
+import ch.zhaw.gartenverwaltung.models.GardenSchedule;
+import ch.zhaw.gartenverwaltung.models.PlantListModel;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.scene.control.DialogPane;
+import javafx.scene.layout.Pane;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+public class AppLoader {
+    /**
+     * Caching the panes
+     */
+    private final Map<String, Pane> panes = new HashMap<>();
+
+    /**
+     * Application-wide dependencies
+     */
+    private final PlantList plantList = new JsonPlantList();
+    private final CropList cropList = new JsonCropList();
+    private final TaskList taskList = new JsonTaskList();
+
+    private final GardenSchedule gardenSchedule = new GardenSchedule(taskList, plantList);
+    private final Garden garden = new Garden(gardenSchedule, cropList);
+
+
+    public AppLoader() throws IOException {
+    }
+
+
+    /**
+     * Loads and returns a {@link Pane} (cached).
+     *
+     * @param fxmlFile The file name to be loaded
+     * @return The loaded Pane
+     * @throws IOException if the file could not be loaded
+     */
+    public Pane loadPane(String fxmlFile) throws IOException {
+        Pane pane = panes.get(fxmlFile);
+        if (pane == null) {
+            loadAndCacheFxml(fxmlFile);
+            pane = panes.get(fxmlFile);
+        }
+        return pane;
+    }
+
+    /**
+     * Loads the given fxml-file from resources (no caching) and creates a new {@link Scene},
+     * which is then appended to the given {@link Stage}.
+     * Performs dependency-injection.
+     *
+     * @param fxmlFile The file name to be loaded
+     * @param appendee The {@link Stage} to which the new {@link Scene} is appended.
+     * @return The controller of the loaded scene.
+     * @throws IOException if the file could not be loaded
+     */
+    public Object loadSceneToStage(String fxmlFile, Stage appendee) throws IOException {
+        FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(HelloApplication.class.getResource(fxmlFile)));
+        Pane root = loader.load();
+        appendee.setScene(new Scene(root));
+        Object controller = loader.getController();
+        annotationInject(controller);
+        return controller;
+    }
+
+    /**
+     * Loads the given fxml-file from resources (no caching) and appendeds it's
+     * contents to the given {@link DialogPane}.
+     * Performs dependency-injection.
+     *
+     * @param fxmlFile The file name to be loaded
+     * @param appendee The {@link DialogPane} to which the FXML contents are to be appended.
+     * @return The controller of the loaded scene.
+     * @throws IOException if the file could not be loaded
+     */
+    public Object loadPaneToDialog(String fxmlFile, DialogPane appendee) throws IOException {
+        FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(HelloApplication.class.getResource(fxmlFile)));
+        appendee.setContent(loader.load());
+        Object controller = loader.getController();
+        annotationInject(controller);
+        return controller;
+    }
+
+    /**
+     * Loads the given fxml-file from resources and caches the pane.
+     * Performs dependency-injection.
+     *
+     * @param fxmlFile The file name to be loaded
+     * @throws IOException if the file could not be loaded
+     */
+    public void loadAndCacheFxml(String fxmlFile) throws IOException {
+        FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(HelloApplication.class.getResource(fxmlFile)));
+        Pane pane = loader.load();
+        panes.put(fxmlFile, pane);
+        annotationInject(loader.getController());
+    }
+
+    /**
+     * Injects the applications dependencies into the given object's fields annotated with {@link Inject}.
+     * Afterwards, all methods on the objects annotated with {@link AfterInject} are executed.
+     * (Success of the injections is not guaranteed!)
+     *
+     * @param controller The class containing the injectable fields
+     */
+    public void annotationInject(Object controller) {
+        Arrays.stream(controller.getClass().getDeclaredFields())
+                .filter(field -> field.isAnnotationPresent(Inject.class))
+                .forEach(field -> {
+                    field.setAccessible(true);
+                    try {
+                        field.set(controller, getAppDependency(field.getType()));
+                    } catch (IllegalAccessException e) {
+                        throw new RuntimeException(e);
+                    }
+                    field.setAccessible(false);
+                });
+
+        Arrays.stream(controller.getClass().getMethods())
+                .filter(method -> method.isAnnotationPresent(AfterInject.class))
+                .forEach(afterInjectMethod -> {
+                    if (afterInjectMethod.getParameterCount() == 0) {
+                        try {
+                            afterInjectMethod.invoke(controller);
+                        } catch (IllegalAccessException | InvocationTargetException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                });
+    }
+
+    private Object getAppDependency(Class<?> type) {
+        return switch (type.getSimpleName()) {
+            case "Garden" -> garden;
+            case "PlantList" -> plantList;
+            case "PlantListModel" -> new PlantListModel(plantList);
+            case "GardenSchedule" -> gardenSchedule;
+            case "AppLoader" -> this;
+            default -> null;
+        };
+    }
+}

src/main/java/ch/zhaw/gartenverwaltung/bootstrap/ChangeViewEvent.java

@@ -0,0 +1,19 @@
+package ch.zhaw.gartenverwaltung.bootstrap;
+
+import javafx.event.Event;
+import javafx.event.EventType;
+
+public class ChangeViewEvent extends Event {
+    private final String view;
+
+    public static final EventType<ChangeViewEvent> CHANGE_MAIN_VIEW = new EventType<>("CHANGE_MAIN_VIEW");
+
+    public ChangeViewEvent(EventType<? extends Event> eventType, String view) {
+        super(eventType);
+        this.view = view;
+    }
+
+    public String view() {
+        return view;
+    }
+}

src/main/java/ch/zhaw/gartenverwaltung/bootstrap/Inject.java

@@ -0,0 +1,13 @@
+package ch.zhaw.gartenverwaltung.bootstrap;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotates a Field to be injected from the application-dependencies
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface Inject { }

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

@@ -6,7 +6,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
 
-public interface GardenPlan {
+public interface CropList {
     /**
      * Yields a list of all {@link Crop}s in the database.
      *

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

@@ -19,7 +19,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class JsonGardenPlan implements GardenPlan {
+public class JsonCropList implements CropList {
     private final URL dataSource;
 
     private IdProvider idProvider;
@@ -42,7 +42,7 @@ public class JsonGardenPlan implements GardenPlan {
     /**
      * Default constructor
      */
-    public JsonGardenPlan() {
+    public JsonCropList() {
         this.dataSource = getClass().getResource("user-crops.json");
     }
 
@@ -50,9 +50,10 @@ public class JsonGardenPlan implements GardenPlan {
      * Constructor to use a specified {@link URL} as a {@link #dataSource}
      * @param dataSource A {@link URL} to the file to be used as a data source
      */
-    public JsonGardenPlan(URL dataSource) {
+    public JsonCropList(URL dataSource) {
         this.dataSource = dataSource;
     }
+
     /**
      * {@inheritDoc}
      */
@@ -145,7 +146,6 @@ public class JsonGardenPlan implements GardenPlan {
                         .registerModule(new Jdk8Module())
                         .writeValue(new File(dataSource.toURI()), cropMap.values());
             } catch (URISyntaxException e) {
-                // TODO: Log
                 throw new IOException(INVALID_DATASOURCE_MSG, e);
             }
         }

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

@@ -20,12 +20,12 @@ import java.util.Map;
 import java.util.Optional;
 
 /**
- * Implements the {@link PlantDatabase} interface for loading {@link Plant} objects
+ * Implements the {@link PlantList} interface for loading {@link Plant} objects
  * from a JSON file.
  * The reads are cached to minimize file-io operations.
  */
-public class JsonPlantDatabase implements PlantDatabase {
-    private final URL dataSource = getClass().getResource("plantdb.json");
+public class JsonPlantList implements PlantList {
+    private final URL dataSource;
 
     private HardinessZone currentZone;
     private Map<Long, Plant> plantMap = Collections.emptyMap();
@@ -44,12 +44,19 @@ public class JsonPlantDatabase implements PlantDatabase {
         imageModule.addDeserializer(Image.class, new PlantImageDeserializer());
     }
 
+    public JsonPlantList() {
+        this.dataSource = getClass().getResource("plantdb.json");
+    }
+    public JsonPlantList(URL dataSource) {
+        this.dataSource = dataSource;
+    }
+
     /**
      * If no data is currently loaded, or the specified zone differs
      * from the {@link #currentZone}, data is loaded from {@link #dataSource}.
      * In any case, the values of {@link #plantMap} are returned.
      *
-     * @see PlantDatabase#getPlantList(HardinessZone)
+     * @see PlantList#getPlantList(HardinessZone)
      */
     @Override
     public List<Plant> getPlantList(HardinessZone zone) throws IOException, HardinessZoneNotSetException {
@@ -60,7 +67,7 @@ public class JsonPlantDatabase implements PlantDatabase {
     }
 
     /**
-     * @see PlantDatabase#getPlantById(long)
+     * @see PlantList#getPlantById(long)
      */
     @Override
     public Optional<Plant> getPlantById(HardinessZone zone, long id) throws HardinessZoneNotSetException, IOException {

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

@@ -1,6 +1,5 @@
 package ch.zhaw.gartenverwaltung.io;
 
-import ch.zhaw.gartenverwaltung.types.Crop;
 import ch.zhaw.gartenverwaltung.types.Task;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
@@ -20,13 +19,13 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * Implements the {@link TaskDatabase} interface for loading and writing {@link Task} objects
+ * Implements the {@link TaskList} interface for loading and writing {@link Task} objects
  * from and to a JSON file.
  * The reads are cached to minimize file-io operations.
  */
-public class JsonTaskDatabase implements TaskDatabase{
+public class JsonTaskList implements TaskList {
     IdProvider idProvider;
-    private final URL dataSource = getClass().getResource("taskdb.json");
+    private final URL dataSource;
     private final static String INVALID_DATASOURCE_MSG = "Invalid datasource specified!";
 
     private Map<Long, Task> taskMap = Collections.emptyMap();
@@ -44,11 +43,18 @@ public class JsonTaskDatabase implements TaskDatabase{
         timeModule.addSerializer(LocalDate.class, dateSerializer);
     }
 
+    public JsonTaskList() {
+        this.dataSource = getClass().getResource("taskdb.json");
+    }
+    public JsonTaskList(URL dataSource) {
+        this.dataSource = dataSource;
+    }
+
     /**
      * If no data is currently loaded, data is loaded from {@link #dataSource}.
      * In any case, the values of {@link #taskMap} are returned.
      *
-     * @see TaskDatabase#getTaskList(LocalDate, LocalDate)
+     * @see TaskList#getTaskList(LocalDate, LocalDate)
      */
     @Override
     public List<Task> getTaskList(LocalDate start, LocalDate end) throws IOException{
@@ -90,16 +96,16 @@ public class JsonTaskDatabase implements TaskDatabase{
      * it to the {@link #taskMap}. In any case, the {@link #taskMap} is written
      * to the {@link #dataSource}.
      *
-     * @see TaskDatabase#saveTask(Task)
+     * @see TaskList#saveTask(Task)
      */
     @Override
     public void saveTask(Task task) throws IOException {
         if(taskMap.isEmpty()) {
             loadTaskListFromFile();
         }
-        if(task.getId() == 0) {
-            task.withId(idProvider.incrementAndGet());
-        }
+        long id = task.getId().orElse(idProvider.incrementAndGet());
+
+        taskMap.put(id, task.withId(id));
         writeTaskListToFile();
     }
 
@@ -108,15 +114,16 @@ public class JsonTaskDatabase implements TaskDatabase{
      * If the {@link Task}s id is found in the {@link #taskMap}, the Task is removed
      * from the  {@link #taskMap}. Then the Task are written to the {@link #dataSource}.
      *
-     * @see TaskDatabase#removeTask(Task)
+     * @see TaskList#removeTask(Task)
      */
     @Override
     public void removeTask(Task task) throws IOException {
         if(taskMap.isEmpty()) {
             loadTaskListFromFile();
         }
-        if(taskMap.containsKey(task.getId())){
-            taskMap.remove(task.getId());
+        Long taskId = task.getId().orElseThrow(IOException::new);
+        if(taskMap.containsKey(taskId)){
+            taskMap.remove(taskId);
             writeTaskListToFile();
         }
     }
@@ -156,7 +163,7 @@ public class JsonTaskDatabase implements TaskDatabase{
 
             taskMap = result.stream()
                     .collect(HashMap::new,
-                        (res, task) -> res.put(task.getId(), task),
+                        (res, task) -> res.put(task.getId().orElse(0L), task),
                         (existing, replacement) -> {});
         }
 

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

@@ -11,7 +11,7 @@ import java.util.Optional;
  * A database of {@link Plant}s.
  * The interface specifies the minimal required operations.
  */
-public interface PlantDatabase {
+public interface PlantList {
     /**
      * Yields a list of all {@link Plant}s in the database with only data relevant to the specfied {@link HardinessZone}
      *

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

@@ -1,20 +1,16 @@
 package ch.zhaw.gartenverwaltung.io;
 
-import ch.zhaw.gartenverwaltung.types.Crop;
-import ch.zhaw.gartenverwaltung.types.HardinessZone;
-import ch.zhaw.gartenverwaltung.types.Plant;
 import ch.zhaw.gartenverwaltung.types.Task;
 
 import java.io.IOException;
 import java.time.LocalDate;
-import java.util.Date;
 import java.util.List;
 
 /**
  * A database of {@link Task}s.
  * The interface specifies the minimal required operations.
  */
-public interface TaskDatabase {
+public interface TaskList {
     /**
      * Yields a list of all {@link Task}s in the database with the start and end date of a period of time.
      *

src/main/java/ch/zhaw/gartenverwaltung/json/GrowthPhaseTypeDeserializer.java

@@ -16,13 +16,12 @@ public class GrowthPhaseTypeDeserializer extends StdDeserializer<GrowthPhaseType
 
     @Override
     public GrowthPhaseType deserialize(JsonParser parser, DeserializationContext context) throws IOException {
-        GrowthPhaseType result = null;
+        GrowthPhaseType result;
         String token = parser.getText();
         try {
             result = GrowthPhaseType.valueOf(token.toUpperCase());
         } catch (IllegalArgumentException e) {
-            // TODO: Log
-            System.err.printf("Bad growth phase type \"%s\"\n", token);
+            throw new IOException(String.format("Bad growth phase type \"%s\"\n", token));
         }
         return result;
     }

src/main/java/ch/zhaw/gartenverwaltung/json/HardinessZoneDeserializer.java

@@ -17,13 +17,12 @@ public class HardinessZoneDeserializer extends StdDeserializer<HardinessZone> {
 
     @Override
     public HardinessZone deserialize(JsonParser parser, DeserializationContext context) throws IOException {
-        HardinessZone result = null;
+        HardinessZone result;
         String token = parser.getText();
         try {
             result = HardinessZone.valueOf(token.toUpperCase());
         } catch (IllegalArgumentException e) {
-            // TODO: Log
-            System.err.printf("Unknown Hardiness Zone \"%s\"\n", token);
+            throw new IOException(String.format("Unknown Hardiness Zone \"%s\"\n", token), e);
         }
         return result;
     }

src/main/java/ch/zhaw/gartenverwaltung/json/PlantImageDeserializer.java

@@ -1,6 +1,6 @@
 package ch.zhaw.gartenverwaltung.json;
 
-import ch.zhaw.gartenverwaltung.io.PlantDatabase;
+import ch.zhaw.gartenverwaltung.io.PlantList;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
@@ -18,14 +18,12 @@ public class PlantImageDeserializer extends JsonDeserializer<Image> {
     @Override
     public Image deserialize(JsonParser parser, DeserializationContext context) throws IOException {
         Image result = null;
-        URL imageUrl = PlantDatabase.class.getResource(String.format("images/%s", parser.getText()));
+        URL imageUrl = PlantList.class.getResource(String.format("images/%s", parser.getText()));
         if (imageUrl != null) {
             try (InputStream is = new FileInputStream(new File(imageUrl.toURI()))) {
                 result = new Image(is);
             } catch (IllegalArgumentException | URISyntaxException e) {
-                // TODO: Log
-                e.printStackTrace();
-                System.err.printf("Cannot find Image \"%s\"\n", imageUrl.getFile());
+                throw new IOException(String.format("Cannot find Image \"%s\"\n", imageUrl.getFile()));
             }
         }
         return result;

src/main/java/ch/zhaw/gartenverwaltung/models/Garden.java

@@ -1,41 +1,41 @@
-package ch.zhaw.gartenverwaltung.gardenplan;
+package ch.zhaw.gartenverwaltung.models;
 
-import ch.zhaw.gartenverwaltung.io.GardenPlan;
+import ch.zhaw.gartenverwaltung.io.CropList;
 import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
-import ch.zhaw.gartenverwaltung.io.JsonGardenPlan;
-import ch.zhaw.gartenverwaltung.taskList.PlantNotFoundException;
-import ch.zhaw.gartenverwaltung.taskList.TaskListModel;
 import ch.zhaw.gartenverwaltung.types.Crop;
 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 java.io.IOException;
 import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import java.util.function.Supplier;
 
 
 /**
  * The Gardenplan model manages the crops in the gardenplan.
  */
-public class Gardenplanmodel {
-    private GardenPlan gardenPlan;
-    private List<Crop> cropList;
-    private TaskListModel taskListModel;
-    private Object IllegalArgumentException;
+public class Garden {
+    private final CropList cropList;
+    private final ListProperty<Crop> plantedCrops = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final GardenSchedule gardenSchedule;
 
     /**
      * Constructor of Gardenplan model
      *
-     * @param taskListModel holds a reference to the task list object.
+     * @param gardenSchedule holds a reference to the task list object.
      */
-    public Gardenplanmodel(TaskListModel taskListModel) throws IOException {
-        this.taskListModel = taskListModel;
-        gardenPlan = new JsonGardenPlan();
-        cropList = new ArrayList<>();
-        cropList = gardenPlan.getCrops();
+    public Garden(GardenSchedule gardenSchedule, CropList cropList) throws IOException {
+        this.gardenSchedule = gardenSchedule;
+        this.cropList = cropList;
+        plantedCrops.addAll(cropList.getCrops());
+    }
+
+    public ListProperty<Crop> getPlantedCrops() {
+        return plantedCrops;
     }
 
     /**
@@ -52,9 +52,10 @@ public class Gardenplanmodel {
         Crop crop = new Crop(plant.id(), plantingDate);
         //TODO Add Area to Plant
         //crop.withArea(0);
-        gardenPlan.saveCrop(crop);
-        taskListModel.planTasksForCrop(crop);
-        cropList = gardenPlan.getCrops();
+        cropList.saveCrop(crop);
+        gardenSchedule.planTasksForCrop(crop);
+        plantedCrops.clear();
+        plantedCrops.addAll(cropList.getCrops());
     }
 
     /**
@@ -64,9 +65,10 @@ public class Gardenplanmodel {
      * @throws IOException If the database cannot be accessed
      */
     public void removeCrop(Crop crop) throws IOException {
-        gardenPlan.removeCrop(crop);
-        taskListModel.removeTasksForCrop(crop.getCropId().orElseThrow(IllegalArgumentException::new));
-        cropList = gardenPlan.getCrops();
+        cropList.removeCrop(crop);
+        gardenSchedule.removeTasksForCrop(crop.getCropId().orElseThrow(IllegalArgumentException::new));
+        plantedCrops.clear();
+        plantedCrops.addAll(cropList.getCrops());
     }
     /**
      * Returns a list of {@link Crop}s which are currently in the gardenplan.
@@ -74,10 +76,7 @@ public class Gardenplanmodel {
      * @throws IOException If the database cannot be accessed
      */
     public List<Crop> getCrops() throws IOException {
-        if(!cropList.isEmpty()){
-                cropList = gardenPlan.getCrops();
-        }
-        return cropList;
+        return cropList.getCrops();
     }
 
     /**
@@ -87,6 +86,6 @@ public class Gardenplanmodel {
      * @throws IOException If the database cannot be accessed
      */
     public Optional<Crop> getCrop(Long cropId) throws IOException {
-        return gardenPlan.getCropById(cropId);
+        return cropList.getCropById(cropId);
     }
 }

src/main/java/ch/zhaw/gartenverwaltung/models/GardenSchedule.java

@@ -1,6 +1,6 @@
-package ch.zhaw.gartenverwaltung.taskList;
+package ch.zhaw.gartenverwaltung.models;
 
-import ch.zhaw.gartenverwaltung.Config;
+import ch.zhaw.gartenverwaltung.Settings;
 import ch.zhaw.gartenverwaltung.io.*;
 import ch.zhaw.gartenverwaltung.types.*;
 
@@ -9,29 +9,23 @@ import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-public class TaskListModel {
-    private TaskDatabase taskDatabase;
-    private PlantDatabase plantDatabase;
+public class GardenSchedule {
+    private final TaskList taskList;
+    private final PlantList plantList;
 
     /**
      * Comparators to create sorted Task List
      */
     static final Comparator<Task> sortByStartDate = Comparator.comparing(Task::getStartDate);
 
-    public TaskListModel(){
-        taskDatabase = new JsonTaskDatabase();
-        plantDatabase = new JsonPlantDatabase();
-    }
-
     /**
      * Constructor to create Database Objects.
      */
-    public TaskListModel(TaskDatabase taskDatabase, PlantDatabase plantDatabase) {
-        this.taskDatabase = taskDatabase;
-        this.plantDatabase = plantDatabase;
+    public GardenSchedule(TaskList taskList, PlantList plantList) {
+        this.taskList = taskList;
+        this.plantList = plantList;
     }
 
     /**
@@ -40,7 +34,7 @@ public class TaskListModel {
      * @throws IOException If the database cannot be accessed
      */
     public void addTask(Task task) throws IOException {
-        taskDatabase.saveTask(task);
+        taskList.saveTask(task);
     }
 
     /**
@@ -51,7 +45,7 @@ public class TaskListModel {
      * @throws IOException If the database cannot be accessed
      */
     public void planTasksForCrop(Crop crop) throws PlantNotFoundException, HardinessZoneNotSetException, IOException {
-        Plant plant = plantDatabase.getPlantById(Config.getCurrentHardinessZone(), crop.getPlantId()).orElseThrow(PlantNotFoundException::new);
+        Plant plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).orElseThrow(PlantNotFoundException::new);
         for (GrowthPhase growthPhase : plant.lifecycle()) {
             for (TaskTemplate taskTemplate : growthPhase.taskTemplates()) {
                 addTask(taskTemplate.generateTask(crop.getStartDate(), crop.getCropId().orElse(0L)));
@@ -65,7 +59,7 @@ public class TaskListModel {
      * @throws IOException If the database cannot be accessed
      */
     public void removeTasksForCrop(long cropId) throws IOException {
-        taskDatabase.removeTasksForCrop(cropId);
+        taskList.removeTasksForCrop(cropId);
     }
 
     /**
@@ -74,7 +68,7 @@ public class TaskListModel {
      * @throws IOException If the database cannot be accessed
      */
     public void removeTask(Task task) throws IOException {
-        taskDatabase.removeTask(task);
+        taskList.removeTask(task);
     }
 
     private List<Task> filterListByCrop(List<Task> taskList, Long cropId) {
@@ -144,7 +138,7 @@ public class TaskListModel {
         List<List<Task>> dayTaskList = new ArrayList<>();
         for(int i = 0; i < 7; i++) {
             LocalDate date = LocalDate.now().plusDays(i);
-            dayTaskList.add(taskDatabase.getTaskList(date, date));
+            dayTaskList.add(taskList.getTaskList(date, date));
         }
         return dayTaskList;
     }
@@ -158,7 +152,7 @@ public class TaskListModel {
         List<List<Task>> dayTaskList = new ArrayList<>();
         for(int i = 0; i < 7; i++) {
             LocalDate date = LocalDate.now().plusDays(i);
-            dayTaskList.add(filterListByCrop(taskDatabase.getTaskList(date, date), cropId));
+            dayTaskList.add(filterListByCrop(taskList.getTaskList(date, date), cropId));
         }
         return dayTaskList;
     }
@@ -171,7 +165,7 @@ public class TaskListModel {
      * @throws IOException If the database cannot be accessed
      */
     public List<Task> getFilteredTaskList(LocalDate start, LocalDate end) throws IOException {
-        return getSortedTaskList(taskDatabase.getTaskList(start, end), sortByStartDate);
+        return getSortedTaskList(taskList.getTaskList(start, end), sortByStartDate);
     }
 
     /**

src/main/java/ch/zhaw/gartenverwaltung/models/PlantListModel.java

@@ -1,8 +1,7 @@
-package ch.zhaw.gartenverwaltung.plantList;
+package ch.zhaw.gartenverwaltung.models;
 
 import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
-import ch.zhaw.gartenverwaltung.io.JsonPlantDatabase;
-import ch.zhaw.gartenverwaltung.io.PlantDatabase;
+import ch.zhaw.gartenverwaltung.io.PlantList;
 import ch.zhaw.gartenverwaltung.types.GrowthPhaseType;
 import ch.zhaw.gartenverwaltung.types.HardinessZone;
 import ch.zhaw.gartenverwaltung.types.Plant;
@@ -16,7 +15,7 @@ import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 public class PlantListModel {
-    private PlantDatabase plantDatabase;
+    private final PlantList plantList;
     private HardinessZone currentZone;
 
     /**
@@ -28,18 +27,13 @@ public class PlantListModel {
     /**
      * Constructor to create Database Object.
      */
-    public PlantListModel() {
-        plantDatabase = new JsonPlantDatabase();
-        setDefaultZone();
-    }
-
-    public PlantListModel(PlantDatabase plantDatabase) {
-        this.plantDatabase = plantDatabase;
+    public PlantListModel(PlantList plantList) {
+        this.plantList = plantList;
         setDefaultZone();
     }
 
     private void setDefaultZone() {
-        currentZone = HardinessZone.ZONE_8A; // TODO: get Default Zone from Config
+        currentZone = HardinessZone.ZONE_8A; // TODO: get Default Zone from Settings
     }
 
     public void setCurrentZone(HardinessZone currentZone) {
@@ -72,7 +66,7 @@ public class PlantListModel {
      */
     public List<Plant> getSortedPlantList(HardinessZone zone, Comparator<Plant> comparator) throws HardinessZoneNotSetException, IOException {
         setCurrentZone(zone);
-        return plantDatabase.getPlantList(zone).stream().sorted(comparator).collect(Collectors.toList());
+        return plantList.getPlantList(zone).stream().sorted(comparator).collect(Collectors.toList());
     }
 
     /**
@@ -101,7 +95,7 @@ public class PlantListModel {
     public List<Plant> getFilteredPlantListById(HardinessZone zone, Long id) throws HardinessZoneNotSetException, IOException {
         setCurrentZone(zone);
         List<Plant> plantList = new ArrayList<>();
-        plantDatabase.getPlantById(zone, id).ifPresent(plantList::add);
+        this.plantList.getPlantById(zone, id).ifPresent(plantList::add);
         return plantList;
     }
 
@@ -116,16 +110,17 @@ public class PlantListModel {
         if (searchString.length() == 0) {
             return getPlantList(zone);
         } else if (searchString.charAt(0) == '#') {
-            try {
-                return getFilteredPlantListById(zone, Long.parseLong(searchString.substring(1)));
-            } catch (NumberFormatException e) {
+            if (isPositiveIntegral(searchString.substring(1))) {
+                Long searchId = Long.parseLong(searchString.substring(1));
+                return getFilteredPlantListById(zone, searchId);
+            } else {
                 return new ArrayList<>();
             }
         } else {
             String caseInsensitiveSearchString = searchString.toLowerCase();
             return getFilteredPlantList(zone, plant ->
-                            plant.name().toLowerCase().contains(caseInsensitiveSearchString) ||
-                                    plant.description().toLowerCase().contains(caseInsensitiveSearchString)
+                    plant.name().toLowerCase().contains(caseInsensitiveSearchString) ||
+                            plant.description().toLowerCase().contains(caseInsensitiveSearchString)
             );
         }
     }
@@ -169,15 +164,24 @@ public class PlantListModel {
     }
 
     /**
-     *
      * @param zone selected hardiness zone
      * @param from the earliest date to for the filter
-     * @param to the lastest date for the filter
+     * @param to   the lastest date for the filter
      * @return List of Plants with selected saison
      * @throws HardinessZoneNotSetException If no {@link HardinessZone} was specified
-     * @throws IOException If the database cannot be accessed
+     * @throws IOException                  If the database cannot be accessed
      */
     public List<Plant> getFilteredPlantListBySaisonWithoutGrowthPhase(HardinessZone zone, MonthDay from, MonthDay to) throws HardinessZoneNotSetException, IOException {
         return getFilteredPlantList(zone, plant -> plant.lifecycle().stream().anyMatch(growthPhase -> growthPhase.startDate().compareTo(from) >= 0 && (growthPhase.startDate().compareTo(to) <= 0)));
     }
+
+    /**
+     * Check if a string can safely be parsed as a positive Integral value (short/int/long)
+     *
+     * @param subject The string to be tested
+     * @return Whether the string contains only digits
+     */
+    private boolean isPositiveIntegral(String subject) {
+        return subject != null && subject.matches("[0-9]+");
+    }
 }

src/main/java/ch/zhaw/gartenverwaltung/models/PlantNotFoundException.java

@@ -1,4 +1,4 @@
-package ch.zhaw.gartenverwaltung.taskList;
+package ch.zhaw.gartenverwaltung.models;
 
 public class PlantNotFoundException extends Exception {
     public PlantNotFoundException() {

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

@@ -3,7 +3,7 @@ package ch.zhaw.gartenverwaltung.types;
 import javafx.scene.image.Image;
 
 import java.time.LocalDate;
-import java.util.LinkedList;
+import java.time.MonthDay;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -42,11 +42,10 @@ public record Plant(
     /**
      * get sow date from given harvest day from lifecycle group
      * @param harvestDate date of the harvest
-     * @param group lifecycle group
      * @return LocaleDate of sow date
      */
-    public LocalDate sowDateFromHarvestDate(LocalDate harvestDate, int group) {
-        return harvestDate.minusDays(timeToHarvest(group));
+    public LocalDate sowDateFromHarvestDate(LocalDate harvestDate) {
+        return harvestDate.minusDays(timeToHarvest(lifecycleGroupFromHarvestDate(harvestDate)));
     }
 
     /**
@@ -69,37 +68,43 @@ public record Plant(
         return (int) DAYS.between(harvest.startDate().atYear(currentYear), sow.startDate().atYear(currentYear));
     }
 
-    /**
-     * filter out the given growthPhase out of the lifecycle
-     * create list of dates for this growthPhase and return it
-     * @param growthPhase the wanted growthPhase
-     * @return a list of dates of the current year
-     */
-    public List<LocalDate> getDateListOfGrowthPhase(GrowthPhaseType growthPhase) {
-        List<LocalDate> dates = new LinkedList<>();
-        for (GrowthPhase growth : lifecycle) {
-            if (growth.type().equals(growthPhase)) {
-                dates = addDatesFromMonthDay(growth);
-            }
-        }
-        return dates;
+    public int lifecycleGroupFromHarvestDate(LocalDate harvestDate) {
+        return lifecycle.stream()
+                .filter(growthPhase -> growthPhase.type().equals(GrowthPhaseType.HARVEST) &&
+                        dateInRange(harvestDate, growthPhase.startDate(), growthPhase.endDate()))
+                .map(GrowthPhase::group)
+                .findFirst()
+                .orElse(0);
     }
 
     /**
-     * transform monthDay value of the given growthPhase to localDate
-     * return a list of dates from start to end of growth phase
-     * @param growthPhase the current growthPhase
-     * @return a list of dates of the current year
+     * Checks if the given {@link LocalDate} is within a {@link GrowthPhase} of the given {@link GrowthPhaseType}
+     *
+     * @param date The date to check.
+     * @param phase The {@link GrowthPhaseType} to match against
+     * @return Whether the date is within the given {@link GrowthPhaseType}
      */
-    private List<LocalDate> addDatesFromMonthDay(GrowthPhase growthPhase) {
-        List<LocalDate> dates = new LinkedList<>();
-        LocalDate today = LocalDate.now();
-        LocalDate start = growthPhase.startDate().atYear(today.getYear());
-        LocalDate end = growthPhase.endDate().atYear(today.getYear());
-        while (!start.isAfter(end)) {
-            dates.add(start);
-            start = start.plusDays(1);
-        }
-        return dates;
+    public boolean isDateInPhase(LocalDate date, GrowthPhaseType phase) {
+        return lifecycle.stream()
+                .filter(growthPhase -> growthPhase.type().equals(phase))
+                .anyMatch(growthPhase -> dateInRange(date, growthPhase.startDate(), growthPhase.endDate()));
+    }
+
+    /**
+     * Checks if the given {@link LocalDate} is within the given {@link MonthDay} range.
+     * (regardless of year)
+     *
+     * @param subject The date to check
+     * @param min The start of the date-range
+     * @param max The end of the date-range
+     * @return Whether the subject is within the range.
+     */
+    private boolean dateInRange(LocalDate subject, MonthDay min, MonthDay max) {
+        return subject.getMonth().compareTo(min.getMonth()) >= 0 &&
+                subject.getMonth().compareTo(max.getMonth()) <= 0 &&
+                // if the day is less than the minimum day, the minimum month must not be equal
+                (subject.getDayOfMonth() >= min.getDayOfMonth() || !subject.getMonth().equals(min.getMonth())) &&
+                // if the day is greater than the maximum day, the maximum month must not be equal
+                (subject.getDayOfMonth() <= max.getDayOfMonth() || !subject.getMonth().equals(max.getMonth()));
     }
 }

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;
@@ -21,11 +21,10 @@ public class Task {
      * default constructor
      * (used by Json deserializer)
      */
-    public Task(long cropId){
+    public Task(){
         name= "";
         description= "";
         startDate = LocalDate.now();
-        this.cropId = cropId;
     }
 
     public Task(String name, String description, LocalDate startDate, long cropId) {
@@ -63,7 +62,7 @@ public class Task {
     }
 
     // Getters
-    public long getId() { return id; }
+    public Optional<Long> getId() { return Optional.ofNullable(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,6 +34,7 @@ public class TaskTemplate {
     public void setRelativeEndDate(Integer relativeEndDate) {
         this.relativeEndDate = relativeEndDate;
     }
+
     public void setInterval(Integer interval) {
         this.interval = interval;
     }
@@ -45,13 +46,10 @@ public class TaskTemplate {
     }
 
     public Task generateTask(LocalDate realStartDate, long cropId) {
-        Task task = new Task(name, description, realStartDate.plusDays(relativeStartDate), cropId);
-        if (relativeEndDate != null) {
-            task.withEndDate(realStartDate.plusDays(relativeEndDate));
-        }
-        if (interval != null) {
-            task.withInterval(interval);
-        }
-        return task;
+        LocalDate endDate = relativeEndDate != null ? realStartDate.plusDays(relativeEndDate) : null;
+
+        return new Task(name, description, realStartDate.plusDays(relativeStartDate), cropId)
+                .withInterval(interval)
+                .withEndDate(endDate);
     }
 }

src/main/java/module-info.java

@@ -4,10 +4,13 @@ module ch.zhaw.gartenverwaltung {
     requires com.fasterxml.jackson.databind;
     requires com.fasterxml.jackson.datatype.jsr310;
     requires com.fasterxml.jackson.datatype.jdk8;
+    requires java.logging;
 
     opens ch.zhaw.gartenverwaltung to javafx.fxml;
     opens ch.zhaw.gartenverwaltung.types to com.fasterxml.jackson.databind;
     exports ch.zhaw.gartenverwaltung;
+    exports ch.zhaw.gartenverwaltung.io;
     exports ch.zhaw.gartenverwaltung.types;
+    exports ch.zhaw.gartenverwaltung.models;
     exports ch.zhaw.gartenverwaltung.json;
 }

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

@@ -3,6 +3,7 @@
 <?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?>
@@ -12,13 +13,11 @@
 <?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="503.0" prefWidth="897.0">
+            <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="781.0" prefWidth="897.0">
                <padding>
                   <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                </padding>
@@ -77,30 +76,30 @@
                               </Label>
                            </children>
                         </GridPane>
-                        <ImageView fitHeight="300.0" fitWidth="300.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER" />
+                        <ImageView fx:id="imageView" fitHeight="300.0" fitWidth="300.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER" />
                      </children>
                   </HBox>
-                  <Label text="Growth Phases:">
+                  <Label text="Tasks:">
                      <VBox.margin>
                         <Insets bottom="10.0" />
                      </VBox.margin>
                   </Label>
-                  <VBox fx:id="growthPhases_vbox" prefHeight="135.0" prefWidth="879.0">
+                  <ListView fx:id="taskList_listView" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="877.0" VBox.vgrow="ALWAYS">
                      <VBox.margin>
                         <Insets bottom="10.0" />
                      </VBox.margin>
-                  </VBox>
-                  <Button mnemonicParsing="false" onAction="#editTaskList" prefHeight="25.0" prefWidth="92.0" text="Edit Tasklist">
+                  </ListView>
+                  <Button fx:id="addTask_button" mnemonicParsing="false" onAction="#addTask" prefHeight="25.0" prefWidth="45.0">
                      <VBox.margin>
                         <Insets bottom="10.0" />
                      </VBox.margin>
                   </Button>
                   <Label text="Pests:" />
-                  <VBox fx:id="pests_vbox" prefHeight="200.0" prefWidth="100.0">
+                  <ListView fx:id="pests_listView" maxHeight="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
                      <VBox.margin>
                         <Insets bottom="10.0" />
                      </VBox.margin>
-                  </VBox>
+                  </ListView>
                   <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="NEVER">
                      <children>
                         <Label text="Area:">
@@ -113,7 +112,7 @@
                               <Insets right="10.0" />
                            </HBox.margin>
                         </Label>
-                        <Button fx:id="area_button" mnemonicParsing="false" onAction="#setArea" prefHeight="25.0" prefWidth="116.0" text="Add Area" />
+                        <Button fx:id="area_button" mnemonicParsing="false" onAction="#setArea" prefHeight="25.0" prefWidth="116.0" text="Set Area" />
                      </children>
                      <VBox.margin>
                         <Insets bottom="10.0" />
@@ -131,7 +130,7 @@
                               <Insets right="10.0" />
                            </HBox.margin>
                         </Label>
-                        <Button fx:id="location_button" mnemonicParsing="false" onAction="#setLocation" prefHeight="25.0" prefWidth="115.0" text="Add Location" />
+                        <Button fx:id="location_button" mnemonicParsing="false" onAction="#setLocation" prefHeight="25.0" prefWidth="115.0" text="Set Location" />
                      </children>
                   </HBox>
                </children>

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

@@ -2,42 +2,210 @@
 
 <?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="729.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="1091.0" prefWidth="1060.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.HomeController">
    <children>
-      <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">
-         <children>
-            <Label text="Gartenverwaltung">
-               <font>
-                  <Font size="34.0" />
-               </font>
-            </Label>
-            <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 name="System Bold" size="18.0" />
-               </font>
-            </Label>
-            <Pane prefHeight="200.0" prefWidth="200.0">
+      <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">
+         <content>
+            <VBox prefHeight="1091.0" prefWidth="1058.0">
                <children>
-                  <VBox prefHeight="200.0" prefWidth="1040.0">
+                  <Pane prefHeight="1085.0" prefWidth="1018.0">
                      <children>
-                        <Label text="Task 1" wrapText="true" />
-                        <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" />
+                        <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">
+                                 <font>
+                                    <Font size="14.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.">
+                                 <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">
+                                       <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">
+                                       <HBox.margin>
+                                          <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>
+                     <VBox.margin>
+                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                     </VBox.margin>
+                  </Pane>
                </children>
-            </Pane>
-         </children>
-         <padding>
-            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-         </padding>
-      </VBox>
+               <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,11 +9,12 @@
    <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="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="myPlants_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#goToMyPlants" prefHeight="38.0" prefWidth="121.0" text="MyPlants" />
-            <Button fx:id="mySchedule_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#goToMySchedule" prefHeight="38.0" prefWidth="121.0" text="MySchedule" />
+            <Button fx:id="home_button" mnemonicParsing="false" onAction="#goToHome" prefHeight="38.0" prefWidth="40.0" HBox.hgrow="NEVER" />
+            <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,17 +3,16 @@
 <?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 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.MyPlantsController">
+<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">
    <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>
-            <Label text="MyPlants">
+            <Label text="My Garden">
                <font>
                   <Font name="System Bold" size="28.0" />
                </font>
@@ -21,7 +20,7 @@
                   <Insets bottom="10.0" />
                </VBox.margin>
             </Label>
-            <VBox fx:id="myPlants_vbox" prefHeight="200.0" prefWidth="100.0" VBox.vgrow="ALWAYS" />
+            <ListView fx:id="myGarden_listView" maxHeight="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.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

@@ -15,7 +15,8 @@
 
 <AnchorPane maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="1000.0" prefHeight="853.0"
             prefWidth="1219.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1"
-            fx:controller="ch.zhaw.gartenverwaltung.PlantsController">
+            fx:controller="ch.zhaw.gartenverwaltung.PlantsController"
+            fx:id="plantsRoot">
    <children>
       <SplitPane dividerPositions="0.7377363661277062" layoutX="539.0" layoutY="266.0" prefHeight="853.0" prefWidth="1219.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <items>
@@ -62,7 +63,7 @@
                               <Font name="System Bold" size="17.0" />
                            </font>
                         </Label>
-                        <TitledPane animated="false" text="Saison">
+                        <TitledPane animated="false" text="Seasons">
                           <content>
                             <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
                                  <children>

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

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.DatePicker?>
-<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.RadioButton?>
 <?import javafx.scene.control.ToggleGroup?>
 <?import javafx.scene.layout.AnchorPane?>
@@ -16,20 +14,19 @@
    <children>
       <VBox maxWidth="1.7976931348623157E308" prefHeight="408.0" prefWidth="640.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
-            <Label fx:id="popup_label" text="Label" />
             <HBox alignment="CENTER" prefHeight="293.0" prefWidth="631.0">
                <children>
                   <VBox alignment="CENTER_LEFT" prefHeight="88.0" prefWidth="155.0">
                      <children>
-                        <RadioButton fx:id="sow_radio" mnemonicParsing="false" selected="true" text="Sow">
+                        <RadioButton fx:id="sow_radio" mnemonicParsing="false" selected="true" text="Sow" toggleGroup="$phase_group">
                            <VBox.margin>
                               <Insets bottom="10.0" />
                            </VBox.margin>
                            <toggleGroup>
-                              <ToggleGroup fx:id="group" />
+                              <ToggleGroup fx:id="phase_group" />
                            </toggleGroup>
                         </RadioButton>
-                        <RadioButton fx:id="harvest_radio" mnemonicParsing="false" text="Harvest" toggleGroup="$group" />
+                        <RadioButton fx:id="harvest_radio" mnemonicParsing="false" text="Harvest" toggleGroup="$phase_group" />
                      </children>
                      <HBox.margin>
                         <Insets top="10.0" />
@@ -38,16 +35,6 @@
                   <DatePicker fx:id="datepicker" />
                </children>
             </HBox>
-            <HBox fillHeight="false" prefHeight="54.0" prefWidth="631.0" VBox.vgrow="NEVER">
-               <children>
-                  <Button fx:id="save_button" mnemonicParsing="false" onAction="#save" prefHeight="25.0" prefWidth="53.0" text="Save">
-                     <HBox.margin>
-                        <Insets right="10.0" />
-                     </HBox.margin>
-                  </Button>
-                  <Button fx:id="cancel_button" mnemonicParsing="false" onAction="#cancel" text="Cancel" />
-               </children>
-            </HBox>
          </children>
          <padding>
             <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />

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

@@ -0,0 +1,37 @@
+<?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

@@ -0,0 +1,54 @@
+<?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

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

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

@@ -1,56 +1,56 @@
 [
   {
-  "id" : 1,
-  "name" : "sow plant",
-  "description": "Plant the seeds, crops in de bed.",
-  "startDate" : "2022-05-01",
-  "endDate" : "2022-05-01",
-  "interval" : 0,
-    "cropId" : 0
+    "id": 1,
+    "name": "sow plant",
+    "description": "Plant the seeds, crops in de bed.",
+    "startDate": "2022-05-01",
+    "endDate": "2022-05-01",
+    "interval": 0,
+    "cropId": 0
   },
   {
-    "id" : 2,
-    "name" : "water plant",
+    "id": 2,
+    "name": "water plant",
     "description": "water the plant, so that the soil is wet around the plant.",
-    "startDate" : "2022-05-01",
-    "endDate" : "2022-09-01",
-    "interval" : 2,
-    "cropId" : 0
+    "startDate": "2022-05-01",
+    "endDate": "2022-09-01",
+    "interval": 2,
+    "cropId": 0
   },
   {
-    "id" : 3,
-    "name" : "fertilize plant",
+    "id": 3,
+    "name": "fertilize plant",
     "description": "The fertilizer has to be mixed with water. Then fertilize the plants soil with the mixture",
-    "startDate" : "2022-06-01",
-    "endDate" : "2022-08-01",
-    "interval" : 28,
-    "cropId" : 0
+    "startDate": "2022-06-01",
+    "endDate": "2022-08-01",
+    "interval": 28,
+    "cropId": 0
   },
   {
-    "id" : 4,
-    "name" : "covering plant",
+    "id": 4,
+    "name": "covering plant",
     "description": "Take a big enough coverage for the plants. Cover the whole plant with a bit space between the plant and the coverage",
-    "startDate" : "2022-07-01",
-    "endDate" : "2022-07-01",
-    "interval" : 0,
-    "cropId" : 0
+    "startDate": "2022-07-01",
+    "endDate": "2022-07-01",
+    "interval": 0,
+    "cropId": 0
   },
   {
-    "id" : 5,
-    "name" : "look after plant",
+    "id": 5,
+    "name": "look after plant",
     "description": "Look for pest or illness at the leaves of the plant. Check the soil around the plant, if the roots are enough covered with soil",
-    "startDate" : "2022-05-01",
-    "endDate" : "2022-09-01",
-    "interval" : 5,
-    "cropId" : 0
+    "startDate": "2022-05-01",
+    "endDate": "2022-09-01",
+    "interval": 5,
+    "cropId": 0
   },
   {
-    "id" : 6,
-    "name" : "harvest plant",
+    "id": 6,
+    "name": "harvest plant",
     "description": "Pull the ripe vegetables out from the soil. Clean them with clear, fresh water. ",
-    "startDate" : "2022-09-01",
-    "endDate" : "2022-09-01",
-    "interval" : 0,
-    "cropId" : 0
+    "startDate": "2022-09-01",
+    "endDate": "2022-09-01",
+    "interval": 0,
+    "cropId": 0
   }
 ]

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

@@ -22,21 +22,21 @@ import java.util.stream.Collectors;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class JsonGardenPlanTest {
-    private GardenPlan testDatabase;
+public class JsonCropListTest {
+    private CropList testDatabase;
     private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
     /**
      * Files to isolate the test-units
      */
-    private final URL dbDataSource = this.getClass().getResource("user-crops.json");
-    private final URL testFile = this.getClass().getResource("test-user-crops.json");
+    private final URL dbDataSource = this.getClass().getResource("test-user-crops.json");
+    private final URL testFile = this.getClass().getResource("template-user-crops.json");
 
     @BeforeEach
     void connectToDb() throws URISyntaxException, IOException {
         assertNotNull(testFile);
         assertNotNull(dbDataSource);
         Files.copy(Path.of(testFile.toURI()), Path.of(dbDataSource.toURI()), StandardCopyOption.REPLACE_EXISTING);
-        testDatabase = new JsonGardenPlan(dbDataSource);
+        testDatabase = new JsonCropList(dbDataSource);
     }
 
 

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

@@ -8,17 +8,22 @@ import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
+import java.net.URL;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-public class JsonPlantDatabaseTest {
-    PlantDatabase testDatabase;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class JsonPlantListTest {
+    private final URL testFile = this.getClass().getResource("test-plantdb.json");
+    PlantList testDatabase;
 
     @BeforeEach
     void connectToDb() {
-        testDatabase = new JsonPlantDatabase();
+        assertNotNull(testFile);
+        testDatabase = new JsonPlantList(testFile);
     }
 
 

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

@@ -1,47 +0,0 @@
-package ch.zhaw.gartenverwaltung.io;
-
-import ch.zhaw.gartenverwaltung.types.Task;
-import org.junit.jupiter.api.*;
-
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-public class JsonTaskDatabaseTest {
-
-    TaskDatabase testDatabase;
-    SimpleDateFormat formatter = new SimpleDateFormat("dd.MM.yyyy");
-    @BeforeEach
-    void connectToDb() {
-        // testDatabase = new JsonTaskDatabase();
-    }
-
-
-    @Test
-    @DisplayName("Check if results are retrieved completely")
-    void getTasks(){
-        /*
-        List<Task> taskList=null;
-        try {
-            taskList = testDatabase.getTaskList(formatter.parse("01.05.2022"), formatter.parse("01.08.2022"));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        } catch (ParseException e) {
-            throw new RuntimeException(e);
-        }
-
-        Assertions.assertTrue(taskList.size()>0);
-        */
-    }
-
-    @Test
-    void getTaskForCrop() {
-        // TODO implement Test
-    }
-
-    @Test
-    void removeTasksForCrop() {
-        // TODO implement Test
-    }
-}

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

@@ -0,0 +1,118 @@
+package ch.zhaw.gartenverwaltung.io;
+
+import ch.zhaw.gartenverwaltung.types.Task;
+import org.junit.jupiter.api.*;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class JsonTaskListTest {
+
+    TaskList testDatabase;
+    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+    private final URL dbDataSource = this.getClass().getResource("test-taskdb.json");
+    private final URL testFile = this.getClass().getResource("template-taskdb.json");
+
+    @BeforeEach
+    void connectToDb() throws URISyntaxException, IOException {
+        assertNotNull(testFile);
+        assertNotNull(dbDataSource);
+        Files.copy(Path.of(testFile.toURI()), Path.of(dbDataSource.toURI()), StandardCopyOption.REPLACE_EXISTING);
+        testDatabase = new JsonTaskList(dbDataSource);
+    }
+
+    @Test
+    @DisplayName("Check if results are retrieved completely")
+    void getTasks() {
+
+        List<Task> taskList;
+        try {
+            taskList = testDatabase.getTaskList(LocalDate.parse("2022-04-30", formatter),
+                    LocalDate.parse("2022-05-31", formatter));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        Assertions.assertEquals(3, taskList.size());
+
+    }
+
+    @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);
+        try {
+            testDatabase.saveTask(task);
+            List<Task> taskList;
+            try {
+                taskList = testDatabase.getTaskList(LocalDate.parse("30.04.2022", formatter),
+                        LocalDate.parse("31.05.2022", formatter));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+
+            Assertions.assertEquals(4, taskList.size());
+
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Test
+    @DisplayName("Remove task.")
+    void removeTask() {
+        Task task = new Task("Dummy", "Dummy", LocalDate.parse("2022-05-31", formatter), 1)
+                .withId(2);
+        try {
+            testDatabase.removeTask(task);
+            List<Task> taskList;
+
+            taskList = testDatabase.getTaskList(LocalDate.parse("2022-04-30", formatter),
+                    LocalDate.parse("2022-05-31", formatter));
+
+            Assertions.assertEquals(2, taskList.size());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+
+    @Test
+    void getTaskForCrop() {
+        List<Task> taskList;
+        try {
+            taskList = testDatabase.getTaskForCrop(0);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        Assertions.assertEquals(6, taskList.size());
+
+    }
+
+    @Disabled("Disabled until removing works")
+    @Test
+    void removeTasksForCrop() {
+        List<Task> taskList;
+        try {
+            testDatabase.removeTasksForCrop(0);
+            taskList = testDatabase.getTaskForCrop(0);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        Assertions.assertEquals(0, taskList.size());
+    }
+}

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

@@ -1,28 +1,32 @@
-package ch.zhaw.gartenverwaltung.gardenplan;
+package ch.zhaw.gartenverwaltung.models;
 
 import ch.zhaw.gartenverwaltung.io.*;
-import ch.zhaw.gartenverwaltung.taskList.PlantNotFoundException;
-import ch.zhaw.gartenverwaltung.taskList.TaskListModel;
 import ch.zhaw.gartenverwaltung.types.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.io.File;
 import java.io.IOException;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.time.LocalDate;
 import java.time.MonthDay;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.Mockito.*;
 
 public class GardenPlanModelTest {
-    GardenPlan gardenPlan;
-    List<Crop> cropList;
+    private final URL dbDataSource = JsonCropListTest.class.getResource("test-user-crops.json");
+    private final URL testFile = JsonCropListTest.class.getResource("template-user-crops.json");
+
+    CropList cropList;
+    List<Crop> exampleCrops;
     Crop exampleCropOnion;
     Crop exampleCropCarrot;
     Crop exampleCrop1;
@@ -30,10 +34,10 @@ public class GardenPlanModelTest {
     Crop exampleCrop3;
     Plant examplePlantOnion;
     Plant examplePlantCarrot;
-    Gardenplanmodel model;
+    Garden model;
 
     @BeforeEach
-    void setUp() throws IOException {
+    void setUp() throws IOException, URISyntaxException {
 
 
         examplePlantOnion = new Plant(
@@ -51,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.withId(3);
+        exampleCropOnion = new Crop(examplePlantOnion.id(), LocalDate.of(2023, 3, 1))
+                .withId(3);
         examplePlantCarrot = new Plant(
                 1,
                 "Early Carrot",
@@ -63,51 +67,58 @@ 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.withId(5);
+        exampleCropCarrot = new Crop(examplePlantCarrot.id(), LocalDate.now())
+                .withId(5);
 
-        exampleCrop1 = new Crop(1, LocalDate.of(2023,2,25));
-        exampleCrop1.withId(0);
-        exampleCrop1.withArea(0.5);
-        exampleCrop2 = new Crop(1,LocalDate.of(2023,3,1));
-        exampleCrop2.withId(1);
-        exampleCrop2.withArea(0.5);
-        exampleCrop3 = new Crop(0,LocalDate.of(2023,3,01));
-        exampleCrop3.withId(2);
-        exampleCrop3.withArea(1.0);
+        exampleCrop1 = new Crop(1, LocalDate.of(2023, 2, 25))
+                .withId(0)
+                .withArea(0.5);
+        exampleCrop2 = new Crop(1, LocalDate.of(2023, 3, 1))
+                .withId(1)
+                .withArea(0.5);
+        exampleCrop3 = new Crop(0, LocalDate.of(2023, 3, 1))
+                .withId(2)
+                .withArea(1.0);
 
-        cropList = new ArrayList<>();
-        cropList.add(exampleCrop1);
-        cropList.add(exampleCrop2);
-        cropList.add(exampleCrop3);
-        gardenPlan = mockGardenPlan(cropList);
+        exampleCrops = new ArrayList<>();
+        exampleCrops.add(exampleCrop1);
+        exampleCrops.add(exampleCrop2);
+        exampleCrops.add(exampleCrop3);
+        cropList = mockCropList(exampleCrops);
 
-        TaskListModel taskListModel = new TaskListModel(new JsonTaskDatabase(), new JsonPlantDatabase());
-        model = new Gardenplanmodel(taskListModel);
+        // Reset Crop "database" before test
+        assertNotNull(testFile);
+        assertNotNull(dbDataSource);
+        Files.copy(Path.of(testFile.toURI()), Path.of(dbDataSource.toURI()), StandardCopyOption.REPLACE_EXISTING);
+        CropList testDatabase = new JsonCropList(dbDataSource);
+
+        GardenSchedule gardenSchedule = mock(GardenSchedule.class);
+        model = new Garden(gardenSchedule, testDatabase);
     }
 
-    GardenPlan mockGardenPlan(List<Crop> cropList) throws IOException {
-        GardenPlan gardenPlan = mock(GardenPlan.class);
-        when(gardenPlan.getCrops()).thenReturn(cropList);
-        when(gardenPlan.getCropById(5)).thenReturn(java.util.Optional.ofNullable(exampleCropCarrot));
-        when(gardenPlan.getCropById(3)).thenReturn(java.util.Optional.ofNullable(exampleCropOnion));
-        return gardenPlan;
+    CropList mockCropList(List<Crop> cropList) throws IOException {
+        CropList croplist = mock(CropList.class);
+        when(croplist.getCrops()).thenReturn(cropList);
+        when(croplist.getCropById(5)).thenReturn(java.util.Optional.ofNullable(exampleCropCarrot));
+        when(croplist.getCropById(3)).thenReturn(java.util.Optional.ofNullable(exampleCropOnion));
+        return croplist;
     }
 
     @Test
     void plantAsCrop() throws HardinessZoneNotSetException, IOException, PlantNotFoundException {
 
-        model.plantAsCrop(examplePlantOnion, LocalDate.of(2023,3,1));
-        exampleCropOnion = model.getCrop(2L).get();
-        assertEquals(model.getCrops().get(2),exampleCropOnion);
+        model.plantAsCrop(examplePlantOnion, LocalDate.of(2023, 3, 1));
+        Optional<Crop> exampleCrop = model.getCrop(2L);
+        assertTrue(exampleCrop.isPresent());
+        assertEquals(model.getCrops().get(2), exampleCrop.get());
 
     }
 
     @Test
     void removeCrop() throws IOException {
         exampleCrop1.withId(2);
-        exampleCrop1.withArea(1.500000);
+        exampleCrop1.withArea(1.5);
         model.removeCrop(exampleCrop1);
-        assertEquals(2,model.getCrops().size());
+        assertEquals(2, model.getCrops().size());
     }
 }

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

@@ -1,8 +1,9 @@
-package ch.zhaw.gartenverwaltung.plantList;
+package ch.zhaw.gartenverwaltung.models;
 
 import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
-import ch.zhaw.gartenverwaltung.io.JsonPlantDatabase;
-import ch.zhaw.gartenverwaltung.io.PlantDatabase;
+import ch.zhaw.gartenverwaltung.io.JsonPlantList;
+import ch.zhaw.gartenverwaltung.io.PlantList;
+import ch.zhaw.gartenverwaltung.models.PlantListModel;
 import ch.zhaw.gartenverwaltung.types.*;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -22,15 +23,15 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 class PlantListModelTest {
-    PlantDatabase plantDatabase;
+    PlantList plantList;
     List<Plant> examplePlantList;
     PlantListModel model;
 
     @BeforeEach
     void setUp() throws HardinessZoneNotSetException, IOException {
         createExamplePlantList();
-        plantDatabase = mockPlantDatabase(examplePlantList);
-        model = new PlantListModel(plantDatabase);
+        plantList = mockPlantDatabase(examplePlantList);
+        model = new PlantListModel(plantList);
     }
 
     @AfterEach
@@ -79,8 +80,8 @@ class PlantListModelTest {
         );
     }
 
-    PlantDatabase mockPlantDatabase(List<Plant> plantList) throws HardinessZoneNotSetException, IOException {
-        PlantDatabase plantDatabase = mock(JsonPlantDatabase.class);
+    PlantList mockPlantDatabase(List<Plant> plantList) throws HardinessZoneNotSetException, IOException {
+        PlantList plantDatabase = mock(JsonPlantList.class);
         when(plantDatabase.getPlantList(HardinessZone.ZONE_8A)).thenReturn(plantList);
         when(plantDatabase.getPlantList(HardinessZone.ZONE_1A)).thenReturn(new ArrayList<>());
         when(plantDatabase.getPlantById(HardinessZone.ZONE_8A, 0)).thenReturn(Optional.of(plantList.get(1)));

src/test/java/ch/zhaw/gartenverwaltung/taskList/GardenScheduleTest.java

@@ -1,6 +1,7 @@
 package ch.zhaw.gartenverwaltung.taskList;
 
 import ch.zhaw.gartenverwaltung.io.*;
+import ch.zhaw.gartenverwaltung.models.GardenSchedule;
 import ch.zhaw.gartenverwaltung.types.HardinessZone;
 import ch.zhaw.gartenverwaltung.types.Plant;
 import ch.zhaw.gartenverwaltung.types.Task;
@@ -14,47 +15,47 @@ import java.util.*;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-class TaskListModelTest {
-    TaskDatabase taskDatabase;
-    PlantDatabase plantDatabase;
+class GardenScheduleTest {
+    TaskList taskList;
+    PlantList plantList;
     List<Task> exampleTaskList;
     Map<Long, Plant> examplePlantMap;
-    TaskListModel model;
+    GardenSchedule model;
 
     @BeforeEach
     void setUp() throws IOException {
         createExampleTaskList();
-        taskDatabase = mockTaskDatabase(exampleTaskList);
-        plantDatabase = mockPlantDatabase(examplePlantMap);
-        model = new TaskListModel(taskDatabase, plantDatabase);
+        taskList = mockTaskDatabase(exampleTaskList);
+        plantList = mockPlantDatabase(examplePlantMap);
+        model = new GardenSchedule(taskList, plantList);
     }
 
-    private TaskDatabase mockTaskDatabase(List<Task> exampleTaskList) throws IOException {
-        TaskDatabase taskDatabase = mock(JsonTaskDatabase.class);
-        when(taskDatabase.getTaskList(LocalDate.MIN, LocalDate.MAX)).thenReturn(exampleTaskList);
+    private TaskList mockTaskDatabase(List<Task> exampleTaskList) throws IOException {
+        TaskList taskList = mock(JsonTaskList.class);
+        when(taskList.getTaskList(LocalDate.MIN, LocalDate.MAX)).thenReturn(exampleTaskList);
 
-        when(taskDatabase.getTaskList(LocalDate.now(), LocalDate.MAX)).thenReturn((exampleTaskList.subList(1, 4)));
+        when(taskList.getTaskList(LocalDate.now(), LocalDate.MAX)).thenReturn((exampleTaskList.subList(1, 4)));
 
         List<Task> pastTasks = new ArrayList<>();
         pastTasks.add(exampleTaskList.get(0));
         pastTasks.add(exampleTaskList.get(2));
         pastTasks.add(exampleTaskList.get(4));
-        when(taskDatabase.getTaskList(LocalDate.MIN, LocalDate.now())).thenReturn(pastTasks);
+        when(taskList.getTaskList(LocalDate.MIN, LocalDate.now())).thenReturn(pastTasks);
 
 
-        when(taskDatabase.getTaskList(LocalDate.now(), LocalDate.now())).thenReturn(List.of(exampleTaskList.get(2)));
-        when(taskDatabase.getTaskList(LocalDate.now().plusDays(1L), LocalDate.now().plusDays(1L))).thenReturn(List.of(exampleTaskList.get(1)));
-        when(taskDatabase.getTaskList(LocalDate.now().plusDays(2L), LocalDate.now().plusDays(2L))).thenReturn(List.of());
-        when(taskDatabase.getTaskList(LocalDate.now().plusDays(3L), LocalDate.now().plusDays(3L))).thenReturn(List.of());
-        when(taskDatabase.getTaskList(LocalDate.now().plusDays(4L), LocalDate.now().plusDays(4L))).thenReturn(List.of());
-        when(taskDatabase.getTaskList(LocalDate.now().plusDays(5L), LocalDate.now().plusDays(5L))).thenReturn(List.of());
-        when(taskDatabase.getTaskList(LocalDate.now().plusDays(6L), LocalDate.now().plusDays(6L))).thenReturn(List.of());
+        when(taskList.getTaskList(LocalDate.now(), LocalDate.now())).thenReturn(List.of(exampleTaskList.get(2)));
+        when(taskList.getTaskList(LocalDate.now().plusDays(1L), LocalDate.now().plusDays(1L))).thenReturn(List.of(exampleTaskList.get(1)));
+        when(taskList.getTaskList(LocalDate.now().plusDays(2L), LocalDate.now().plusDays(2L))).thenReturn(List.of());
+        when(taskList.getTaskList(LocalDate.now().plusDays(3L), LocalDate.now().plusDays(3L))).thenReturn(List.of());
+        when(taskList.getTaskList(LocalDate.now().plusDays(4L), LocalDate.now().plusDays(4L))).thenReturn(List.of());
+        when(taskList.getTaskList(LocalDate.now().plusDays(5L), LocalDate.now().plusDays(5L))).thenReturn(List.of());
+        when(taskList.getTaskList(LocalDate.now().plusDays(6L), LocalDate.now().plusDays(6L))).thenReturn(List.of());
 
-        return taskDatabase;
+        return taskList;
     }
 
-    private PlantDatabase mockPlantDatabase(Map<Long, Plant> examplePlantMap) {
-        return new PlantDatabase() {
+    private PlantList mockPlantDatabase(Map<Long, Plant> examplePlantMap) {
+        return new PlantList() {
             @Override
             public List<Plant> getPlantList(HardinessZone zone) {
                 return null;
@@ -86,14 +87,14 @@ class TaskListModelTest {
     void addTask() throws IOException {
         Task taskToAdd = new Task("name", "description", LocalDate.now(), 1L);
         model.addTask(taskToAdd);
-        verify(taskDatabase, times(1)).saveTask(taskToAdd);
+        verify(taskList, times(1)).saveTask(taskToAdd);
     }
 
     @Test
     void removeTask() throws IOException {
         Task taskToRemove = new Task("name", "description", LocalDate.now(), 1L);
         model.removeTask(taskToRemove);
-        verify(taskDatabase, times(1)).removeTask(taskToRemove);
+        verify(taskList, times(1)).removeTask(taskToRemove);
     }
 
     @Test
@@ -153,6 +154,6 @@ class TaskListModelTest {
     @Test
     void removeTasksForCrop() throws IOException {
         model.removeTasksForCrop(1L);
-        verify(taskDatabase, times(1)).removeTasksForCrop(1L);
+        verify(taskList, times(1)).removeTasksForCrop(1L);
     }
 }

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

@@ -1,257 +0,0 @@
-[
-  {
-    "id": 0,
-    "name": "Potato",
-    "description": "The potato is a tuber, round or oval, with small white roots called  'eyes', that are growth buds. The size varies depending on the variety; the colour of the skin can be white, yellow or even purple.",
-    "light": 6,
-    "spacing": "35",
-    "soil": "sandy",
-    "image": "potato.jpg",
-    "pests": [
-      {
-        "name": "Rot",
-        "description": "Rot, any of several plant diseases, caused by any of hundreds of species of soil-borne bacteria, fungi, and funguslike organisms (Oomycota). Rot diseases are characterized by plant decomposition and putrefaction. The decay may be hard, dry, spongy, watery, mushy, or slimy and may affect any plant part.",
-        "measures": "Less water."
-      }
-    ],
-    "lifecycle": [
-      {
-        "startDate": "03-10",
-        "endDate": "04-10",
-        "type": "SOW",
-        "zone": "ZONE_8A",
-        "group": 0,
-        "wateringCycle": {
-          "litersPerSqM": 0,
-          "interval": null,
-          "notes": []
-        },
-        "taskTemplates": [
-          {
-            "name": "Germinate",
-            "relativeStartDate": -14,
-            "relativeEndDate": null,
-            "description": "\"Take an egg carton and fill it with soil. Put the seedling deep enaugh so its half covered with soil. Keep it in 10-15 * Celsius with lots of light.\"",
-            "interval": null,
-            "isOptional": false
-          }
-        ]
-      },
-      {
-        "startDate": "04-10",
-        "endDate": "07-10",
-        "type": "PLANT",
-        "zone": "ZONE_8A",
-        "group": 0,
-        "wateringCycle": {
-          "litersPerSqM": 25,
-          "interval": 7,
-          "notes": []
-        },
-        "taskTemplates": [
-          {
-            "name": "hilling",
-            "relativeStartDate": 0,
-            "relativeEndDate": null,
-            "description": "\"When the plants are 20 cm tall, begin hilling the potatoes by gently mounding the soil from the center of your rows around the stems of the plant. Mound up the soil around the plant until just the top few leaves show above the soil. Two weeks later, hill up the soil again when the plants grow another 20 cm.\"",
-            "interval": 21,
-            "isOptional": false
-          }
-        ]
-      },
-      {
-        "startDate": "06-10",
-        "endDate": "08-10",
-        "type": "HARVEST",
-        "zone": "ZONE_8A",
-        "group": 0,
-        "wateringCycle": {
-          "litersPerSqM": 0,
-          "interval": null,
-          "notes": []
-        },
-        "taskTemplates": [
-          {
-            "name": "Harvest",
-            "relativeStartDate": 0,
-            "relativeEndDate": null,
-            "description": "Once the foliage has wilted and dried completely, harvest on a dry day. Store in a dark and cool location.",
-            "interval": null,
-            "isOptional": false
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "id": 1,
-    "name": "Early Carrot",
-    "description": "Carrot, (Daucus carota), herbaceous, generally biennial plant of the Apiaceae family that produces an edible taproot. Among common varieties root shapes range from globular to long, with lower ends blunt to pointed. Besides the orange-coloured roots, white-, yellow-, and purple-fleshed varieties are known.",
-    "image": "carrot.jpg",
-    "lifecycle": [
-      {
-        "startDate": "02-20",
-        "endDate": "03-10",
-        "zone": "ZONE_8A",
-        "type": "SOW",
-        "wateringCycle": {
-          "litersPerSqM": 15,
-          "interval": 3,
-          "notes": []
-        },
-        "taskTemplates": [
-          {
-            "name": "hilling",
-            "relativeStartDate": 0,
-            "relativeEndDate": 0,
-            "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": null,
-            "isOptional": false
-          }
-        ]
-      },
-      {
-        "startDate": "03-10",
-        "endDate": "05-10",
-        "zone": "ZONE_8A",
-        "type": "PLANT",
-        "wateringCycle": {
-          "litersPerSqM": 25,
-          "interval": 3,
-          "notes": [
-            "Be careful not to pour water over the leaves, as this will lead to sunburn."
-          ]
-        },
-        "taskTemplates": [
-          {
-            "name": "hilling",
-            "relativeStartDate": 0,
-            "relativeEndDate": null,
-            "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": 15,
-            "isOptional": true
-          }
-        ]
-      },
-      {
-        "startDate": "05-10",
-        "endDate": "05-20",
-        "zone": "ZONE_8A",
-        "type": "HARVEST",
-        "wateringCycle": {
-          "litersPerSqM": 0,
-          "interval": null,
-          "notes": []
-        },
-        "taskTemplates": [
-          {
-            "name": "Harvesting",
-            "relativeStartDate": 0,
-            "relativeEndDate": 14,
-            "description": "When the leaves turn to a yellowish brown. Do not harvest earlier. The plant will show when it's ready.",
-            "interval": null,
-            "isOptional": false
-          }
-        ]
-      }
-    ],
-    "soil": "sandy to loamy, loose soil, free of stones",
-    "spacing": "5,35,2.5",
-    "pests": [
-      {
-        "name": "Rot",
-        "description": "rot, any of several plant diseases, caused by any of hundreds of species of soil-borne bacteria, fungi, and funguslike organisms (Oomycota). Rot diseases are characterized by plant decomposition and putrefaction. The decay may be hard, dry, spongy, watery, mushy, or slimy and may affect any plant part.",
-        "measures": "less water"
-      }
-    ]
-  },
-  {
-    "id": 2,
-    "name": "Summertime Onion",
-    "description": "Onion, (Allium cepa), herbaceous biennial plant in the amaryllis family (Amaryllidaceae) grown for its edible bulb. The onion is likely native to southwestern Asia but is now grown throughout the world, chiefly in the temperate zones. Onions are low in nutrients but are valued for their flavour and are used widely in cooking. They add flavour to such dishes as stews, roasts, soups, and salads and are also served as a cooked vegetable.",
-    "image": "onion.jpg",
-    "lifecycle": [
-      {
-        "startDate": "03-15",
-        "endDate": "04-10",
-        "type": "SOW",
-        "zone": "ZONE_8A",
-        "group": 0,
-        "wateringCycle": {
-          "litersPerSqM": 15,
-          "interval": 4,
-          "notes": [
-
-          ]
-        },
-        "taskTemplates": [
-          {
-            "name": "hilling",
-            "relativeStartDate": 0,
-            "relativeEndDate": 0,
-            "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": null,
-            "isOptional": false
-          }
-        ]
-      },
-      {
-        "startDate": "04-10",
-        "endDate": "07-10",
-        "type": "PLANT",
-        "zone": "ZONE_8A",
-        "group": 0,
-        "wateringCycle": {
-          "litersPerSqM": 25,
-          "interval": 3,
-          "notes": [
-            ""
-          ]
-        },
-        "taskTemplates": [
-          {
-            "name": "hilling",
-            "relativeStartDate": 0,
-            "relativeEndDate": null,
-            "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": 15,
-            "isOptional": true
-          }
-        ]
-      },
-      {
-        "startDate": "07-10",
-        "endDate": "09-20",
-        "type": "HARVEST",
-        "zone": "ZONE_8A",
-        "group": 0,
-        "wateringCycle": {
-          "litersPerSqM": 0,
-          "interval": null,
-          "notes": [
-
-          ]
-        },
-        "taskTemplates": [
-          {
-            "name": "Harvesting",
-            "relativeStartDate": 0,
-            "relativeEndDate": 14,
-            "description": "When ready for harvest, the leaves on your onion plants will start to flop over. This happens at the \"neck\" of the onion and it signals that the plant has stopped growing and is ready for storage. Onions should be harvested soon thereafter",
-            "interval": null,
-            "isOptional": false
-          }
-        ]
-      }
-    ],
-    "soil": "sandy to loamy, loose soil, free of stones",
-    "spacing": "15,30,2",
-    "pests": [
-      {
-        "name": "Rot",
-        "description": "rot, any of several plant diseases, caused by any of hundreds of species of soil-borne bacteria, fungi, and funguslike organisms (Oomycota). Rot diseases are characterized by plant decomposition and putrefaction. The decay may be hard, dry, spongy, watery, mushy, or slimy and may affect any plant part.",
-        "measures": "less water"
-      }
-    ]
-  }
-]

src/test/resources/ch/zhaw/gartenverwaltung/io/template-taskdb.json

@@ -1,12 +1,12 @@
 [
   {
-  "id" : 1,
-  "name" : "sow plant",
-  "description": "Plant the seeds, crops in de bed.",
-  "startDate" : "2022-05-01",
-  "endDate" : "2022-05-01",
-  "interval" : 0,
-    "cropID" : 0
+    "id" : 1,
+    "name" : "sow plant",
+    "description": "Plant the seeds, crops in de bed.",
+    "startDate" : "2022-05-01",
+    "endDate" : "2022-05-01",
+    "interval" : 0,
+    "cropId" : 0
   },
   {
     "id" : 2,
@@ -15,7 +15,7 @@
     "startDate" : "2022-05-01",
     "endDate" : "2022-09-01",
     "interval" : 2,
-    "cropID" : 0
+    "cropId" : 0
   },
   {
     "id" : 3,
@@ -24,7 +24,7 @@
     "startDate" : "2022-06-01",
     "endDate" : "2022-08-01",
     "interval" : 28,
-    "cropID" : 0
+    "cropId" : 0
   },
   {
     "id" : 4,
@@ -33,7 +33,7 @@
     "startDate" : "2022-07-01",
     "endDate" : "2022-07-01",
     "interval" : 0,
-    "cropID" : 0
+    "cropId" : 0
   },
   {
     "id" : 5,
@@ -42,7 +42,7 @@
     "startDate" : "2022-05-01",
     "endDate" : "2022-09-01",
     "interval" : 5,
-    "cropID" : 0
+    "cropId" : 0
   },
   {
     "id" : 6,
@@ -51,6 +51,6 @@
     "startDate" : "2022-09-01",
     "endDate" : "2022-09-01",
     "interval" : 0,
-    "cropID" : 0
+    "cropId" : 0
   }
 ]

src/test/resources/ch/zhaw/gartenverwaltung/io/template-user-crops.json

@@ -0,0 +1,20 @@
+[
+  {
+    "cropId": 0,
+    "plantId": 1,
+    "startDate": "2023-02-25",
+    "area": 0.5
+  },
+  {
+    "cropId": 1,
+    "plantId": 1,
+    "startDate": "2023-03-01",
+    "area": 0.5
+  },
+  {
+    "cropId": 2,
+    "plantId": 0,
+    "startDate": "2023-03-25",
+    "area": 1.5
+  }
+]

src/test/resources/ch/zhaw/gartenverwaltung/io/test-plantdb.json

@@ -31,7 +31,7 @@
             "name": "Germinate",
             "relativeStartDate": -14,
             "relativeEndDate": null,
-            "description": "\"Take an egg carton and fill it with soil. Put the seedling deep enaugh so its half covered with soil. Keep it in 10-15 * Celsius with lots of light.\"",
+            "description": "Take an egg carton and fill it with soil. Put the seedling deep enough so its half covered with soil. Keep it in 10-15 * Celsius with lots of light.",
             "interval": null,
             "isOptional": false
           }
@@ -53,7 +53,7 @@
             "name": "hilling",
             "relativeStartDate": 0,
             "relativeEndDate": null,
-            "description": "\"When the plants are 20 cm tall, begin hilling the potatoes by gently mounding the soil from the center of your rows around the stems of the plant. Mound up the soil around the plant until just the top few leaves show above the soil. Two weeks later, hill up the soil again when the plants grow another 20 cm.\"",
+            "description": "When the plants are 20 cm tall, begin hilling the potatoes by gently mounding the soil from the center of your rows around the stems of the plant. Mound up the soil around the plant until just the top few leaves show above the soil. Two weeks later, hill up the soil again when the plants grow another 20 cm.",
             "interval": 21,
             "isOptional": false
           }
@@ -94,6 +94,7 @@
         "endDate": "03-10",
         "zone": "ZONE_8A",
         "type": "SOW",
+        "group": 0,
         "wateringCycle": {
           "litersPerSqM": 15,
           "interval": 3,
@@ -115,6 +116,7 @@
         "endDate": "05-10",
         "zone": "ZONE_8A",
         "type": "PLANT",
+        "group": 0,
         "wateringCycle": {
           "litersPerSqM": 25,
           "interval": 3,
@@ -138,6 +140,7 @@
         "endDate": "05-20",
         "zone": "ZONE_8A",
         "type": "HARVEST",
+        "group": 0,
         "wateringCycle": {
           "litersPerSqM": 0,
           "interval": null,

src/test/resources/ch/zhaw/gartenverwaltung/io/test-user-crops.json

@@ -1,20 +1,2 @@
 [
-  {
-    "cropId": 0,
-    "plantId": 1,
-    "startDate": "2023-02-25",
-    "area": 0.5
-  },
-  {
-    "cropId": 1,
-    "plantId": 1,
-    "startDate": "2023-03-01",
-    "area": 0.5
-  },
-  {
-    "cropId": 2,
-    "plantId": 0,
-    "startDate": "2023-03-25",
-    "area": 1.5
-  }
 ]