remove duplicate filtering

build.gradle

@@ -26,7 +26,7 @@ tasks.withType(JavaCompile) {
 
 application {
     mainModule = 'ch.zhaw.gartenverwaltung'
-    mainClass = 'ch.zhaw.gartenverwaltung.Main'
+    mainClass = 'ch.zhaw.gartenverwaltung.HelloApplication'
 }
 
 javafx {
@@ -42,8 +42,6 @@ dependencies {
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4'
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.4'
     testImplementation 'org.mockito:mockito-core:4.3.+'
-    implementation 'com.sun.mail:javax.mail:1.6.2'
-
 }
 
 test {

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

@@ -1,6 +1,5 @@
 package ch.zhaw.gartenverwaltung;
 
-import ch.zhaw.gartenverwaltung.bootstrap.AppLoader;
 import ch.zhaw.gartenverwaltung.bootstrap.Inject;
 import ch.zhaw.gartenverwaltung.io.PlantList;
 import ch.zhaw.gartenverwaltung.models.Garden;
@@ -11,30 +10,20 @@ import ch.zhaw.gartenverwaltung.types.Crop;
 import ch.zhaw.gartenverwaltung.types.Pest;
 import ch.zhaw.gartenverwaltung.types.Plant;
 import ch.zhaw.gartenverwaltung.types.Task;
-import javafx.beans.property.ListProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.collections.FXCollections;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.geometry.Pos;
-import javafx.scene.control.*;
+import javafx.scene.control.Button;
-import javafx.scene.image.Image;
+import javafx.scene.control.Label;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.Pane;
+import javafx.scene.layout.VBox;
-import javafx.scene.layout.Priority;
 import javafx.stage.Stage;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-/**
- * Controller class for the CropDetail.fxml file
- */
 public class CropDetailController {
     private Crop crop;
 
@@ -45,12 +34,7 @@ public class CropDetailController {
     @Inject
     private Garden garden;
 
-    @Inject
-    AppLoader appLoader;
-
     private static final Logger LOG = Logger.getLogger(CropDetailController.class.getName());
-    private final ListProperty<Task> taskListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ListProperty<Pest> pestListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
 
     @FXML
     private ImageView imageView;
@@ -67,9 +51,21 @@ public class CropDetailController {
     @FXML
     private Label description_label;
 
+    @FXML
+    private VBox growthPhases_vbox;
+
+    @FXML
+    private Label location_label;
+
     @FXML
     private Label light_label;
 
+    @FXML
+    private Button location_button;
+
+    @FXML
+    private VBox pests_vbox;
+
     @FXML
     private Label soil_label;
 
@@ -77,42 +73,26 @@ public class CropDetailController {
     private Label spacing_label;
 
     @FXML
-    private Button addTask_button;
+    void editTaskList() {
 
-    @FXML
-    private ListView<Task> taskList_listView;
-
-    @FXML
-    private ListView<Pest> pests_listView;
-
-    @FXML
-    void addTask() throws IOException, HardinessZoneNotSetException {
-        createTaskDialog(true, null);
     }
 
-    /**
-     * close Window
-     */
     @FXML
     void goBack() {
         Stage stage = (Stage) imageView.getScene().getWindow();
         stage.close();
     }
 
-    /**
-     * open dialog to set area
-     */
     @FXML
-    void setArea() throws IOException {
+    void setArea() {
-        openTextFieldDialog();
+
+    }
+
+    @FXML
+    void setLocation() {
+
     }
 
-    /**
-     * set labels and image from selected {@link Crop}
-     * set icons for buttons
-     * @param crop {@link Crop} which will be displayed
-     * @throws PlantNotFoundException exception
-     */
     public void setPlantFromCrop(Crop crop) throws PlantNotFoundException {
         this.crop = crop;
         try {
@@ -127,75 +107,24 @@ public class CropDetailController {
             if (plant.image() != null) {
                 imageView.setImage(plant.image());
             }
-            area_label.setText(String.valueOf(crop.getArea()));
+            area_label.setText("");
-
+            location_label.setText("");
-            setTaskListProperty(crop);
+            createTaskLists(crop);
-            taskList_listView.itemsProperty().bind(taskListProperty);
+            createPestList(plant);
-
-            pestListProperty.addAll(plant.pests());
-            pests_listView.itemsProperty().bind(pestListProperty);
-
-
         } catch (HardinessZoneNotSetException | IOException e) {
             throw new PlantNotFoundException();
         }
-        setIconToButton(addTask_button, "addIcon.png");
-        setIconToButton(area_button, "areaIcon.png");
-        setCellFactoryPests();
-        setCellFactoryTasks();
     }
 
-    /**
+    private void createTaskLists(Crop crop) {
-     * cell Factory for TaskListView
-     */
-    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));
-                }
-            }
-        });
-    }
-
-    /**
-     * cell Factory for PestListView
-     */
-    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));
-                }
-            }
-        });
-    }
-
-    /**
-     * update task list
-     * @param crop {@link Crop} that is selected
-     */
-    private void setTaskListProperty(Crop crop) {
         crop.getCropId().ifPresent(id -> {
             List<Task> taskList;
             try {
                 taskList = gardenSchedule.getTaskListForCrop(id);
-                taskListProperty.clear();
+                for (Task task : taskList) {
-                taskListProperty.addAll(taskList);
+                    Label label = new Label(task.getDescription());
+                    growthPhases_vbox.getChildren().add(label);
+                }
             } catch (IOException e) {
                 // TODO: Alert
                 LOG.log(Level.SEVERE, "Could not get task list for crop", e.getCause());
@@ -203,213 +132,21 @@ public class CropDetailController {
         });
     }
 
-    /**
+    private void createPestList(Plant plant) {
-     * Creates a {@link HBox} for the given {@link Task}.
+        List<Pest> pests = plant.pests();
-     * @param task {@link Task} which is selected
+        for (Pest pest : pests) {
-     * @return {@link HBox} that was created
+            Label label = new Label(pest.name() + ":");
-     */
+            label.setStyle("-fx-font-weight: bold");
-    private HBox createTaskHBox(Task task) {
+            HBox hBox = new HBox();
-        HBox hBox = new HBox(10);
+            hBox.fillHeightProperty();
-        Label taskName = new Label(task.getName()+": ");
+            Label label1 = new Label(pest.description());
-        taskName.setMinWidth(100);
+            label1.setAlignment(Pos.TOP_LEFT);
-        taskName.setMaxSize(Double.MAX_VALUE, Double.MAX_VALUE);
+            label1.setWrapText(true);
-        taskName.setStyle("-fx-font-weight: bold");
+            label1.setMaxWidth(600);
-        Label taskDescription = new Label(task.getDescription());
+            label1.setMaxHeight(100);
-        taskDescription.setWrapText(true);
+            Button button = new Button("Get Counter Measures");
-        taskDescription.setMaxSize(600, Double.MAX_VALUE);
+            hBox.getChildren().addAll(label1, button);
-        Pane puffer = new Pane();
+            pests_vbox.getChildren().addAll(label, hBox);
-        HBox.setHgrow(puffer, Priority.ALWAYS);
-
-
-        Button edit = new Button();
-        Button delete = new Button();
-        edit.getStyleClass().add("button-class");
-        delete.getStyleClass().add("button-class");
-        HBox.setHgrow(edit, Priority.NEVER);
-        HBox.setHgrow(delete, Priority.NEVER);
-        setIconToButton(edit, "editIcon.png");
-        setIconToButton(delete, "deleteIcon.png");
-        edit.setOnAction(getEditTaskEvent(task));
-        delete.setOnAction(deleteTask(task));
-
-        hBox.getChildren().addAll(taskName, taskDescription, puffer, edit, delete);
-        return hBox;
-    }
-
-    /**
-     * Creates a {@link HBox} for the given {@link Pest}.
-     * @param pest {@link Pest} which is selected
-     * @return {@link HBox} that was created
-     */
-    private HBox createPestHBox(Pest pest) {
-        Label label = new Label(pest.name() + ":    ");
-        label.setStyle("-fx-font-weight: bold");
-        HBox hBox = new HBox();
-        hBox.fillHeightProperty();
-        Label description = new Label(pest.description());
-        description.setAlignment(Pos.TOP_LEFT);
-        description.setWrapText(true);
-        description.setMaxWidth(800);
-        hBox.getChildren().addAll(label, description);
-        return hBox;
-    }
-
-    /**
-     * adds icon to button
-     * @param button the button which get the icon
-     * @param iconFileName file name of icon
-     */
-    private void setIconToButton(Button button, String iconFileName) {
-        Image img = new Image(String.valueOf(getClass().getResource("icons/" + iconFileName)));
-        ImageView imageView = new ImageView(img);
-        imageView.setFitHeight(20);
-        imageView.setPreserveRatio(true);
-        button.setGraphic(imageView);
-    }
-
-    /**
-     * opens dialog of {@link Task} edit.
-     * @param task {@link Task}
-     * @return {@link EventHandler} for the case of editing a {@link Task}
-     */
-    private EventHandler<ActionEvent> getEditTaskEvent(Task task) {
-        return (event) -> {
-            try {
-                createTaskDialog(false, task);
-            } catch (IOException | HardinessZoneNotSetException e) {
-                e.printStackTrace();
-            }
-        };
-    }
-
-    /**
-     * opens alert of {@link Task} deletion.
-     * @param task {@link Task}
-     * @return {@link EventHandler} for the case of deleting a {@link Task}
-     */
-    private EventHandler<ActionEvent> deleteTask(Task task) {
-        return (event) -> {
-            showDeleteTask(task);
-        };
-    }
-
-    /**
-     * opens a dialog to create a new Task or edit the given Task
-     * @param newTask boolean if it is a new Task
-     * @param givenTask {@link Task} which was selected
-     * @throws IOException Exception
-     * @throws HardinessZoneNotSetException Exception
-     */
-    private void createTaskDialog(boolean newTask, Task givenTask) throws IOException, HardinessZoneNotSetException {
-        Dialog<Task> dialog = new Dialog<>();
-        dialog.setTitle("Set Task");
-        dialog.setHeaderText("Add/Edit Task:");
-        dialog.setResizable(false);
-
-        DialogPane dialogPane = dialog.getDialogPane();
-
-        dialogPane.getStylesheets().add(
-                Objects.requireNonNull(getClass().getResource("bootstrap/dialogStyle.css")).toExternalForm());
-        dialogPane.getStyleClass().add("myDialog");
-
-        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(this.crop) : 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);
-                        }
-                    });
-        }
-
-    }
-
-    /**
-     * opens TextField Dialog to enter the plant area.
-     * @throws IOException Exception
-     */
-    private void openTextFieldDialog() throws IOException {
-        Dialog<String> dialog = new Dialog<>();
-        dialog.setTitle("set Text Area");
-        dialog.setHeaderText("set Text Area");
-        dialog.setResizable(false);
-
-        DialogPane dialogPane = dialog.getDialogPane();
-
-        dialogPane.getStylesheets().add(
-                Objects.requireNonNull(getClass().getResource("bootstrap/dialogStyle.css")).toExternalForm());
-        dialogPane.getStyleClass().add("myDialog");
-
-        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("Text Area");
-            controller.setValueTextArea(area_label.getText());
-            controller.initSaveButton((Button) dialogPane.lookupButton(save));
-
-            dialog.setResultConverter(button -> button.equals(save) ? controller.getValue() : null);
-
-            dialog.showAndWait()
-                    .ifPresent(string -> {
-                        try {
-                            garden.updateCrop(this.crop.withArea(Double.parseDouble(string)));
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                        }
-                        area_label.setText(string);
-                    });
-        }
-    }
-
-    /**
-     * Alert to delete Task.
-     * @param task {@link Task} which is being deleted
-     */
-    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?");
-
-        DialogPane dialogPane = alert.getDialogPane();
-
-        dialogPane.getStylesheets().add(
-                Objects.requireNonNull(getClass().getResource("bootstrap/dialogStyle.css")).toExternalForm());
-        dialogPane.getStyleClass().add("myDialog");
-
-        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/HelloApplication.java

@@ -0,0 +1,23 @@
+package ch.zhaw.gartenverwaltung;
+
+import ch.zhaw.gartenverwaltung.bootstrap.AppLoader;
+import javafx.application.Application;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+
+public class HelloApplication extends Application {
+    @Override
+    public void start(Stage stage) throws IOException {
+        AppLoader appLoader = new AppLoader();
+
+        appLoader.loadSceneToStage("MainFXML.fxml", stage);
+
+        stage.setTitle("Gartenverwaltung");
+        stage.show();
+    }
+
+    public static void main(String[] args) {
+        launch();
+    }
+}

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

@@ -0,0 +1,14 @@
+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,55 +1,5 @@
 package ch.zhaw.gartenverwaltung;
 
-import javafx.fxml.FXML;
+public class HomeController
-import javafx.fxml.Initializable;
+{
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-
-import java.net.URL;
-import java.util.ResourceBundle;
-
-/**
- * Controller class for the Home.fxml file
- */
-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, "");
-    }
-
-    /**
-     * set image to image view
-     * @param imageView the imageView to update
-     * @param photoName the file name of the photo
-     */
-    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/Main.java

@@ -1,42 +0,0 @@
-package ch.zhaw.gartenverwaltung;
-
-import ch.zhaw.gartenverwaltung.bootstrap.AppLoader;
-import ch.zhaw.gartenverwaltung.backgroundtasks.BackgroundTasks;
-import ch.zhaw.gartenverwaltung.io.CropList;
-import ch.zhaw.gartenverwaltung.io.PlantList;
-import ch.zhaw.gartenverwaltung.io.TaskList;
-import ch.zhaw.gartenverwaltung.models.Garden;
-import ch.zhaw.gartenverwaltung.types.Crop;
-import javafx.application.Application;
-import javafx.stage.Stage;
-
-import java.io.IOException;
-import java.util.Timer;
-
-public class Main extends Application {
-    Timer backGroundTaskTimer = new Timer();
-    BackgroundTasks backgroundTasks;
-
-    @Override
-    public void start(Stage stage) throws IOException {
-        AppLoader appLoader = new AppLoader();
-
-        backgroundTasks = new BackgroundTasks((TaskList) appLoader.getAppDependency(TaskList.class),(CropList) appLoader.getAppDependency(CropList.class), (PlantList) appLoader.getAppDependency(PlantList.class));
-        // TODO reduce period
-        backGroundTaskTimer.scheduleAtFixedRate(backgroundTasks, 0, 1000);
-
-        appLoader.loadSceneToStage("MainFXML.fxml", stage);
-
-        stage.setTitle("Gartenverwaltung");
-        stage.show();
-    }
-
-    @Override
-    public void stop(){
-        backGroundTaskTimer.cancel();
-    }
-
-    public static void main(String[] args) {
-        launch();
-    }
-}

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

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

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

@@ -13,12 +13,15 @@ import ch.zhaw.gartenverwaltung.types.Plant;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
-import javafx.scene.control.*;
+import javafx.scene.control.Alert;
-import javafx.scene.image.Image;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.Label;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 
@@ -27,9 +30,6 @@ import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-/**
- * Controller class for the MyGarden.fxml file
- */
 public class MyGardenController {
     private static final Logger LOG = Logger.getLogger(MyGardenController.class.getName());
     @Inject
@@ -42,63 +42,39 @@ public class MyGardenController {
     @FXML
     public AnchorPane myGardenRoot;
     @FXML
-    private Button addPlant_button;
+    private VBox myPlants_vbox;
-    @FXML
-    private ListView<Crop> myGarden_listView;
 
-    /**
-     * initialize crop list
-     * add listener for crop list
-     * set icon for button
-     */
     @AfterInject
     @SuppressWarnings("unused")
     public void init() {
-        setIconToButton(addPlant_button, "addIcon.png");
+        garden.getPlantedCrops().addListener((observable, oldValue, newValue) -> {
-        myGarden_listView.itemsProperty().bind(garden.getPlantedCrops());
+            try {
-        setCellFactory();
+                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);
+        }
     }
 
-    /**
-     * redirect to plant fxml file
-     */
     @FXML
     void addPlant() {
         myGardenRoot.fireEvent(new ChangeViewEvent(ChangeViewEvent.CHANGE_MAIN_VIEW, "Plants.fxml"));
     }
 
-    /**
+    private void createPlantView(List<Crop> crops) throws HardinessZoneNotSetException, IOException {
-     * set cell factory to load {@link HBox} as list view content
+        myPlants_vbox.getChildren().clear();
-     */
+        for (Crop crop : crops) {
-    private void setCellFactory() {
+            HBox hBox = createPlantView(crop);
-        myGarden_listView.setCellFactory(param -> new ListCell<>() {
+            myPlants_vbox.getChildren().add(hBox);
-            @Override
+        }
-            protected void updateItem(Crop crop, boolean empty) {
-                super.updateItem(crop, empty);
-
-                if (empty || crop == null) {
-                    setText(null);
-                    setGraphic(null);
-                } else {
-                    try {
-                        setText("");
-                        setGraphic(createHBoxForListView(crop));
-                    } catch (HardinessZoneNotSetException | IOException e) {
-                        LOG.log(Level.WARNING, "Could not get plant for Cell", e);
-                    }
-                }
-            }
-        });
     }
 
-    /**
+    private HBox createPlantView(Crop crop) throws HardinessZoneNotSetException, IOException {
-     * Creates and returns HBox of the crop
-     * @param crop {@link Crop} which is selected
-     * @return {@link HBox} of the {@link Crop}
-     * @throws HardinessZoneNotSetException exception
-     * @throws IOException exception
-     */
-    private HBox createHBoxForListView(Crop crop) throws HardinessZoneNotSetException, IOException {
         //ToDo add better design
         Plant plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).get();
         HBox hBox = new HBox(10);
@@ -115,13 +91,8 @@ public class MyGardenController {
         label.setMaxWidth(2000);
         HBox.setHgrow(label, Priority.ALWAYS);
 
-        Button details = new Button();
+        Button details = new Button("Details");
-        Button delete = new Button();
+        Button delete = new Button("delete");
-        details.getStyleClass().add("button-class");
-        delete.getStyleClass().add("button-class");
-
-        setIconToButton(details, "detailsIcon.png");
-        setIconToButton(delete, "deleteIcon.png");
         details.setOnAction(getGoToCropDetailEvent(crop));
         delete.setOnAction(getDeleteCropEvent(crop));
         
@@ -129,24 +100,6 @@ public class MyGardenController {
         return hBox;
     }
 
-    /**
-     * adds icon to button
-     * @param button the button which get the icon
-     * @param iconFileName file name of icon
-     */
-    private void setIconToButton(Button button, String iconFileName) {
-        Image img = new Image(String.valueOf(getClass().getResource("icons/" + iconFileName)));
-        ImageView imageView = new ImageView(img);
-        imageView.setFitHeight(20);
-        imageView.setPreserveRatio(true);
-        button.setGraphic(imageView);
-    }
-
-    /**
-     * open detail window of the selected {@link Crop}
-     * @param crop {@link Crop} which is selected
-     * @return {@link EventHandler} for button
-     */
     private EventHandler<ActionEvent> getGoToCropDetailEvent(Crop crop) {
         return (event) -> {
             try {
@@ -164,11 +117,6 @@ public class MyGardenController {
         };
     }
 
-    /**
-     * open alert for deleting the selected {@link Crop}
-     * @param crop {@link Crop} which is selected
-     * @return {@link EventHandler} for button
-     */
     private EventHandler<ActionEvent> getDeleteCropEvent(Crop crop) {
         return (event) -> {
             try {
@@ -179,22 +127,9 @@ public class MyGardenController {
         };
     }
 
-    /**
-     * Alert to confirm that the crop can be deleted.
-     * @param crop {@link Crop} which is selected
-     * @throws IOException exception
-     * @throws HardinessZoneNotSetException exception
-     */
     private void showConfirmation(Crop crop) throws IOException, HardinessZoneNotSetException {
-        Plant plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).get();
         Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
-        alert.setTitle("Delete " + plant.name());
+        alert.setTitle("Delete Crop");
-        DialogPane dialogPane = alert.getDialogPane();
-
-        dialogPane.getStylesheets().add(
-                Objects.requireNonNull(getClass().getResource("bootstrap/dialogStyle.css")).toExternalForm());
-        dialogPane.getStyleClass().add("myDialog");
-
         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/MyScheduleController.java

@@ -9,16 +9,11 @@ import ch.zhaw.gartenverwaltung.models.GardenSchedule;
 import ch.zhaw.gartenverwaltung.types.Crop;
 import ch.zhaw.gartenverwaltung.types.Plant;
 import ch.zhaw.gartenverwaltung.types.Task;
-import javafx.beans.property.ListProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.collections.FXCollections;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
 import javafx.fxml.FXML;
-import javafx.scene.control.*;
+import javafx.scene.control.Label;
-import javafx.scene.layout.HBox;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
 import javafx.scene.layout.Pane;
-import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
 
 import java.io.IOException;
@@ -27,12 +22,8 @@ import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-/**
- * Controller class for the MySchedule.fxml file
- */
 public class MyScheduleController {
     private static final Logger LOG = Logger.getLogger(MyScheduleController.class.getName());
-    private final ListProperty<List<Task>> taskListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
 
     private Crop selectedCrop = null;
 
@@ -44,7 +35,46 @@ public class MyScheduleController {
     private PlantList plantList;
 
     @FXML
-    private ListView<List<Task>> week_listView;
+    private Label day1_label;
+
+    @FXML
+    private Pane day1_pane;
+
+    @FXML
+    private Label day2_label;
+
+    @FXML
+    private Pane day2_pane;
+
+    @FXML
+    private Label day3_label;
+
+    @FXML
+    private Pane day3_pane;
+
+    @FXML
+    private Label day4_label;
+
+    @FXML
+    private Pane day4_pane;
+
+    @FXML
+    private Label day5_label;
+
+    @FXML
+    private Pane day5_pane;
+
+    @FXML
+    private Label day6_label;
+
+    @FXML
+    private Pane day6_pane;
+
+    @FXML
+    private Label day7_label;
+
+    @FXML
+    private Pane day7_pane;
 
     @FXML
     private Label information_label;
@@ -55,11 +85,10 @@ public class MyScheduleController {
     @AfterInject
     @SuppressWarnings("unused")
     public void init() {
-        setCellFactoryCropListView();
+        setCellFactoryListView();
-        setCellFactoryTaskListView();
         scheduledPlants_listview.itemsProperty().bind(garden.getPlantedCrops());
-        week_listView.itemsProperty().bind(taskListProperty);
         lookForSelectedListEntries();
+        setDayLabels();
         information_label.setText("");
         try {
             loadTaskList();
@@ -68,9 +97,6 @@ public class MyScheduleController {
         }
     }
 
-    /**
-     * sort scheduler to selected crop
-     */
     private void lookForSelectedListEntries() {
         scheduledPlants_listview.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
             selectedCrop = newValue;
@@ -82,10 +108,18 @@ public class MyScheduleController {
         });
     }
 
-    /**
+    private void setDayLabels() {
-     * set cellFactory for the crops.
+        LocalDate today = LocalDate.now();
-     */
+        day1_label.setText(today.getDayOfWeek().toString());
-    private void setCellFactoryCropListView() {
+        day2_label.setText(today.plusDays(1).getDayOfWeek().toString());
+        day3_label.setText(today.plusDays(2).getDayOfWeek().toString());
+        day4_label.setText(today.plusDays(3).getDayOfWeek().toString());
+        day5_label.setText(today.plusDays(4).getDayOfWeek().toString());
+        day6_label.setText(today.plusDays(5).getDayOfWeek().toString());
+        day7_label.setText(today.plusDays(6).getDayOfWeek().toString());
+    }
+
+    private void setCellFactoryListView() {
         scheduledPlants_listview.setCellFactory(param -> new ListCell<>() {
             @Override
             protected void updateItem(Crop crop, boolean empty) {
@@ -107,30 +141,6 @@ public class MyScheduleController {
         });
     }
 
-    /**
-     * set CallFactory for the given Tasks
-     */
-    private void setCellFactoryTaskListView() {
-        week_listView.setCellFactory(param -> new ListCell<>() {
-            @Override
-            protected void updateItem(List<Task> taskList, boolean empty) {
-                super.updateItem(taskList, empty);
-
-                if (empty || taskList == null) {
-                    setGraphic(null);
-                    setText(null);
-                } else {
-                    setText("");
-                    setGraphic(weekTaskVBox(taskList, this.getIndex()));
-                }
-            }
-        });
-    }
-
-    /**
-     * update task list
-     * @throws IOException exception
-     */
     private void loadTaskList() throws IOException {
         List<List<Task>> taskLists;
         if (selectedCrop != null) {
@@ -138,73 +148,25 @@ public class MyScheduleController {
         } else {
             taskLists = gardenSchedule.getTasksUpcomingWeek();
         }
-        taskListProperty.clear();
+        if (!taskLists.isEmpty()) {
-        taskListProperty.addAll(taskLists);
+            viewTaskListOfDay(day1_pane, taskLists.get(0));
-    }
+            viewTaskListOfDay(day2_pane, taskLists.get(1));
-
+            viewTaskListOfDay(day3_pane, taskLists.get(2));
-    /**
+            viewTaskListOfDay(day4_pane, taskLists.get(3));
-     * Create a {@link VBox} of the given TaskList.
+            viewTaskListOfDay(day5_pane, taskLists.get(4));
-     * @param tasks List of {@link Task}s
+            viewTaskListOfDay(day6_pane, taskLists.get(5));
-     * @param dayIndex index of the day
+            viewTaskListOfDay(day7_pane, taskLists.get(6));
-     * @return {@link VBox} of the given Task of the day
-     */
-    private VBox weekTaskVBox(List<Task> tasks, int dayIndex) {
-        VBox vBox = new VBox(10);
-        LocalDate today = LocalDate.now();
-        Label weekDay = new Label(today.plusDays(dayIndex).getDayOfWeek().toString());
-        weekDay.setStyle("-fx-font-weight: bold; -fx-underline: true");
-        vBox.getChildren().add(weekDay);
-        for (Task task : tasks) {
-            HBox hBox = new HBox(10);
-            Label taskName = new Label(task.getName() + ":");
-            taskName.setStyle("-fx-font-weight: bold");
-            taskName.setMinWidth(100);
-            taskName.setMaxSize(Double.MAX_VALUE, Double.MAX_VALUE);
-            hBox.getChildren().addAll(taskName);
-
-            HBox hBoxDescription = new HBox();
-            Label taskDescription = new Label(task.getDescription());
-            taskDescription.setWrapText(true);
-            taskDescription.setMaxSize(600, Double.MAX_VALUE);
-            Pane puffer = new Pane();
-            HBox.setHgrow(puffer, Priority.ALWAYS);
-            Button button = new Button("Task completed!");
-            button.getStyleClass().add("button-class");
-
-            button.setOnAction(new EventHandler<ActionEvent>() {
-                @Override
-                public void handle(ActionEvent event) {
-                    showConfirmation(task);
-                }
-            });
-            HBox.setHgrow(button, Priority.NEVER);
-            hBoxDescription.getChildren().addAll(taskDescription, puffer, button);
-            vBox.getChildren().addAll(hBox, hBoxDescription);
         }
-        return vBox;
     }
 
-    /**
+    private void viewTaskListOfDay(Pane pane, List<Task> tasks) {
-     * Alert to confirm that task has been completed.
+        //ToDo update pane with task list
-     * @param task {@link Task} which is selected
+        VBox vBox = new VBox();
-     */
+        for (Task task : tasks) {
-    private void showConfirmation(Task task) {
+            Label label = new Label(task.getDescription());
-        Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
+            vBox.getChildren().add(label);
-        alert.setTitle("Task Completed?");
+        }
-        alert.setHeaderText("Are you sure you have completed this task?");
+        pane.getChildren().add(vBox);
-        alert.setContentText("Confirming that you have completed the task will remove it from the schedule.");
-
-        alert.showAndWait()
-                .ifPresent(buttonType -> {
-                    if (buttonType == ButtonType.OK) {
-                        task.done();
-                        try {
-                            loadTaskList();
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                });
     }
 
 

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

@@ -25,13 +25,9 @@ import javafx.scene.layout.VBox;
 import java.io.IOException;
 import java.time.LocalDate;
 import java.util.List;
-import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-/**
- * Controller class for the Plants.fxml file
- */
 public class PlantsController {
     private static final Logger LOG = Logger.getLogger(PlantsController.class.getName());
 
@@ -45,6 +41,7 @@ public class PlantsController {
     private Plant selectedPlant = null;
     private final HardinessZone DEFAULT_HARDINESS_ZONE = HardinessZone.ZONE_8A;
 
+    // TODO: move to model
     private final ListProperty<Plant> plantListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
 
     @FXML
@@ -83,10 +80,6 @@ public class PlantsController {
 
         DialogPane dialogPane = dateSelection.getDialogPane();
 
-        dialogPane.getStylesheets().add(
-                Objects.requireNonNull(getClass().getResource("bootstrap/dialogStyle.css")).toExternalForm());
-        dialogPane.getStyleClass().add("myDialog");
-
         ButtonType sowButton = new ButtonType("Save", ButtonBar.ButtonData.OK_DONE);
         dialogPane.getButtonTypes().addAll(sowButton, ButtonType.CANCEL);
 
@@ -241,11 +234,11 @@ public class PlantsController {
             RadioButton radioButton = new RadioButton(season.getName());
             radioButton.setToggleGroup(seasonGroup);
             radioButton.setPadding(new Insets(0, 0, 10, 0));
-            if (season.equals(Seasons.ALLSEASONS)) {
+            if (season.equals(Seasons.AllSEASONS)) {
                 radioButton.setSelected(true);
             }
             radioButton.selectedProperty().addListener((observable, oldValue, newValue) -> {
-                if (season.equals(Seasons.ALLSEASONS)) {
+                if (season.equals(Seasons.AllSEASONS)) {
                     fillPlantListWithHardinessZone();
                 } else {
                     try {
@@ -276,7 +269,7 @@ public class PlantsController {
         list_plants.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
             if (newValue != null) {
                 selectedPlant = newValue;
-                description_plant.setText(getPlantDescription());
+                description_plant.setText(selectedPlant.description());
                 selectSowDay_button.setDisable(false);
                 Image img1;
                 if (selectedPlant.image() != null) {
@@ -295,20 +288,6 @@ public class PlantsController {
         });
     }
 
-    /**
-     * creates {@link String} of the plant information.
-     * @return return {@link Plant} description
-     */
-    private String getPlantDescription() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Name:            ").append(selectedPlant.name())
-                .append("\nDescription:\n").append(selectedPlant.description())
-                .append("\nLight Level:    ").append(selectedPlant.light())
-                .append("\nSoil:               ").append(selectedPlant.soil())
-                .append("\nSpacing:        ").append(selectedPlant.spacing());
-        return sb.toString();
-    }
-
 
     /**
      * clears the ListView of entries

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

@@ -8,10 +8,6 @@ import javafx.util.Callback;
 
 import java.time.LocalDate;
 
-/**
- * Controller class for the SelectSowDay.fxml file
- * Gets opened with a dialog.
- */
 public class SelectSowDayController {
     private Plant selectedPlant;
 
@@ -25,11 +21,6 @@ public class SelectSowDayController {
     @FXML
     public ToggleGroup phase_group;
 
-    /**
-     * if sow date radio button was selected return sow date
-     * if sow date was not selected get sow from harvest day and return sow date
-     * @return {@link LocalDate} of the sow date
-     */
     public LocalDate retrieveResult() {
         LocalDate sowDate = datepicker.getValue();
         if (harvest_radio.isSelected()) {
@@ -62,10 +53,6 @@ public class SelectSowDayController {
         harvest_radio.setUserData(GrowthPhaseType.HARVEST);
     }
 
-    /**
-     * Disable save button when date picker is empty
-     * @param saveButton {@link Button} to be disabled
-     */
     public void initSaveButton(Button saveButton) {
         saveButton.disableProperty().bind(datepicker.valueProperty().isNull());
     }

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

@@ -1,25 +1,10 @@
 package ch.zhaw.gartenverwaltung;
 
-import ch.zhaw.gartenverwaltung.backgroundtasks.email.SmtpCredentials;
 import ch.zhaw.gartenverwaltung.types.HardinessZone;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-
-import java.util.List;
 
 public class Settings {
-    private static final Settings instance;
     private HardinessZone currentHardinessZone = HardinessZone.ZONE_8A;
-    private final BooleanProperty showTutorial = new SimpleBooleanProperty(false);
+    private static Settings instance;
-    private SmtpCredentials smtpCredentials = new SmtpCredentials("imap.gmail.com", "587", "pm3.hs22.it21b.win.team1@gmail.com", "pm3.hs22.it21b.win.team1@gmail.com", "bisefhhjtrrhtoqr", true);
-    // Gmail Address: pm3.hs22.it21b.win.team1@gmail.com
-    // Gmail Passwort: Gartenverwaltung.PM3.2022
-    // E-Mail Inbox: https://www.mailinator.com/v4/public/inboxes.jsp?to=pm3.hs22.it21b.win.team1
-    private String mailNotificationReceivers = "pm3.hs22.it21b.win.team1@mailinator.com";
-    private String mailNotificationSubjectTemplate = "Task %s is due!"; // {0} = Task Name
-    private String mailNotificationTextTemplate = "Dear user\nYour gardentask %s for plant %s is due at %tF. Don't forget to confirm in your application if the task is done.\nTask description:\n%s"; // {0} = Task Name, {1} = plantname, {2} = nextExecution, {3} = Task description
-
-    private String location = "";
 
     static {
         instance = new Settings();
@@ -38,40 +23,4 @@ public class Settings {
     public void setCurrentHardinessZone(HardinessZone currentHardinessZone) {
         this.currentHardinessZone = currentHardinessZone;
     }
-
-    public void setShowTutorial (boolean showTutorial) {
-        this.showTutorial.setValue(showTutorial);
-    }
-
-    public BooleanProperty getShowTutorialProperty() {
-        return this.showTutorial;
-    }
-
-    public boolean getShowTutorial() {
-        return this.showTutorial.get();
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public String getLocation() {
-        return this.location;
-    }
-  
-    public SmtpCredentials getSmtpCredentials() {
-        return smtpCredentials;
-    }
-
-    public String getMailNotificationReceivers() {
-        return mailNotificationReceivers;
-    }
-
-    public String getMailNotificationSubjectTemplate() {
-        return mailNotificationSubjectTemplate;
-    }
-
-    public String getMailNotificationTextTemplate() {
-        return mailNotificationTextTemplate;
-    }
 }

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

@@ -1,116 +0,0 @@
-package ch.zhaw.gartenverwaltung;
-
-import ch.zhaw.gartenverwaltung.bootstrap.AppLoader;
-import ch.zhaw.gartenverwaltung.bootstrap.Inject;
-import ch.zhaw.gartenverwaltung.types.HardinessZone;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.scene.control.*;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Objects;
-import java.util.ResourceBundle;
-
-/**
- * Controller class for the Settings.fxml file
- */
-public class SettingsController implements Initializable {
-    Settings settings = Settings.getInstance();
-
-    @Inject
-    AppLoader appLoader;
-    @FXML
-    private ComboBox<HardinessZone> selectHardinessZone_comboBox;
-
-    @FXML
-    private CheckBox showTutorial_checkBox;
-
-    @FXML
-    private Button location_button;
-
-    @FXML
-    private Label location_label;
-
-    /**
-     * open dialog to set location
-     * @param event event
-     * @throws IOException exception
-     */
-    @FXML
-    void setLocation(ActionEvent event) throws IOException {
-        openTextFieldDialog();
-    }
-
-    /**
-     * save selected values to {@link Settings}
-     */
-    public void saveSettings() {
-        settings.setShowTutorial(showTutorial_checkBox.isSelected());
-        settings.setCurrentHardinessZone(selectHardinessZone_comboBox.getValue());
-    }
-
-    /**
-     * save default values form {@link Settings}
-     * @param location location
-     * @param resources resources
-     */
-    @Override
-    public void initialize(URL location, ResourceBundle resources) {
-        showTutorial_checkBox.setSelected(settings.getShowTutorial());
-        selectHardinessZone_comboBox.getItems().addAll(HardinessZone.values());
-        selectHardinessZone_comboBox.setValue(settings.getCurrentHardinessZone());
-        setIconToButton(location_button, "locationIcon.png");
-        location_label.setText(settings.getLocation());
-    }
-
-    /**
-     * adds icon to button
-     * @param button the button which get the icon
-     * @param iconFileName file name of icon
-     */
-    private void setIconToButton(Button button, String iconFileName) {
-        Image img = new Image(String.valueOf(getClass().getResource("icons/" + iconFileName)));
-        ImageView imageView = new ImageView(img);
-        imageView.setFitHeight(20);
-        imageView.setPreserveRatio(true);
-        button.setGraphic(imageView);
-    }
-
-    /**
-     * opens Dialog to set exception
-     * @throws IOException exception
-     */
-    private void openTextFieldDialog() throws IOException {
-        Dialog<String> dialog = new Dialog<>();
-        dialog.setTitle("Set Location of your Garden");
-        dialog.setHeaderText("set Location of your Garden!");
-        dialog.setResizable(false);
-
-        DialogPane dialogPane = dialog.getDialogPane();
-
-        dialogPane.getStylesheets().add(
-                Objects.requireNonNull(getClass().getResource("bootstrap/dialogStyle.css")).toExternalForm());
-        dialogPane.getStyleClass().add("myDialog");
-
-        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("Set");
-            controller.setValueTextArea(settings.getLocation());
-            controller.initSaveButton((Button) dialogPane.lookupButton(save));
-
-            dialog.setResultConverter(button -> button.equals(save) ? controller.getValue() : null);
-
-            dialog.showAndWait()
-                    .ifPresent(string -> {
-                        settings.setLocation(string);
-                        location_label.setText(settings.getLocation());
-                    });
-        }
-    }
-}

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

@@ -1,190 +0,0 @@
-package ch.zhaw.gartenverwaltung;
-
-import ch.zhaw.gartenverwaltung.bootstrap.AfterInject;
-import ch.zhaw.gartenverwaltung.bootstrap.Inject;
-import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
-import ch.zhaw.gartenverwaltung.io.PlantList;
-import ch.zhaw.gartenverwaltung.models.Garden;
-import ch.zhaw.gartenverwaltung.models.GardenSchedule;
-import ch.zhaw.gartenverwaltung.types.Crop;
-import ch.zhaw.gartenverwaltung.types.Plant;
-import ch.zhaw.gartenverwaltung.types.Task;
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.scene.control.*;
-import javafx.util.Callback;
-
-import java.io.IOException;
-import java.net.URL;
-import java.time.LocalDate;
-import java.util.ResourceBundle;
-
-/**
- * Controller class for the TaskFormular.fxml file
- */
-public class TaskFormularController implements Initializable {
-    private Crop crop;
-    private Plant plant;
-    private Task task = null;
-
-    @Inject
-    private GardenSchedule gardenSchedule;
-    @Inject
-    private Garden garden;
-    @Inject
-    private PlantList plantList;
-
-    @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;
-
-    @AfterInject
-    @SuppressWarnings("unused")
-
-    /**
-     * returns the edited or added {@link Task}
-     * @param crop {@link Crop} which was selected
-     * @return {@link Task} which was edited or added
-     */
-    public Task returnResult(Crop crop) {
-        int interval = 0;
-        if (!(interval_field.getText().isEmpty() || interval_field.getText().equals(""))) {
-            interval = Integer.parseInt(interval_field.getText());
-        }
-        Task task = new Task(taskName_field.getText(), description_area.getText(),
-                start_datePicker.getValue(), end_datePicker.getValue(),
-                interval, crop.getCropId().get());
-        if (this.task != null) return this.task.updateTask(task);
-        return task;
-    }
-
-    /**
-     * set selected crop and get the plant from the crop.
-     * @param crop {@link Crop} which was selected
-     * @throws HardinessZoneNotSetException exception
-     * @throws IOException exception
-     */
-    public void setCorp(Crop crop) throws HardinessZoneNotSetException, IOException {
-        this.crop = crop;
-        this.plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).get();
-    }
-
-    /**
-     * set the values of task into the labels and datePicker.
-     * @param task {@link Task} which was given
-     */
-    public void setTaskValue(Task task) {
-        this.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);
-        }
-    }
-
-    /**
-     * dayCellFactory of the start date
-     * @return {@link Callback} of the dayCellFactory
-     */
-    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 && item.compareTo(crop.getStartDate().plusDays(plant.timeToHarvest(0))) < 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;");
-                }
-            }
-        };
-    }
-
-    /**
-     * dayCellFactory of the end date
-     * @return {@link Callback} of the dayCellFactory
-     */
-    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 && item.compareTo(crop.getStartDate().plusDays(plant.timeToHarvest(0))) < 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;");
-                }
-            }
-        };
-    }
-
-    /**
-     * disable button until condition meet.
-     * @param button {@link Button} which was given
-     */
-    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(taskName_field.textProperty().isEmpty())
-                .or(description_area.textProperty().isEmpty()));
-    }
-
-    /**
-     * initialize dayCellFactories
-     * @param location
-     * The location used to resolve relative paths for the root object, or
-     * {@code null} if the location is not known.
-     *
-     * @param resources
-     * The resources used to localize the root object, or {@code null} if
-     * the root object was not localized.
-     */
-    @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

@@ -1,60 +0,0 @@
-package ch.zhaw.gartenverwaltung;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextField;
-
-/**
- * Controller class for the TexFieldFormular.fxml file
- */
-public class TextFieldFormularController {
-
-    @FXML
-    private Label description_label;
-
-    @FXML
-    private TextField text_area;
-
-
-    /**
-     * set description label
-     * @param string string of the description
-     */
-    public void setDescription_label(String string) {
-        description_label.setText(string);
-    }
-
-    /**
-     * set text area value
-     * @param string string of text area value
-     */
-    public void setValueTextArea(String string) {
-        text_area.setText(string);
-    }
-
-    /**
-     * return value of text area
-     * @return string of the tex area
-     */
-    public String getValue() {
-        return text_area.getText();
-    }
-
-    /**
-     * Disable Button until condition meet
-     * @param button {@link Button} which is gets dissabled
-     */
-    public void initSaveButton(Button button) {
-        text_area.textProperty().addListener((observable, oldValue, newValue) -> {
-            if (newValue.matches("\\d*\\.?\\d*")) {
-                text_area.setText(newValue);
-            } else {
-                text_area.setText(oldValue);
-            }
-        });
-
-        button.disableProperty().bind(text_area.textProperty().isEmpty());
-    }
-
-}

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

@@ -1,73 +0,0 @@
-package ch.zhaw.gartenverwaltung;
-
-
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.layout.StackPane;
-import javafx.stage.Stage;
-
-/**
- * Controller class for the Tutorial.fxml file
- */
-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();
-    }
-
-    /**
-     * disable next or close button according to the location of button
-     */
-    private void setButtonAbilities() {
-        previousPageButton.setDisable(page <= 0);
-        nextPageButton.setDisable(page >= tourPages.getChildren().size() - 1);
-    }
-
-    /**
-     * switch to next view
-     */
-    private void switchViews() {
-        tourPages.getChildren().forEach(node -> node.setOpacity(0));
-        tourPages.getChildren().get(page).setOpacity(1);
-    }
-
-    /**
-     * close Tutorial
-     */
-    public void closeTutorial() {
-        Stage root = (Stage) tourPages.getScene().getWindow();
-        root.close();
-    }
-}

src/main/java/ch/zhaw/gartenverwaltung/backgroundtasks/BackgroundTasks.java

@@ -1,63 +0,0 @@
-package ch.zhaw.gartenverwaltung.backgroundtasks;
-
-import ch.zhaw.gartenverwaltung.CropDetailController;
-import ch.zhaw.gartenverwaltung.backgroundtasks.weather.WeatherGradenTaskPlanner;
-import ch.zhaw.gartenverwaltung.io.CropList;
-import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
-import ch.zhaw.gartenverwaltung.io.PlantList;
-import ch.zhaw.gartenverwaltung.io.TaskList;
-import ch.zhaw.gartenverwaltung.models.PlantNotFoundException;
-import ch.zhaw.gartenverwaltung.types.Task;
-
-import javax.mail.MessagingException;
-import java.io.IOException;
-import java.time.LocalDate;
-import java.util.List;
-import java.util.TimerTask;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class BackgroundTasks extends TimerTask {
-    private static final Logger LOG = Logger.getLogger(CropDetailController.class.getName());
-    private final TaskList taskList;
-    private final Notifier notifier;
-    private final WeatherGradenTaskPlanner weatherGardenTaskPlaner;
-
-    private void movePastTasks() throws IOException {
-        List<Task> taskList = this.taskList.getTaskList(LocalDate.MIN, LocalDate.now().minusDays(1));
-        taskList.forEach(task -> {
-            if (!task.isDone()) {
-                task.setNextExecution(LocalDate.now());
-            }
-        });
-    }
-
-    public BackgroundTasks(TaskList taskList, CropList cropList, PlantList plantList) {
-        this.taskList = taskList;
-        notifier = new Notifier(taskList, plantList, cropList);
-        weatherGardenTaskPlaner = new WeatherGradenTaskPlanner(taskList, plantList, cropList);
-    }
-
-    @Override
-    public void run() {
-        try {
-            movePastTasks();
-        } catch (IOException e) {
-            e.printStackTrace();
-            LOG.log(Level.SEVERE, "Could not execute Background Task: move past Tasks ", e.getCause());
-        }
-        try {
-            weatherGardenTaskPlaner.refreshTasks();
-        } catch (IOException | HardinessZoneNotSetException | PlantNotFoundException e) {
-            e.printStackTrace();
-            LOG.log(Level.SEVERE, "Could not execute Background Task: Refresh Tasks by WeatherGardenTaskPlaner ", e.getCause());
-        }
-        try {
-            notifier.sendNotifications();
-        } catch (IOException | MessagingException | HardinessZoneNotSetException e) {
-            e.printStackTrace();
-            LOG.log(Level.SEVERE, "Could not execute Background Task: send Notification for due Tasks", e.getCause());
-        }
-    }
-}
-

src/main/java/ch/zhaw/gartenverwaltung/backgroundtasks/Notifier.java

@@ -1,50 +0,0 @@
-package ch.zhaw.gartenverwaltung.backgroundtasks;
-
-import ch.zhaw.gartenverwaltung.Settings;
-import ch.zhaw.gartenverwaltung.backgroundtasks.email.EMailSender;
-import ch.zhaw.gartenverwaltung.io.CropList;
-import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
-import ch.zhaw.gartenverwaltung.io.PlantList;
-import ch.zhaw.gartenverwaltung.io.TaskList;
-import ch.zhaw.gartenverwaltung.types.Crop;
-import ch.zhaw.gartenverwaltung.types.Task;
-
-import javax.mail.MessagingException;
-import java.io.IOException;
-import java.time.LocalDate;
-
-public class Notifier {
-    private final TaskList taskList;
-    private final CropList cropList;
-    private final PlantList plantList;
-    private final EMailSender eMailSender = new EMailSender();
-
-    public Notifier(TaskList taskList, PlantList plantList, CropList cropList) {
-        this.taskList = taskList;
-        this.cropList = cropList;
-        this.plantList = plantList;
-    }
-
-    private void sendNotification(Task task) throws IOException, MessagingException, HardinessZoneNotSetException {
-        String plantName = "unkown plant";
-        if(cropList.getCropById((task.getCropId())).isPresent()){
-            Crop crop = cropList.getCropById(task.getCropId()).get();
-            if(plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).isPresent()) {
-                plantName = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).get().name();
-            }
-        }
-        String messageSubject = String.format(Settings.getInstance().getMailNotificationSubjectTemplate(), task.getName());
-        String messageText = String.format(Settings.getInstance().getMailNotificationTextTemplate(), task.getName(), plantName, task.getNextExecution(), task.getDescription());
-        eMailSender.sendMails(Settings.getInstance().getMailNotificationReceivers(), messageSubject, messageText);
-    }
-
-    public void sendNotifications() throws IOException, MessagingException, HardinessZoneNotSetException {
-        for (Task task : taskList.getTaskList(LocalDate.MIN, LocalDate.MAX)) {
-            if (task.getNextNotification() != null && task.getNextNotification().isBefore(LocalDate.now().minusDays(1))) {
-                sendNotification(task);
-                task.setNextNotification(LocalDate.now().plusDays(1));
-                taskList.saveTask(task);
-            }
-        }
-    }
-}

src/main/java/ch/zhaw/gartenverwaltung/backgroundtasks/email/EMailSender.java

@@ -1,40 +0,0 @@
-package ch.zhaw.gartenverwaltung.backgroundtasks.email;
-
-import ch.zhaw.gartenverwaltung.Settings;
-
-import javax.mail.*;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-public class EMailSender {
-
-
-    public EMailSender(){
-
-    }
-
-    public void sendMails(String recipients, String subject, String text) throws MessagingException {
-        // TODO replace printMail with implementation
-        printMail(recipients, subject, text); // TODO Remove Printing E-Mail to console to test it
-        MimeMessage message = new MimeMessage(Settings.getInstance().getSmtpCredentials().getSession());
-        message.addHeader("Content-type", "text/HTML; charset=UTF-8");
-        message.addHeader("format", "flowed");
-        message.addHeader("Content-Transfer-Encoding", "8bit");
-        message.setFrom(new InternetAddress(Settings.getInstance().getSmtpCredentials().fromAddress()));
-        message.setReplyTo(InternetAddress.parse(Settings.getInstance().getSmtpCredentials().fromAddress(), false));
-        message.setSubject(subject);
-        message.setText(text);
-        message.setSentDate(new Date());
-        message.setRecipients(Message.RecipientType.TO, InternetAddress.parse(recipients, false));
-        Transport.send(message);
-    }
-
-    private void printMail(String receiver, String subject, String text){
-        System.out.printf("\nSending E-Mail:\nTo: %s\nSubject: %s\nMessage:\n%s\n", receiver, subject, text);
-    }
-
-}

src/main/java/ch/zhaw/gartenverwaltung/backgroundtasks/email/SmtpCredentials.java

@@ -1,41 +0,0 @@
-package ch.zhaw.gartenverwaltung.backgroundtasks.email;
-
-import javax.mail.PasswordAuthentication;
-import javax.mail.Session;
-import java.net.Authenticator;
-import java.util.Properties;
-
-public record SmtpCredentials(
-        String host,
-        String port,
-        String fromAddress,
-        String username,
-        String password,
-        boolean startTLS
-        ) {
-
-    private Properties getProperties() {
-        Properties properties = new Properties();
-        properties.put("mail.smtp.host", host);
-        properties.put("mail.smtp.port", port);
-        properties.put("mail.smtp.auth", "true");
-        properties.put("mail.smtp.starttls.enable", startTLS ? "true" : "false");
-        return properties;
-    }
-
-    private javax.mail.Authenticator getAuthenticator() {
-        return new javax.mail.Authenticator() {
-            @Override
-            protected PasswordAuthentication getPasswordAuthentication() {
-                return new PasswordAuthentication(username, password);
-            }
-        };
-    }
-
-    public Session getSession() {
-        return Session.getInstance(getProperties(), getAuthenticator());
-    }
-
-
-
-}

src/main/java/ch/zhaw/gartenverwaltung/backgroundtasks/weather/SevereWeather.java

@@ -1,5 +0,0 @@
-package ch.zhaw.gartenverwaltung.backgroundtasks.weather;
-
-public enum SevereWeather {
-    FROST,SNOW,HAIL,NO_SEVERE_WEATHER,RAIN
-}

src/main/java/ch/zhaw/gartenverwaltung/backgroundtasks/weather/WeatherGradenTaskPlanner.java

@@ -1,127 +0,0 @@
-package ch.zhaw.gartenverwaltung.backgroundtasks.weather;
-
-import ch.zhaw.gartenverwaltung.io.CropList;
-import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
-import ch.zhaw.gartenverwaltung.io.PlantList;
-import ch.zhaw.gartenverwaltung.io.TaskList;
-import ch.zhaw.gartenverwaltung.models.PlantNotFoundException;
-import ch.zhaw.gartenverwaltung.types.*;
-
-import java.io.IOException;
-import java.time.LocalDate;
-import java.util.List;
-
-/**
- * The WeatherGardenTaskPlanner creates Tasks based on weather events and the rain amount from the last days
- *
- */
-public class WeatherGradenTaskPlanner {
-    private final TaskList taskList;
-    private final PlantList plantList;
-    private final CropList cropList;
-    WeatherService weatherService;
-    private final LocalDate dateSevereWeather = LocalDate.of(2022,12,15);
-
-    public WeatherGradenTaskPlanner(TaskList taskList, PlantList plantList, CropList cropList) {
-        this.taskList = taskList;
-        this.plantList = plantList;
-        this.cropList = cropList;
-        weatherService = new WeatherService();
-    }
-
-    /**
-     * Method to refresh watering tasks and severe weather tasks
-     * @throws IOException If the database cannot be accessed
-     * @throws HardinessZoneNotSetException If the hardiness zone is not available
-     * @throws PlantNotFoundException if the plant is not available for the watering task
-     */
-    public void refreshTasks() throws IOException, HardinessZoneNotSetException, PlantNotFoundException {
-        getSevereWeatherEvents();
-        getRainAmount();
-    }
-
-    private void getSevereWeatherEvents() throws IOException {
-        SevereWeather actualWeather = weatherService.causeSevereWeather(1);
-        if (SevereWeather.HAIL.equals(actualWeather)) {
-            createPreHailTask();
-        } else if (SevereWeather.FROST.equals(actualWeather)) {
-            createPreFrostTask();
-        } else if (SevereWeather.SNOW.equals(actualWeather)) {
-            createPreSnowTask();
-        }
-    }
-
-    private void getRainAmount() throws IOException, HardinessZoneNotSetException, PlantNotFoundException {
-        int rainAmount = weatherService.causeRainAmount(3);
-        adjustWateringTask(rainAmount);
-    }
-
-    /**
-     * Method to create a PreHailTask
-     * @throws IOException If the database cannot be accessed
-     */
-    private void createPreHailTask() throws IOException {
-
-        Task preHailTask = new Task("Hail",
-                                    "During a summer Thunderstorm it could hail heavily. THe Hail could damage the crops. To prevent damage cover the plants with a strong tarpaulin",
-                                    dateSevereWeather.minusDays(1L),dateSevereWeather.plusDays(1L));
-        taskList.saveTask(preHailTask);
-
-    }
-
-    /**
-     * Method to create a PreFrosttask
-     * @throws IOException If the database cannot be accessed
-     */
-    private void createPreFrostTask() throws IOException {
-        Task preFrostTask = new Task("Frost",
-                                    "The temperatur falls below zero degrees, cover especially the root with wool",
-                                    dateSevereWeather.minusDays(1L),dateSevereWeather.plusDays(1L));
-        taskList.saveTask(preFrostTask);
-    }
-
-    /**
-     * Method to create a PreSnowTask
-     * @throws IOException If the database cannot be accessed
-     */
-    private void createPreSnowTask() throws IOException {
-        Task preSnowTask = new Task("Snow",
-                                    "The weather brings little snowfall. Cover your crops",
-                                    dateSevereWeather.minusDays(1L),dateSevereWeather.plusDays(1L));
-        taskList.saveTask(preSnowTask);
-    }
-
-    /**
-     * Method to adjust the water plant tasks
-     * @param rainAmount Amount of rain from the last 7 days
-     * @throws IOException If the database cannot be accessed
-     * @throws HardinessZoneNotSetException If the hardiness zone is not available
-     * @throws PlantNotFoundException if the plant is not available for the watering task
-     */
-    private void adjustWateringTask(int rainAmount) throws HardinessZoneNotSetException, IOException, PlantNotFoundException {
-
-        for (Crop crop : cropList.getCrops()) {
-            Plant plant = plantList.getPlantById(HardinessZone.ZONE_8A,crop.getPlantId()).orElseThrow(PlantNotFoundException::new);
-
-            if(plant.wateringCycle().litersPerSqM() < rainAmount){
-                adjustNextExecutionOfWateringTasks(taskList.getTaskList(LocalDate.now(), LocalDate.now().plusDays(7)));
-            }
-        }
-
-    }
-
-    /**
-     * Method to set next execution date of the water plant tasks
-     * @param cropTaskList List with tasks from crops
-     * @throws IOException If the database cannot be accessed
-     * @throws HardinessZoneNotSetException If the hardiness zone is not available
-     * @throws PlantNotFoundException if the plant is not available for the watering task
-     */
-    private void adjustNextExecutionOfWateringTasks(List<Task> cropTaskList){
-        for(Task task : cropTaskList){
-            if(task.getName().equals("water plant")){
-                task.setNextExecution(task.getNextExecution().plusDays(task.getInterval().orElse(1)));
-            }
-        }
-    }
-}

src/main/java/ch/zhaw/gartenverwaltung/backgroundtasks/weather/WeatherService.java

@@ -1,32 +0,0 @@
-package ch.zhaw.gartenverwaltung.backgroundtasks.weather;
-/**
- * The WeatherService is a class to cause weather events for the WeatherGardenTaskPlanner
- *
- */
-public class WeatherService {
-    private static final int NO_RAIN = 0;
-    private static final int LITTLE_RAIN = 15;
-    private static final int RAIN = 25;
-    private static final int HEAVY_RAIN = 50;
-
-    public SevereWeather causeSevereWeather(int randomWeather) {
-        return switch (randomWeather) {
-            case 1 -> SevereWeather.HAIL;
-            case 2 -> SevereWeather.SNOW;
-            case 3 -> SevereWeather.FROST;
-            default -> null;
-        };
-
-    }
-
-    public int causeRainAmount(int randomRainAmount) {
-        return switch (randomRainAmount) {
-            case 1 -> NO_RAIN;
-            case 2 -> LITTLE_RAIN;
-            case 3 -> RAIN;
-            case 4 -> HEAVY_RAIN;
-            default -> -1;
-        };
-
-    }
-}

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 annotated with {@link Inject}
+ * Annotates a method to be executed after all dependencies annotates with {@link Inject}
  * have been injected.
  */
 @Retention(RetentionPolicy.RUNTIME)

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

@@ -1,7 +1,12 @@
 package ch.zhaw.gartenverwaltung.bootstrap;
 
-import ch.zhaw.gartenverwaltung.Main;
+import ch.zhaw.gartenverwaltung.HelloApplication;
-import ch.zhaw.gartenverwaltung.io.*;
+import ch.zhaw.gartenverwaltung.io.CropList;
+import ch.zhaw.gartenverwaltung.io.JsonCropList;
+import ch.zhaw.gartenverwaltung.io.JsonPlantList;
+import ch.zhaw.gartenverwaltung.io.JsonTaskList;
+import ch.zhaw.gartenverwaltung.io.PlantList;
+import ch.zhaw.gartenverwaltung.io.TaskList;
 import ch.zhaw.gartenverwaltung.models.Garden;
 import ch.zhaw.gartenverwaltung.models.GardenSchedule;
 import ch.zhaw.gartenverwaltung.models.PlantListModel;
@@ -18,10 +23,6 @@ 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
@@ -31,25 +32,18 @@ public class AppLoader {
     /**
      * Application-wide dependencies
      */
-    private final Map<String, Object> dependencies = new HashMap<>();
+    private final PlantList plantList = new JsonPlantList();
+    private final CropList cropList = new JsonCropList();
+    private final TaskList taskList = new JsonTaskList();
+
+    private final GardenSchedule gardenSchedule = new GardenSchedule(taskList, plantList);
+    private final Garden garden = new Garden(gardenSchedule, cropList);
+
 
     public AppLoader() throws IOException {
-        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).
      *
@@ -77,12 +71,9 @@ public class AppLoader {
      * @throws IOException if the file could not be loaded
      */
     public Object loadSceneToStage(String fxmlFile, Stage appendee) throws IOException {
-        FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(Main.class.getResource(fxmlFile)));
+        FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(HelloApplication.class.getResource(fxmlFile)));
         Pane root = loader.load();
-        Scene scene = new Scene(root);
+        appendee.setScene(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;
@@ -99,7 +90,7 @@ public class AppLoader {
      * @throws IOException if the file could not be loaded
      */
     public Object loadPaneToDialog(String fxmlFile, DialogPane appendee) throws IOException {
-        FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(Main.class.getResource(fxmlFile)));
+        FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(HelloApplication.class.getResource(fxmlFile)));
         appendee.setContent(loader.load());
         Object controller = loader.getController();
         annotationInject(controller);
@@ -114,7 +105,7 @@ public class AppLoader {
      * @throws IOException if the file could not be loaded
      */
     public void loadAndCacheFxml(String fxmlFile) throws IOException {
-        FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(Main.class.getResource(fxmlFile)));
+        FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(HelloApplication.class.getResource(fxmlFile)));
         Pane pane = loader.load();
         panes.put(fxmlFile, pane);
         annotationInject(loader.getController());
@@ -141,18 +132,26 @@ public class AppLoader {
                 });
 
         Arrays.stream(controller.getClass().getMethods())
-                .filter(method -> method.isAnnotationPresent(AfterInject.class) && method.getParameterCount() == 0)
+                .filter(method -> method.isAnnotationPresent(AfterInject.class))
                 .forEach(afterInjectMethod -> {
-                    try {
+                    if (afterInjectMethod.getParameterCount() == 0) {
-                        afterInjectMethod.invoke(controller);
+                        try {
-                    } catch (IllegalAccessException | InvocationTargetException e) {
+                            afterInjectMethod.invoke(controller);
-                        // TODO: Log
+                        } catch (IllegalAccessException | InvocationTargetException e) {
-                        e.printStackTrace();
+                            e.printStackTrace();
+                        }
                     }
                 });
     }
 
-    public Object getAppDependency(Class<?> type) {
+    private Object getAppDependency(Class<?> type) {
-        return dependencies.get(type.getSimpleName());
+        return switch (type.getSimpleName()) {
+            case "Garden" -> garden;
+            case "PlantList" -> plantList;
+            case "PlantListModel" -> new PlantListModel(plantList);
+            case "GardenSchedule" -> gardenSchedule;
+            case "AppLoader" -> this;
+            default -> null;
+        };
     }
 }

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

@@ -3,20 +3,11 @@ 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,10 +6,6 @@ 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,18 +1,10 @@
 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,11 +19,6 @@ 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;
 
@@ -45,7 +40,7 @@ public class JsonCropList implements CropList {
     }
 
     /**
-     * Default constructor. Uses a file from the app resources.
+     * Default constructor
      */
     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 reading {@link Plant} objects
+ * Implements the {@link PlantList} interface for loading {@link Plant} objects
- * from a local JSON file.
+ * from a JSON file.
  * The reads are cached to minimize file-io operations.
  */
 public class JsonPlantList implements PlantList {
@@ -44,17 +44,9 @@ 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;
     }
@@ -75,7 +67,7 @@ public class JsonPlantList implements PlantList {
     }
 
     /**
-     * @see PlantList#getPlantById(HardinessZone, long)
+     * @see PlantList#getPlantById(long)
      */
     @Override
     public Optional<Plant> getPlantById(HardinessZone zone, long id) throws HardinessZoneNotSetException, IOException {

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

@@ -13,15 +13,14 @@ 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 reading and writing {@link Task} objects
+ * Implements the {@link TaskList} interface for loading and writing {@link Task} objects
- * from and to a local JSON file.
+ * from and to a JSON file.
  * The reads are cached to minimize file-io operations.
  */
 public class JsonTaskList implements TaskList {
@@ -30,7 +29,6 @@ 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
@@ -45,17 +43,9 @@ 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;
     }
@@ -96,9 +86,13 @@ public class JsonTaskList implements TaskList {
         if(taskMap.isEmpty()) {
             loadTaskListFromFile();
         }
-        taskMap.entrySet().removeIf(entry -> entry.getValue().getCropId() == cropId);
+
+        List<Task> temptasks = taskMap.values().stream().
+                filter(task -> { return task.getCropId() == cropId;}).toList();
+        for (Task task : temptasks ) {
+                taskMap.remove(task.getId());
+        }
         writeTaskListToFile();
-        notifySubscribers();
     }
 
     /**
@@ -115,11 +109,11 @@ public class JsonTaskList implements TaskList {
         if(taskMap.isEmpty()) {
             loadTaskListFromFile();
         }
-        long id = task.getId().orElse(idProvider.incrementAndGet());
+        if(task.getId() == 0) {
-
+            task.withId(idProvider.incrementAndGet());
-        taskMap.put(id, task.withId(id));
+        }
+        taskMap.put(task.getId(),task);
         writeTaskListToFile();
-        notifySubscribers();
     }
 
     /**
@@ -134,30 +128,10 @@ public class JsonTaskList implements TaskList {
         if(taskMap.isEmpty()) {
             loadTaskListFromFile();
         }
-        Long taskId = task.getId().orElseThrow(IOException::new);
+        if(taskMap.containsKey(task.getId())){
-        if(taskMap.containsKey(taskId)){
+            taskMap.remove(task.getId());
-            taskMap.remove(taskId);
             writeTaskListToFile();
         }
-        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());
-        }
     }
 
     /**
@@ -195,7 +169,7 @@ public class JsonTaskList implements TaskList {
 
             taskMap = result.stream()
                     .collect(HashMap::new,
-                        (res, task) -> res.put(task.getId().orElse(0L), task),
+                        (res, task) -> res.put(task.getId(), task),
                         (existing, replacement) -> {});
         }
 

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

@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Optional;
 
 /**
- * A List of {@link Plant}s.
+ * A database 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;
 
 /**
- * Represents a List of {@link Task}s.
+ * A database of {@link Task}s.
- * The interface specifies the operations to add/update and remove entries.
+ * The interface specifies the minimal required operations.
  */
 public interface TaskList {
     /**
@@ -51,22 +51,4 @@ 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,9 +7,6 @@ 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,9 +7,6 @@ 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,17 +13,18 @@ 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
     public Image deserialize(JsonParser parser, DeserializationContext context) throws IOException {
         Image result = null;
-        InputStream is = PlantList.class.getResourceAsStream(String.format("images/%s", parser.getText()));
+        URL imageUrl = PlantList.class.getResource(String.format("images/%s", parser.getText()));
-        if (is != null) {
+        if (imageUrl != null) {
-            result = new Image(is);
+            try (InputStream is = new FileInputStream(new File(imageUrl.toURI()))) {
+                result = new Image(is);
+            } catch (IllegalArgumentException | URISyntaxException e) {
+                throw new IOException(String.format("Cannot find Image \"%s\"\n", imageUrl.getFile()));
+            }
         }
         return result;
     }

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

@@ -70,19 +70,6 @@ public class Garden {
         plantedCrops.clear();
         plantedCrops.addAll(cropList.getCrops());
     }
-
-    /**
-     * Updates the {@link Crop} from the file and the cache
-     *
-     * @param crop The crop which is being updated
-     * @throws IOException If the database cannot be accessed
-     */
-    public void updateCrop(Crop crop) throws IOException {
-        cropList.saveCrop(crop);
-        plantedCrops.clear();
-        plantedCrops.addAll(cropList.getCrops());
-    }
-
     /**
      * Returns a list of {@link Crop}s which are currently in the gardenplan.
      *

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

@@ -19,7 +19,6 @@ 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.
@@ -47,12 +46,7 @@ public class GardenSchedule {
      */
     public void planTasksForCrop(Crop crop) throws PlantNotFoundException, HardinessZoneNotSetException, IOException {
         Plant plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).orElseThrow(PlantNotFoundException::new);
-        int growPhaseGroup = plant.getGrowphaseGroupForDate(crop.getStartDate());
+        for (GrowthPhase growthPhase : plant.lifecycle()) {
-        addTask(new Task("watering Task", "pour water over the plant circa : "+ plant.wateringCycle().litersPerSqM() +" per square meter",
-                crop.getStartDate(), crop.getStartDate().plusDays(plant.timeToHarvest(0)),
-                plant.wateringCycle().interval(), crop.getCropId().orElse(0L)));
-
-        for (GrowthPhase growthPhase : plant.lifecycleForGroup(growPhaseGroup)) {
             for (TaskTemplate taskTemplate : growthPhase.taskTemplates()) {
                 addTask(taskTemplate.generateTask(crop.getStartDate(), crop.getCropId().orElse(0L)));
             }
@@ -141,27 +135,10 @@ 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 < listLength; i++) {
+        for(int i = 0; i < 7; i++) {
             LocalDate date = LocalDate.now().plusDays(i);
-            dayTaskList.add(new ArrayList<>());
+            dayTaskList.add(taskList.getTaskList(date, date));
-            final int finalI = i;
-            weekTasks.forEach(task -> {
-                if (task.getNextExecution() == null) {
-                    task.isDone();
-                } else {
-                    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().orElse(0) == 0) && checkDate.isBefore(LocalDate.now().plusDays(listLength)));
-                }
-            });
         }
         return dayTaskList;
     }
@@ -172,8 +149,11 @@ public class GardenSchedule {
      * @throws IOException If the database cannot be accessed
      */
     public List<List<Task>> getTasksUpcomingWeekForCrop(Long cropId) throws IOException {
-        List<List<Task>> dayTaskList = getTasksUpcomingWeek();
+        List<List<Task>> dayTaskList = new ArrayList<>();
-        dayTaskList.forEach(taskList -> taskList.removeIf(task -> task.getCropId() != cropId));
+        for(int i = 0; i < 7; i++) {
+            LocalDate date = LocalDate.now().plusDays(i);
+            dayTaskList.add(filterListByCrop(taskList.getTaskList(date, date), cropId));
+        }
         return dayTaskList;
     }
 
@@ -185,7 +165,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), sortByNextExecution);
+        return getSortedTaskList(taskList.getTaskList(start, end), sortByStartDate);
     }
 
     /**
@@ -195,6 +175,6 @@ public class GardenSchedule {
      * @return a sorted coppy of the given Tasklist
      */
     private List<Task> getSortedTaskList(List<Task> taskList, Comparator<Task> comparator) {
-        return taskList.stream().filter(task -> task.getNextExecution() != null).sorted(comparator).collect(Collectors.toList());
+        return taskList.stream().sorted(comparator).collect(Collectors.toList());
     }
 }

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

@@ -1,8 +1,5 @@
 package ch.zhaw.gartenverwaltung.types;
 
-import ch.zhaw.gartenverwaltung.io.JsonPlantList;
-import ch.zhaw.gartenverwaltung.io.PlantList;
-
 import java.time.LocalDate;
 import java.util.Objects;
 import java.util.Optional;

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

@@ -12,6 +12,7 @@ public record GrowthPhase(
         MonthDay startDate,
         MonthDay endDate,
         int group,
+        WateringCycle wateringCycle,
         @JsonDeserialize(using = GrowthPhaseTypeDeserializer.class) GrowthPhaseType type,
         @JsonDeserialize(using = HardinessZoneDeserializer.class) HardinessZone zone,
         List<TaskTemplate> taskTemplates) {

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

@@ -18,7 +18,6 @@ public record Plant(
         int light,
         String soil,
         List<Pest> pests,
-        WateringCycle wateringCycle,
         List<GrowthPhase> lifecycle) {
 
     /**
@@ -40,16 +39,6 @@ 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
@@ -67,16 +56,16 @@ public record Plant(
     public int timeToHarvest(int group) {
         List<GrowthPhase> activeLifecycle = lifecycleForGroup(group);
         GrowthPhase sow = activeLifecycle.stream()
-                .filter(growthPhase -> growthPhase.type().equals(GrowthPhaseType.SOW))
+                .filter(growthPhase -> !growthPhase.type().equals(GrowthPhaseType.SOW))
                 .findFirst()
                 .orElseThrow();
         GrowthPhase harvest = activeLifecycle.stream()
-                .filter(growthPhase -> growthPhase.type().equals(GrowthPhaseType.HARVEST))
+                .filter(growthPhase -> !growthPhase.type().equals(GrowthPhaseType.HARVEST))
                 .findFirst()
                 .orElseThrow();
 
         int currentYear = LocalDate.now().getYear();
-        return (int) DAYS.between(sow.startDate().atYear(currentYear),harvest.startDate().atYear(currentYear));
+        return (int) DAYS.between(harvest.startDate().atYear(currentYear), sow.startDate().atYear(currentYear));
     }
 
     public int lifecycleGroupFromHarvestDate(LocalDate harvestDate) {

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

@@ -3,7 +3,7 @@ package ch.zhaw.gartenverwaltung.types;
 import java.time.MonthDay;
 
 public enum Seasons {
-    ALLSEASONS("--01-01", "--12-31", "All Seasons"),
+    AllSEASONS("--01-01", "--12-31", "All Seasons"),
     SPRING("--03-01", "--05-30", "Spring"),
     SUMMER("--06-01", "--08-30", "Summer"),
     AUTUMN("--09-01", "--11-30", "Autumn"),

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

@@ -9,16 +9,13 @@ import java.util.Optional;
  * May be created using the builder pattern.
  */
 public class Task {
-    private Long id;
+    private long id;
-    private String name;
+    private final String name;
-    private String description;
+    private final String description;
-    private LocalDate startDate;
+    private final LocalDate startDate;
     private Integer interval;
     private LocalDate endDate;
-    private LocalDate nextExecution;
-    private LocalDate nextNotification;
     private long cropId;
-    private boolean done;
 
     /**
      * default constructor
@@ -28,34 +25,19 @@ 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;
     }
 
-    /**
-     * Constructor for weather events
-    */
-    public Task(String name, String description, LocalDate startDate, LocalDate endDate) {
-        this.name = name;
-        this.description = description;
-        this.startDate = startDate;
-        this.endDate = endDate;
-    }
-
     public Task(String name, String description, LocalDate startDate, LocalDate endDate, int interval, long cropId) {
         this.name = name;
         this.description = description;
         this.startDate = startDate;
-        nextExecution = startDate;
         this.endDate = endDate;
         this.interval = interval;
         this.cropId = cropId;
@@ -76,35 +58,11 @@ public class Task {
     }
 
     public boolean isInTimePeriode(LocalDate searchStartDate, LocalDate searchEndDate){
-        return endDate.isAfter(searchStartDate) && startDate.isBefore(searchEndDate);
+        return startDate.isAfter(searchStartDate) && startDate.isBefore(searchEndDate);
-    }
-
-    public void done(){
-        if(interval != null && interval != 0 && !nextExecution.plusDays(interval).isAfter(endDate)){
-            nextExecution = nextExecution.plusDays(interval);
-            nextNotification = nextExecution;
-        } else {
-            nextExecution = null;
-            nextNotification = 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 LocalDate getNextNotification() { return nextNotification; }
+    public long getId() { return id; }
-    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; }
@@ -116,14 +74,4 @@ public class Task {
     public Optional<LocalDate> getEndDate() {
         return Optional.ofNullable(endDate);
     }
-
-    public Task updateTask(Task task) {
-        this.name = task.getName();
-        this.description = task.getDescription();
-        this.startDate = task.getStartDate();
-        this.endDate = task.getEndDate().orElse(null);
-        this.interval = task.getInterval().orElse(0);
-        this.cropId = task.getCropId();
-        return this;
-    }
 }

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

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

src/main/java/module-info.java

@@ -5,8 +5,6 @@ module ch.zhaw.gartenverwaltung {
     requires com.fasterxml.jackson.datatype.jsr310;
     requires com.fasterxml.jackson.datatype.jdk8;
     requires java.logging;
-    requires java.mail;
-
 
     opens ch.zhaw.gartenverwaltung to javafx.fxml;
     opens ch.zhaw.gartenverwaltung.types to com.fasterxml.jackson.databind;
@@ -15,8 +13,4 @@ module ch.zhaw.gartenverwaltung {
     exports ch.zhaw.gartenverwaltung.types;
     exports ch.zhaw.gartenverwaltung.models;
     exports ch.zhaw.gartenverwaltung.json;
-    exports ch.zhaw.gartenverwaltung.backgroundtasks;
-    opens ch.zhaw.gartenverwaltung.backgroundtasks to javafx.fxml;
-    exports ch.zhaw.gartenverwaltung.backgroundtasks.email;
-    opens ch.zhaw.gartenverwaltung.backgroundtasks.email to javafx.fxml;
 }

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

@@ -3,7 +3,6 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ListView?>
 <?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
@@ -13,34 +12,39 @@
 <?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 fitToHeight="true" fitToWidth="true" prefHeight="759.0" prefWidth="664.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <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 fx:id="cropDetailVBox" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="781.0" prefWidth="897.0" spacing="5.0">
+            <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="503.0" prefWidth="897.0">
+               <padding>
+                  <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+               </padding>
                <children>
-                  <Button styleClass="button-class" mnemonicParsing="false" onAction="#goBack" prefHeight="25.0" prefWidth="91.0" text="Go Back">
+                  <Button mnemonicParsing="false" onAction="#goBack" prefHeight="25.0" prefWidth="91.0" text="Go Back">
                      <VBox.margin>
                         <Insets bottom="10.0" />
                      </VBox.margin>
                   </Button>
-                  <Label styleClass="page-title" fx:id="cropName_label" text="Label">
+                  <Label fx:id="cropName_label" text="Label">
                      <VBox.margin>
                         <Insets bottom="10.0" />
                      </VBox.margin>
                   </Label>
-                  <HBox maxHeight="1.7976931348623157E308" prefHeight="268.0" prefWidth="855.0" spacing="10.0" VBox.vgrow="NEVER">
+                  <HBox prefHeight="265.0" prefWidth="879.0">
                      <children>
-                        <GridPane styleClass="custom-container" maxWidth="1.7976931348623157E308" prefHeight="231.0" prefWidth="555.0" HBox.hgrow="ALWAYS">
+                        <GridPane maxWidth="1.7976931348623157E308" prefHeight="296.0" prefWidth="577.0" HBox.hgrow="ALWAYS">
                           <columnConstraints>
                             <ColumnConstraints halignment="LEFT" hgrow="SOMETIMES" maxWidth="284.0" minWidth="10.0" prefWidth="97.33334350585938" />
                             <ColumnConstraints hgrow="SOMETIMES" maxWidth="488.99999237060547" minWidth="10.0" prefWidth="481.9999898274739" />
                           </columnConstraints>
                           <rowConstraints>
-                            <RowConstraints maxHeight="149.66665903727215" minHeight="10.0" prefHeight="126.33328501383463" valignment="TOP" vgrow="SOMETIMES" />
+                            <RowConstraints maxHeight="149.66665903727215" minHeight="10.0" prefHeight="149.66665903727215" valignment="TOP" vgrow="SOMETIMES" />
-                            <RowConstraints maxHeight="187.9999647140503" minHeight="10.0" prefHeight="45.00002034505208" vgrow="SOMETIMES" />
+                            <RowConstraints maxHeight="187.9999647140503" minHeight="10.0" prefHeight="51.00000762939453" vgrow="SOMETIMES" />
-                            <RowConstraints maxHeight="105.66662597656247" minHeight="10.0" prefHeight="46.33331298828125" vgrow="SOMETIMES" />
+                            <RowConstraints maxHeight="105.66662597656247" minHeight="10.0" prefHeight="54.0" vgrow="SOMETIMES" />
-                              <RowConstraints maxHeight="105.66662597656247" minHeight="10.0" prefHeight="45.66668701171875" vgrow="SOMETIMES" />
+                              <RowConstraints maxHeight="105.66662597656247" minHeight="10.0" prefHeight="46.66666666666666" vgrow="SOMETIMES" />
                           </rowConstraints>
                            <children>
                               <Label prefHeight="17.0" prefWidth="65.0" text="Description:">
@@ -72,58 +76,67 @@
                                  </GridPane.margin>
                               </Label>
                            </children>
-                           <padding>
-                              <Insets bottom="5.0" left="10.0" right="5.0" top="5.0" />
-                           </padding>
                         </GridPane>
-                        <ImageView fx:id="imageView" fitHeight="250.0" fitWidth="250.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER" />
+                        <ImageView fx:id="imageView" fitHeight="300.0" fitWidth="300.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER" />
                      </children>
                   </HBox>
-                  <Label text="Tasks:">
+                  <Label text="Growth Phases:">
-                     <VBox.margin>
-                        <Insets />
-                     </VBox.margin>
-                  </Label>
-                  <ListView fx:id="taskList_listView" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" prefHeight="100.0" prefWidth="869.0" VBox.vgrow="ALWAYS">
                      <VBox.margin>
                         <Insets bottom="10.0" />
                      </VBox.margin>
-                  </ListView>
+                  </Label>
-                  <Button styleClass="button-class" fx:id="addTask_button" mnemonicParsing="false" onAction="#addTask" prefHeight="25.0" prefWidth="45.0" VBox.vgrow="NEVER">
+                  <VBox fx:id="growthPhases_vbox" prefHeight="135.0" prefWidth="879.0">
                      <VBox.margin>
-                        <Insets />
+                        <Insets bottom="10.0" />
+                     </VBox.margin>
+                  </VBox>
+                  <Button mnemonicParsing="false" onAction="#editTaskList" prefHeight="25.0" prefWidth="92.0" text="Edit Tasklist">
+                     <VBox.margin>
+                        <Insets bottom="10.0" />
                      </VBox.margin>
                   </Button>
-                  <Label text="Pests:" VBox.vgrow="NEVER" />
+                  <Label text="Pests:" />
-                  <ListView fx:id="pests_listView" maxHeight="1.7976931348623157E308" minHeight="-Infinity" prefHeight="100.0" prefWidth="855.0" VBox.vgrow="SOMETIMES">
+                  <VBox fx:id="pests_vbox" prefHeight="200.0" prefWidth="100.0">
                      <VBox.margin>
-                        <Insets />
+                        <Insets bottom="10.0" />
                      </VBox.margin>
-                  </ListView>
+                  </VBox>
-                  <HBox alignment="CENTER_LEFT" prefHeight="27.0" prefWidth="869.0" VBox.vgrow="NEVER">
+                  <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="NEVER">
                      <children>
                         <Label text="Area:">
                            <HBox.margin>
                               <Insets right="60.0" />
                            </HBox.margin>
                         </Label>
-                        <Label fx:id="area_label" minWidth="-Infinity" prefWidth="50.0" text="Label">
+                        <Label fx:id="area_label" text="Label">
                            <HBox.margin>
                               <Insets right="10.0" />
                            </HBox.margin>
                         </Label>
-                        <Button styleClass="button-class" fx:id="area_button" mnemonicParsing="false" onAction="#setArea" prefHeight="25.0" prefWidth="116.0" text="Set Area" />
+                        <Button fx:id="area_button" mnemonicParsing="false" onAction="#setArea" prefHeight="25.0" prefWidth="116.0" text="Add Area" />
                      </children>
                      <VBox.margin>
-                        <Insets />
+                        <Insets bottom="10.0" />
                      </VBox.margin>
                   </HBox>
+                  <HBox alignment="CENTER_LEFT" layoutX="20.0" layoutY="719.0" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="NEVER">
+                     <children>
+                        <Label text="Location:">
+                           <HBox.margin>
+                              <Insets right="40.0" />
+                           </HBox.margin>
+                        </Label>
+                        <Label fx:id="location_label" text="Label">
+                           <HBox.margin>
+                              <Insets right="10.0" />
+                           </HBox.margin>
+                        </Label>
+                        <Button fx:id="location_button" mnemonicParsing="false" onAction="#setLocation" prefHeight="25.0" prefWidth="115.0" text="Add Location" />
+                     </children>
+                  </HBox>
                </children>
             </VBox>
          </content>
-         <padding>
-            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-         </padding>
       </ScrollPane>
    </children>
 </AnchorPane>

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

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

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

@@ -7,14 +7,13 @@
 
 <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="938.0" prefWidth="1110.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.MainFXMLController">
    <children>
-      <HBox fx:id="menubar" maxWidth="35.0" minHeight="40.0" prefHeight="38.0" prefWidth="1110.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <HBox maxWidth="35.0" minHeight="35.0" prefHeight="38.0" prefWidth="1110.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
-            <Button fx:id="home_button" mnemonicParsing="false" onAction="#goToHome" prefHeight="38.0" prefWidth="38.0" HBox.hgrow="NEVER" />
+            <Button fx:id="home_button" mnemonicParsing="false" onAction="#goToHome" prefHeight="38.0" prefWidth="121.0" text="Home" HBox.hgrow="NEVER" />
+            <Button fx:id="plants_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#goToPlants" prefHeight="38.0" prefWidth="121.0" text="Plants" />
             <Button fx:id="myGarden_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#goToMyPlants" prefHeight="38.0" prefWidth="121.0" text="My Garden" />
             <Button fx:id="mySchedule_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#goToMySchedule" prefHeight="38.0" prefWidth="121.0" text="My Schedule" />
-            <Button fx:id="tutorial_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#showTutorial" prefHeight="38.0" prefWidth="121.0" text="Tutorial" />
+            <Pane maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS" />
-            <Pane fx:id="menu_pane" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS" />
-            <Button fx:id="settings_button" mnemonicParsing="false" onAction="#openSettings" prefHeight="38.0" prefWidth="38.0" HBox.hgrow="NEVER" />
          </children>
       </HBox>
       <AnchorPane fx:id="mainPane" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="35.0" />

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

@@ -3,33 +3,32 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ListView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="myGardenRoot" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="655.0" prefWidth="1175.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.MyGardenController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="655.0" prefWidth="1175.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.MyGardenController" fx:id="myGardenRoot">
    <children>
-      <VBox layoutY="49.0" prefHeight="655.0" prefWidth="1175.0" spacing="10.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <VBox layoutY="49.0" prefHeight="655.0" prefWidth="1175.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
-            <Label  styleClass="page-title" text="My Garden">
+            <Label text="My Garden">
                <font>
                   <Font name="System Bold" size="28.0" />
                </font>
                <VBox.margin>
-                  <Insets />
+                  <Insets bottom="10.0" />
                </VBox.margin>
             </Label>
-            <ListView fx:id="myGarden_listView" maxHeight="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS" />
+            <VBox fx:id="myPlants_vbox" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="100.0" VBox.vgrow="ALWAYS" />
-            <Button styleClass="button-class" fx:id="addPlant_button" mnemonicParsing="false" onAction="#addPlant" prefHeight="45.0" prefWidth="155.0" text="Add new Plant">
+            <Button fx:id="addPlant_button" mnemonicParsing="false" onAction="#addPlant" prefHeight="45.0" prefWidth="155.0" text="Add new Plant">
                <VBox.margin>
-                  <Insets />
+                  <Insets top="10.0" />
                </VBox.margin>
             </Button>
          </children>
+         <padding>
+            <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
+         </padding>
       </VBox>
    </children>
-   <padding>
-      <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-   </padding>
 </AnchorPane>

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

@@ -1,60 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="572.0" prefWidth="867.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.MyScheduleController">
+
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="572.0" prefWidth="867.0"
+            xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.MyScheduleController">
    <children>
-      <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <Label layoutX="14.0" layoutY="14.0" text="MySchedule">
+         <font>
+            <Font size="24.0" />
+         </font>
+      </Label>
+      <HBox layoutY="31.0" prefHeight="541.0" prefWidth="867.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="50.0">
          <children>
-            <Label styleClass="page-title" text="MySchedule" VBox.vgrow="NEVER">
+            <ListView fx:id="scheduledPlants_listview" maxWidth="1.7976931348623157E308" prefHeight="522.0" prefWidth="365.0" HBox.hgrow="NEVER" />
-               <font>
+            <VBox maxWidth="1.7976931348623157E308" prefHeight="537.0" prefWidth="650.0" HBox.hgrow="ALWAYS">
-                  <Font size="24.0" />
-               </font>
-            </Label>
-            <HBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="541.0" prefWidth="867.0" spacing="10.0" VBox.vgrow="ALWAYS">
                <children>
-                  <ListView fx:id="scheduledPlants_listview" maxWidth="1.7976931348623157E308" prefHeight="522.0" prefWidth="271.0" HBox.hgrow="NEVER">
+                  <GridPane alignment="CENTER_LEFT" gridLinesVisible="true" maxWidth="1.7976931348623157E308" prefHeight="403.0" prefWidth="575.0" VBox.vgrow="ALWAYS">
-                     <HBox.margin>
+                    <columnConstraints>
-                        <Insets />
+                      <ColumnConstraints fillWidth="false" hgrow="NEVER" maxWidth="278.0" minWidth="100.0" prefWidth="173.0" />
-                     </HBox.margin>
+                      <ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" minWidth="10.0" prefWidth="402.0" />
-                  </ListView>
+                    </columnConstraints>
-                  <VBox maxWidth="1.7976931348623157E308" prefHeight="537.0" prefWidth="650.0" spacing="10.0" HBox.hgrow="ALWAYS">
+                    <rowConstraints>
+                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                    </rowConstraints>
                      <children>
-                        <ListView fx:id="week_listView" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+                        <Label fx:id="day1_label" alignment="CENTER" prefHeight="32.0" prefWidth="173.0" text="Label" />
-                           <VBox.margin>
+                        <Label fx:id="day2_label" alignment="CENTER" prefHeight="29.0" prefWidth="173.0" text="Label" GridPane.rowIndex="1" />
-                              <Insets />
+                        <Label fx:id="day3_label" alignment="CENTER" prefHeight="32.0" prefWidth="172.0" text="Label" GridPane.rowIndex="2" />
-                           </VBox.margin>
+                        <Label fx:id="day4_label" alignment="CENTER" prefHeight="35.0" prefWidth="173.0" text="Label" GridPane.rowIndex="3" />
-                        </ListView>
+                        <Label fx:id="day5_label" alignment="CENTER" prefHeight="31.0" prefWidth="173.0" text="Label" GridPane.rowIndex="4" />
-                        <VBox styleClass="custom-container" prefHeight="131.0" prefWidth="603.0" spacing="5.0" VBox.vgrow="NEVER">
+                        <Label fx:id="day6_label" alignment="CENTER" prefHeight="31.0" prefWidth="173.0" text="Label" GridPane.rowIndex="5" />
-                           <children>
+                        <Label fx:id="day7_label" alignment="CENTER" prefHeight="35.0" prefWidth="173.0" text="Label" GridPane.rowIndex="6" />
-                              <Label alignment="TOP_LEFT" maxWidth="1.7976931348623157E308" prefHeight="17.0" prefWidth="558.0" text="Importants Information:" wrapText="true" VBox.vgrow="NEVER">
+                        <Pane fx:id="day1_pane" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" />
-                                 <font>
+                        <Pane fx:id="day2_pane" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                                    <Font name="System Bold" size="12.0" />
+                        <Pane fx:id="day3_pane" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                                 </font>
+                        <Pane fx:id="day4_pane" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-                              </Label>
+                        <Pane fx:id="day5_pane" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-                              <Label fx:id="information_label" alignment="TOP_LEFT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="73.0" prefWidth="550.0" text="Label" wrapText="true" VBox.vgrow="ALWAYS" />
+                        <Pane fx:id="day6_pane" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="5" />
-                           </children>
+                        <Pane fx:id="day7_pane" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="6" />
-                           <VBox.margin>
-                              <Insets />
-                           </VBox.margin>
-                           <padding>
-                              <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                           </padding>
-                        </VBox>
                      </children>
-                  </VBox>
+                  </GridPane>
+                  <Pane prefHeight="119.0" prefWidth="575.0" VBox.vgrow="NEVER">
+                     <children>
+                        <Label alignment="TOP_LEFT" layoutX="14.0" layoutY="14.0" prefHeight="17.0" prefWidth="550.0" text="Importants Information:" wrapText="true">
+                           <font>
+                              <Font name="System Bold" size="12.0" />
+                           </font>
+                        </Label>
+                        <Label fx:id="information_label" alignment="TOP_LEFT" layoutX="14.0" layoutY="31.0" maxWidth="1.7976931348623157E308" prefHeight="82.0" prefWidth="550.0" text="Label" wrapText="true" />
+                     </children>
+                  </Pane>
                </children>
-            </HBox>
+            </VBox>
          </children>
-      </VBox>
+      </HBox>
    </children>
-   <padding>
-      <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-   </padding>
 </AnchorPane>

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

@@ -4,109 +4,91 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.SplitPane?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.control.TitledPane?>
 <?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 fx:id="plantsRoot" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="1000.0" prefHeight="853.0" prefWidth="1219.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.PlantsController">
+<AnchorPane maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="1000.0" prefHeight="853.0"
+            prefWidth="1219.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1"
+            fx:controller="ch.zhaw.gartenverwaltung.PlantsController"
+            fx:id="plantsRoot">
    <children>
-      <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <SplitPane dividerPositions="0.7377363661277062" layoutX="539.0" layoutY="266.0" prefHeight="853.0" prefWidth="1219.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-         <children>
+        <items>
-            <Label styleClass="page-title" prefHeight="45.0" prefWidth="903.0" text="Plants" VBox.vgrow="NEVER">
+          <AnchorPane maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
-               <font>
-                  <Font name="System Bold" size="30.0" />
-               </font>
-            </Label>
-            <HBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="100.0" prefWidth="200.0" spacing="10.0" VBox.vgrow="ALWAYS">
                <children>
-                <AnchorPane maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0" HBox.hgrow="ALWAYS">
+                  <VBox maxWidth="1.7976931348623157E308" prefHeight="850.6666666666666" prefWidth="894.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                      <children>
-                        <VBox maxWidth="1.7976931348623157E308" prefHeight="850.6666666666666" prefWidth="894.0" spacing="10.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                        <Label prefHeight="45.0" prefWidth="903.0" text="Plants">
+                           <font>
+                              <Font name="System Bold" size="30.0" />
+                           </font>
+                        </Label>
+                        <TextField fx:id="search_plants" promptText="Search for Plant Name" />
+                        <HBox alignment="CENTER_LEFT" prefHeight="480.0" prefWidth="881.0" VBox.vgrow="ALWAYS">
                            <children>
-                              <TextField fx:id="search_plants" promptText="Search for Plant Name" VBox.vgrow="NEVER" />
+                              <ListView fx:id="list_plants" maxWidth="1.7976931348623157E308" prefHeight="497.0" prefWidth="400.0" HBox.hgrow="ALWAYS" />
-                              <HBox alignment="CENTER_LEFT" minHeight="300.0" prefHeight="480.0" prefWidth="881.0" spacing="10.0" VBox.vgrow="ALWAYS">
+                              <ImageView fx:id="img_plant" fitWidth="300" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER" />
-                                 <children>
-                                    <ListView fx:id="list_plants" maxWidth="1.7976931348623157E308" prefHeight="497.0" prefWidth="400.0" HBox.hgrow="ALWAYS" />
-                                    <Pane styleClass="custom-container" maxHeight="1.7976931348623157E308" maxWidth="300.0" minWidth="300.0" prefHeight="200.0" prefWidth="200.0" HBox.hgrow="NEVER">
-                                       <children>
-                                          <ImageView fx:id="img_plant" fitWidth="300" pickOnBounds="true" preserveRatio="true" />
-                                       </children>
-                                    </Pane>
-                                 </children>
-                              </HBox>
-                              <VBox styleClass="vbox" maxHeight="1.7976931348623157E308" prefHeight="237.0" prefWidth="879.0" VBox.vgrow="ALWAYS">
-                                 <children>
-                                    <Label maxHeight="1.7976931348623157E308" prefHeight="33.0" prefWidth="919.0" text="Plant Information:" VBox.vgrow="NEVER">
-                                       <font>
-                                          <Font name="System Bold" size="12.0" />
-                                       </font>
-                                    </Label>
-                                    <Label fx:id="description_plant" alignment="TOP_LEFT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="96.0" prefWidth="879.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." textAlignment="JUSTIFY" wrapText="true" VBox.vgrow="ALWAYS">
-                                       <padding>
-                                          <Insets bottom="10.0" top="10.0" />
-                                       </padding>
-                                    </Label>
-                                    <Button styleClass="button-class" fx:id="selectSowDay_button" alignment="CENTER" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#selectSowDate" prefHeight="38.0" prefWidth="917.0" text="Select Harvest/Sow Day" VBox.vgrow="NEVER" />
-                                 </children>
-                                 <VBox.margin>
-                                    <Insets />
-                                 </VBox.margin>
-                                 <padding>
-                                    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                                 </padding>
-                              </VBox>
                            </children>
-                        </VBox>
+                        </HBox>
+                        <Label prefHeight="33.0" prefWidth="919.0" text="Plant Information:">
+                           <font>
+                              <Font name="System Bold" size="12.0" />
+                           </font>
+                           <padding>
+                              <Insets top="15.0" />
+                           </padding>
+                        </Label>
+                        <Label fx:id="description_plant" alignment="TOP_LEFT" maxWidth="1.7976931348623157E308" prefHeight="194.0" prefWidth="893.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." textAlignment="JUSTIFY" wrapText="true">
+                           <padding>
+                              <Insets bottom="10.0" top="10.0" />
+                           </padding>
+                        </Label>
+                        <Button fx:id="selectSowDay_button" alignment="CENTER" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#selectSowDate" prefHeight="38.0" prefWidth="917.0" text="Select Harvest/Sow Day" />
                      </children>
-                     <HBox.margin>
+                  </VBox>
-                        <Insets />
-                     </HBox.margin>
-                  </AnchorPane>
-                <AnchorPane styleClass="custom-container" maxWidth="300.0" minHeight="0.0" minWidth="300.0" prefHeight="160.0" prefWidth="100.0">
-                     <children>
-                        <VBox layoutX="38.0" layoutY="100.0" prefHeight="850.6666666666666" prefWidth="316.6666666666667" spacing="10.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                           <children>
-                              <Label text="Filter">
-                                 <font>
-                                    <Font name="System Bold" size="17.0" />
-                                 </font>
-                              </Label>
-                              <TitledPane animated="false" text="Seasons">
-                                <content>
-                                  <AnchorPane styleClass="custom-container" minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
-                                       <children>
-                                          <VBox fx:id="seasons" layoutX="37.0" layoutY="-19.0" prefHeight="180.66666666666666" prefWidth="310.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
-                                       </children>
-                                    </AnchorPane>
-                                </content>
-                              </TitledPane>
-                              <TitledPane animated="false" text="Climate Zones">
-                                <content>
-                                  <AnchorPane styleClass="custom-container" minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
-                                       <children>
-                                          <VBox fx:id="climate_zones" layoutX="36.0" layoutY="-19.0" prefHeight="180.66666666666666" prefWidth="310.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
-                                       </children>
-                                    </AnchorPane>
-                                </content>
-                              </TitledPane>
-                           </children>
-                        </VBox>
-                     </children>
-                     <padding>
-                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                     </padding>
-                  </AnchorPane>
                </children>
-            </HBox>
+            </AnchorPane>
-         </children>
+          <AnchorPane maxWidth="300.0" minHeight="0.0" minWidth="300.0" prefHeight="160.0" prefWidth="100.0">
-      </VBox>
+               <children>
+                  <VBox layoutX="38.0" layoutY="100.0" prefHeight="850.6666666666666" prefWidth="316.6666666666667" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                     <children>
+                        <Label text="Filter">
+                           <font>
+                              <Font name="System Bold" size="17.0" />
+                           </font>
+                        </Label>
+                        <TitledPane animated="false" text="Saison">
+                          <content>
+                            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+                                 <children>
+                                    <VBox fx:id="seasons" layoutX="37.0" layoutY="-19.0" prefHeight="180.66666666666666" prefWidth="310.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
+                                 </children>
+                              </AnchorPane>
+                          </content>
+                        </TitledPane>
+                        <TitledPane animated="false" text="Climate Zones">
+                          <content>
+                            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+                                 <children>
+                                    <VBox fx:id="climate_zones" layoutX="36.0" layoutY="-19.0" prefHeight="180.66666666666666" prefWidth="310.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
+                                 </children>
+                              </AnchorPane>
+                          </content>
+                        </TitledPane>
+                     </children>
+                  </VBox>
+               </children>
+            </AnchorPane>
+        </items>
+         <padding>
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+         </padding>
+      </SplitPane>
    </children>
-   <padding>
-      <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-   </padding>
 </AnchorPane>

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

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

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

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.DatePicker?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextArea?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="259.0" prefWidth="390.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.TaskFormularController">
-   <children>
-      <VBox layoutX="14.0" layoutY="14.0" prefHeight="272.0" prefWidth="390.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-         <padding>
-            <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
-         </padding>
-         <children>
-            <HBox alignment="CENTER_LEFT" prefHeight="35.0" prefWidth="560.0">
-               <children>
-                  <Label maxWidth="1.7976931348623157E308" text="Task name:" HBox.hgrow="ALWAYS" />
-                  <TextField fx:id="taskName_field" promptText="Task Name" />
-               </children>
-            </HBox>
-            <HBox prefHeight="77.0" prefWidth="350.0">
-               <children>
-                  <Label maxWidth="1.7976931348623157E308" text="Description:" HBox.hgrow="ALWAYS" />
-                  <TextArea fx:id="description_area" prefHeight="73.0" prefWidth="206.0" promptText="Description" wrapText="true" />
-               </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

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

@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ButtonBar?>
-<?import javafx.scene.control.CheckBox?>
-<?import javafx.scene.control.Separator?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.StackPane?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
-<?import javafx.scene.text.TextFlow?>
-
-<BorderPane maxHeight="470.0" maxWidth="724.0" minHeight="470.0" minWidth="724.0" prefHeight="470.0" prefWidth="724.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.TutorialController">
-   <bottom>
-      <HBox alignment="CENTER" prefHeight="0.0" prefWidth="724.0" BorderPane.alignment="CENTER">
-         <children>
-            <CheckBox mnemonicParsing="false" text="Don't show again" />
-            <Separator prefWidth="50.0" visible="false" HBox.hgrow="ALWAYS" />
-            <ButtonBar prefHeight="40.0" prefWidth="200.0">
-              <buttons>
-                  <Button styleClass="button-class" cancelButton="true" contentDisplay="CENTER" graphicTextGap="5.0" mnemonicParsing="false" text="Close" onAction="#closeTutorial"/>
-                <Button styleClass="button-class" fx:id="previousPageButton" mnemonicParsing="false" text="Previous" onAction="#viewPreviousPage"/>
-                  <Button styleClass="button-class" 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/dialogStyle.css

@@ -1,86 +0,0 @@
-.myDialog *.header-panel,
-.myDialog *.header-panel .label {
-    -fx-background-color: #D3FFB5;
-    -fx-font-weight: bold;
-}
-.myDialog {
-    -fx-background-color: #EAFFE2;
-    -fx-border-color: black;
-}
-
-.myDialog .button {
-    -fx-border-color: darkgreen;
-    -fx-border-radius: 4;
-    -fx-border-width: 1.5;
-    -fx-background-color: #D1FFB7;
-    -fx-font-weight: bold;
-    -fx-font-size: 13
-}
-
-.myDialog .check-box .box {
-    -fx-background-color: #D3FFB5;
-    -fx-border-color:grey;
-    -fx-border-radius: 3;
-}
-
-.myDialog .combo-box .list-cell
-{
-    -fx-background-color: #D1FFB7;
-    -fx-text-fill: -fx-text-base-color;
-}
-
-.myDialog .combo-box-popup .list-view
-{
-    -fx-background-color: darkgreen, darkgreen;
-    -fx-background-insets: 0, 1;
-    -fx-effect: dropshadow( three-pass-box , rgba(0,0,0,0.6) , 8, 0.0 , 0 , 0 );
-}
-
-.myDialog .combo-box-popup .list-view .list-cell
-{
-    -fx-padding: 4 0 4 5;
-
-    /* No alternate highlighting */
-    -fx-background-color: #EAFFE2;
-}
-
-.myDialog .combo-box-popup .list-view .list-cell:filled:selected, .combo-box-popup .list-view .list-cell:filled:selected:hover
-{
-    -fx-background: -fx-accent;
-    -fx-text-fill: black;
-    -fx-background-color: #D1FFB7;
-
-}
-
-.myDialog .combo-box-popup .list-view .list-cell:filled:hover
-{
-    -fx-text-fill: black;
-    -fx-background-color: #54B91C;
-
-}
-
-.myDialog .combo-box-base {
-    -fx-border-color: grey;
-    -fx-background-color: #D1FFB7;
-}
-
-.myDialog .combo-box-base:hover
-{
-    -fx-color: #54B91C;
-}
-
-.myDialog .radio-button .radio {
-    -fx-background-color: #D3FFB5;
-    -fx-border-color:grey;
-    -fx-border-radius: 25;
-}
-
-.myDialog .date-picker .button {
-    -fx-border-color: none;
-    -fx-background-color: none;
-}
-
-
-
-
-

src/main/resources/ch/zhaw/gartenverwaltung/bootstrap/styles.css

@@ -1,85 +0,0 @@
-.button-class {
-    -fx-border-color: darkgreen;
-    -fx-border-radius: 4;
-    -fx-border-width: 1.5;
-    -fx-background-color: #D1FFB7;
-    -fx-font-weight: bold;
-    -fx-font-size: 13
-}
-
-#home_button, #myGarden_button,
-#mySchedule_button, #settings_button,
-#tutorial_button, #menu_pane {
-    -fx-text-fill: white;
-    -fx-background-color: rgb(0,128,0);
-    -fx-border-color: rgb(0,128,0);
-    -fx-border-radius: 0;
-}
-
-#menubar {
-    -fx-background-color: rgb(0,128,0);
-}
-
-#home_button:hover, #myGarden_button:hover,
-#mySchedule_button:hover, #settings_button:hover,
-#tutorial_button:hover {
-    -fx-background-color: darkgreen;
-}
-
-.root, .scroll-pane, #homeVBox, #cropDetailVBox {
-    -fx-background-color: #F3FFEC;
-}
-
-.list-view {
-    -fx-border-color: black;
-    -fx-background-color: #EAFFE2;
-}
-
-.list-cell:even:filled:selected:focused .label,
-.list-cell:even:filled:selected .label,
-.list-cell:even {
-    -fx-background-color: #EAFFE2;
-    -fx-text-fill: black;
-}
-
-.list-cell:odd:filled:selected:focused .label,
-.list-cell:odd:filled:selected .label,
-.list-cell:odd {
-    -fx-background-color: #D3FFB5;
-    -fx-text-fill: black;
-}
-
-#list_plants .list-cell:even:filled:selected:focused,
-#list_plants .list-cell:even:filled:selected,
-#list_plants .list-cell:odd:filled:selected:focused,
-#list_plants .list-cell:odd:filled:selected,
-#scheduledPlants_listview .list-cell:even:filled:selected:focused,
-#scheduledPlants_listview .list-cell:even:filled:selected,
-#scheduledPlants_listview .list-cell:odd:filled:selected:focused,
-#scheduledPlants_listview .list-cell:odd:filled:selected{
-    -fx-background-color: #7CD14B;
-    -fx-text-fill: white;
-    -fx-font-weight: bold;
-}
-
-.vbox, .custom-container {
-    -fx-background-color: #EAFFE2;
-    -fx-border-color: black;
-}
-
-.titled-pane > .title {
-    -fx-background-color: #D3FFB5;
-    -fx-border-color: black;
-}
-
-.page-title {
-    -fx-font-size: 20;
-    -fx-font-weight: bold;
-}
-
-.radio-button .radio {
-    -fx-background-color: #D3FFB5;
-    -fx-border-color:grey;
-    -fx-border-radius: 25;
-}
-

src/main/resources/ch/zhaw/gartenverwaltung/hello-view.fxml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.VBox?>
+
+<?import javafx.scene.control.Button?>
+<VBox alignment="CENTER" spacing="20.0" xmlns:fx="http://javafx.com/fxml"
+      fx:controller="ch.zhaw.gartenverwaltung.HelloController">
+    <padding>
+        <Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>
+    </padding>
+
+    <Label fx:id="welcomeText"/>
+    <Button text="Hello!" onAction="#onHelloButtonClick"/>
+</VBox>

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

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

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

@@ -1,68 +1,56 @@
 [
   {
-    "id": 1,
+  "id" : 1,
-    "name": "sow plant",
+  "name" : "sow plant",
-    "description": "Plant the seeds, crops in de bed.",
+  "description": "Plant the seeds, crops in de bed.",
-    "startDate": "2022-05-01",
+  "startDate" : "2022-05-01",
-    "nextExecution": "2022-05-01",
+  "endDate" : "2022-05-01",
-    "nextNotification": "2022-05-01",
+  "interval" : 0,
-    "endDate": "2022-05-01",
+    "cropId" : 0
-    "interval": null,
-    "cropId": 0
   },
   {
-    "id": 2,
+    "id" : 2,
-    "name": "water plant",
+    "name" : "water plant",
     "description": "water the plant, so that the soil is wet around the plant.",
-    "startDate": "2022-10-29",
+    "startDate" : "2022-05-01",
-    "nextExecution": "2022-11-30",
+    "endDate" : "2022-09-01",
-    "nextNotification": "2022-05-01",
+    "interval" : 2,
-    "endDate": "2022-12-31",
+    "cropId" : 0
-    "interval": 2,
-    "cropId": 0
   },
   {
-    "id": 3,
+    "id" : 3,
-    "name": "fertilize plant",
+    "name" : "fertilize plant",
     "description": "The fertilizer has to be mixed with water. Then fertilize the plants soil with the mixture",
-    "startDate": "2022-06-01",
+    "startDate" : "2022-06-01",
-    "nextExecution": "2022-06-01",
+    "endDate" : "2022-08-01",
-    "nextNotification": "2022-06-01",
+    "interval" : 28,
-    "endDate": "2022-08-01",
+    "cropId" : 0
-    "interval": 28,
-    "cropId": 0
   },
   {
-    "id": 4,
+    "id" : 4,
-    "name": "covering plant",
+    "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",
+    "startDate" : "2022-07-01",
-    "nextExecution": "2022-07-01",
+    "endDate" : "2022-07-01",
-    "nextNotification": "2022-07-01",
+    "interval" : 0,
-    "endDate": "2022-07-01",
+    "cropId" : 0
-    "interval": null,
-    "cropId": 0
   },
   {
-    "id": 5,
+    "id" : 5,
-    "name": "look after plant",
+    "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",
+    "startDate" : "2022-05-01",
-    "nextExecution": "2022-05-01",
+    "endDate" : "2022-09-01",
-    "nextNotification": "2022-05-01",
+    "interval" : 5,
-    "endDate": "2022-09-01",
+    "cropId" : 0
-    "interval": 5,
-    "cropId": 0
   },
   {
-    "id": 6,
+    "id" : 6,
-    "name": "harvest plant",
+    "name" : "harvest plant",
     "description": "Pull the ripe vegetables out from the soil. Clean them with clear, fresh water. ",
-    "startDate": "2022-09-01",
+    "startDate" : "2022-09-01",
-    "nextExecution": "2022-09-01",
+    "endDate" : "2022-09-01",
-    "nextNotification": "2022-09-01",
+    "interval" : 0,
-    "endDate": "2022-09-01",
+    "cropId" : 0
-    "interval": null,
-    "cropId": 0
   }
 ]

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

@@ -30,7 +30,6 @@ public class JsonCropListTest {
      */
     private final URL dbDataSource = this.getClass().getResource("test-user-crops.json");
     private final URL testFile = this.getClass().getResource("template-user-crops.json");
-    private final URL corruptTestFile = this.getClass().getResource("corrupt-template-user-crops.json");
 
     @BeforeEach
     void connectToDb() throws URISyntaxException, IOException {
@@ -102,13 +101,5 @@ public class JsonCropListTest {
             throw new RuntimeException(e);
         }
     }
-
-    @Test
-    void detectCorruptJsonResource(){
-        JsonCropList tL = new JsonCropList(corruptTestFile);
-        Assertions.assertThrows(InvalidJsonException.class, () -> {
-            tL.getCrops();
-        });
-    }
 }
 

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

@@ -15,7 +15,6 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class JsonPlantListTest {
     private final URL testFile = this.getClass().getResource("test-plantdb.json");
@@ -63,8 +62,6 @@ public class JsonPlantListTest {
     void getPlantByIdAndZone() {
         Optional<Plant> testPlant;
         try {
-            assertThrows(HardinessZoneNotSetException.class, () -> testDatabase.getPlantById(null,1).get());
-
             testPlant = testDatabase.getPlantById(HardinessZone.ZONE_8A, 1);
         } catch (IOException | HardinessZoneNotSetException e) {
             throw new RuntimeException(e);
@@ -98,16 +95,5 @@ public class JsonPlantListTest {
 
     }
 
-    @Test
-    void testDefaultConstructor(){
-        JsonPlantList db = new JsonPlantList();
-        try {
-            assertNotNull(db.getPlantList(HardinessZone.ZONE_8A));
-        } catch (IOException | HardinessZoneNotSetException e) {
-            throw new RuntimeException(e);
-        }
-
-    }
-
 }
 

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

@@ -2,8 +2,6 @@ package ch.zhaw.gartenverwaltung.io;
 
 import ch.zhaw.gartenverwaltung.types.Task;
 import org.junit.jupiter.api.*;
-import org.mockito.ArgumentMatchers;
-import org.mockito.Mockito;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -16,8 +14,6 @@ import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 
 public class JsonTaskListTest {
 
@@ -104,7 +100,6 @@ public class JsonTaskListTest {
 
     }
 
-
     @Test
     void removeTasksForCrop() {
         List<Task> taskList;
@@ -117,27 +112,4 @@ public class JsonTaskListTest {
 
         Assertions.assertEquals(0, taskList.size());
     }
-
-    @Test
-    void testDefaultConstructor(){
-        JsonTaskList db = new JsonTaskList();
-        try {
-            assertNotNull(db.getTaskForCrop(0));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-
-    }
-
-    @Test
-    void testSubscription() {
-        TaskList.TaskListObserver mockObs = Mockito.mock(TaskList.TaskListObserver.class);
-        testDatabase.subscribe(mockObs);
-        try {
-            testDatabase.removeTasksForCrop(0);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        verify(mockObs, times(1)).onChange(ArgumentMatchers.anyList());
-    }
 }

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

@@ -49,15 +49,14 @@ public class GardenPlanModelTest {
                 0,
                 "sandy to loamy, loose soil, free of stones",
                 new ArrayList<>(),
-                new WateringCycle(15, 0, null),
+                List.of(new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()),
-                List.of(new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()),
+                        new GrowthPhase(MonthDay.of(4, 3), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
-                        new GrowthPhase(MonthDay.of(4, 3), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
+                        new GrowthPhase(MonthDay.of(8, 5), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
-                        new GrowthPhase(MonthDay.of(8, 5), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
+                        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(2, 8), MonthDay.of(12, 4), 0, 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<>())));
-                        new GrowthPhase(MonthDay.of(10, 2), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())));
 
-        exampleCropOnion = new Crop(examplePlantOnion.id(), LocalDate.of(2023, 3, 1))
+        exampleCropOnion = new Crop(examplePlantOnion.id(),  LocalDate.of(2023,3,1));
-                .withId(3);
+        exampleCropOnion.withId(3);
         examplePlantCarrot = new Plant(
                 1,
                 "Early Carrot",
@@ -67,20 +66,19 @@ public class GardenPlanModelTest {
                 0,
                 "sandy to loamy, loose soil, free of stones",
                 new ArrayList<>(),
-                new WateringCycle(25, 0, null),
+                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<>())));
-                List.of(new GrowthPhase(MonthDay.of(4, 4), MonthDay.of(12, 4), 0, 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));
-                .withId(0)
+        exampleCrop1.withId(0);
-                .withArea(0.5);
+        exampleCrop1.withArea(0.5);
-        exampleCrop2 = new Crop(1, LocalDate.of(2023, 3, 1))
+        exampleCrop2 = new Crop(1,LocalDate.of(2023,3,1));
-                .withId(1)
+        exampleCrop2.withId(1);
-                .withArea(0.5);
+        exampleCrop2.withArea(0.5);
-        exampleCrop3 = new Crop(0, LocalDate.of(2023, 3, 1))
+        exampleCrop3 = new Crop(0,LocalDate.of(2023,3,1));
-                .withId(2)
+        exampleCrop3.withId(2);
-                .withArea(1.0);
+        exampleCrop3.withArea(1.0);
 
         exampleCrops = new ArrayList<>();
         exampleCrops.add(exampleCrop1);
@@ -109,7 +107,7 @@ public class GardenPlanModelTest {
     @Test
     void plantAsCrop() throws HardinessZoneNotSetException, IOException, PlantNotFoundException {
 
-        model.plantAsCrop(examplePlantOnion, LocalDate.of(2023, 3, 1));
+        model.plantAsCrop(examplePlantOnion, LocalDate.of(2023,3,1));
         Optional<Crop> exampleCrop = model.getCrop(2L);
         assertTrue(exampleCrop.isPresent());
         assertEquals(model.getCrops().get(2), exampleCrop.get());
@@ -121,6 +119,6 @@ public class GardenPlanModelTest {
         exampleCrop1.withId(2);
         exampleCrop1.withArea(1.5);
         model.removeCrop(exampleCrop1);
-        assertEquals(2, model.getCrops().size());
+        assertEquals(2,model.getCrops().size());
     }
 }

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

@@ -1,225 +0,0 @@
-package ch.zhaw.gartenverwaltung.models;
-
-import ch.zhaw.gartenverwaltung.io.*;
-import ch.zhaw.gartenverwaltung.models.GardenSchedule;
-import ch.zhaw.gartenverwaltung.types.*;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.time.LocalDate;
-import java.time.MonthDay;
-import java.time.format.DateTimeFormatter;
-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;
-    List<TaskTemplate> exampleTaskTemplateList;
-    GardenSchedule model;
-
-    @BeforeEach
-    void setUp() throws IOException, HardinessZoneNotSetException {
-        createExampleTaskList();
-        createExampleTaskTemplateList();
-        createExamplePlantList();
-        taskList = mockTaskDatabase(exampleTaskList);
-        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)));
-
-        List<Task> pastTasks = new ArrayList<>();
-        pastTasks.add(exampleTaskList.get(0));
-        pastTasks.add(exampleTaskList.get(2));
-        pastTasks.add(exampleTaskList.get(4));
-        when(taskList.getTaskList(LocalDate.MIN, LocalDate.now())).thenReturn(pastTasks);
-
-
-        when(taskList.getTaskList(LocalDate.now(), LocalDate.now())).thenReturn(List.of(exampleTaskList.get(2)));
-        when(taskList.getTaskList(LocalDate.now().plusDays(1L), LocalDate.now().plusDays(1L))).thenReturn(List.of(exampleTaskList.get(1)));
-        when(taskList.getTaskList(LocalDate.now().plusDays(2L), LocalDate.now().plusDays(2L))).thenReturn(List.of());
-        when(taskList.getTaskList(LocalDate.now().plusDays(3L), LocalDate.now().plusDays(3L))).thenReturn(List.of());
-        when(taskList.getTaskList(LocalDate.now().plusDays(4L), LocalDate.now().plusDays(4L))).thenReturn(List.of());
-        when(taskList.getTaskList(LocalDate.now().plusDays(5L), LocalDate.now().plusDays(5L))).thenReturn(List.of());
-        when(taskList.getTaskList(LocalDate.now().plusDays(6L), LocalDate.now().plusDays(6L))).thenReturn(List.of());
-
-        return taskList;
-    }
-
-    void createExampleTaskTemplateList(){
-        exampleTaskTemplateList = new ArrayList<>();
-        exampleTaskTemplateList.add(mock(TaskTemplate.class));
-        exampleTaskTemplateList.add(mock(TaskTemplate.class));
-        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));
-    }
-
-    void createExamplePlantList(){
-        examplePlantList = new ArrayList<>();
-        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<>(),
-                new WateringCycle(15, 0, null),
-                List.of(
-
-                        new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0,  GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, List.of(
-                                exampleTaskTemplateList.get(0),
-                                exampleTaskTemplateList.get(1)
-                        )),
-                        new GrowthPhase(MonthDay.of(4, 3), MonthDay.of(12, 4), 0,  GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, List.of(
-                                exampleTaskTemplateList.get(2),
-                                exampleTaskTemplateList.get(3)
-                        )),
-                        new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0,  GrowthPhaseType.SOW, HardinessZone.ZONE_8A, List.of(
-
-                        ))
-                )));
-    }
-
-    void createExampleTaskList() {
-        exampleTaskList = new ArrayList<>();
-        exampleTaskList.add(new Task("name", "description", LocalDate.now().minusDays(1), 1L));
-        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.now().minusDays(10), LocalDate.now().plusDays(4),2, 2L));
-    }
-
-    @Test
-    void addTask() throws IOException {
-        Task taskToAdd = new Task("name", "description", LocalDate.now(), 1L);
-        model.addTask(taskToAdd);
-        verify(taskList, times(1)).saveTask(taskToAdd);
-    }
-
-    @Test
-    void removeTask() throws IOException {
-        Task taskToRemove = new Task("name", "description", LocalDate.now(), 1L);
-        model.removeTask(taskToRemove);
-        verify(taskList, times(1)).removeTask(taskToRemove);
-    }
-
-    @Test
-    void getTaskList() throws IOException {
-        List<Task> listToCheck = model.getTaskList();
-        assertEquals(5, listToCheck.size());
-        assertEquals(exampleTaskList.get(4), listToCheck.get(0));
-        assertEquals(exampleTaskList.get(0), listToCheck.get(1));
-        assertEquals(exampleTaskList.get(2), listToCheck.get(2));
-        assertEquals(exampleTaskList.get(1), listToCheck.get(3));
-        assertEquals(exampleTaskList.get(3), listToCheck.get(4));
-    }
-
-    @Test
-    void getFutureTasks() throws IOException {
-        List<Task> listToCheck = model.getFutureTasks();
-        assertEquals(3, listToCheck.size());
-        assertEquals(exampleTaskList.get(2), listToCheck.get(0));
-        assertEquals(exampleTaskList.get(1), listToCheck.get(1));
-        assertEquals(exampleTaskList.get(3), listToCheck.get(2));
-    }
-
-    @Test
-    void getPastTasks() throws IOException {
-        List<Task> listToCheck = model.getPastTasks();
-        assertEquals(3, listToCheck.size());
-        assertEquals(exampleTaskList.get(4), listToCheck.get(0));
-        assertEquals(exampleTaskList.get(0), listToCheck.get(1));
-        assertEquals(exampleTaskList.get(2), listToCheck.get(2));
-    }
-
-    @Test
-    void getTasksUpcomingWeek() throws IOException {
-        List<List<Task>> dayList = model.getTasksUpcomingWeek();
-        assertEquals(7, dayList.size());
-
-        //Check day 0
-        assertEquals(2, dayList.get(0).size());
-        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());
-        assertTrue(dayList.get(1).contains(exampleTaskList.get(1)));
-
-        //Check day 2
-        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(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
-        assertEquals(0, dayList.get(6).size());
-    }
-
-    @Test
-    void removeTasksForCrop() throws IOException {
-        model.removeTasksForCrop(1L);
-        verify(taskList, times(1)).removeTasksForCrop(1L);
-    }
-
-    @Test
-    void planTasksForCrop() throws HardinessZoneNotSetException, PlantNotFoundException, IOException, URISyntaxException {
-        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));
-
-         final URL dbDataSource = this.getClass().getResource("test-taskdb.json");
-         final URL testFile = this.getClass().getResource("template-taskdb.json");
-
-        Files.copy(Path.of(testFile.toURI()), Path.of(dbDataSource.toURI()), StandardCopyOption.REPLACE_EXISTING);
-        JsonTaskList testTaskList = new JsonTaskList(dbDataSource);
-
-        model = spy(new GardenSchedule(testTaskList,plantList));
-        model.planTasksForCrop(new Crop(20, exampleStartDate).withId(30));
-        assertEquals(5,testTaskList.getTaskList(LocalDate.MIN,LocalDate.MAX).size());
-        testTaskList.getTaskList(LocalDate.MIN,LocalDate.MAX).get(0);
-    }
-
-
-}

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

@@ -49,12 +49,11 @@ class PlantListModelTest {
                 0,
                 "sandy to loamy, loose soil, free of stones",
                 new ArrayList<>(),
-                new WateringCycle(25, 0, null),
+                List.of(new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()),
-                List.of(new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0,  GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()),
+                        new GrowthPhase(MonthDay.of(4, 3), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
-                        new GrowthPhase(MonthDay.of(4, 3), MonthDay.of(12, 4), 0,  GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
+                        new GrowthPhase(MonthDay.of(8, 5), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
-                        new GrowthPhase(MonthDay.of(8, 5), MonthDay.of(12, 4), 0,  GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
+                        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(2, 8), MonthDay.of(12, 4), 0,  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<>())))
-                        new GrowthPhase(MonthDay.of(10, 2), MonthDay.of(12, 4), 0,  GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())))
         );
         examplePlantList.add(new Plant(
                 0,
@@ -65,9 +64,8 @@ class PlantListModelTest {
                 6,
                 "sandy",
                 new ArrayList<>(),
-                new WateringCycle(0, 0, null),
+                List.of(new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()),
-                List.of(new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0,  GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()),
+                        new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())))
-                        new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0,  GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())))
         );
         examplePlantList.add(new Plant(
                 1,
@@ -78,8 +76,7 @@ class PlantListModelTest {
                 0,
                 "sandy to loamy, loose soil, free of stones",
                 new ArrayList<>(),
-                new WateringCycle(25, 0, null),
+                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<>())))
-                List.of(new GrowthPhase(MonthDay.of(4, 4), MonthDay.of(12, 4), 0,  GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())))
         );
     }
 

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

@@ -0,0 +1,159 @@
+package ch.zhaw.gartenverwaltung.taskList;
+
+import ch.zhaw.gartenverwaltung.io.*;
+import ch.zhaw.gartenverwaltung.models.GardenSchedule;
+import ch.zhaw.gartenverwaltung.types.HardinessZone;
+import ch.zhaw.gartenverwaltung.types.Plant;
+import ch.zhaw.gartenverwaltung.types.Task;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.time.LocalDate;
+import java.util.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+class GardenScheduleTest {
+    TaskList taskList;
+    PlantList plantList;
+    List<Task> exampleTaskList;
+    Map<Long, Plant> examplePlantMap;
+    GardenSchedule model;
+
+    @BeforeEach
+    void setUp() throws IOException {
+        createExampleTaskList();
+        taskList = mockTaskDatabase(exampleTaskList);
+        plantList = mockPlantDatabase(examplePlantMap);
+        model = new GardenSchedule(taskList, plantList);
+    }
+
+    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.MAX)).thenReturn((exampleTaskList.subList(1, 4)));
+
+        List<Task> pastTasks = new ArrayList<>();
+        pastTasks.add(exampleTaskList.get(0));
+        pastTasks.add(exampleTaskList.get(2));
+        pastTasks.add(exampleTaskList.get(4));
+        when(taskList.getTaskList(LocalDate.MIN, LocalDate.now())).thenReturn(pastTasks);
+
+
+        when(taskList.getTaskList(LocalDate.now(), LocalDate.now())).thenReturn(List.of(exampleTaskList.get(2)));
+        when(taskList.getTaskList(LocalDate.now().plusDays(1L), LocalDate.now().plusDays(1L))).thenReturn(List.of(exampleTaskList.get(1)));
+        when(taskList.getTaskList(LocalDate.now().plusDays(2L), LocalDate.now().plusDays(2L))).thenReturn(List.of());
+        when(taskList.getTaskList(LocalDate.now().plusDays(3L), LocalDate.now().plusDays(3L))).thenReturn(List.of());
+        when(taskList.getTaskList(LocalDate.now().plusDays(4L), LocalDate.now().plusDays(4L))).thenReturn(List.of());
+        when(taskList.getTaskList(LocalDate.now().plusDays(5L), LocalDate.now().plusDays(5L))).thenReturn(List.of());
+        when(taskList.getTaskList(LocalDate.now().plusDays(6L), LocalDate.now().plusDays(6L))).thenReturn(List.of());
+
+        return taskList;
+    }
+
+    private PlantList mockPlantDatabase(Map<Long, Plant> examplePlantMap) {
+        return new PlantList() {
+            @Override
+            public List<Plant> getPlantList(HardinessZone zone) {
+                return null;
+            }
+
+            @Override
+            public Optional<Plant> getPlantById(HardinessZone zone, long id) {
+                return Optional.ofNullable(examplePlantMap.get(id));
+            }
+        };
+    }
+
+    void createExampleTaskList() {
+        exampleTaskList = new ArrayList<>();
+        exampleTaskList.add(new Task("name", "description", LocalDate.now().minusDays(1), 1L));
+        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));
+    }
+
+    void createExamplePlantMap() {
+        examplePlantMap = new HashMap<>();
+    }
+
+
+
+    @Test
+    void addTask() throws IOException {
+        Task taskToAdd = new Task("name", "description", LocalDate.now(), 1L);
+        model.addTask(taskToAdd);
+        verify(taskList, times(1)).saveTask(taskToAdd);
+    }
+
+    @Test
+    void removeTask() throws IOException {
+        Task taskToRemove = new Task("name", "description", LocalDate.now(), 1L);
+        model.removeTask(taskToRemove);
+        verify(taskList, times(1)).removeTask(taskToRemove);
+    }
+
+    @Test
+    void getTaskList() throws IOException {
+        List<Task> listToCheck = model.getTaskList();
+        assertEquals(5, listToCheck.size());
+        assertEquals(exampleTaskList.get(4), listToCheck.get(0));
+        assertEquals(exampleTaskList.get(0), listToCheck.get(1));
+        assertEquals(exampleTaskList.get(2), listToCheck.get(2));
+        assertEquals(exampleTaskList.get(1), listToCheck.get(3));
+        assertEquals(exampleTaskList.get(3), listToCheck.get(4));
+    }
+
+    @Test
+    void getFutureTasks() throws IOException {
+        List<Task> listToCheck = model.getFutureTasks();
+        assertEquals(3, listToCheck.size());
+        assertEquals(exampleTaskList.get(2), listToCheck.get(0));
+        assertEquals(exampleTaskList.get(1), listToCheck.get(1));
+        assertEquals(exampleTaskList.get(3), listToCheck.get(2));
+    }
+
+    @Test
+    void getPastTasks() throws IOException {
+        List<Task> listToCheck = model.getPastTasks();
+        assertEquals(3, listToCheck.size());
+        assertEquals(exampleTaskList.get(4), listToCheck.get(0));
+        assertEquals(exampleTaskList.get(0), listToCheck.get(1));
+        assertEquals(exampleTaskList.get(2), listToCheck.get(2));
+    }
+
+    @Test
+    void getTasksUpcomingWeek() throws IOException {
+        List<List<Task>> dayList = model.getTasksUpcomingWeek();
+        assertEquals(7, dayList.size());
+
+        //Check day 0
+        assertEquals(1, dayList.get(0).size());
+        assertEquals(exampleTaskList.get(2), dayList.get(0).get(0));
+
+        //Check day 1
+        assertEquals(1, dayList.get(1).size());
+        assertEquals(exampleTaskList.get(1), dayList.get(1).get(0));
+
+        //Check day 2
+        assertEquals(0, dayList.get(2).size());
+        //Check day 3
+        assertEquals(0, dayList.get(3).size());
+        //Check day 4
+        assertEquals(0, dayList.get(4).size());
+        //Check day 5
+        assertEquals(0, dayList.get(5).size());
+        //Check day 6
+        assertEquals(0, dayList.get(6).size());
+    }
+
+    @Test
+    void removeTasksForCrop() throws IOException {
+        model.removeTasksForCrop(1L);
+        verify(taskList, times(1)).removeTasksForCrop(1L);
+    }
+}

src/test/java/ch/zhaw/gartenverwaltung/types/PlantTest.java

@@ -1,98 +0,0 @@
-package ch.zhaw.gartenverwaltung.types;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import java.time.LocalDate;
-import java.time.MonthDay;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class PlantTest {
-
-    Plant testPlant;
-
-    @BeforeEach
-    void setUp() {
-        List<GrowthPhase> growthPhases = new ArrayList<>();
-        growthPhases.add(new GrowthPhase(MonthDay.of(2, 1), MonthDay.of(4, 4), 0, GrowthPhaseType.SOW, HardinessZone.ZONE_8A, new ArrayList<>()));
-        growthPhases.add(new GrowthPhase(MonthDay.of(4, 2), MonthDay.of(6, 5), 0,  GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()));
-        growthPhases.add(new GrowthPhase(MonthDay.of(6, 3), MonthDay.of(8, 6), 0,  GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()));
-        growthPhases.add(new GrowthPhase(MonthDay.of(3, 1), MonthDay.of(5, 4), 1,  GrowthPhaseType.SOW, HardinessZone.ZONE_8A, new ArrayList<>()));
-        growthPhases.add(new GrowthPhase(MonthDay.of(5, 2), MonthDay.of(7, 5), 1,  GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()));
-        growthPhases.add(new GrowthPhase(MonthDay.of(7, 3), MonthDay.of(9, 6), 1,  GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()));
-        growthPhases.add(new GrowthPhase(MonthDay.of(4, 1), MonthDay.of(6, 4), 0,  GrowthPhaseType.SOW, HardinessZone.ZONE_1A, new ArrayList<>()));
-        growthPhases.add(new GrowthPhase(MonthDay.of(6, 2), MonthDay.of(8, 5), 0,  GrowthPhaseType.PLANT, HardinessZone.ZONE_1A, new ArrayList<>()));
-        growthPhases.add(new GrowthPhase(MonthDay.of(7, 2), MonthDay.of(9, 5), 0,  GrowthPhaseType.PLANT, HardinessZone.ZONE_1A, new ArrayList<>()));
-        growthPhases.add(new GrowthPhase(MonthDay.of(8, 3), MonthDay.of(10, 6), 0,  GrowthPhaseType.HARVEST, HardinessZone.ZONE_1A, new ArrayList<>()));
-
-        testPlant = 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<>(),
-                new WateringCycle(25, 0, null),
-                growthPhases);
-    }
-
-    @AfterEach
-    void tearDown() {
-    }
-
-    @Test
-    void inZone() {
-        assertEquals(7,testPlant.lifecycleForGroup(0).size());
-        testPlant.inZone(HardinessZone.ZONE_8A);
-        assertEquals(3,testPlant.lifecycleForGroup(0).size());
-        assertEquals(Arrays.asList(3,5,7),testPlant.lifecycleForGroup(1).stream().map(gp ->gp.startDate().getMonthValue()).toList() );
-        testPlant.inZone(HardinessZone.ZONE_1A);
-        assertEquals(0,testPlant.lifecycleForGroup(0).size());
-    }
-
-    @Test
-    void lifecycleForGroup() {
-        assertEquals(Arrays.asList(2,4,6,4,6,7,8),testPlant.lifecycleForGroup(0).stream().map(gp ->gp.startDate().getMonthValue()).toList() );
-        assertEquals(Arrays.asList(3,5,7),testPlant.lifecycleForGroup(1).stream().map(gp ->gp.startDate().getMonthValue()).toList() );
-
-    }
-
-    @Test
-    void sowDateFromHarvestDate() {
-        assertEquals(LocalDate.of(2022,8,1),
-                testPlant.sowDateFromHarvestDate(LocalDate.of(2022,12,1))
-        );
-    }
-
-    @Test
-    void timeToHarvest() {
-        testPlant.inZone(HardinessZone.ZONE_8A);
-        assertEquals(122,testPlant.timeToHarvest(0));
-    }
-
-    @Test
-    void lifecycleGroupFromHarvestDate() {
-        testPlant.inZone(HardinessZone.ZONE_8A);
-        assertEquals(0,testPlant.lifecycleGroupFromHarvestDate(LocalDate.of(2022,6,30)));
-        assertEquals(1,testPlant.lifecycleGroupFromHarvestDate(LocalDate.of(2022,8,30)));
-    }
-
-    @Test
-    void isDateInPhase() {
-        assertTrue(testPlant.isDateInPhase(LocalDate.of(2022,6,30),GrowthPhaseType.HARVEST));
-        assertTrue(testPlant.isDateInPhase(LocalDate.of(2022,8,30),GrowthPhaseType.HARVEST));
-        assertTrue(testPlant.isDateInPhase(LocalDate.of(2022,2,1),GrowthPhaseType.SOW));
-        assertTrue(testPlant.isDateInPhase(LocalDate.of(2022,4,2),GrowthPhaseType.PLANT));
-        assertFalse(testPlant.isDateInPhase(LocalDate.of(2022,6,30),GrowthPhaseType.SOW));
-
-
-    }
-}

src/test/java/ch/zhaw/gartenverwaltung/types/SeasonsTest.java

@@ -1,38 +0,0 @@
-package ch.zhaw.gartenverwaltung.types;
-
-import org.junit.jupiter.api.Test;
-
-import java.time.MonthDay;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class SeasonsTest {
-
-    @Test
-    void getStartDate() {
-        assertEquals(MonthDay.of(1,1), Seasons.ALLSEASONS.getStartDate());
-        assertEquals(MonthDay.of(3,1), Seasons.SPRING.getStartDate());
-        assertEquals(MonthDay.of(6,1), Seasons.SUMMER.getStartDate());
-        assertEquals(MonthDay.of(9,1), Seasons.AUTUMN.getStartDate());
-        assertEquals(MonthDay.of(12,1), Seasons.WINTER.getStartDate());
-    }
-
-    @Test
-    void getEndDate() {
-        assertEquals(MonthDay.of(12,31), Seasons.ALLSEASONS.getEndDate());
-        assertEquals(MonthDay.of(5,30), Seasons.SPRING.getEndDate());
-        assertEquals(MonthDay.of(8,30), Seasons.SUMMER.getEndDate());
-        assertEquals(MonthDay.of(11,30), Seasons.AUTUMN.getEndDate());
-        assertEquals(MonthDay.of(2,28), Seasons.WINTER.getEndDate());
-    }
-
-    @Test
-    void getName() {
-        assertEquals("All Seasons", Seasons.ALLSEASONS.getName());
-        assertEquals("Spring", Seasons.SPRING.getName());
-        assertEquals("Summer", Seasons.SUMMER.getName());
-        assertEquals("Autumn", Seasons.AUTUMN.getName());
-        assertEquals("Winter", Seasons.WINTER.getName());
-
-    }
-}

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

@@ -1,7 +0,0 @@
-[
-  {
-    "plantId": 1,
-    "startDate": "2023-02-25",
-    "area": 0.5
-  }
-]

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

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

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

@@ -4,8 +4,6 @@
     "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,
     "cropId" : 0
@@ -15,8 +13,6 @@
     "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
@@ -26,8 +22,6 @@
     "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-05-01",
-    "nextNotification": "2022-05-01",
     "endDate" : "2022-08-01",
     "interval" : 28,
     "cropId" : 0
@@ -37,8 +31,6 @@
     "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-05-01",
-    "nextNotification": "2022-05-01",
     "endDate" : "2022-07-01",
     "interval" : 0,
     "cropId" : 0
@@ -48,8 +40,6 @@
     "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
@@ -59,8 +49,6 @@
     "name" : "harvest plant",
     "description": "Pull the ripe vegetables out from the soil. Clean them with clear, fresh water. ",
     "startDate" : "2022-09-01",
-    "nextExecution": "2022-05-01",
-    "nextNotification": "2022-05-01",
     "endDate" : "2022-09-01",
     "interval" : 0,
     "cropId" : 0

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

@@ -14,11 +14,6 @@
         "measures": "Less water."
       }
     ],
-    "wateringCycle": {
-      "litersPerSqM": 25,
-      "interval": null,
-      "notes": []
-    },
     "lifecycle": [
       {
         "startDate": "03-10",
@@ -26,13 +21,19 @@
         "type": "SOW",
         "zone": "ZONE_8A",
         "group": 0,
+        "wateringCycle": {
+          "litersPerSqM": 0,
+          "interval": null,
+          "notes": []
+        },
         "taskTemplates": [
           {
             "name": "Germinate",
             "relativeStartDate": -14,
             "relativeEndDate": null,
             "description": "Take an egg carton and fill it with soil. Put the seedling deep enough so its half covered with soil. Keep it in 10-15 * Celsius with lots of light.",
-            "interval": null
+            "interval": null,
+            "isOptional": false
           }
         ]
       },
@@ -42,13 +43,19 @@
         "type": "PLANT",
         "zone": "ZONE_8A",
         "group": 0,
+        "wateringCycle": {
+          "litersPerSqM": 25,
+          "interval": 7,
+          "notes": []
+        },
         "taskTemplates": [
           {
             "name": "hilling",
             "relativeStartDate": 0,
             "relativeEndDate": null,
             "description": "When the plants are 20 cm tall, begin hilling the potatoes by gently mounding the soil from the center of your rows around the stems of the plant. Mound up the soil around the plant until just the top few leaves show above the soil. Two weeks later, hill up the soil again when the plants grow another 20 cm.",
-            "interval": 21
+            "interval": 21,
+            "isOptional": false
           }
         ]
       },
@@ -58,13 +65,19 @@
         "type": "HARVEST",
         "zone": "ZONE_8A",
         "group": 0,
+        "wateringCycle": {
+          "litersPerSqM": 0,
+          "interval": null,
+          "notes": []
+        },
         "taskTemplates": [
           {
             "name": "Harvest",
             "relativeStartDate": 0,
             "relativeEndDate": null,
             "description": "Once the foliage has wilted and dried completely, harvest on a dry day. Store in a dark and cool location.",
-            "interval": null
+            "interval": null,
+            "isOptional": false
           }
         ]
       }
@@ -75,11 +88,6 @@
     "name": "Early Carrot",
     "description": "Carrot, (Daucus carota), herbaceous, generally biennial plant of the Apiaceae family that produces an edible taproot. Among common varieties root shapes range from globular to long, with lower ends blunt to pointed. Besides the orange-coloured roots, white-, yellow-, and purple-fleshed varieties are known.",
     "image": "carrot.jpg",
-    "wateringCycle": {
-      "litersPerSqM": 15,
-      "interval": 3,
-      "notes": []
-    },
     "lifecycle": [
       {
         "startDate": "02-20",
@@ -87,14 +95,19 @@
         "zone": "ZONE_8A",
         "type": "SOW",
         "group": 0,
-
+        "wateringCycle": {
+          "litersPerSqM": 15,
+          "interval": 3,
+          "notes": []
+        },
         "taskTemplates": [
           {
             "name": "hilling",
             "relativeStartDate": 0,
             "relativeEndDate": 0,
             "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": null
+            "interval": null,
+            "isOptional": false
           }
         ]
       },
@@ -104,13 +117,21 @@
         "zone": "ZONE_8A",
         "type": "PLANT",
         "group": 0,
+        "wateringCycle": {
+          "litersPerSqM": 25,
+          "interval": 3,
+          "notes": [
+            "Be careful not to pour water over the leaves, as this will lead to sunburn."
+          ]
+        },
         "taskTemplates": [
           {
             "name": "hilling",
             "relativeStartDate": 0,
             "relativeEndDate": null,
             "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": 15
+            "interval": 15,
+            "isOptional": true
           }
         ]
       },
@@ -120,13 +141,19 @@
         "zone": "ZONE_8A",
         "type": "HARVEST",
         "group": 0,
+        "wateringCycle": {
+          "litersPerSqM": 0,
+          "interval": null,
+          "notes": []
+        },
         "taskTemplates": [
           {
             "name": "Harvesting",
             "relativeStartDate": 0,
             "relativeEndDate": 14,
             "description": "When the leaves turn to a yellowish brown. Do not harvest earlier. The plant will show when it's ready.",
-            "interval": null
+            "interval": null,
+            "isOptional": false
           }
         ]
       }
@@ -146,12 +173,6 @@
     "name": "Summertime Onion",
     "description": "Onion, (Allium cepa), herbaceous biennial plant in the amaryllis family (Amaryllidaceae) grown for its edible bulb. The onion is likely native to southwestern Asia but is now grown throughout the world, chiefly in the temperate zones. Onions are low in nutrients but are valued for their flavour and are used widely in cooking. They add flavour to such dishes as stews, roasts, soups, and salads and are also served as a cooked vegetable.",
     "image": "onion.jpg",
-    "wateringCycle": {
-      "litersPerSqM": 15,
-      "interval": 4,
-      "notes": [
-      ]
-    },
     "lifecycle": [
       {
         "startDate": "03-15",
@@ -159,13 +180,21 @@
         "type": "SOW",
         "zone": "ZONE_8A",
         "group": 0,
+        "wateringCycle": {
+          "litersPerSqM": 15,
+          "interval": 4,
+          "notes": [
+
+          ]
+        },
         "taskTemplates": [
           {
-            "name": "Plant Sets",
+            "name": "hilling",
             "relativeStartDate": 0,
             "relativeEndDate": 0,
-            "description": "Plant the sets about 5cm deep into the soil.",
+            "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": null
+            "interval": null,
+            "isOptional": false
           }
         ]
       },
@@ -175,13 +204,21 @@
         "type": "PLANT",
         "zone": "ZONE_8A",
         "group": 0,
+        "wateringCycle": {
+          "litersPerSqM": 25,
+          "interval": 3,
+          "notes": [
+            ""
+          ]
+        },
         "taskTemplates": [
           {
             "name": "hilling",
             "relativeStartDate": 0,
             "relativeEndDate": null,
             "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": 15
+            "interval": 15,
+            "isOptional": true
           }
         ]
       },
@@ -191,13 +228,21 @@
         "type": "HARVEST",
         "zone": "ZONE_8A",
         "group": 0,
+        "wateringCycle": {
+          "litersPerSqM": 0,
+          "interval": null,
+          "notes": [
+
+          ]
+        },
         "taskTemplates": [
           {
             "name": "Harvesting",
             "relativeStartDate": 0,
             "relativeEndDate": 14,
             "description": "When ready for harvest, the leaves on your onion plants will start to flop over. This happens at the \"neck\" of the onion and it signals that the plant has stopped growing and is ready for storage. Onions should be harvested soon thereafter",
-            "interval": null
+            "interval": null,
+            "isOptional": false
           }
         ]
       }

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

@@ -1,2 +0,0 @@
-[
-]

src/test/resources/ch/zhaw/gartenverwaltung/models/test-taskdb.json

@@ -1,2 +0,0 @@
-[
-]