refactor: javadoc and dependencies in HashMap

completed Tests for GardenScheduleTest and new Structure of Task

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

@@ -1,5 +1,6 @@
 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;
@@ -10,14 +11,18 @@ import ch.zhaw.gartenverwaltung.types.Crop;
 import ch.zhaw.gartenverwaltung.types.Pest;
 import ch.zhaw.gartenverwaltung.types.Plant;
 import ch.zhaw.gartenverwaltung.types.Task;
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.collections.FXCollections;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.geometry.Pos;
-import javafx.scene.control.Button;
+import javafx.scene.control.*;
-import javafx.scene.control.Label;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.VBox;
+import javafx.scene.layout.Priority;
 import javafx.stage.Stage;
 
 import java.io.IOException;
@@ -35,7 +40,12 @@ public class CropDetailController {
     @Inject
     private Garden garden;
 
+    @Inject
+    AppLoader appLoader;
+
     private static final Logger LOG = Logger.getLogger(CropDetailController.class.getName());
+    private final ListProperty<Task> taskListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<Pest> pestListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
 
     @FXML
     private ImageView imageView;
@@ -52,9 +62,6 @@ public class CropDetailController {
     @FXML
     private Label description_label;
 
-    @FXML
-    private VBox growthPhases_vbox;
-
     @FXML
     private Label location_label;
 
@@ -64,9 +71,6 @@ public class CropDetailController {
     @FXML
     private Button location_button;
 
-    @FXML
-    private VBox pests_vbox;
-
     @FXML
     private Label soil_label;
 
@@ -74,29 +78,50 @@ public class CropDetailController {
     private Label spacing_label;
 
     @FXML
-    private Button editTaskList_button;
+    private Button addTask_button;
 
     @FXML
-    void editTaskList() {
+    private ListView<Task> taskList_listView;
 
+    @FXML
+    private ListView<Pest> pests_listView;
+
+    @FXML
+    void addTask() throws IOException {
+        createTaskDialog(true, null);
     }
 
+    /**
+     * close Window
+     */
     @FXML
     void goBack() {
         Stage stage = (Stage) imageView.getScene().getWindow();
         stage.close();
     }
 
+    /**
+     * open dialog to set area
+     */
     @FXML
-    void setArea() {
+    void setArea() throws IOException {
-
+        openTextFieldDialog("set Text Area", "Text Area", area_label.getText(), false);
     }
 
+    /**
+     * open dialog to set location
+     */
     @FXML
-    void setLocation() {
+    void setLocation() throws IOException {
-
+        openTextFieldDialog("set Location", "Location", location_label.getText(), true);
     }
 
+    /**
+     * set labels and image from selected {@link Crop}
+     * set icons for buttons
+     * @param crop {@link Crop} which will be displayed
+     * @throws PlantNotFoundException exception
+     */
     public void setPlantFromCrop(Crop crop) throws PlantNotFoundException {
         this.crop = crop;
         try {
@@ -113,25 +138,65 @@ public class CropDetailController {
             }
             area_label.setText("");
             location_label.setText("");
-            createTaskLists(crop);
+
-            createPestList(plant);
+            setTaskListProperty(crop);
+            taskList_listView.itemsProperty().bind(taskListProperty);
+
+            pestListProperty.addAll(plant.pests());
+            pests_listView.itemsProperty().bind(pestListProperty);
+
+
         } catch (HardinessZoneNotSetException | IOException e) {
             throw new PlantNotFoundException();
         }
-        setIconToButton(editTaskList_button, "editIcon.png");
+        setIconToButton(addTask_button, "addIcon.png");
         setIconToButton(area_button, "areaIcon.png");
         setIconToButton(location_button, "locationIcon.png");
+        setCellFactoryPests();
+        setCellFactoryTasks();
     }
 
-    private void createTaskLists(Crop crop) {
+    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);
-                for (Task task : taskList) {
+                taskListProperty.clear();
-                    Label label = new Label(task.getDescription());
+                taskListProperty.addAll(taskList);
-                    growthPhases_vbox.getChildren().add(label);
-                }
             } catch (IOException e) {
                 // TODO: Alert
                 LOG.log(Level.SEVERE, "Could not get task list for crop", e.getCause());
@@ -139,9 +204,27 @@ public class CropDetailController {
         });
     }
 
-    private void createPestList(Plant plant) {
+    private HBox createTaskHBox(Task task) {
-        List<Pest> pests = plant.pests();
+        HBox hBox = new HBox();
-        for (Pest pest : pests) {
+        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));
+        delete.setOnAction(deleteTask(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();
@@ -150,11 +233,9 @@ public class CropDetailController {
         label1.setAlignment(Pos.TOP_LEFT);
         label1.setWrapText(true);
         label1.setMaxWidth(600);
-            label1.setMaxHeight(100);
         Button button = new Button("Get Counter Measures");
-            hBox.getChildren().addAll(label1, button);
+        hBox.getChildren().addAll(label, label1, button);
-            pests_vbox.getChildren().addAll(label, hBox);
+        return hBox;
-        }
     }
 
     /**
@@ -169,4 +250,114 @@ public class CropDetailController {
         imageView.setPreserveRatio(true);
         button.setGraphic(imageView);
     }
+
+    private EventHandler<ActionEvent> getEditTaskEvent(Task task) {
+        return (event) -> {
+            try {
+                createTaskDialog(false, task);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        };
+    }
+
+    private EventHandler<ActionEvent> deleteTask(Task task) {
+        return (event) -> {
+            showDeleteTask(task);
+        };
+    }
+
+    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);
+            controller.initSaveButton((Button) dialogPane.lookupButton(saveTask));
+            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);
+                        }
+                    });
+        }
+
+    }
+
+    private void openTextFieldDialog(String title, String labelDescription, String value, boolean isLocation) throws IOException {
+        Dialog<String> dialog = new Dialog<>();
+        dialog.setTitle(title);
+        dialog.setHeaderText(title);
+        dialog.setResizable(false);
+
+        DialogPane dialogPane = dialog.getDialogPane();
+
+        ButtonType save = new ButtonType("Save", ButtonBar.ButtonData.OK_DONE);
+        dialogPane.getButtonTypes().addAll(save, ButtonType.CANCEL);
+
+        if (appLoader.loadPaneToDialog("TextFieldFormular.fxml", dialogPane) instanceof TextFieldFormularController controller) {
+            controller.setDescription_label(labelDescription);
+            controller.setValueTextArea(value);
+            controller.initSaveButton((Button) dialogPane.lookupButton(save));
+
+            dialog.setResultConverter(button -> button.equals(save) ? controller.getValue() : null);
+
+            dialog.showAndWait()
+                    .ifPresent(string -> {
+                        if (isLocation) {
+                            System.out.println(string);
+                            //ToDo method to set location
+                            location_label.setText(string);
+                        } else {
+                            System.out.println(string);
+                            //ToDo method to set area of crop in garden
+                            area_label.setText(string);
+                        }
+                    });
+        }
+    }
+
+    private void showDeleteTask(Task task) {
+        Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
+        alert.setTitle("Delete " + task.getName());
+        alert.setHeaderText("Are you sure want to delete this Task?");
+
+        alert.showAndWait()
+                .ifPresent(buttonType -> {
+                    if (buttonType == ButtonType.OK) {
+                        try {
+                            gardenSchedule.removeTask(task);
+                            setTaskListProperty(this.crop);
+                        } catch (IOException e) {
+                            // TODO: Show error alert
+                            LOG.log(Level.SEVERE, "Could not remove crop.", e);
+                        }
+                    }
+                });
+    }
 }

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

@@ -1,14 +0,0 @@
-package ch.zhaw.gartenverwaltung;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.Label;
-
-public class HelloController {
-    @FXML
-    private Label welcomeText;
-
-    @FXML
-    protected void onHelloButtonClick() {
-        welcomeText.setText("Welcome to JavaFX Application!");
-    }
-}

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

@@ -4,7 +4,6 @@ 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.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
@@ -12,6 +11,9 @@ import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.Pane;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import javafx.stage.WindowEvent;
 
 import java.io.IOException;
 import java.util.logging.Level;
@@ -41,26 +43,42 @@ public class MainFXMLController {
     @FXML
     private Button tutorial_button;
 
+    private final Stage tutorialModal = new Stage();
+
+
+    /**
+     * go to home pane
+     */
     @FXML
     void goToHome() {
         showPaneAsMainView("Home.fxml");
         styleChangeButton(home_button);
     }
 
+    /**
+     * go to my garden pane
+     */
     @FXML
     void goToMyPlants() {
         showPaneAsMainView("MyGarden.fxml");
         styleChangeButton(myGarden_button);
     }
 
+    /**
+     * go to the schedule pane
+     */
     @FXML
     void goToMySchedule() {
         showPaneAsMainView("MySchedule.fxml");
         styleChangeButton(mySchedule_button);
     }
 
+    /**
+     * open dialog of the settings
+     * @throws IOException exception
+     */
     @FXML
-    public void openSettings(ActionEvent actionEvent) throws IOException {
+    public void openSettings() throws IOException {
         Dialog<ButtonType> dialog = new Dialog<>();
         dialog.setTitle("Settings");
         dialog.setHeaderText("Settings");
@@ -82,9 +100,24 @@ public class MainFXMLController {
         }
     }
 
-    public void goToTutorial(ActionEvent actionEvent) {
+    /**
-        //showPaneAsMainView("Tutorial.fxml");
+     * Show the tutorial window
-        styleChangeButton(tutorial_button);
+     */
+    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();
     }
 
     /**
@@ -109,6 +142,10 @@ public class MainFXMLController {
 
     private final EventHandler<ChangeViewEvent> changeMainViewHandler = (ChangeViewEvent event) -> showPaneAsMainView(event.view());
 
+    /**
+     * preload all menu bar panes
+     * @throws IOException exception
+     */
     private void preloadPanes() throws IOException {
         appLoader.loadAndCacheFxml("MyGarden.fxml");
         appLoader.loadAndCacheFxml("MySchedule.fxml");
@@ -133,16 +170,18 @@ public class MainFXMLController {
         } catch (IOException e) {
             LOG.log(Level.SEVERE, "Failed to load FXML-Pane!", e);
         }
+        mainPane.getScene().getWindow().setOnCloseRequest(this::closeWindowHandler);
         setIconToButton(home_button, "homeIcon.png");
         setIconToButton(settings_button, "settingsIcon.png");
-        Settings.getInstance().getShowTutorialProperty().addListener((observable, oldValue, newValue) -> {
+        tutorial_button.visibleProperty().bind(Settings.getInstance().getShowTutorialProperty());
-            tutorial_button.setVisible(newValue);
+    }
-        });
+
-        tutorial_button.setVisible(Settings.getInstance().getShowTutorial());
+    private void closeWindowHandler(WindowEvent windowEvent) {
+        tutorialModal.close();
     }
 
     /**
-     * adds icon to button
+     * adds icon to given button
      * @param button the button which get the icon
      * @param iconFileName file name of icon
      */
@@ -153,7 +192,4 @@ public class MainFXMLController {
         imageView.setPreserveRatio(true);
         button.setGraphic(imageView);
     }
-
-
 }
-

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

@@ -13,16 +13,12 @@ import ch.zhaw.gartenverwaltung.types.Plant;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
-import javafx.scene.control.Alert;
+import javafx.scene.control.*;
-import javafx.scene.control.Button;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.Label;
 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.scene.layout.VBox;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 
@@ -43,42 +39,64 @@ public class MyGardenController {
     @FXML
     public AnchorPane myGardenRoot;
     @FXML
-    private VBox myPlants_vbox;
-    @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() {
-        garden.getPlantedCrops().addListener((observable, oldValue, newValue) -> {
+        System.out.println("once");
-            try {
-                createPlantView(newValue);
-            } catch (HardinessZoneNotSetException | IOException e) {
-                LOG.log(Level.SEVERE, "Could not update view of croplist!", e);
-            }
-        });
-        try {
-            createPlantView(garden.getPlantedCrops());
-        } catch (HardinessZoneNotSetException | IOException e) {
-            LOG.log(Level.SEVERE, "Could not update view of croplist!", e);
-        }
         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"));
     }
 
-    private void createPlantView(List<Crop> crops) throws HardinessZoneNotSetException, IOException {
+    /**
-        myPlants_vbox.getChildren().clear();
+     * set cell factory to load {@link HBox} as list view content
-        for (Crop crop : crops) {
+     */
-            HBox hBox = createPlantView(crop);
+    private void setCellFactory() {
-            myPlants_vbox.getChildren().add(hBox);
+        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);
                     }
                 }
+            }
+        });
+    }
 
-    private HBox createPlantView(Crop crop) throws HardinessZoneNotSetException, IOException {
+    /**
+     * Creates and returns HBox of the crop
+     * @param crop {@link Crop} which is selected
+     * @return {@link HBox} of the {@link Crop}
+     * @throws HardinessZoneNotSetException exception
+     * @throws IOException exception
+     */
+    private HBox createHBoxForListView(Crop crop) throws HardinessZoneNotSetException, IOException {
         //ToDo add better design
         Plant plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).get();
         HBox hBox = new HBox(10);
@@ -95,8 +113,8 @@ public class MyGardenController {
         label.setMaxWidth(2000);
         HBox.setHgrow(label, Priority.ALWAYS);
 
-        Button details = new Button("");
+        Button details = new Button();
-        Button delete = new Button("");
+        Button delete = new Button();
         setIconToButton(details, "detailsIcon.png");
         setIconToButton(delete, "deleteIcon.png");
         details.setOnAction(getGoToCropDetailEvent(crop));
@@ -119,6 +137,11 @@ public class MyGardenController {
         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 {
@@ -136,6 +159,11 @@ public class MyGardenController {
         };
     }
 
+    /**
+     * open alert for deleting the selected {@link Crop}
+     * @param crop {@link Crop} which is selected
+     * @return {@link EventHandler} for button
+     */
     private EventHandler<ActionEvent> getDeleteCropEvent(Crop crop) {
         return (event) -> {
             try {
@@ -146,9 +174,16 @@ public class MyGardenController {
         };
     }
 
+    /**
+     * Alert to confirm that the crop can be deleted.
+     * @param crop {@link Crop} which is selected
+     * @throws IOException exception
+     * @throws HardinessZoneNotSetException exception
+     */
     private void showConfirmation(Crop crop) throws IOException, HardinessZoneNotSetException {
+        Plant plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).get();
         Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
-        alert.setTitle("Delete Crop");
+        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.");
 

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

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

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

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

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

@@ -0,0 +1,133 @@
+package ch.zhaw.gartenverwaltung;
+
+import ch.zhaw.gartenverwaltung.types.Crop;
+import ch.zhaw.gartenverwaltung.types.Task;
+import javafx.beans.binding.Binding;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+import javafx.scene.control.*;
+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> getDayCellFactoryStartDate() {
+
+        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;");
+                }
+
+                if (end_datePicker.getValue() != null && item.compareTo(end_datePicker.getValue()) > 0) {
+                    setDisable(true);
+                    setStyle("-fx-background-color: #ffc0cb;");
+                }
+            }
+        };
+    }
+
+    private Callback<DatePicker, DateCell> getDayCellFactoryEndDate() {
+
+        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;");
+                }
+
+                if (start_datePicker.getValue() != null && item.compareTo(start_datePicker.getValue()) < 0) {
+                    setDisable(true);
+                    setStyle("-fx-background-color: #ffc0cb;");
+                }
+            }
+        };
+    }
+
+    public void initSaveButton(Button button) {
+        interval_field.textProperty().addListener((observable, oldValue, newValue) -> {
+            if (!newValue.matches("\\d*")) {
+                interval_field.setText(newValue.replaceAll("[^\\d]", ""));
+            }
+        });
+
+        button.disableProperty().bind(start_datePicker.valueProperty().isNull()
+                .or(end_datePicker.valueProperty().isNull())
+                .or(taskName_field.textProperty().isEmpty())
+                .or(description_area.textProperty().isEmpty())
+                .or(interval_field.textProperty().isEmpty()));
+
+
+    }
+
+    @Override
+    public void initialize(URL location, ResourceBundle resources) {
+        start_datePicker.setDayCellFactory(getDayCellFactoryStartDate());
+        start_datePicker.setEditable(false);
+
+        end_datePicker.setDayCellFactory(getDayCellFactoryEndDate());
+        end_datePicker.setEditable(false);
+    }
+}

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

@@ -0,0 +1,32 @@
+package ch.zhaw.gartenverwaltung;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+
+public class TextFieldFormularController {
+
+    @FXML
+    private Label description_label;
+
+    @FXML
+    private TextField text_area;
+
+
+    public void setDescription_label(String string) {
+        description_label.setText(string);
+    }
+
+    public void setValueTextArea(String string) {
+        text_area.setText(string);
+    }
+
+    public String getValue() {
+        return text_area.getText();
+    }
+
+    public void initSaveButton(Button button) {
+        button.disableProperty().bind(text_area.textProperty().isEmpty());
+    }
+}

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

@@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Annotates a method to be executed after all dependencies annotates with {@link Inject}
+ * Annotates a method to be executed after all dependencies annotated with {@link Inject}
  * have been injected.
  */
 @Retention(RetentionPolicy.RUNTIME)

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

@@ -23,6 +23,10 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
+/**
+ * Class responsible for bootstrapping the application wide dependencies
+ * and injecting them into JavaFX Controllers.
+ */
 public class AppLoader {
     /**
      * Caching the panes
@@ -32,17 +36,24 @@ public class AppLoader {
     /**
      * Application-wide dependencies
      */
-    private final PlantList plantList = new JsonPlantList();
+    private final Map<String, Object> dependencies = new HashMap<>();
-    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 {
-    }
+        PlantList plantList = new JsonPlantList();
+        CropList cropList = new JsonCropList();
+        TaskList taskList = new JsonTaskList();
+        GardenSchedule gardenSchedule = new GardenSchedule(taskList, plantList);
 
+        dependencies.put(PlantList.class.getSimpleName(), plantList);
+        dependencies.put(CropList.class.getSimpleName(), cropList);
+        dependencies.put(TaskList.class.getSimpleName(), taskList);
+
+        dependencies.put(PlantListModel.class.getSimpleName(), new PlantListModel(plantList));
+
+        dependencies.put(GardenSchedule.class.getSimpleName(), gardenSchedule);
+        dependencies.put(Garden.class.getSimpleName(), new Garden(gardenSchedule, cropList));
+        dependencies.put(AppLoader.class.getSimpleName(), this);
+    }
 
     /**
      * Loads and returns a {@link Pane} (cached).
@@ -73,7 +84,10 @@ public class AppLoader {
     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));
+        Scene scene = new Scene(root);
+        String css = Objects.requireNonNull(this.getClass().getResource("styles.css")).toExternalForm();
+        appendee.setScene(scene);
+        scene.getStylesheets().add(css);
         Object controller = loader.getController();
         annotationInject(controller);
         return controller;
@@ -132,26 +146,18 @@ public class AppLoader {
                 });
 
         Arrays.stream(controller.getClass().getMethods())
-                .filter(method -> method.isAnnotationPresent(AfterInject.class))
+                .filter(method -> method.isAnnotationPresent(AfterInject.class) && method.getParameterCount() == 0)
                 .forEach(afterInjectMethod -> {
-                    if (afterInjectMethod.getParameterCount() == 0) {
                     try {
                         afterInjectMethod.invoke(controller);
                     } catch (IllegalAccessException | InvocationTargetException e) {
+                        // TODO: Log
                         e.printStackTrace();
                     }
-                    }
                 });
     }
 
     private Object getAppDependency(Class<?> type) {
-        return switch (type.getSimpleName()) {
+        return dependencies.get(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

@@ -3,11 +3,20 @@ package ch.zhaw.gartenverwaltung.bootstrap;
 import javafx.event.Event;
 import javafx.event.EventType;
 
+/**
+ * Represents an event that should lead to a view being changed.
+ */
 public class ChangeViewEvent extends Event {
     private final String view;
 
     public static final EventType<ChangeViewEvent> CHANGE_MAIN_VIEW = new EventType<>("CHANGE_MAIN_VIEW");
 
+    /**
+     * Creates an Event that should lead to the main view being changed.
+     *
+     * @param eventType The {@link EventType<ChangeViewEvent>} specifying which view should be changed.
+     * @param view The filename of the View to be changed to
+     */
     public ChangeViewEvent(EventType<? extends Event> eventType, String view) {
         super(eventType);
         this.view = view;

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

@@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Annotates a Field to be injected from the application-dependencies
+ * Annotates a Field to be injected from the application-dependencies.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)

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

@@ -6,6 +6,10 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
 
+/**
+ * Represents a List of {@link Crop}s.
+ * The interface specifies the operations to add/update and remove entries.
+ */
 public interface CropList {
     /**
      * Yields a list of all {@link Crop}s in the database.

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

@@ -1,10 +1,18 @@
 package ch.zhaw.gartenverwaltung.io;
 
+/**
+ * Provides an sequential ID starting from the given initial Value.
+ */
 public class IdProvider {
     private long currentId;
     public IdProvider(long initialValue) {
         currentId = initialValue;
     }
+
+    /**
+     * Yields the next ID in the sequence.
+     * @return The next ID
+     */
     public long incrementAndGet() {
         return ++currentId;
     }

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

@@ -19,6 +19,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+/**
+ * Implements the {@link CropList} interface for reading and writing {@link Crop} objects
+ * from and to a local JSON file.
+ * The reads are cached to minimize file-io operations.
+ */
 public class JsonCropList implements CropList {
     private final URL dataSource;
 
@@ -40,7 +45,7 @@ public class JsonCropList implements CropList {
     }
 
     /**
-     * Default constructor
+     * Default constructor. Uses a file from the app resources.
      */
     public JsonCropList() {
         this.dataSource = getClass().getResource("user-crops.json");

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

@@ -20,8 +20,8 @@ import java.util.Map;
 import java.util.Optional;
 
 /**
- * Implements the {@link PlantList} interface for loading {@link Plant} objects
+ * Implements the {@link PlantList} interface for reading {@link Plant} objects
- * from a JSON file.
+ * from a local JSON file.
  * The reads are cached to minimize file-io operations.
  */
 public class JsonPlantList implements PlantList {
@@ -44,9 +44,17 @@ public class JsonPlantList implements PlantList {
         imageModule.addDeserializer(Image.class, new PlantImageDeserializer());
     }
 
+    /**
+     * Default constructor. Uses a file from the app resources.
+     */
     public JsonPlantList() {
         this.dataSource = getClass().getResource("plantdb.json");
     }
+
+    /**
+     * 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 JsonPlantList(URL dataSource) {
         this.dataSource = dataSource;
     }
@@ -67,7 +75,7 @@ public class JsonPlantList implements PlantList {
     }
 
     /**
-     * @see PlantList#getPlantById(long)
+     * @see PlantList#getPlantById(HardinessZone, long)
      */
     @Override
     public Optional<Plant> getPlantById(HardinessZone zone, long id) throws HardinessZoneNotSetException, IOException {

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

@@ -13,14 +13,15 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 /**
- * Implements the {@link TaskList} interface for loading and writing {@link Task} objects
+ * Implements the {@link TaskList} interface for reading and writing {@link Task} objects
- * from and to a JSON file.
+ * from and to a local JSON file.
  * The reads are cached to minimize file-io operations.
  */
 public class JsonTaskList implements TaskList {
@@ -29,6 +30,7 @@ public class JsonTaskList implements TaskList {
     private final static String INVALID_DATASOURCE_MSG = "Invalid datasource specified!";
 
     private Map<Long, Task> taskMap = Collections.emptyMap();
+    private final List<TaskListObserver> subscribers = new ArrayList<>();
 
     /**
      * Creating constant objects required to deserialize the {@link LocalDate} classes
@@ -43,9 +45,17 @@ public class JsonTaskList implements TaskList {
         timeModule.addSerializer(LocalDate.class, dateSerializer);
     }
 
+    /**
+     * Default constructor. Uses a file from the app resources.
+     */
     public JsonTaskList() {
         this.dataSource = getClass().getResource("taskdb.json");
     }
+
+    /**
+     * 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 JsonTaskList(URL dataSource) {
         this.dataSource = dataSource;
     }
@@ -87,6 +97,7 @@ public class JsonTaskList implements TaskList {
             loadTaskListFromFile();
         }
         taskMap.values().removeIf(task -> task.getCropId() == cropId);
+        notifySubscribers();
     }
 
     /**
@@ -103,10 +114,11 @@ public class JsonTaskList implements TaskList {
         if(taskMap.isEmpty()) {
             loadTaskListFromFile();
         }
-        if(task.getId() == 0) {
+        long id = task.getId().orElse(idProvider.incrementAndGet());
-            task.withId(idProvider.incrementAndGet());
+
-        }
+        taskMap.put(id, task.withId(id));
         writeTaskListToFile();
+        notifySubscribers();
     }
 
     /**
@@ -121,10 +133,30 @@ public class JsonTaskList implements TaskList {
         if(taskMap.isEmpty()) {
             loadTaskListFromFile();
         }
-        if(taskMap.containsKey(task.getId())){
+        Long taskId = task.getId().orElseThrow(IOException::new);
-            taskMap.remove(task.getId());
+        if(taskMap.containsKey(taskId)){
+            taskMap.remove(taskId);
             writeTaskListToFile();
         }
+        notifySubscribers();
+    }
+
+    /**
+     * {@inheritDoc}
+     * @param observer The change handler
+     */
+    @Override
+    public void subscribe(TaskListObserver observer) {
+        subscribers.add(observer);
+    }
+
+    /**
+     * Calls the change handler method on all registered observers.
+     */
+    private void notifySubscribers() {
+        for (TaskListObserver subscriber : subscribers) {
+            subscriber.onChange(taskMap.values().stream().toList());
+        }
     }
 
     /**
@@ -162,7 +194,7 @@ public class JsonTaskList implements TaskList {
 
             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

@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Optional;
 
 /**
- * A database of {@link Plant}s.
+ * A List of {@link Plant}s.
  * The interface specifies the minimal required operations.
  */
 public interface PlantList {

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

@@ -7,8 +7,8 @@ import java.time.LocalDate;
 import java.util.List;
 
 /**
- * A database of {@link Task}s.
+ * Represents a List of {@link Task}s.
- * The interface specifies the minimal required operations.
+ * The interface specifies the operations to add/update and remove entries.
  */
 public interface TaskList {
     /**
@@ -51,4 +51,22 @@ public interface TaskList {
      * @throws IOException If the database cannot be accessed
      */
     void removeTask(Task task) throws IOException;
+
+    /**
+     * Registers an observer to be notified of Changes in the TaskList
+     * @param observer The change handler
+     */
+    void subscribe(TaskListObserver observer);
+
+    /**
+     * Specifies an observer for a TaskList
+     */
+    @FunctionalInterface
+    interface TaskListObserver {
+        /**
+         * Method which will be called when changes occur.
+         * @param newTaskList The new values
+         */
+        void onChange(List<Task> newTaskList);
+    }
 }

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

@@ -7,6 +7,9 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 
 import java.io.IOException;
 
+/**
+ * Used by the Jackson Library to deserialize a String to a {@link GrowthPhaseType}
+ */
 public class GrowthPhaseTypeDeserializer extends StdDeserializer<GrowthPhaseType> {
     public GrowthPhaseTypeDeserializer(Class<?> vc) {
         super(vc);

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

@@ -7,6 +7,9 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 
 import java.io.IOException;
 
+/**
+ * Used by the Jackson Library to deserialize a String to a {@link HardinessZone}
+ */
 public class HardinessZoneDeserializer extends StdDeserializer<HardinessZone> {
     public HardinessZoneDeserializer(Class<?> vc) {
         super(vc);

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

@@ -13,6 +13,9 @@ import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.net.URL;
 
+/**
+ * Used by the Jackson Library to deserialize a String to a {@link Image}
+ */
 public class PlantImageDeserializer extends JsonDeserializer<Image> {
 
     @Override

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

@@ -9,6 +9,7 @@ import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 public class GardenSchedule {
@@ -19,6 +20,7 @@ public class GardenSchedule {
      * Comparators to create sorted Task List
      */
     static final Comparator<Task> sortByStartDate = Comparator.comparing(Task::getStartDate);
+    static final Comparator<Task> sortByNextExecution = Comparator.comparing(Task::getNextExecution);
 
     /**
      * Constructor to create Database Objects.
@@ -46,7 +48,8 @@ public class GardenSchedule {
      */
     public void planTasksForCrop(Crop crop) throws PlantNotFoundException, HardinessZoneNotSetException, IOException {
         Plant plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).orElseThrow(PlantNotFoundException::new);
-        for (GrowthPhase growthPhase : plant.lifecycle()) {
+        int growPhaseGroup = plant.getGrowphaseGroupForDate(crop.getStartDate());
+        for (GrowthPhase growthPhase : plant.lifecycleForGroup(growPhaseGroup)) {
             for (TaskTemplate taskTemplate : growthPhase.taskTemplates()) {
                 addTask(taskTemplate.generateTask(crop.getStartDate(), crop.getCropId().orElse(0L)));
             }
@@ -135,10 +138,22 @@ public class GardenSchedule {
      * @throws IOException If the database cannot be accessed
      */
     public List<List<Task>> getTasksUpcomingWeek() throws IOException {
+        final int listLength = 7;
+        List<Task> weekTasks = taskList.getTaskList(LocalDate.now(), LocalDate.now().plusDays(listLength - 1));
         List<List<Task>> dayTaskList = new ArrayList<>();
-        for(int i = 0; i < 7; i++) {
+        for(int i = 0; i < listLength; i++) {
             LocalDate date = LocalDate.now().plusDays(i);
-            dayTaskList.add(taskList.getTaskList(date, date));
+            dayTaskList.add(new ArrayList<>());
+            final int finalI = i;
+            weekTasks.forEach(task -> {
+                LocalDate checkDate = task.getNextExecution();
+                do {
+                    if (date.equals(checkDate) && !date.isAfter(task.getEndDate().orElse(LocalDate.MIN))) {
+                        dayTaskList.get(finalI).add(task);
+                    }
+                    checkDate = checkDate.plusDays(task.getInterval().orElse(0));
+                } while (task.getInterval().isPresent() && checkDate.isBefore(LocalDate.now().plusDays(listLength)));
+            });
         }
         return dayTaskList;
     }
@@ -149,11 +164,8 @@ public class GardenSchedule {
      * @throws IOException If the database cannot be accessed
      */
     public List<List<Task>> getTasksUpcomingWeekForCrop(Long cropId) throws IOException {
-        List<List<Task>> dayTaskList = new ArrayList<>();
+        List<List<Task>> dayTaskList = getTasksUpcomingWeek();
-        for(int i = 0; i < 7; i++) {
+        dayTaskList.forEach(taskList -> taskList.removeIf(task -> task.getCropId() != cropId));
-            LocalDate date = LocalDate.now().plusDays(i);
-            dayTaskList.add(filterListByCrop(taskList.getTaskList(date, date), cropId));
-        }
         return dayTaskList;
     }
 
@@ -165,7 +177,7 @@ public class GardenSchedule {
      * @throws IOException If the database cannot be accessed
      */
     public List<Task> getFilteredTaskList(LocalDate start, LocalDate end) throws IOException {
-        return getSortedTaskList(taskList.getTaskList(start, end), sortByStartDate);
+        return getSortedTaskList(taskList.getTaskList(start, end), sortByNextExecution);
     }
 
     /**

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

@@ -39,6 +39,16 @@ public record Plant(
                 .collect(Collectors.toList());
     }
 
+    public int getGrowphaseGroupForDate(LocalDate date) {
+        for(GrowthPhase growthPhase : lifecycle){
+            MonthDay plantingDate = MonthDay.of(date.getMonth().getValue(), date.getDayOfMonth());
+            if(plantingDate.isAfter(growthPhase.startDate()) && plantingDate.isBefore(growthPhase.endDate())){
+                return growthPhase.group();
+            }
+        }
+        return 0; // TODO implement
+    }
+
     /**
      * get sow date from given harvest day from lifecycle group
      * @param harvestDate date of the harvest

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

@@ -9,12 +9,14 @@ 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;
     private Integer interval;
     private LocalDate endDate;
+    private LocalDate nextExecution;
+    private LocalDate nextNotification;
     private long cropId;
 
     /**
@@ -25,12 +27,16 @@ public class Task {
         name= "";
         description= "";
         startDate = LocalDate.now();
+        endDate = startDate;
+        nextExecution = startDate;
     }
 
     public Task(String name, String description, LocalDate startDate, long cropId) {
         this.name = name;
         this.description = description;
         this.startDate = startDate;
+        this.endDate = startDate;
+        nextExecution = startDate;
         this.cropId = cropId;
     }
 
@@ -38,6 +44,7 @@ public class Task {
         this.name = name;
         this.description = description;
         this.startDate = startDate;
+        nextExecution = startDate;
         this.endDate = endDate;
         this.interval = interval;
         this.cropId = cropId;
@@ -58,11 +65,33 @@ public class Task {
     }
 
     public boolean isInTimePeriode(LocalDate searchStartDate, LocalDate searchEndDate){
-        return startDate.isAfter(searchStartDate) && startDate.isBefore(searchEndDate);
+        return endDate.isAfter(searchStartDate) && startDate.isBefore(searchEndDate);
+    }
+
+    public void done(){
+        if(interval != null && !nextExecution.plusDays(interval).isAfter(endDate)){
+            nextExecution = nextExecution.plusDays(interval);
+        } else {
+            nextExecution = null;
+        }
+    }
+
+    public boolean isDone(){
+        return nextExecution == null;
+    }
+
+    public void setNextExecution(LocalDate nextExecution) {
+        this.nextExecution = nextExecution;
+    }
+
+    public void setNextNotification(LocalDate nextNotification) {
+        this.nextNotification = nextNotification;
     }
 
     // Getters
-    public long getId() { return id; }
+    public LocalDate getNextNotification() { return nextNotification; }
+    public LocalDate getNextExecution() { return nextExecution; }
+    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

@@ -16,10 +16,6 @@ public class TaskTemplate {
     @JsonProperty
     private Integer interval;
 
-    // TODO: reconsider if we need this
-    @JsonProperty
-    private boolean isOptional = false;
-
     /**
      * Default constructor
      * (Used by deserializer)
@@ -34,6 +30,7 @@ public class TaskTemplate {
     public void setRelativeEndDate(Integer relativeEndDate) {
         this.relativeEndDate = relativeEndDate;
     }
+
     public void setInterval(Integer interval) {
         this.interval = interval;
     }
@@ -45,13 +42,14 @@ public class TaskTemplate {
     }
 
     public Task generateTask(LocalDate realStartDate, long cropId) {
-        Task task = new Task(name, description, realStartDate.plusDays(relativeStartDate), cropId);
+        LocalDate endDate = relativeEndDate != null ? realStartDate.plusDays(relativeEndDate) : null;
-        if (relativeEndDate != null) {
+
-            task.withEndDate(realStartDate.plusDays(relativeEndDate));
+        if (interval == null) {
+            this.interval = 0;
         }
-        if (interval != null) {
+
-            task.withInterval(interval);
+        return new Task(name, description, realStartDate.plusDays(relativeStartDate), cropId)
-        }
+                .withInterval(interval)
-        return task;
+                .withEndDate(endDate);
     }
 }

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>
@@ -85,22 +84,22 @@
                         <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>
+                  </ListView>
-                  <Button fx:id="editTaskList_button" mnemonicParsing="false" onAction="#editTaskList" prefHeight="25.0" prefWidth="45.0">
+                  <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:">

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="1091.0" prefWidth="1060.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.HomeController">
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="729.0" prefWidth="1060.0"
-            xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.HomeController">
    <children>
-      <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">
+      <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>
+                  <Pane prefHeight="1085.0" prefWidth="1018.0">
+                     <children>
+                        <VBox prefHeight="1047.0" prefWidth="1019.0">
                            <children>
                               <Label text="Garden Management">
                                  <font>
                                     <Font size="34.0" />
                                  </font>
+                                 <VBox.margin>
+                                    <Insets bottom="30.0" />
+                                 </VBox.margin>
                               </Label>
-            <Label 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 alignment="TOP_LEFT" prefHeight="22.0" prefWidth="1039.0" text="This Application was created to help the user manage his or her garden. For this the Application has many functionalities:" wrapText="true">
-            <Label text="Tutorial">
                                  <font>
-                  <Font name="System Bold" size="18.0" />
+                                    <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>
-            <Pane prefHeight="200.0" prefWidth="200.0">
+                              <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>
-                  <VBox prefHeight="200.0" prefWidth="1040.0">
+                                    <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>
-                        <Label text="Task 1" wrapText="true" />
+                                    <ImageView fx:id="imageViewPhilippe" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER">
-                        <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" />
+                                       <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.margin>
+                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                     </VBox.margin>
                   </Pane>
                </children>
                <padding>
                   <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                </padding>
             </VBox>
+         </content>
+      </ScrollPane>
    </children>
 </AnchorPane>

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

@@ -12,7 +12,7 @@
             <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="#goToTutorial" prefHeight="38.0" prefWidth="121.0" text="Tutorial" />
+            <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>

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

@@ -3,11 +3,12 @@
 <?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.MyGardenController" fx:id="myGardenRoot">
+<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>
@@ -19,7 +20,7 @@
                   <Insets bottom="10.0" />
                </VBox.margin>
             </Label>
-            <VBox fx:id="myPlants_vbox" maxWidth="1.7976931348623157E308" 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/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/TextFieldFormular.fxml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+
+
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="64.0" prefWidth="298.0" xmlns="http://javafx.com/javafx/17"
+            xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.TextFieldFormularController">
+   <children>
+      <HBox alignment="CENTER" layoutX="153.0" layoutY="33.0" prefHeight="100.0" prefWidth="200.0" spacing="10.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <children>
+            <Label fx:id="description_label" maxWidth="1.7976931348623157E308" text="Label" HBox.hgrow="ALWAYS" />
+            <TextField fx:id="text_area" HBox.hgrow="NEVER" />
+         </children>
+         <padding>
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+         </padding>
+      </HBox>
+   </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/bootstrap/styles.css

@@ -0,0 +1,6 @@
+.button{
+    -fx-text-fill: rgb(49, 89, 23);
+    -fx-border-color: rgb(49, 89, 23);
+    -fx-border-radius: 5;
+    -fx-padding: 3 6 6 6;
+}

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

@@ -32,8 +32,7 @@
             "relativeStartDate": -14,
             "relativeEndDate": null,
             "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,
+            "interval": null
-            "isOptional": false
           }
         ]
       },
@@ -54,8 +53,7 @@
             "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,
+            "interval": 21
-            "isOptional": false
           }
         ]
       },
@@ -76,8 +74,7 @@
             "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,
+            "interval": null
-            "isOptional": false
           }
         ]
       }
@@ -106,8 +103,7 @@
             "relativeStartDate": 0,
             "relativeEndDate": 0,
             "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": null,
+            "interval": null
-            "isOptional": false
           }
         ]
       },
@@ -130,8 +126,7 @@
             "relativeStartDate": 0,
             "relativeEndDate": null,
             "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": 15,
+            "interval": 15
-            "isOptional": true
           }
         ]
       },
@@ -152,8 +147,7 @@
             "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,
+            "interval": null
-            "isOptional": false
           }
         ]
       }
@@ -184,17 +178,15 @@
           "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,
+            "interval": null
-            "isOptional": false
           }
         ]
       },
@@ -217,8 +209,7 @@
             "relativeStartDate": 0,
             "relativeEndDate": null,
             "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": 15,
+            "interval": 15
-            "isOptional": true
           }
         ]
       },
@@ -232,7 +223,6 @@
           "litersPerSqM": 0,
           "interval": null,
           "notes": [
-
           ]
         },
         "taskTemplates": [
@@ -241,8 +231,7 @@
             "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,
+            "interval": null
-            "isOptional": false
           }
         ]
       }

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

@@ -4,8 +4,10 @@
     "name": "sow plant",
     "description": "Plant the seeds, crops in de bed.",
     "startDate": "2022-05-01",
+    "nextExecution": "2022-05-01",
+    "nextNotification": "2022-05-01",
     "endDate": "2022-05-01",
-  "interval" : 0,
+    "interval": null,
     "cropId": 0
   },
   {
@@ -13,6 +15,8 @@
     "name": "water plant",
     "description": "water the plant, so that the soil is wet around the plant.",
     "startDate": "2022-05-01",
+    "nextExecution": "2022-05-01",
+    "nextNotification": "2022-05-01",
     "endDate": "2022-09-01",
     "interval": 2,
     "cropId": 0
@@ -22,6 +26,8 @@
     "name": "fertilize plant",
     "description": "The fertilizer has to be mixed with water. Then fertilize the plants soil with the mixture",
     "startDate": "2022-06-01",
+    "nextExecution": "2022-06-01",
+    "nextNotification": "2022-06-01",
     "endDate": "2022-08-01",
     "interval": 28,
     "cropId": 0
@@ -31,8 +37,10 @@
     "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",
+    "nextExecution": "2022-07-01",
+    "nextNotification": "2022-07-01",
     "endDate": "2022-07-01",
-    "interval" : 0,
+    "interval": null,
     "cropId": 0
   },
   {
@@ -40,6 +48,8 @@
     "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",
+    "nextExecution": "2022-05-01",
+    "nextNotification": "2022-05-01",
     "endDate": "2022-09-01",
     "interval": 5,
     "cropId": 0
@@ -49,8 +59,10 @@
     "name": "harvest plant",
     "description": "Pull the ripe vegetables out from the soil. Clean them with clear, fresh water. ",
     "startDate": "2022-09-01",
+    "nextExecution": "2022-09-01",
+    "nextNotification": "2022-09-01",
     "endDate": "2022-09-01",
-    "interval" : 0,
+    "interval": null,
     "cropId": 0
   }
 ]

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

@@ -72,7 +72,8 @@ public class JsonTaskListTest {
     @Test
     @DisplayName("Remove task.")
     void removeTask() {
-        Task task = new Task("Dummy", "Dummy", LocalDate.parse("2022-05-31", formatter), 1).withId(2);
+        Task task = new Task("Dummy", "Dummy", LocalDate.parse("2022-05-31", formatter), 1)
+                .withId(2);
         try {
             testDatabase.removeTask(task);
             List<Task> taskList;

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

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

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

@@ -1,38 +1,49 @@
-package ch.zhaw.gartenverwaltung.taskList;
+package ch.zhaw.gartenverwaltung.models;
 
 import ch.zhaw.gartenverwaltung.io.*;
 import ch.zhaw.gartenverwaltung.models.GardenSchedule;
-import ch.zhaw.gartenverwaltung.types.HardinessZone;
+import ch.zhaw.gartenverwaltung.types.*;
-import ch.zhaw.gartenverwaltung.types.Plant;
-import ch.zhaw.gartenverwaltung.types.Task;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.time.LocalDate;
+import java.time.MonthDay;
 import java.util.*;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
 class GardenScheduleTest {
+    LocalDate exampleStartDate = LocalDate.of(2020, 2, 2);
     TaskList taskList;
     PlantList plantList;
+    List<Plant> examplePlantList;
     List<Task> exampleTaskList;
-    Map<Long, Plant> examplePlantMap;
+    List<TaskTemplate> exampleTaskTemplateList;
     GardenSchedule model;
 
     @BeforeEach
-    void setUp() throws IOException {
+    void setUp() throws IOException, HardinessZoneNotSetException {
         createExampleTaskList();
+        createExampleTaskTemplateList();
+        createExamplePlantList();
         taskList = mockTaskDatabase(exampleTaskList);
-        plantList = mockPlantDatabase(examplePlantMap);
+        plantList = mockPlantDatabase(examplePlantList);
         model = new GardenSchedule(taskList, plantList);
     }
 
+    PlantList mockPlantDatabase(List<Plant> plantList) throws HardinessZoneNotSetException, IOException {
+        PlantList plantDatabase = mock(JsonPlantList.class);
+        when(plantDatabase.getPlantList(HardinessZone.ZONE_8A)).thenReturn(plantList);
+        when(plantDatabase.getPlantById(HardinessZone.ZONE_8A,20)).thenReturn(Optional.of(examplePlantList.get(0)));
+        return plantDatabase;
+    }
+
     private TaskList mockTaskDatabase(List<Task> exampleTaskList) throws IOException {
         TaskList taskList = mock(JsonTaskList.class);
         when(taskList.getTaskList(LocalDate.MIN, LocalDate.MAX)).thenReturn(exampleTaskList);
+        when(taskList.getTaskList(LocalDate.now(), LocalDate.now().plusDays(7 - 1))).thenReturn(exampleTaskList);
 
         when(taskList.getTaskList(LocalDate.now(), LocalDate.MAX)).thenReturn((exampleTaskList.subList(1, 4)));
 
@@ -54,18 +65,39 @@ class GardenScheduleTest {
         return taskList;
     }
 
-    private PlantList mockPlantDatabase(Map<Long, Plant> examplePlantMap) {
+    void createExampleTaskTemplateList(){
-        return new PlantList() {
+        exampleTaskTemplateList = new ArrayList<>();
-            @Override
+        exampleTaskTemplateList.add(mock(TaskTemplate.class));
-            public List<Plant> getPlantList(HardinessZone zone) {
+        exampleTaskTemplateList.add(mock(TaskTemplate.class));
-                return null;
+        exampleTaskTemplateList.add(mock(TaskTemplate.class));
+        exampleTaskTemplateList.add(mock(TaskTemplate.class));
+        when(exampleTaskTemplateList.get(0).generateTask(exampleStartDate, 30)).thenReturn(exampleTaskList.get(0));
+        when(exampleTaskTemplateList.get(1).generateTask(exampleStartDate, 30)).thenReturn(exampleTaskList.get(1));
+        when(exampleTaskTemplateList.get(2).generateTask(exampleStartDate, 30)).thenReturn(exampleTaskList.get(2));
+        when(exampleTaskTemplateList.get(3).generateTask(exampleStartDate, 30)).thenReturn(exampleTaskList.get(3));
     }
 
-            @Override
+    void createExamplePlantList(){
-            public Optional<Plant> getPlantById(HardinessZone zone, long id) {
+        examplePlantList = new ArrayList<>();
-                return Optional.ofNullable(examplePlantMap.get(id));
+        examplePlantList.add(new Plant(
-            }
+                20,
-        };
+                "summertime onion",
+                "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.",
+                null,
+                "15,30,2",
+                0,
+                "sandy to loamy, loose soil, free of stones",
+                new ArrayList<>(),
+                List.of(
+                        new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, List.of(
+                                exampleTaskTemplateList.get(0),
+                                exampleTaskTemplateList.get(1)
+                        )),
+                        new GrowthPhase(MonthDay.of(4, 3), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, List.of(
+                                exampleTaskTemplateList.get(2),
+                                exampleTaskTemplateList.get(3)
+                        ))
+                )));
     }
 
     void createExampleTaskList() {
@@ -74,15 +106,9 @@ class GardenScheduleTest {
         exampleTaskList.add(new Task("name", "description", LocalDate.now().plusDays(1), 2L));
         exampleTaskList.add(new Task("name", "description", LocalDate.now(), 1L));
         exampleTaskList.add(new Task("name", "description", LocalDate.of(9019, 5, 5), 1L));
-        exampleTaskList.add(new Task("name", "description", LocalDate.of(2019, 5, 5), 2L));
+        exampleTaskList.add(new Task("name", "description", LocalDate.now().minusDays(10), LocalDate.now().plusDays(4),2, 2L));
     }
 
-    void createExamplePlantMap() {
-        examplePlantMap = new HashMap<>();
-    }
-
-
-
     @Test
     void addTask() throws IOException {
         Task taskToAdd = new Task("name", "description", LocalDate.now(), 1L);
@@ -132,19 +158,22 @@ class GardenScheduleTest {
         assertEquals(7, dayList.size());
 
         //Check day 0
-        assertEquals(1, dayList.get(0).size());
+        assertEquals(2, dayList.get(0).size());
-        assertEquals(exampleTaskList.get(2), dayList.get(0).get(0));
+        assertTrue(dayList.get(0).contains(exampleTaskList.get(2)));
+        assertTrue(dayList.get(0).contains(exampleTaskList.get(4)));
 
         //Check day 1
         assertEquals(1, dayList.get(1).size());
-        assertEquals(exampleTaskList.get(1), dayList.get(1).get(0));
+        assertTrue(dayList.get(1).contains(exampleTaskList.get(1)));
 
         //Check day 2
-        assertEquals(0, dayList.get(2).size());
+        assertEquals(1, dayList.get(2).size());
+        assertTrue(dayList.get(2).contains(exampleTaskList.get(4)));
         //Check day 3
         assertEquals(0, dayList.get(3).size());
         //Check day 4
-        assertEquals(0, dayList.get(4).size());
+        assertEquals(1, dayList.get(4).size());
+        assertTrue(dayList.get(4).contains(exampleTaskList.get(4)));
         //Check day 5
         assertEquals(0, dayList.get(5).size());
         //Check day 6
@@ -156,4 +185,17 @@ class GardenScheduleTest {
         model.removeTasksForCrop(1L);
         verify(taskList, times(1)).removeTasksForCrop(1L);
     }
+
+    @Test
+    void planTasksForCrop() throws HardinessZoneNotSetException, PlantNotFoundException, IOException {
+        model.planTasksForCrop(new Crop(20, exampleStartDate).withId(30));
+        verify(exampleTaskTemplateList.get(0), times(1)).generateTask(exampleStartDate, 30);
+        verify(exampleTaskTemplateList.get(1), times(1)).generateTask(exampleStartDate, 30);
+        verify(exampleTaskTemplateList.get(2), times(1)).generateTask(exampleStartDate, 30);
+        verify(exampleTaskTemplateList.get(3), times(1)).generateTask(exampleStartDate, 30);
+        verify(taskList, times(1)).saveTask(exampleTaskList.get(0));
+        verify(taskList, times(1)).saveTask(exampleTaskList.get(1));
+        verify(taskList, times(1)).saveTask(exampleTaskList.get(2));
+        verify(taskList, times(1)).saveTask(exampleTaskList.get(3));
+    }
 }

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

@@ -32,8 +32,7 @@
             "relativeStartDate": -14,
             "relativeEndDate": null,
             "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,
+            "interval": null
-            "isOptional": false
           }
         ]
       },
@@ -54,8 +53,7 @@
             "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,
+            "interval": 21
-            "isOptional": false
           }
         ]
       },
@@ -76,8 +74,7 @@
             "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,
+            "interval": null
-            "isOptional": false
           }
         ]
       }
@@ -106,8 +103,7 @@
             "relativeStartDate": 0,
             "relativeEndDate": 0,
             "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": null,
+            "interval": null
-            "isOptional": false
           }
         ]
       },
@@ -130,8 +126,7 @@
             "relativeStartDate": 0,
             "relativeEndDate": null,
             "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": 15,
+            "interval": 15
-            "isOptional": true
           }
         ]
       },
@@ -152,8 +147,7 @@
             "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,
+            "interval": null
-            "isOptional": false
           }
         ]
       }
@@ -193,8 +187,7 @@
             "relativeStartDate": 0,
             "relativeEndDate": 0,
             "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": null,
+            "interval": null
-            "isOptional": false
           }
         ]
       },
@@ -217,8 +210,7 @@
             "relativeStartDate": 0,
             "relativeEndDate": null,
             "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": 15,
+            "interval": 15
-            "isOptional": true
           }
         ]
       },
@@ -241,8 +233,7 @@
             "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,
+            "interval": null
-            "isOptional": false
           }
         ]
       }