Merge remote-tracking branch 'origin/feature_gardenplan-model_M2' into feature_gardenplan-model_M2

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/ISSUE_TEMPLATE/tests.md

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

build.gradle

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

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

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

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

@@ -1,152 +0,0 @@
-package ch.zhaw.gartenverwaltung;
-
-import ch.zhaw.gartenverwaltung.bootstrap.Inject;
-import ch.zhaw.gartenverwaltung.io.PlantList;
-import ch.zhaw.gartenverwaltung.models.Garden;
-import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
-import ch.zhaw.gartenverwaltung.models.GardenSchedule;
-import ch.zhaw.gartenverwaltung.models.PlantNotFoundException;
-import ch.zhaw.gartenverwaltung.types.Crop;
-import ch.zhaw.gartenverwaltung.types.Pest;
-import ch.zhaw.gartenverwaltung.types.Plant;
-import ch.zhaw.gartenverwaltung.types.Task;
-import javafx.fxml.FXML;
-import javafx.geometry.Pos;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.image.ImageView;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.VBox;
-import javafx.stage.Stage;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class CropDetailController {
-    private Crop crop;
-
-    @Inject
-    private PlantList plantList;
-    @Inject
-    private GardenSchedule gardenSchedule;
-    @Inject
-    private Garden garden;
-
-    private static final Logger LOG = Logger.getLogger(CropDetailController.class.getName());
-
-    @FXML
-    private ImageView imageView;
-
-    @FXML
-    private Button area_button;
-
-    @FXML
-    private Label area_label;
-
-    @FXML
-    private Label cropName_label;
-
-    @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;
-
-    @FXML
-    private Label spacing_label;
-
-    @FXML
-    void editTaskList() {
-
-    }
-
-    @FXML
-    void goBack() {
-        Stage stage = (Stage) imageView.getScene().getWindow();
-        stage.close();
-    }
-
-    @FXML
-    void setArea() {
-
-    }
-
-    @FXML
-    void setLocation() {
-
-    }
-
-    public void setPlantFromCrop(Crop crop) throws PlantNotFoundException {
-        this.crop = crop;
-        try {
-            Plant plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId())
-                    .orElseThrow(PlantNotFoundException::new);
-
-            cropName_label.setText(plant.name());
-            description_label.setText(plant.description());
-            light_label.setText(String.valueOf(plant.light()));
-            soil_label.setText(plant.soil());
-            spacing_label.setText(plant.spacing());
-            if (plant.image() != null) {
-                imageView.setImage(plant.image());
-            }
-            area_label.setText("");
-            location_label.setText("");
-            createTaskLists(crop);
-            createPestList(plant);
-        } catch (HardinessZoneNotSetException | IOException e) {
-            throw new PlantNotFoundException();
-        }
-    }
-
-    private void createTaskLists(Crop crop) {
-        crop.getCropId().ifPresent(id -> {
-            List<Task> taskList;
-            try {
-                taskList = gardenSchedule.getTaskListForCrop(id);
-                for (Task task : 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());
-            }
-        });
-    }
-
-    private void createPestList(Plant plant) {
-        List<Pest> pests = plant.pests();
-        for (Pest pest : pests) {
-            Label label = new Label(pest.name() + ":");
-            label.setStyle("-fx-font-weight: bold");
-            HBox hBox = new HBox();
-            hBox.fillHeightProperty();
-            Label label1 = new Label(pest.description());
-            label1.setAlignment(Pos.TOP_LEFT);
-            label1.setWrapText(true);
-            label1.setMaxWidth(600);
-            label1.setMaxHeight(100);
-            Button button = new Button("Get Counter Measures");
-            hBox.getChildren().addAll(label1, button);
-            pests_vbox.getChildren().addAll(label, hBox);
-        }
-    }
-}

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

@@ -1,7 +1,8 @@
 package ch.zhaw.gartenverwaltung;
 
-import ch.zhaw.gartenverwaltung.bootstrap.AppLoader;
 import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
 import javafx.stage.Stage;
 
 import java.io.IOException;
@@ -9,11 +10,10 @@ 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);
-
+        FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("MainFXML.fxml"));
+        Scene scene = new Scene(fxmlLoader.load());
         stage.setTitle("Gartenverwaltung");
+        stage.setScene(scene);
         stage.show();
     }
 

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

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

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

@@ -1,148 +0,0 @@
-package ch.zhaw.gartenverwaltung;
-
-import ch.zhaw.gartenverwaltung.bootstrap.AfterInject;
-import ch.zhaw.gartenverwaltung.bootstrap.AppLoader;
-import ch.zhaw.gartenverwaltung.bootstrap.ChangeViewEvent;
-import ch.zhaw.gartenverwaltung.bootstrap.Inject;
-import ch.zhaw.gartenverwaltung.io.PlantList;
-import ch.zhaw.gartenverwaltung.models.Garden;
-import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
-import ch.zhaw.gartenverwaltung.models.PlantNotFoundException;
-import ch.zhaw.gartenverwaltung.types.Crop;
-import ch.zhaw.gartenverwaltung.types.Plant;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
-import javafx.fxml.FXML;
-import javafx.scene.control.Alert;
-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;
-
-import java.io.IOException;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class MyGardenController {
-    private static final Logger LOG = Logger.getLogger(MyGardenController.class.getName());
-    @Inject
-    AppLoader appLoader;
-    @Inject
-    private Garden garden;
-    @Inject
-    private PlantList plantList;
-
-    @FXML
-    public AnchorPane myGardenRoot;
-    @FXML
-    private VBox myPlants_vbox;
-
-    @AfterInject
-    @SuppressWarnings("unused")
-    public void init() {
-        garden.getPlantedCrops().addListener((observable, oldValue, newValue) -> {
-            try {
-                createPlantView(newValue);
-            } catch (HardinessZoneNotSetException | IOException e) {
-                LOG.log(Level.SEVERE, "Could not update view of croplist!", e);
-            }
-        });
-        try {
-            createPlantView(garden.getPlantedCrops());
-        } catch (HardinessZoneNotSetException | IOException e) {
-            LOG.log(Level.SEVERE, "Could not update view of croplist!", e);
-        }
-    }
-
-    @FXML
-    void addPlant() {
-        myGardenRoot.fireEvent(new ChangeViewEvent(ChangeViewEvent.CHANGE_MAIN_VIEW, "Plants.fxml"));
-    }
-
-    private void createPlantView(List<Crop> crops) throws HardinessZoneNotSetException, IOException {
-        myPlants_vbox.getChildren().clear();
-        for (Crop crop : crops) {
-            HBox hBox = createPlantView(crop);
-            myPlants_vbox.getChildren().add(hBox);
-        }
-    }
-
-    private HBox createPlantView(Crop crop) throws HardinessZoneNotSetException, IOException {
-        //ToDo add better design
-        Plant plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).get();
-        HBox hBox = new HBox(10);
-        ImageView imageView = new ImageView();
-        imageView.setPreserveRatio(false);
-        imageView.setFitHeight(100);
-        imageView.setFitWidth(100);
-        imageView.maxHeight(100);
-        if (plant.image() != null) {
-            imageView.setImage(plant.image());
-        }
-        hBox.setMinHeight(100);
-        Label label = new Label(plant.name());
-        label.setMaxWidth(2000);
-        HBox.setHgrow(label, Priority.ALWAYS);
-
-        Button details = new Button("Details");
-        Button delete = new Button("delete");
-        details.setOnAction(getGoToCropDetailEvent(crop));
-        delete.setOnAction(getDeleteCropEvent(crop));
-        
-        hBox.getChildren().addAll(imageView, label, details, delete);
-        return hBox;
-    }
-
-    private EventHandler<ActionEvent> getGoToCropDetailEvent(Crop crop) {
-        return (event) -> {
-            try {
-                Stage stage = new Stage();
-                if (appLoader.loadSceneToStage("CropDetail.fxml", stage) instanceof CropDetailController controller) {
-                    controller.setPlantFromCrop(crop);
-                }
-                stage.initModality(Modality.APPLICATION_MODAL);
-                stage.setResizable(true);
-                stage.showAndWait();
-            } catch (IOException | PlantNotFoundException e) {
-                // TODO: show error alert
-                LOG.log(Level.SEVERE, "Could not load plant details.", e);
-            }
-        };
-    }
-
-    private EventHandler<ActionEvent> getDeleteCropEvent(Crop crop) {
-        return (event) -> {
-            try {
-                showConfirmation(crop);
-            } catch (IOException | HardinessZoneNotSetException e) {
-                e.printStackTrace();
-            }
-        };
-    }
-
-    private void showConfirmation(Crop crop) throws IOException, HardinessZoneNotSetException {
-        Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
-        alert.setTitle("Delete Crop");
-        alert.setHeaderText("Are you sure want to delete this Crop?");
-        alert.setContentText("Deleting this crop will remove all associated tasks from your schedule.");
-
-        alert.showAndWait()
-                .ifPresent(buttonType -> {
-                    if (buttonType == ButtonType.OK) {
-                        try {
-                            garden.removeCrop(crop);
-                        } catch (IOException e) {
-                            // TODO: Show error alert
-                            LOG.log(Level.SEVERE, "Could not remove crop.", e);
-                        }
-                    }
-                });
-    }
-}

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

@@ -0,0 +1,58 @@
+package ch.zhaw.gartenverwaltung;
+
+import ch.zhaw.gartenverwaltung.types.Plant;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+import javafx.scene.control.Button;
+import javafx.scene.layout.VBox;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ResourceBundle;
+
+public class MyPlantsController implements Initializable {
+    MainFXMLController mainController;
+
+    @FXML
+    private Button addPlant_button;
+
+    @FXML
+    private VBox myPlants_vbox;
+
+    @FXML
+    void addPlant(ActionEvent event) throws IOException {
+        mainController.loadPane("Plants.fxml");
+    }
+
+    @Override
+    public void initialize(URL url, ResourceBundle resourceBundle) {
+        //ToDo
+        List<Plant> myPlants = getMyPlants();
+        createPlantView(myPlants);
+    }
+
+    private void createPlantView(List<Plant> myPlants) {
+        //ToDo
+        for(Plant plant : myPlants) {
+            createPlantView();
+        }
+    }
+
+    public void getMainController(MainFXMLController controller) {
+        mainController = controller;
+    }
+
+    private List<Plant> getMyPlants() {
+        //ToDo method to get myPlantList(scheduled)
+        //Method to call all Plants saved
+        List<Plant> myPlantList = new LinkedList<>();
+        return myPlantList;
+    }
+
+    private void createPlantView() {
+        //ToDo FXML Panel with Plant data
+    }
+}

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

@@ -1,38 +1,23 @@
 package ch.zhaw.gartenverwaltung;
 
-import ch.zhaw.gartenverwaltung.bootstrap.AfterInject;
-import ch.zhaw.gartenverwaltung.bootstrap.Inject;
-import ch.zhaw.gartenverwaltung.io.PlantList;
-import ch.zhaw.gartenverwaltung.models.Garden;
-import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
-import ch.zhaw.gartenverwaltung.models.GardenSchedule;
-import ch.zhaw.gartenverwaltung.types.Crop;
 import ch.zhaw.gartenverwaltung.types.Plant;
-import ch.zhaw.gartenverwaltung.types.Task;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
 import javafx.scene.control.Label;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.scene.layout.Pane;
-import javafx.scene.layout.VBox;
 
-import java.io.IOException;
+import java.net.URL;
 import java.time.LocalDate;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import java.util.ResourceBundle;
 
-public class MyScheduleController {
-    private static final Logger LOG = Logger.getLogger(MyScheduleController.class.getName());
-
-    private Crop selectedCrop = null;
-
-    @Inject
-    private GardenSchedule gardenSchedule;
-    @Inject
-    private Garden garden;
-    @Inject
-    private PlantList plantList;
+public class MyScheduleController implements Initializable {
+    private Plant selectedPlant = null;
 
     @FXML
     private Label day1_label;
@@ -80,30 +65,28 @@ public class MyScheduleController {
     private Label information_label;
 
     @FXML
-    private ListView<Crop> scheduledPlants_listview;
+    private ListView<Plant> scheduledPlants_listview;
 
-    @AfterInject
-    @SuppressWarnings("unused")
-    public void init() {
-        setCellFactoryListView();
-        scheduledPlants_listview.itemsProperty().bind(garden.getPlantedCrops());
-        lookForSelectedListEntries();
+    @Override
+    public void initialize(URL location, ResourceBundle resources) {
+        List<Plant> plantList = new LinkedList<>();
+        fillListViewMyPlantsInSchedule(plantList);
+        getSelectedPlantTask();
         setDayLabels();
         information_label.setText("");
-        try {
-            loadTaskList();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
     }
 
-    private void lookForSelectedListEntries() {
-        scheduledPlants_listview.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
-            selectedCrop = newValue;
-            try {
-                loadTaskList();
-            } catch (IOException e) {
-                e.printStackTrace();
+    private void getSelectedPlantTask() {
+        scheduledPlants_listview.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<Plant>() {
+            @Override
+            public void changed(ObservableValue<? extends Plant> observable, Plant oldValue, Plant newValue) {
+                if(newValue != null) {
+                    selectedPlant = newValue;
+                    //ToDo update day<x>_panel with task for the day
+                } else {
+                    selectedPlant = null;
+                    //ToDo update day<x>_panel with task for the day (all plants)
+                }
             }
         });
     }
@@ -119,55 +102,23 @@ public class MyScheduleController {
         day7_label.setText(today.plusDays(6).getDayOfWeek().toString());
     }
 
-    private void setCellFactoryListView() {
-        scheduledPlants_listview.setCellFactory(param -> new ListCell<>() {
+    private void fillListViewMyPlantsInSchedule(List<Plant> list) {
+        for (Plant plant : list) {
+            scheduledPlants_listview.getItems().add(plant);
+        }
+        scheduledPlants_listview.setCellFactory(param -> new ListCell<Plant>() {
             @Override
-            protected void updateItem(Crop crop, boolean empty) {
-                super.updateItem(crop, empty);
+            protected void updateItem(Plant plant, boolean empty) {
+                super.updateItem(plant, empty);
 
-                if (empty || crop == null) {
+                if (empty || plant == null || plant.name() == null) {
                     setText(null);
                 } else {
-                    try {
-                        String text = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId())
-                                .map(Plant::name)
-                                .orElse("");
-                        setText(text);
-                    } catch (HardinessZoneNotSetException | IOException e) {
-                        LOG.log(Level.WARNING, "Could not get plant for Cell", e);
-                    }
+                    setText(plant.name());
                 }
             }
         });
     }
 
-    private void loadTaskList() throws IOException {
-        List<List<Task>> taskLists;
-        if (selectedCrop != null) {
-            taskLists = gardenSchedule.getTasksUpcomingWeekForCrop(selectedCrop.getCropId().get());
-        } else {
-            taskLists = gardenSchedule.getTasksUpcomingWeek();
-        }
-        if (!taskLists.isEmpty()) {
-            viewTaskListOfDay(day1_pane, taskLists.get(0));
-            viewTaskListOfDay(day2_pane, taskLists.get(1));
-            viewTaskListOfDay(day3_pane, taskLists.get(2));
-            viewTaskListOfDay(day4_pane, taskLists.get(3));
-            viewTaskListOfDay(day5_pane, taskLists.get(4));
-            viewTaskListOfDay(day6_pane, taskLists.get(5));
-            viewTaskListOfDay(day7_pane, taskLists.get(6));
-        }
-    }
-
-    private void viewTaskListOfDay(Pane pane, List<Task> tasks) {
-        //ToDo update pane with task list
-        VBox vBox = new VBox();
-        for (Task task : tasks) {
-            Label label = new Label(task.getDescription());
-            vBox.getChildren().add(label);
-        }
-        pane.getChildren().add(vBox);
-    }
-
 
 }

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

@@ -1,51 +1,40 @@
 package ch.zhaw.gartenverwaltung;
 
-import ch.zhaw.gartenverwaltung.bootstrap.AfterInject;
-import ch.zhaw.gartenverwaltung.bootstrap.AppLoader;
-import ch.zhaw.gartenverwaltung.bootstrap.ChangeViewEvent;
-import ch.zhaw.gartenverwaltung.bootstrap.Inject;
 import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
-import ch.zhaw.gartenverwaltung.models.Garden;
-import ch.zhaw.gartenverwaltung.models.PlantListModel;
-import ch.zhaw.gartenverwaltung.models.PlantNotFoundException;
+import ch.zhaw.gartenverwaltung.plantList.PlantListModel;
 import ch.zhaw.gartenverwaltung.types.HardinessZone;
 import ch.zhaw.gartenverwaltung.types.Plant;
 import ch.zhaw.gartenverwaltung.types.Seasons;
+import javafx.application.Platform;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
 import javafx.geometry.Insets;
+import javafx.geometry.Bounds;
 import javafx.scene.control.*;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
-import javafx.scene.layout.AnchorPane;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.VBox;
 
 import java.io.IOException;
-import java.time.LocalDate;
+import java.net.URL;
 import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class PlantsController {
-    private static final Logger LOG = Logger.getLogger(PlantsController.class.getName());
-
-    @Inject
-    private PlantListModel plantListModel;
-    @Inject
-    private AppLoader appLoader;
-    @Inject
-    private Garden garden;
+import java.util.ResourceBundle;
 
+public class PlantsController implements Initializable {
+    private final PlantListModel plantListModel = new PlantListModel();
     private Plant selectedPlant = null;
     private final HardinessZone DEFAULT_HARDINESS_ZONE = HardinessZone.ZONE_8A;
 
     // TODO: move to model
-    private final ListProperty<Plant> plantListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
 
-    @FXML
-    public AnchorPane plantsRoot;
+    private final ListProperty<Plant> plantListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
 
     @FXML
     private VBox seasons;
@@ -63,41 +52,18 @@ public class PlantsController {
     private ListView<Plant> list_plants;
 
     @FXML
-    private Button selectSowDay_button;
+    private Button saveToMyPlant_button;
 
     @FXML
     private TextField search_plants;
 
     /**
-     * open new window to select sow or harvest day to save the crop
+     * saves the current selected plant in new JSON database
+     * @param event event
      */
     @FXML
-    void selectSowDate() throws IOException {
-        Dialog<LocalDate> dateSelection = new Dialog<>();
-        dateSelection.setTitle("Select Date");
-        dateSelection.setHeaderText(String.format("Select Harvest/Sow Date for %s:", selectedPlant.name()));
-        dateSelection.setResizable(false);
-
-        DialogPane dialogPane = dateSelection.getDialogPane();
-
-        ButtonType sowButton = new ButtonType("Save", ButtonBar.ButtonData.OK_DONE);
-        dialogPane.getButtonTypes().addAll(sowButton, ButtonType.CANCEL);
-
-        if (appLoader.loadPaneToDialog("SelectSowDay.fxml", dialogPane) instanceof SelectSowDayController controller) {
-            controller.initSaveButton((Button) dialogPane.lookupButton(sowButton));
-            controller.setSelectedPlant(selectedPlant);
-            dateSelection.setResultConverter(button -> button.equals(sowButton) ? controller.retrieveResult() : null);
-
-            dateSelection.showAndWait()
-                    .ifPresent(date -> {
-                        try {
-                            garden.plantAsCrop(selectedPlant, date);
-                        } catch (IOException | HardinessZoneNotSetException | PlantNotFoundException e) {
-                            LOG.log(Level.SEVERE, "Couldn't save Crop", e);
-                        }
-                        plantsRoot.fireEvent(new ChangeViewEvent(ChangeViewEvent.CHANGE_MAIN_VIEW, "MyGarden.fxml"));
-                    });
-        }
+    void saveToMyPlant(ActionEvent event) {
+        //ToDo model save selectedPlant to mySelectedPlant(IO)
     }
 
     /**
@@ -107,26 +73,22 @@ public class PlantsController {
      * create event listener for selected list entry and search by query
      * {@inheritDoc}
      */
-    @AfterInject
-    @SuppressWarnings("unused")
-    public void init() {
+    @Override
+    public void initialize(URL url, ResourceBundle resourceBundle) {
         setListCellFactory();
         fillPlantListWithHardinessZone();
         list_plants.itemsProperty().bind(plantListProperty);
 
         description_plant.setText("");
-        selectSowDay_button.setDisable(true);
+        saveToMyPlant_button.setDisable(true);
 
         createFilterSeasons();
         createFilterHardinessZone();
         lookForSelectedListEntry();
-
         try {
             viewFilteredListBySearch();
-        } catch (HardinessZoneNotSetException e) {
-            LOG.log(Level.WARNING, "Hardiness Zone not set!");
-        } catch (IOException e) {
-            LOG.log(Level.WARNING, "Could not retrieve data!", e);
+        } catch (HardinessZoneNotSetException | IOException e) {
+            e.printStackTrace();
         }
     }
 
@@ -134,7 +96,7 @@ public class PlantsController {
      *  set text of list view to plant name
      */
     private void setListCellFactory() {
-        list_plants.setCellFactory(param -> new ListCell<>() {
+        list_plants.setCellFactory(param -> new ListCell<Plant>() {
             @Override
             protected void updateItem(Plant plant, boolean empty) {
                 super.updateItem(plant, empty);
@@ -151,7 +113,6 @@ public class PlantsController {
     /**
      * get plant list according to param season and hardiness zone
      * fill list view with plant list
-     *
      * @param season enum of seasons
      * @throws HardinessZoneNotSetException throws exception
      * @throws IOException throws exception
@@ -164,7 +125,6 @@ public class PlantsController {
     /**
      * get plant list filtered by search plant entry and hardiness zone
      * fill list view with plant list
-     *
      * @throws HardinessZoneNotSetException throws exception when no hardiness zone is defined
      * @throws IOException throws exception
      */
@@ -177,10 +137,8 @@ public class PlantsController {
                     List<Plant> filteredPlants = plantListModel.getFilteredPlantListByString(DEFAULT_HARDINESS_ZONE, newValue);
                     clearListView();
                     plantListProperty.addAll(filteredPlants);
-                } catch (HardinessZoneNotSetException e) {
-                    LOG.log(Level.WARNING, "Hardiness Zone not set!");
-                } catch (IOException e) {
-                    LOG.log(Level.WARNING, "Could not retrieve data!", e);
+                } catch (HardinessZoneNotSetException | IOException e) {
+                    e.printStackTrace();
                 }
             }
         });
@@ -194,10 +152,8 @@ public class PlantsController {
         try {
             clearListView();
             plantListProperty.addAll(plantListModel.getPlantList(plantListModel.getCurrentZone()));
-        } catch (HardinessZoneNotSetException e) {
-            LOG.log(Level.WARNING, "Hardiness Zone not set!");
-        } catch (IOException e) {
-            LOG.log(Level.WARNING, "Could not retrieve data!", e);
+        } catch (HardinessZoneNotSetException | IOException e) {
+            e.printStackTrace();
         }
     }
 
@@ -215,9 +171,12 @@ public class PlantsController {
             if (zone.equals(DEFAULT_HARDINESS_ZONE)) {
                 radioButton.setSelected(true);
             }
-            radioButton.selectedProperty().addListener((observable, oldValue, newValue) -> {
+            radioButton.selectedProperty().addListener(new ChangeListener<Boolean>() {
+                @Override
+                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
                     plantListModel.setCurrentZone(zone);
                     fillPlantListWithHardinessZone();
+                }
             });
             climate_zones.getChildren().add(radioButton);
         }
@@ -231,25 +190,26 @@ public class PlantsController {
     private void createFilterSeasons() {
         ToggleGroup seasonGroup = new ToggleGroup();
         for (Seasons season : Seasons.values()) {
-            RadioButton radioButton = new RadioButton(season.getName());
+            RadioButton radioButton = new RadioButton(season.name());
             radioButton.setToggleGroup(seasonGroup);
             radioButton.setPadding(new Insets(0,0,10,0));
             if (season.equals(Seasons.AllSEASONS)) {
                 radioButton.setSelected(true);
             }
-            radioButton.selectedProperty().addListener((observable, oldValue, newValue) -> {
+            radioButton.selectedProperty().addListener(new ChangeListener<Boolean>() {
+                @Override
+                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
                     if (season.equals(Seasons.AllSEASONS)) {
                         fillPlantListWithHardinessZone();
                     } else {
                         try {
                             viewFilteredListBySeason(season);
-                    } catch (HardinessZoneNotSetException e) {
-                        LOG.log(Level.WARNING, "Hardiness Zone not set!");
-                    } catch (IOException e) {
-                        LOG.log(Level.WARNING, "Could not retrieve data!", e);
+                        } catch (HardinessZoneNotSetException | IOException e) {
+                            e.printStackTrace();
                         }
                     }
 
+                }
             });
             seasons.getChildren().add(radioButton);
         }
@@ -261,29 +221,29 @@ public class PlantsController {
      * image of the plant
      */
     private void lookForSelectedListEntry() {
-        selectedPlant = null;
-        description_plant.setText("");
-        selectSowDay_button.setDisable(true);
-        Image img = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
-        img_plant.setImage(img);
-        list_plants.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+        list_plants.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<Plant>() {
+            @Override
+            public void changed(ObservableValue<? extends Plant> observable, Plant oldValue, Plant newValue) {
                 if(newValue != null) {
                     selectedPlant = newValue;
                     description_plant.setText(selectedPlant.description());
-                selectSowDay_button.setDisable(false);
-                Image img1;
+                    saveToMyPlant_button.setDisable(false);
+                    Image img;
                     if(selectedPlant.image() != null) {
-                    img1 = selectedPlant.image();
+                        img = selectedPlant.image();
                     } else {
-                    img1 = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
+                        img = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
                     }
-                img_plant.setImage(img1);
+                    img_plant.setImage(img);
+
+
                 } else {
                     selectedPlant = null;
                     description_plant.setText("");
-                selectSowDay_button.setDisable(true);
-                Image img1 = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
-                img_plant.setImage(img1);
+                    saveToMyPlant_button.setDisable(true);
+                    Image img = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
+                    img_plant.setImage(img);
+                }
             }
         });
     }

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

@@ -1,94 +0,0 @@
-package ch.zhaw.gartenverwaltung;
-
-import ch.zhaw.gartenverwaltung.types.GrowthPhaseType;
-import ch.zhaw.gartenverwaltung.types.Plant;
-import javafx.fxml.FXML;
-import javafx.scene.control.*;
-import javafx.util.Callback;
-
-import java.time.LocalDate;
-
-public class SelectSowDayController {
-    private Plant selectedPlant;
-
-    @FXML
-    private DatePicker datepicker;
-
-    @FXML
-    private RadioButton harvest_radio;
-    @FXML
-    private RadioButton sow_radio;
-    @FXML
-    public ToggleGroup phase_group;
-
-    public LocalDate retrieveResult() {
-        LocalDate sowDate = datepicker.getValue();
-        if (harvest_radio.isSelected()) {
-            sowDate = selectedPlant.sowDateFromHarvestDate(sowDate);
-        }
-        return sowDate;
-    }
-
-    /**
-     * Set the {@link Plant} for which a date should be selected.
-     *
-     * @param plant Plant
-     */
-    public void setSelectedPlant(Plant plant) {
-        selectedPlant = plant;
-    }
-
-    /**
-     * add listener and set default values
-     */
-    @FXML
-    public void initialize() {
-        clearDatePickerEntries();
-
-        Callback<DatePicker, DateCell> dayCellFactory = getDayCellFactory();
-        datepicker.setDayCellFactory(dayCellFactory);
-        datepicker.setEditable(false);
-
-        sow_radio.setUserData(GrowthPhaseType.SOW);
-        harvest_radio.setUserData(GrowthPhaseType.HARVEST);
-    }
-
-    public void initSaveButton(Button saveButton) {
-        saveButton.disableProperty().bind(datepicker.valueProperty().isNull());
-    }
-
-    /**
-     * clear date picker editor when radio button is changed
-     */
-    private void clearDatePickerEntries() {
-        harvest_radio.selectedProperty().addListener((observable, oldValue, isNowSelected) -> datepicker.setValue(null));
-    }
-
-    /**
-     * date picker disable/enable dates according to selected plant: sow or harvest day
-     *
-     * @return cellFactory of datePicker
-     */
-    private Callback<DatePicker, DateCell> getDayCellFactory() {
-
-        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 && (!harvest_radio.isSelected() || selectedPlant.sowDateFromHarvestDate(item).compareTo(today) >= 0)) {
-                    GrowthPhaseType selectedPhase = (GrowthPhaseType) phase_group.getSelectedToggle().getUserData();
-
-                    if (selectedPlant.isDateInPhase(item, selectedPhase)) {
-                        setDisable(false);
-                        setStyle("-fx-background-color: #32CD32;");
-                    }
-                }
-            }
-        };
-    }
-}

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

@@ -1,26 +0,0 @@
-package ch.zhaw.gartenverwaltung;
-
-import ch.zhaw.gartenverwaltung.types.HardinessZone;
-
-public class Settings {
-    private HardinessZone currentHardinessZone = HardinessZone.ZONE_8A;
-    private static Settings instance;
-
-    static {
-        instance = new Settings();
-    }
-
-    public static Settings getInstance() {
-        return Settings.instance;
-    }
-
-    private Settings() {}
-
-    public HardinessZone getCurrentHardinessZone() {
-        return currentHardinessZone;
-    }
-
-    public void setCurrentHardinessZone(HardinessZone currentHardinessZone) {
-        this.currentHardinessZone = currentHardinessZone;
-    }
-}

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

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

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

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

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

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

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

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

src/main/java/ch/zhaw/gartenverwaltung/gardenplan/Gardenplanmodel.java

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

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

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

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

@@ -19,7 +19,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class JsonCropList implements CropList {
+public class JsonGardenPlan implements GardenPlan {
     private final URL dataSource;
 
     private IdProvider idProvider;
@@ -42,7 +42,7 @@ public class JsonCropList implements CropList {
     /**
      * Default constructor
      */
-    public JsonCropList() {
+    public JsonGardenPlan() {
         this.dataSource = getClass().getResource("user-crops.json");
     }
 
@@ -50,7 +50,7 @@ public class JsonCropList implements CropList {
      * 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 JsonCropList(URL dataSource) {
+    public JsonGardenPlan(URL dataSource) {
         this.dataSource = dataSource;
     }
     /**
@@ -145,6 +145,7 @@ public class JsonCropList implements CropList {
                         .registerModule(new Jdk8Module())
                         .writeValue(new File(dataSource.toURI()), cropMap.values());
             } catch (URISyntaxException e) {
+                // TODO: Log
                 throw new IOException(INVALID_DATASOURCE_MSG, e);
             }
         }

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

@@ -20,11 +20,11 @@ import java.util.Map;
 import java.util.Optional;
 
 /**
- * Implements the {@link PlantList} interface for loading {@link Plant} objects
+ * Implements the {@link PlantDatabase} interface for loading {@link Plant} objects
  * from a JSON file.
  * The reads are cached to minimize file-io operations.
  */
-public class JsonPlantList implements PlantList {
+public class JsonPlantDatabase implements PlantDatabase {
     private final URL dataSource = getClass().getResource("plantdb.json");
 
     private HardinessZone currentZone;
@@ -49,7 +49,7 @@ public class JsonPlantList implements PlantList {
      * from the {@link #currentZone}, data is loaded from {@link #dataSource}.
      * In any case, the values of {@link #plantMap} are returned.
      *
-     * @see PlantList#getPlantList(HardinessZone)
+     * @see PlantDatabase#getPlantList(HardinessZone)
      */
     @Override
     public List<Plant> getPlantList(HardinessZone zone) throws IOException, HardinessZoneNotSetException {
@@ -60,7 +60,7 @@ public class JsonPlantList implements PlantList {
     }
 
     /**
-     * @see PlantList#getPlantById(long)
+     * @see PlantDatabase#getPlantById(long)
      */
     @Override
     public Optional<Plant> getPlantById(HardinessZone zone, long id) throws HardinessZoneNotSetException, IOException {

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

@@ -1,5 +1,6 @@
 package ch.zhaw.gartenverwaltung.io;
 
+import ch.zhaw.gartenverwaltung.types.Crop;
 import ch.zhaw.gartenverwaltung.types.Task;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
@@ -19,11 +20,11 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * Implements the {@link TaskList} interface for loading and writing {@link Task} objects
+ * Implements the {@link TaskDatabase} interface for loading and writing {@link Task} objects
  * from and to a JSON file.
  * The reads are cached to minimize file-io operations.
  */
-public class JsonTaskList implements TaskList {
+public class JsonTaskDatabase implements TaskDatabase{
     IdProvider idProvider;
     private final URL dataSource = getClass().getResource("taskdb.json");
     private final static String INVALID_DATASOURCE_MSG = "Invalid datasource specified!";
@@ -47,7 +48,7 @@ public class JsonTaskList implements TaskList {
      * If no data is currently loaded, data is loaded from {@link #dataSource}.
      * In any case, the values of {@link #taskMap} are returned.
      *
-     * @see TaskList#getTaskList(LocalDate, LocalDate)
+     * @see TaskDatabase#getTaskList(LocalDate, LocalDate)
      */
     @Override
     public List<Task> getTaskList(LocalDate start, LocalDate end) throws IOException{
@@ -89,7 +90,7 @@ public class JsonTaskList implements TaskList {
      * it to the {@link #taskMap}. In any case, the {@link #taskMap} is written
      * to the {@link #dataSource}.
      *
-     * @see TaskList#saveTask(Task)
+     * @see TaskDatabase#saveTask(Task)
      */
     @Override
     public void saveTask(Task task) throws IOException {
@@ -107,7 +108,7 @@ public class JsonTaskList implements TaskList {
      * If the {@link Task}s id is found in the {@link #taskMap}, the Task is removed
      * from the  {@link #taskMap}. Then the Task are written to the {@link #dataSource}.
      *
-     * @see TaskList#removeTask(Task)
+     * @see TaskDatabase#removeTask(Task)
      */
     @Override
     public void removeTask(Task task) throws IOException {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/main/java/ch/zhaw/gartenverwaltung/taskList/TaskListModel.java

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

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

@@ -3,7 +3,6 @@ package ch.zhaw.gartenverwaltung.types;
 import javafx.scene.image.Image;
 
 import java.time.LocalDate;
-import java.time.MonthDay;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -20,39 +19,20 @@ public record Plant(
         List<Pest> pests,
         List<GrowthPhase> lifecycle) {
 
-    /**
-     * remove all growthPhase which do not belong to the hardiness zone
-     * @param zone hardiness zone
-     */
     public void inZone(HardinessZone zone) {
         lifecycle.removeIf(growthPhase -> !growthPhase.zone().equals(zone));
     }
 
-    /**
-     * get all growthPhases of lifecycle group
-     * @param group lifecycle group
-     * @return list of growthPhases
-     */
     public List<GrowthPhase> lifecycleForGroup(int group) {
         return lifecycle.stream()
-                .filter(growthPhase -> growthPhase.group() == group)
+                .filter(growthPhase -> growthPhase.group() != group)
                 .collect(Collectors.toList());
     }
 
-    /**
-     * get sow date from given harvest day from lifecycle group
-     * @param harvestDate date of the harvest
-     * @return LocaleDate of sow date
-     */
-    public LocalDate sowDateFromHarvestDate(LocalDate harvestDate) {
-        return harvestDate.minusDays(timeToHarvest(lifecycleGroupFromHarvestDate(harvestDate)));
+    public LocalDate sowDateFromHarvestDate(LocalDate harvestDate, int group) {
+        return harvestDate.minusDays(timeToHarvest(group));
     }
 
-    /**
-     * calculate the days between sow and harvest day for lifecycle group
-     * @param group the lifecycle group
-     * @return Integer number of dates between sow and harvest day
-     */
     public int timeToHarvest(int group) {
         List<GrowthPhase> activeLifecycle = lifecycleForGroup(group);
         GrowthPhase sow = activeLifecycle.stream()
@@ -67,44 +47,4 @@ public record Plant(
         int currentYear = LocalDate.now().getYear();
         return (int) DAYS.between(harvest.startDate().atYear(currentYear), sow.startDate().atYear(currentYear));
     }
-
-    public int lifecycleGroupFromHarvestDate(LocalDate harvestDate) {
-        return lifecycle.stream()
-                .filter(growthPhase -> growthPhase.type().equals(GrowthPhaseType.HARVEST) &&
-                        dateInRange(harvestDate, growthPhase.startDate(), growthPhase.endDate()))
-                .map(GrowthPhase::group)
-                .findFirst()
-                .orElse(0);
-    }
-
-    /**
-     * Checks if the given {@link LocalDate} is within a {@link GrowthPhase} of the given {@link GrowthPhaseType}
-     *
-     * @param date The date to check.
-     * @param phase The {@link GrowthPhaseType} to match against
-     * @return Whether the date is within the given {@link GrowthPhaseType}
-     */
-    public boolean isDateInPhase(LocalDate date, GrowthPhaseType phase) {
-        return lifecycle.stream()
-                .filter(growthPhase -> growthPhase.type().equals(phase))
-                .anyMatch(growthPhase -> dateInRange(date, growthPhase.startDate(), growthPhase.endDate()));
-    }
-
-    /**
-     * Checks if the given {@link LocalDate} is within the given {@link MonthDay} range.
-     * (regardless of year)
-     *
-     * @param subject The date to check
-     * @param min The start of the date-range
-     * @param max The end of the date-range
-     * @return Whether the subject is within the range.
-     */
-    private boolean dateInRange(LocalDate subject, MonthDay min, MonthDay max) {
-        return subject.getMonth().compareTo(min.getMonth()) >= 0 &&
-                subject.getMonth().compareTo(max.getMonth()) <= 0 &&
-                // if the day is less than the minimum day, the minimum month must not be equal
-                (subject.getDayOfMonth() >= min.getDayOfMonth() || !subject.getMonth().equals(min.getMonth())) &&
-                // if the day is greater than the maximum day, the maximum month must not be equal
-                (subject.getDayOfMonth() <= max.getDayOfMonth() || !subject.getMonth().equals(max.getMonth()));
-    }
 }

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

@@ -3,20 +3,18 @@ package ch.zhaw.gartenverwaltung.types;
 import java.time.MonthDay;
 
 public enum 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"),
-    WINTER("--12-01", "--02-28", "Winter");
+    AllSEASONS("--01-01", "--12-31"),
+    SPRING("--03-01", "--05-30"),
+    SOMMER("--06-01", "--08-30"),
+    AUTUM("--09-01", "--11-30"),
+    WINTER("--12-01", "--02-28");
 
     public final String startDate;
     public final String endDate;
-    public final String name;
 
-    Seasons(String startDate, String endDate, String name) {
+    Seasons(String startDate, String endDate) {
         this.startDate = startDate;
         this.endDate = endDate;
-        this.name = name;
     }
 
     public MonthDay getStartDate() {
@@ -25,7 +23,4 @@ public enum Seasons {
     public MonthDay getEndDate() {
         return MonthDay.parse(this.endDate);
     }
-    public String getName() {
-        return this.name;
-    }
 }

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

@@ -21,10 +21,11 @@ public class Task {
      * default constructor
      * (used by Json deserializer)
      */
-    public Task(){
+    public Task(long cropId){
         name= "";
         description= "";
         startDate = LocalDate.now();
+        this.cropId = cropId;
     }
 
     public Task(String name, String description, LocalDate startDate, long cropId) {

src/main/java/module-info.java

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

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

@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?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">
-   <children>
-      <ScrollPane fitToWidth="true" prefHeight="759.0" prefWidth="664.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-         <content>
-            <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="503.0" prefWidth="897.0">
-               <padding>
-                  <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-               </padding>
-               <children>
-                  <Button mnemonicParsing="false" onAction="#goBack" prefHeight="25.0" prefWidth="91.0" text="Go Back">
-                     <VBox.margin>
-                        <Insets bottom="10.0" />
-                     </VBox.margin>
-                  </Button>
-                  <Label fx:id="cropName_label" text="Label">
-                     <VBox.margin>
-                        <Insets bottom="10.0" />
-                     </VBox.margin>
-                  </Label>
-                  <HBox prefHeight="265.0" prefWidth="879.0">
-                     <children>
-                        <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="149.66665903727215" valignment="TOP" vgrow="SOMETIMES" />
-                            <RowConstraints maxHeight="187.9999647140503" minHeight="10.0" prefHeight="51.00000762939453" vgrow="SOMETIMES" />
-                            <RowConstraints maxHeight="105.66662597656247" minHeight="10.0" prefHeight="54.0" 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:">
-                                 <GridPane.margin>
-                                    <Insets top="10.0" />
-                                 </GridPane.margin>
-                              </Label>
-                              <Label text="Light-Level:" GridPane.rowIndex="1" />
-                              <Label text="Spacing:" GridPane.rowIndex="2" />
-                              <Label text="Soil-Type:" GridPane.rowIndex="3" />
-                              <Label fx:id="description_label" text="Label" wrapText="true" GridPane.columnIndex="1">
-                                 <GridPane.margin>
-                                    <Insets left="10.0" top="10.0" />
-                                 </GridPane.margin>
-                              </Label>
-                              <Label fx:id="light_label" text="Label" GridPane.columnIndex="1" GridPane.rowIndex="1">
-                                 <GridPane.margin>
-                                    <Insets left="10.0" />
-                                 </GridPane.margin>
-                              </Label>
-                              <Label fx:id="spacing_label" text="Label" GridPane.columnIndex="1" GridPane.rowIndex="2">
-                                 <GridPane.margin>
-                                    <Insets left="10.0" />
-                                 </GridPane.margin>
-                              </Label>
-                              <Label fx:id="soil_label" text="Label" GridPane.columnIndex="1" GridPane.rowIndex="3">
-                                 <GridPane.margin>
-                                    <Insets left="10.0" />
-                                 </GridPane.margin>
-                              </Label>
-                           </children>
-                        </GridPane>
-                        <ImageView fx:id="imageView" fitHeight="300.0" fitWidth="300.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER" />
-                     </children>
-                  </HBox>
-                  <Label text="Growth Phases:">
-                     <VBox.margin>
-                        <Insets bottom="10.0" />
-                     </VBox.margin>
-                  </Label>
-                  <VBox fx:id="growthPhases_vbox" prefHeight="135.0" prefWidth="879.0">
-                     <VBox.margin>
-                        <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 fx:id="pests_vbox" prefHeight="200.0" prefWidth="100.0">
-                     <VBox.margin>
-                        <Insets bottom="10.0" />
-                     </VBox.margin>
-                  </VBox>
-                  <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" text="Label">
-                           <HBox.margin>
-                              <Insets right="10.0" />
-                           </HBox.margin>
-                        </Label>
-                        <Button fx:id="area_button" mnemonicParsing="false" onAction="#setArea" prefHeight="25.0" prefWidth="116.0" text="Add Area" />
-                     </children>
-                     <VBox.margin>
-                        <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>
-      </ScrollPane>
-   </children>
-</AnchorPane>

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

@@ -11,7 +11,7 @@
          <children>
             <Button fx:id="home_button" mnemonicParsing="false" onAction="#goToHome" prefHeight="38.0" prefWidth="121.0" text="Home" HBox.hgrow="NEVER" />
             <Button fx:id="plants_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#goToPlants" prefHeight="38.0" prefWidth="121.0" text="Plants" />
-            <Button fx:id="myGarden_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#goToMyPlants" prefHeight="38.0" prefWidth="121.0" text="My Garden" />
+            <Button fx:id="myPlants_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#goToMyPlants" prefHeight="38.0" prefWidth="121.0" text="MyPlants" />
             <Button fx:id="mySchedule_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#goToMySchedule" prefHeight="38.0" prefWidth="121.0" text="MySchedule" />
             <Pane maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS" />
          </children>

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

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

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

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
+<?import javafx.geometry.Rectangle2D?>
 <?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.Image?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
@@ -15,8 +17,7 @@
 
 <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">
+            fx:controller="ch.zhaw.gartenverwaltung.PlantsController">
    <children>
       <SplitPane dividerPositions="0.7377363661277062" layoutX="539.0" layoutY="266.0" prefHeight="853.0" prefWidth="1219.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <items>
@@ -32,8 +33,15 @@
                         <TextField fx:id="search_plants" promptText="Search for Plant Name" />
                         <HBox alignment="CENTER_LEFT" prefHeight="480.0" prefWidth="881.0" VBox.vgrow="ALWAYS">
                            <children>
-                              <ListView fx:id="list_plants" maxWidth="1.7976931348623157E308" prefHeight="497.0" prefWidth="400.0" HBox.hgrow="ALWAYS" />
-                              <ImageView fx:id="img_plant" fitWidth="300" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER" />
+                              <ListView fx:id="list_plants" maxWidth="1.7976931348623157E308" prefHeight="497.0" prefWidth="580.0" HBox.hgrow="ALWAYS" />
+                              <ImageView fx:id="img_plant" fitHeight="322.0" fitWidth="861.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER">
+                                 <viewport>
+                                    <Rectangle2D height="300.0" width="300.0" />
+                                 </viewport>
+                                 <image>
+                                    <Image url="@placeholder.png" />
+                                 </image>
+                              </ImageView>
                            </children>
                         </HBox>
                         <Label prefHeight="33.0" prefWidth="919.0" text="Plant Information:">
@@ -49,7 +57,7 @@
                               <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" />
+                        <Button fx:id="saveToMyPlant_button" alignment="CENTER" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#saveToMyPlant" prefHeight="38.0" prefWidth="917.0" text="Save to MyPlants" />
                      </children>
                   </VBox>
                </children>

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

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.DatePicker?>
-<?import javafx.scene.control.RadioButton?>
-<?import javafx.scene.control.ToggleGroup?>
-<?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="150.0"
-            prefWidth="308.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.SelectSowDayController">
-   <children>
-      <VBox maxWidth="1.7976931348623157E308" prefHeight="408.0" prefWidth="640.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-         <children>
-            <HBox alignment="CENTER" prefHeight="293.0" prefWidth="631.0">
-               <children>
-                  <VBox alignment="CENTER_LEFT" prefHeight="88.0" prefWidth="155.0">
-                     <children>
-                        <RadioButton fx:id="sow_radio" mnemonicParsing="false" selected="true" text="Sow" toggleGroup="$phase_group">
-                           <VBox.margin>
-                              <Insets bottom="10.0" />
-                           </VBox.margin>
-                           <toggleGroup>
-                              <ToggleGroup fx:id="phase_group" />
-                           </toggleGroup>
-                        </RadioButton>
-                        <RadioButton fx:id="harvest_radio" mnemonicParsing="false" text="Harvest" toggleGroup="$phase_group" />
-                     </children>
-                     <HBox.margin>
-                        <Insets top="10.0" />
-                     </HBox.margin>
-                  </VBox>
-                  <DatePicker fx:id="datepicker" />
-               </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/io/plantdb.json

@@ -94,7 +94,6 @@
         "endDate": "03-10",
         "zone": "ZONE_8A",
         "type": "SOW",
-        "group": 0,
         "wateringCycle": {
           "litersPerSqM": 15,
           "interval": 3,
@@ -116,7 +115,6 @@
         "endDate": "05-10",
         "zone": "ZONE_8A",
         "type": "PLANT",
-        "group": 0,
         "wateringCycle": {
           "litersPerSqM": 25,
           "interval": 3,
@@ -140,7 +138,6 @@
         "endDate": "05-20",
         "zone": "ZONE_8A",
         "type": "HARVEST",
-        "group": 0,
         "wateringCycle": {
           "litersPerSqM": 0,
           "interval": null,

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

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

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

@@ -22,8 +22,8 @@ import java.util.stream.Collectors;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class JsonCropListTest {
-    private CropList testDatabase;
+public class JsonGardenPlanTest {
+    private GardenPlan testDatabase;
     private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
     /**
      * Files to isolate the test-units
@@ -36,7 +36,7 @@ public class JsonCropListTest {
         assertNotNull(testFile);
         assertNotNull(dbDataSource);
         Files.copy(Path.of(testFile.toURI()), Path.of(dbDataSource.toURI()), StandardCopyOption.REPLACE_EXISTING);
-        testDatabase = new JsonCropList(dbDataSource);
+        testDatabase = new JsonGardenPlan(dbDataSource);
     }
 
 

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

@@ -13,12 +13,12 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-public class JsonPlantListTest {
-    PlantList testDatabase;
+public class JsonPlantDatabaseTest {
+    PlantDatabase testDatabase;
 
     @BeforeEach
     void connectToDb() {
-        testDatabase = new JsonPlantList();
+        testDatabase = new JsonPlantDatabase();
     }
 
 

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

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

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

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

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

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

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

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

src/test/resources/ch.zhaw.gartenverwaltung.gardenplan/taskdb.json

@@ -6,7 +6,7 @@
   "startDate" : "2022-05-01",
   "endDate" : "2022-05-01",
   "interval" : 0,
-    "cropId" : 0
+    "cropID" : 0
   },
   {
     "id" : 2,
@@ -15,7 +15,7 @@
     "startDate" : "2022-05-01",
     "endDate" : "2022-09-01",
     "interval" : 2,
-    "cropId" : 0
+    "cropID" : 0
   },
   {
     "id" : 3,
@@ -24,7 +24,7 @@
     "startDate" : "2022-06-01",
     "endDate" : "2022-08-01",
     "interval" : 28,
-    "cropId" : 0
+    "cropID" : 0
   },
   {
     "id" : 4,
@@ -33,7 +33,7 @@
     "startDate" : "2022-07-01",
     "endDate" : "2022-07-01",
     "interval" : 0,
-    "cropId" : 0
+    "cropID" : 0
   },
   {
     "id" : 5,
@@ -42,7 +42,7 @@
     "startDate" : "2022-05-01",
     "endDate" : "2022-09-01",
     "interval" : 5,
-    "cropId" : 0
+    "cropID" : 0
   },
   {
     "id" : 6,
@@ -51,6 +51,6 @@
     "startDate" : "2022-09-01",
     "endDate" : "2022-09-01",
     "interval" : 0,
-    "cropId" : 0
+    "cropID" : 0
   }
 ]

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

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