Merge pull request #51 from schrom01/feature_taskList_m2

TaskListModel

doc/Classdiagramm/pm3-dcd.uxf

@@ -0,0 +1,144 @@
+<diagram program="umletino" version="15.0.0"><zoom_level>10</zoom_level><element><id>UMLClass</id><coordinates><x>482</x><y>360</y><w>100</w><h>30</h></coordinates><panel_attributes>Main</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1082</x><y>380</y><w>370</w><h>100</h></coordinates><panel_attributes>&lt;&lt;Interface&gt;&gt;
+PlantDatabase
+--
++ getPlantList(zone: HardinessZone): List&lt;Plant&gt;
++ getPlantById(zone: HardinessZone id: long): Optional&lt;Plant&gt;</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>672</x><y>710</y><w>220</w><h>40</h></coordinates><panel_attributes>TaskListController</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1132</x><y>110</y><w>300</w><h>180</h></coordinates><panel_attributes>&lt;&lt;Record&gt;&gt;
+Plant
+--
++ id: long
++ name: String
++ description: String
++ spacing: int
++ lifecycle: List&lt;GrowthPhase&gt;
+--
++ calculateStartDate(harvestDate: Date): Date
++ generateTasks()
+</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>942</x><y>710</y><w>210</w><h>120</h></coordinates><panel_attributes>TaskListModel
+--
+- tasks: ListProperty&lt;Task&gt;
+- taskDb: TaskDatabase
+--
++ getTask(id: long): Optional&lt;Task&gt;
++ saveTask(task: Task)
++ removeTask(task: Task)</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>322</x><y>690</y><w>250</w><h>120</h></coordinates><panel_attributes>GardenPlanModel
+--
+- tasks: ListProperty&lt;Crop&gt;
+- gardenPlan: GardenPlan
+--
++ plantAsCrop(planting: UserPlanting)
++ removePlanting(planting: UserPlanting)</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>72</x><y>680</y><w>180</w><h>80</h></coordinates><panel_attributes>GardenPlanController</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1362</x><y>830</y><w>490</w><h>240</h></coordinates><panel_attributes>Task
+--
++ id: long
++ name: String {readOnly}
++ description: String {readOnly}
++ startDate: Date {readOnly}
++ isOptional: boolean {readOnly}
+- interval: int
+- endDate: Date
+--
++ Task(name: String, description: String, startDate: String, isReadOnly: boolean): Task
++ withInterval(interval: int): Task
++ withEndDate(endDate: Date): Task
++ withId(id: long): Task
+--
++ getInterval(): Optional&lt;int&gt;
++ getEndDate(): Optional&lt;Date&gt;</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>902</x><y>930</y><w>280</w><h>140</h></coordinates><panel_attributes>&lt;&lt;Interface&gt;&gt;
+TaskDatabase
+--
++ getTaskList(start: Date, end: Date): List&lt;Task&gt;
++ saveTask(Task task) throws ??Exception
++ removeTask(Task task) throws ??Exception</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>442</x><y>440</y><w>170</w><h>80</h></coordinates><panel_attributes>MainWindowController</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>962</x><y>1310</y><w>210</w><h>70</h></coordinates><panel_attributes>NotificationService
+--
+- taskDb: TaskDatabase
+--
++ tick()</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1412</x><y>1310</y><w>240</w><h>90</h></coordinates><panel_attributes>&lt;&lt;Interface&gt;&gt;
+WeatherProvider
+--
++ getWeatherForecast: WeatherForecast</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1392</x><y>1150</y><w>400</w><h>100</h></coordinates><panel_attributes>WeatherService
+--
+- weatherPovider: WeatherProvider
+- taskDb: TaskDatabase
+--
++ WeatherService(provider: WeatherProvider, taskDb: TaskDatabase)
+- updateTasks()</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1502</x><y>110</y><w>260</w><h>150</h></coordinates><panel_attributes>&lt;&lt;Record&gt;&gt;
+GrowthPhase
+--
++ startDate: MonthDay
++ endDate: MonthDay 
++ type: GrowthPhaseType
+
+</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>1422</x><y>180</y><w>100</w><h>40</h></coordinates><panel_attributes>lt=&lt;-&gt;&gt;&gt;&gt;&gt;
+m1=*
+m2=1</panel_attributes><additional_attributes>80;10;10;10</additional_attributes></element><element><id>Text</id><coordinates><x>152</x><y>130</y><w>190</w><h>70</h></coordinates><panel_attributes>Note:
+--
+{final, readOnly} omitted on public  data fields in &lt;&lt;Record&gt;&gt; Entities for clarity
+style=wordwrap</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>1172</x><y>970</y><w>210</w><h>50</h></coordinates><panel_attributes>lt=&lt;.
+m1=*
+m2=1
+returns &gt;</panel_attributes><additional_attributes>190;20;10;20</additional_attributes></element><element><id>Relation</id><coordinates><x>1032</x><y>820</y><w>140</w><h>130</h></coordinates><panel_attributes>lt=&lt;-
+m1=1 external database
+m2=1 internal list
+accesses</panel_attributes><additional_attributes>10;110;10;10</additional_attributes></element><element><id>UMLClass</id><coordinates><x>322</x><y>1120</y><w>240</w><h>150</h></coordinates><panel_attributes>Crop
+--
+- cropId: Long
++ plantId: long {final, readOnly}
++ startDate: LocalDate {final, readOnly}
++ area: Double
+--
++ withId(long): Crop
++ withArea(double): Crop
+--
++ getCropId(): Optional&lt;Long&gt;</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>1262</x><y>280</y><w>70</w><h>120</h></coordinates><panel_attributes>lt=&lt;.
+m1=*
+m2=1
+returns</panel_attributes><additional_attributes>10;10;10;100</additional_attributes></element><element><id>UMLClass</id><coordinates><x>1632</x><y>290</y><w>130</w><h>100</h></coordinates><panel_attributes>&lt;&lt;Enumeration&gt;&gt;
+GrowthPhaseType
+--
+SOW
+PLANT
+HARVEST</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>1582</x><y>250</y><w>70</w><h>120</h></coordinates><panel_attributes>lt=&lt;-&gt;&gt;&gt;&gt;
+m1=1
+m2=*</panel_attributes><additional_attributes>50;90;10;90;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>882</x><y>720</y><w>80</w><h>30</h></coordinates><panel_attributes>lt=&lt;-&gt;&gt;&gt;&gt;</panel_attributes><additional_attributes>60;10;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>432</x><y>1020</y><w>110</w><h>120</h></coordinates><panel_attributes>lt=&lt;.
+m1=*
+m2=1
+returns / saves</panel_attributes><additional_attributes>10;100;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>242</x><y>710</y><w>100</w><h>30</h></coordinates><panel_attributes>lt=&lt;-&gt;&gt;&gt;&gt;</panel_attributes><additional_attributes>80;10;10;10</additional_attributes></element><element><id>UMLClass</id><coordinates><x>302</x><y>890</y><w>280</w><h>140</h></coordinates><panel_attributes>&lt;&lt;Interface&gt;&gt;
+GardenPlan
+--
++ getPlantings(): List&lt;UserPlanting&gt;
++ addPlanting(plantId: long, startDate)
++ savePlanting(planting: UserPlanting)
+</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>422</x><y>800</y><w>80</w><h>110</h></coordinates><panel_attributes>lt=&lt;.
+m1=1
+m2=1
+accesses</panel_attributes><additional_attributes>10;90;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>1522</x><y>1240</y><w>30</w><h>90</h></coordinates><panel_attributes>lt=&lt;.</panel_attributes><additional_attributes>10;70;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>1062</x><y>1060</y><w>80</w><h>270</h></coordinates><panel_attributes>lt=&lt;-
+m1=1
+m2=1
+accesses</panel_attributes><additional_attributes>10;10;10;250</additional_attributes></element><element><id>Relation</id><coordinates><x>1142</x><y>1060</y><w>270</w><h>170</h></coordinates><panel_attributes>lt=&lt;-
+m1=1
+m2=1
+adds Tasks</panel_attributes><additional_attributes>10;10;10;140;250;140</additional_attributes></element><element><id>UMLClass</id><coordinates><x>822</x><y>1140</y><w>200</w><h>50</h></coordinates><panel_attributes>JsonTaskDatabase</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>912</x><y>1060</y><w>30</w><h>100</h></coordinates><panel_attributes>lt=&lt;&lt;-</panel_attributes><additional_attributes>10;10;10;80</additional_attributes></element><element><id>UMLClass</id><coordinates><x>1562</x><y>430</y><w>200</w><h>50</h></coordinates><panel_attributes>JsonPlantDatabase</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>1442</x><y>440</y><w>140</w><h>30</h></coordinates><panel_attributes>lt=&lt;&lt;-</panel_attributes><additional_attributes>10;10;120;10</additional_attributes></element><element><id>UMLClass</id><coordinates><x>32</x><y>930</y><w>200</w><h>50</h></coordinates><panel_attributes>JsonGardenPlan</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>222</x><y>940</y><w>100</w><h>30</h></coordinates><panel_attributes>lt=&lt;&lt;-</panel_attributes><additional_attributes>80;10;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>582</x><y>510</y><w>220</w><h>220</h></coordinates><panel_attributes>lt=&lt;.</panel_attributes><additional_attributes>200;200;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>172</x><y>510</y><w>340</w><h>190</h></coordinates><panel_attributes>lt=&lt;.</panel_attributes><additional_attributes>10;170;320;10</additional_attributes></element><element><id>UMLClass</id><coordinates><x>582</x><y>250</y><w>160</w><h>60</h></coordinates><panel_attributes>PlantListController</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>522</x><y>380</y><w>30</w><h>80</h></coordinates><panel_attributes>lt=&lt;.</panel_attributes><additional_attributes>10;60;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>602</x><y>300</y><w>80</w><h>210</h></coordinates><panel_attributes>lt=&lt;.</panel_attributes><additional_attributes>60;10;10;190</additional_attributes></element><element><id>UMLClass</id><coordinates><x>732</x><y>390</y><w>160</w><h>60</h></coordinates><panel_attributes>PlantListModel</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>732</x><y>280</y><w>90</w><h>130</h></coordinates><panel_attributes>lt=&lt;.</panel_attributes><additional_attributes>70;110;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>882</x><y>400</y><w>220</w><h>70</h></coordinates><panel_attributes>lt=&lt;-
+m1=1\nexternal\ndatabase
+m2=1\ninternal\nlist
+accesses &gt;</panel_attributes><additional_attributes>200;20;10;20</additional_attributes></element><element><id>Relation</id><coordinates><x>582</x><y>0</y><w>190</w><h>50</h></coordinates><panel_attributes>lt=-
+m1=0..n
+m2=0..1
+teaches to &gt;</panel_attributes><additional_attributes>10;20;170;20</additional_attributes></element><element><id>UMLClass</id><coordinates><x>1412</x><y>530</y><w>420</w><h>200</h></coordinates><panel_attributes>TaskTemplate
+--
++ name: String {readOnly}
++ description: String {readOnly}
++ relativeStartDate: int {readOnly}
+- interval: Integer
+- relativeEndDate: Integer
+- isOptional: boolean
+--
++ Task(name: String, description: String, startDate: String): TaskTemplate
++ setRelativeEndDate(relativeEndDate: int)
++ setInterval(interval: Integer)
++ generateTask(realStartDate: LocalDate): Task
+</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>1752</x><y>180</y><w>130</w><h>490</h></coordinates><panel_attributes>lt=&lt;-&gt;&gt;&gt;&gt;&gt;
+m1=*
+m2=1</panel_attributes><additional_attributes>80;460;110;460;110;10;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>1602</x><y>720</y><w>90</w><h>130</h></coordinates><panel_attributes>lt=&lt;.
+m1=*
+m2=1
+generates</panel_attributes><additional_attributes>10;110;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>562</x><y>770</y><w>400</w><h>40</h></coordinates><panel_attributes>lt=&lt;-
+delegates generating Tasks</panel_attributes><additional_attributes>380;20;10;20</additional_attributes></element></diagram>

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/MainFXMLController.java

@@ -19,7 +19,7 @@ public class MainFXMLController implements Initializable {
     /**
      * Caching the panes
      */
-    private final Map<String, Node> panes = new HashMap<>();
+    private final Map<String, AnchorPane> panes = new HashMap<>();
 
     @FXML
     private Button home_button;
@@ -68,20 +68,22 @@ public class MainFXMLController implements Initializable {
      * @throws IOException exception when file does not exist
      */
     public void loadPane(String fxmlFile) throws IOException {
-        //ToDo HGrow and VGrow of new node
-        Node node = panes.get(fxmlFile);
-        System.out.println(node);
-        if (node == null) {
+
+        AnchorPane anchorPane = panes.get(fxmlFile);
+        if (anchorPane == null) {
             FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(HelloApplication.class.getResource(fxmlFile)));
-            node = loader.load();
-            panes.put(fxmlFile, node);
+            anchorPane = loader.load();
+            panes.put(fxmlFile, anchorPane);
 
             if(fxmlFile.equals("MyPlants.fxml")) {
                 MyPlantsController myPlantsController = loader.getController();
                 myPlantsController.getMainController(this);
             }
         }
-        mainPane.getChildren().setAll(node);
+        mainPane.getChildren().setAll(anchorPane);
+        anchorPane.prefWidthProperty().bind(mainPane.widthProperty());
+        anchorPane.prefHeightProperty().bind(mainPane.heightProperty());
+
     }
 
     private void styleChangeButton(Button button) {

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

@@ -4,6 +4,7 @@ import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
 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;
@@ -13,8 +14,10 @@ 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.input.KeyEvent;
 import javafx.scene.layout.VBox;
@@ -30,10 +33,11 @@ public class PlantsController implements Initializable {
     private final HardinessZone DEFAULT_HARDINESS_ZONE = HardinessZone.ZONE_8A;
 
     // TODO: move to model
+
     private final ListProperty<Plant> plantListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
 
     @FXML
-    private CheckBox autum_filter;
+    private VBox seasons;
 
     @FXML
     private VBox climate_zones;
@@ -53,81 +57,44 @@ public class PlantsController implements Initializable {
     @FXML
     private TextField search_plants;
 
-    @FXML
-    private CheckBox sommer_filter;
-
-    @FXML
-    private CheckBox spring_filter;
-
-    @FXML
-    private CheckBox winter_filter;
-
-    @FXML
-    void filterAutum(ActionEvent event) {
-        //ToDo
-
-    }
-
-    @FXML
-    void filterSommer(ActionEvent event) {
-        //ToDo
-
-    }
-
-    @FXML
-    void filterSpring(ActionEvent event) {
-        //ToDo
-
-    }
-
-    @FXML
-    void filterWinter(ActionEvent event) {
-        //ToDo
-
-    }
-
+    /**
+     * saves the current selected plant in new JSON database
+     * @param event event
+     */
     @FXML
     void saveToMyPlant(ActionEvent event) {
         //ToDo model save selectedPlant to mySelectedPlant(IO)
     }
 
-    @FXML
-    void searchForPlant(KeyEvent event) {
-        viewFilteredListBySearch(search_plants.getText());
-    }
-
     /**
+     * fill list view with current hardiness zone
+     * set default values
+     * create filter of season and hardiness zone
+     * create event listener for selected list entry and search by query
      * {@inheritDoc}
      */
     @Override
     public void initialize(URL url, ResourceBundle resourceBundle) {
         setListCellFactory();
-        try {
-            plantListProperty.addAll(plantListModel.getPlantList(DEFAULT_HARDINESS_ZONE));
-        } catch (HardinessZoneNotSetException | IOException e) {
-            e.printStackTrace();
-        }
-
+        fillPlantListWithHardinessZone();
         list_plants.itemsProperty().bind(plantListProperty);
-        list_plants.getSelectionModel().selectedItemProperty()
-                .addListener((observable, oldPlant, newPlant) -> {
-                    if (newPlant != null) {
-                        img_plant.setImage(newPlant.image());
-                    }
-                });
 
         description_plant.setText("");
         saveToMyPlant_button.setDisable(true);
 
+        createFilterSeasons();
         createFilterHardinessZone();
         lookForSelectedListEntry();
+        try {
+            viewFilteredListBySearch();
+        } catch (HardinessZoneNotSetException | IOException e) {
+            e.printStackTrace();
+        }
     }
 
-    private void centerImage() {
-
-        //img_plant.setX(0.3);
-        //img_plant.setX(-100);
-    }
+    /**
+     *  set text of list view to plant name
+     */
     private void setListCellFactory() {
         list_plants.setCellFactory(param -> new ListCell<Plant>() {
             @Override
@@ -144,62 +111,138 @@ public class PlantsController implements Initializable {
     }
 
     /**
-     * update the ListView according to the plant list provided
-     * Entry in ListView is plant name
-     * @param list plantList which fill the ListView
+     * 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
      */
-    private void fillListViewWithData(List<Plant> list) {
+    private void viewFilteredListBySeason(Seasons season) throws HardinessZoneNotSetException, IOException {
         clearListView();
-        for (Plant plant : list) {
-            list_plants.getItems().add(plant);
-        }
-
+        plantListProperty.addAll(plantListModel.getFilteredPlantListBySaisonWithoutGrowthPhase(plantListModel.getCurrentZone(), season.getStartDate(), season.getEndDate()));
     }
 
-    private void viewFilteredListByFilters() {
-        boolean springValue = spring_filter.isSelected();
-        boolean sommerValue = sommer_filter.isSelected();
-        boolean autumValue = autum_filter.isSelected();
-        boolean winterValue = winter_filter.isSelected();
-        //ToDo getFilteredPlantList with (plantListModel.getFilteredPlantList(DEFAULT_HARDINESS_ZONE, <predicate>))
-        //List<Plant> plantList = new LinkedList<>();
-        //fillListViewWithData(plantList);
+    /**
+     * 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
+     */
+    private void viewFilteredListBySearch() throws HardinessZoneNotSetException, IOException {
+        search_plants.textProperty().addListener((observable, oldValue, newValue) -> {
+            if (newValue.isEmpty()) {
+                fillPlantListWithHardinessZone();
+            }else {
+                try {
+                    List<Plant> filteredPlants = plantListModel.getFilteredPlantListByString(DEFAULT_HARDINESS_ZONE, newValue);
+                    clearListView();
+                    plantListProperty.addAll(filteredPlants);
+                } catch (HardinessZoneNotSetException | IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
     }
 
-    private void viewFilteredListBySearch(String query) {
-        //ToDo getFilteredPlantList with (plantListModel.getFilteredPlantList(DEFAULT_HARDINESS_ZONE, <predicate>))
+    /**
+     * get plant list of current hardiness zone
+     * fill list view with plant list
+     */
+    private void fillPlantListWithHardinessZone() {
         try {
-            List<Plant> filteredPlants = plantListModel.getFilteredPlantListByString(DEFAULT_HARDINESS_ZONE, query);
             clearListView();
-            plantListProperty.addAll(filteredPlants);
-
+            plantListProperty.addAll(plantListModel.getPlantList(plantListModel.getCurrentZone()));
         } catch (HardinessZoneNotSetException | IOException e) {
             e.printStackTrace();
         }
     }
 
+    /**
+     * creates radio buttons for the hardiness zones defined in enum HardinessZone
+     * defines default value as selected
+     * when selected filter viewList according to hardiness zone
+     */
     private void createFilterHardinessZone() {
-        //ToDo create radioList of hardinessZone in VBox climate_zones
+        ToggleGroup hardinessGroup = new ToggleGroup();
+        for (HardinessZone zone : HardinessZone.values()) {
+            RadioButton radioButton = new RadioButton(zone.name());
+            radioButton.setToggleGroup(hardinessGroup);
+            radioButton.setPadding(new Insets(0,0,10,0));
+            if (zone.equals(DEFAULT_HARDINESS_ZONE)) {
+                radioButton.setSelected(true);
+            }
+            radioButton.selectedProperty().addListener(new ChangeListener<Boolean>() {
+                @Override
+                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+                    plantListModel.setCurrentZone(zone);
+                    fillPlantListWithHardinessZone();
+                }
+            });
+            climate_zones.getChildren().add(radioButton);
+        }
     }
 
     /**
-     * observes changes in the selectedProperty of ListView and updates the description label
+     * creates radio buttons for the seasons defined in enum Seasons
+     * defines default value as selected
+     * when selected filter viewList according to seasons
+     */
+    private void createFilterSeasons() {
+        ToggleGroup seasonGroup = new ToggleGroup();
+        for (Seasons season : Seasons.values()) {
+            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(new ChangeListener<Boolean>() {
+                @Override
+                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+                    if (season.equals(Seasons.AllSEASONS)) {
+                        fillPlantListWithHardinessZone();
+                    } else {
+                        try {
+                            viewFilteredListBySeason(season);
+                        } catch (HardinessZoneNotSetException | IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
+
+                }
+            });
+            seasons.getChildren().add(radioButton);
+        }
+    }
+
+    /**
+     * observes changes in the selectedProperty of ListView and updates:
+     * the description label
+     * image of the plant
      */
     private void lookForSelectedListEntry() {
         list_plants.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<Plant>() {
             @Override
             public void changed(ObservableValue<? extends Plant> observable, Plant oldValue, Plant newValue) {
-                //ToDo
                 if(newValue != null) {
                     selectedPlant = newValue;
                     description_plant.setText(selectedPlant.description());
                     saveToMyPlant_button.setDisable(false);
-                    //update img plant
+                    Image img;
+                    if(selectedPlant.image() != null) {
+                        img = selectedPlant.image();
+                    } else {
+                        img = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
+                    }
+                    img_plant.setImage(img);
+
+
                 } else {
                     selectedPlant = null;
                     description_plant.setText("");
                     saveToMyPlant_button.setDisable(true);
-                    //update img when null placeholder PNG
+                    Image img = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
+                    img_plant.setImage(img);
                 }
             }
         });

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

@@ -20,7 +20,7 @@ import java.util.Map;
 import java.util.Optional;
 
 public class JsonGardenPlan implements GardenPlan {
-    private final URL dataSource = getClass().getResource("user-crops.json");
+    private final URL dataSource;
 
     private IdProvider idProvider;
     private Map<Long, Crop> cropMap = Collections.emptyMap();
@@ -40,7 +40,21 @@ public class JsonGardenPlan implements GardenPlan {
     }
 
     /**
-     * @see GardenPlan#getCrops()
+     * Default constructor
+     */
+    public JsonGardenPlan() {
+        this.dataSource = getClass().getResource("user-crops.json");
+    }
+
+    /**
+     * Constructor to use a specified {@link URL} as a {@link #dataSource}
+     * @param dataSource A {@link URL} to the file to be used as a data source
+     */
+    public JsonGardenPlan(URL dataSource) {
+        this.dataSource = dataSource;
+    }
+    /**
+     * {@inheritDoc}
      */
     @Override
     public List<Crop> getCrops() throws IOException {
@@ -51,7 +65,7 @@ public class JsonGardenPlan implements GardenPlan {
     }
 
     /**
-     * @see GardenPlan#getCropById(long)
+     * {@inheritDoc}
      */
     @Override
     public Optional<Crop> getCropById(long id) throws IOException {
@@ -62,7 +76,7 @@ public class JsonGardenPlan implements GardenPlan {
     }
 
     /**
-     * @see GardenPlan#saveCrop(Crop)
+     * {@inheritDoc}
      *
      * Saves a crop to the database.
      * If no {@link Crop#cropId} is set, one will be generated and
@@ -79,7 +93,7 @@ public class JsonGardenPlan implements GardenPlan {
     }
 
     /**
-     * @see GardenPlan#removeCrop(Crop)
+     * {@inheritDoc}
      */
     @Override
     public void removeCrop(Crop crop) throws IOException {

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

@@ -89,15 +89,16 @@ public class JsonPlantDatabase implements PlantDatabase {
             List<Plant> result;
             result = mapper.readerForListOf(Plant.class).readValue(dataSource);
 
-            for (Plant plant : result) {
-                plant.inZone(currentZone);
-            }
-
-            // Turn list into a HashMap with structure id => Plant
             plantMap = result.stream()
+                    // Remove plants not in the current zone
+                    .filter(plant -> {
+                        plant.inZone(currentZone);
+                        return !plant.lifecycle().isEmpty();
+                    })
+                    // Create Hashmap from results
                     .collect(HashMap::new,
                             (res, plant) -> res.put(plant.id(), plant),
-                            (existing, replacement) -> { });
+                            (existing, replacement) -> {});
         }
     }
 }

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;
@@ -51,6 +52,31 @@ public class JsonTaskDatabase implements TaskDatabase{
         return taskMap.values().stream().filter(task -> task.isInTimePeriode(start, end)).toList();
     }
 
+    /**
+     * Method get all Tasks for a specific Crop
+     * @param cropId the cropId
+     * @return List of Tasks for given Crop
+     */
+    @Override
+    public List<Task> getTaskForCrop(long cropId) throws IOException {
+        if(taskMap.isEmpty()) {
+            loadTaskListFromFile();
+        }
+        return taskMap.values().stream().filter(task -> task.getCropId() == cropId).toList();
+    }
+
+    /**
+     * Method remove all Tasks for a specific Crop
+     * @param cropId the crop
+     */
+    @Override
+    public void removeTasksForCrop(long cropId) throws IOException {
+        if(taskMap.isEmpty()) {
+            loadTaskListFromFile();
+        }
+        taskMap.values().removeIf(task -> task.getCropId() == cropId);
+    }
+
     /**
      * If no data is currently loaded, data is loaded from {@link #dataSource}.
      * If the {@link Task} has an id than the task is added to the {@link #taskMap}

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

@@ -1,5 +1,6 @@
 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;
@@ -24,6 +25,21 @@ public interface TaskDatabase {
      */
     List<Task> getTaskList(LocalDate start, LocalDate end) throws IOException;
 
+    /**
+     * Method get all Tasks for a specific Crop
+     * @param cropId the cropId
+     * @return List of Tasks for given Crop
+     * @throws IOException If the database cannot be accessed
+     */
+    List<Task> getTaskForCrop(long cropId) throws IOException;
+
+    /**
+     * Method remove all Tasks for a specific Crop
+     * @param cropId the cropId
+     * @throws IOException If the database cannot be accessed
+     */
+    void removeTasksForCrop(long cropId) throws IOException;
+
     /**
      * Saves the {@link Task} in the Cache.
      *

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

@@ -167,4 +167,17 @@ public class PlantListModel {
     public List<Plant> getFilteredPlantListByHarvestSaison(HardinessZone zone, MonthDay from, MonthDay to) throws HardinessZoneNotSetException, IOException {
         return getFilteredPlantListBySaison(GrowthPhaseType.HARVEST, zone, from, to);
     }
+
+    /**
+     *
+     * @param zone selected hardiness zone
+     * @param from the earliest date to for the filter
+     * @param to the lastest date for the filter
+     * @return List of Plants with selected saison
+     * @throws HardinessZoneNotSetException If no {@link HardinessZone} was specified
+     * @throws IOException If the database cannot be accessed
+     */
+    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)));
+    }
 }

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

@@ -0,0 +1,7 @@
+package ch.zhaw.gartenverwaltung.taskList;
+
+public class PlantNotFoundException extends Exception {
+    public PlantNotFoundException() {
+        super("The selected Plant was not found in Database!");
+    }
+}

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

@@ -0,0 +1,188 @@
+package ch.zhaw.gartenverwaltung.taskList;
+
+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;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+public class TaskListModel {
+    private TaskDatabase taskDatabase;
+    private PlantDatabase plantDatabase;
+
+    /**
+     * 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 TaskListModel(TaskDatabase taskDatabase, PlantDatabase plantDatabase) {
+        this.taskDatabase = taskDatabase;
+        this.plantDatabase = plantDatabase;
+    }
+
+    /**
+     * Method to save a new Task to Task Database
+     * @param task the Task to save
+     * @throws IOException If the database cannot be accessed
+     */
+    public void addTask(Task task) throws IOException {
+        taskDatabase.saveTask(task);
+    }
+
+    /**
+     * Method to add all Tasks for a new crop
+     * @param crop the crop which is added
+     * @throws PlantNotFoundException if the plantId in the crop doesn't exist in Plant Database
+     * @throws HardinessZoneNotSetException If there is no Hardiness Zone Set in Plant Database
+     * @throws IOException If the database cannot be accessed
+     */
+    public void planTasksForCrop(Crop crop) throws PlantNotFoundException, HardinessZoneNotSetException, IOException {
+        Plant plant = plantDatabase.getPlantById(Config.getCurrentHardinessZone(), crop.getPlantId()).orElseThrow(PlantNotFoundException::new);
+        for (GrowthPhase growthPhase : plant.lifecycle()) {
+            for (TaskTemplate taskTemplate : growthPhase.taskTemplates()) {
+                addTask(taskTemplate.generateTask(crop.getStartDate(), crop.getCropId().orElse(0L)));
+            }
+        }
+    }
+
+    /**
+     * Method to remove all Tasks for a specific Crop
+     * @param cropId The crop which is removed
+     * @throws IOException If the database cannot be accessed
+     */
+    public void removeTasksForCrop(long cropId) throws IOException {
+        taskDatabase.removeTasksForCrop(cropId);
+    }
+
+    /**
+     * Method to remove a Task from Database
+     * @param task the Task to remove
+     * @throws IOException If the database cannot be accessed
+     */
+    public void removeTask(Task task) throws IOException {
+        taskDatabase.removeTask(task);
+    }
+
+    private List<Task> filterListByCrop(List<Task> taskList, Long cropId) {
+        return taskList.stream().filter(task -> task.getCropId() == cropId).collect(Collectors.toList());
+    }
+
+    /**
+     * Method to get all Tasks
+     * @return List of all Tasks
+     * @throws IOException If the database cannot be accessed
+     */
+    public List<Task> getTaskList() throws IOException {
+        return getFilteredTaskList(LocalDate.MIN, LocalDate.MAX);
+    }
+
+    /**
+     * Method to get all Tasks for specific Crop
+     * @return List of all Tasks for with given CropID
+     * @throws IOException If the database cannot be accessed
+     */
+    public List<Task> getTaskListForCrop(Long cropId) throws IOException {
+        return filterListByCrop(getTaskList(), cropId);
+    }
+
+    /**
+     * Method to get all Tasks which are today or in future
+     * @return List of Tasks
+     * @throws IOException If the database cannot be accessed
+     */
+    public List<Task> getFutureTasks() throws IOException {
+        return getFilteredTaskList(LocalDate.now(), LocalDate.MAX);
+    }
+
+    /**
+     * Method to get all Tasks which are today or in future for specific Crop
+     * @return List of Tasks with given crop ID
+     * @throws IOException If the database cannot be accessed
+     */
+    public List<Task> getFutureTasksForCrop(Long cropId) throws IOException {
+        return filterListByCrop(getFutureTasks(), cropId);
+    }
+
+    /**
+     * Method to get all Tasks which are today or in past
+     * @return List of Tasks
+     * @throws IOException If the database cannot be accessed
+     */
+    public List<Task> getPastTasks() throws IOException {
+        return getFilteredTaskList(LocalDate.MIN, LocalDate.now());
+    }
+
+    /**
+     * Method to get all Tasks which are today or in past for specifc crop
+     * @return List of Tasks with given grop id
+     * @throws IOException If the database cannot be accessed
+     */
+    public List<Task> getPastTasksForCrop(Long cropId) throws IOException {
+        return filterListByCrop(getPastTasks(), cropId);
+    }
+
+    /**
+     * Method to get an List of 7 Tasklists for the next 7 days. Index 0 is Tasklist for Today.
+     * @return List with length 7 (List<List<Task>>)
+     * @throws IOException If the database cannot be accessed
+     */
+    public List<List<Task>> getTasksUpcomingWeek() throws IOException {
+        List<List<Task>> dayTaskList = new ArrayList<>();
+        for(int i = 0; i < 7; i++) {
+            LocalDate date = LocalDate.now().plusDays(i);
+            dayTaskList.add(taskDatabase.getTaskList(date, date));
+        }
+        return dayTaskList;
+    }
+
+    /**
+     * Method to get an List of 7 Tasklists for the next 7 days. (Filtered Index 0 is Tasklist for Today.
+     * @return List with length 7 (List<List<Task>>)
+     * @throws IOException If the database cannot be accessed
+     */
+    public List<List<Task>> getTasksUpcomingWeekForCrop(Long cropId) throws IOException {
+        List<List<Task>> dayTaskList = new ArrayList<>();
+        for(int i = 0; i < 7; i++) {
+            LocalDate date = LocalDate.now().plusDays(i);
+            dayTaskList.add(filterListByCrop(taskDatabase.getTaskList(date, date), cropId));
+        }
+        return dayTaskList;
+    }
+
+    /**
+     * Method to get Tasklist filtered by date.
+     * @param start the start date for the filter
+     * @param end the end date for the filter
+     * @return List of Tasks matched by the filter
+     * @throws IOException If the database cannot be accessed
+     */
+    public List<Task> getFilteredTaskList(LocalDate start, LocalDate end) throws IOException {
+        return getSortedTaskList(taskDatabase.getTaskList(start, end), sortByStartDate);
+    }
+
+    /**
+     * Method to sort a Tasklist by a given Comparator
+     * @param taskList The Tasklist to sort
+     * @param comparator the comparator to sort
+     * @return a sorted coppy of the given Tasklist
+     */
+    private List<Task> getSortedTaskList(List<Task> taskList, Comparator<Task> comparator) {
+        return taskList.stream().sorted(comparator).collect(Collectors.toList());
+    }
+}

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

@@ -1,6 +1,7 @@
 package ch.zhaw.gartenverwaltung.types;
 
 import java.time.LocalDate;
+import java.util.Objects;
 import java.util.Optional;
 
 public class Crop {
@@ -41,6 +42,24 @@ public class Crop {
     public LocalDate getStartDate() { return startDate; }
     public double getArea() { return area; }
 
+    @Override
+    public boolean equals(Object other) {
+        if (this == other) return true;
+        if (other instanceof Crop otherCrop) {
+            return Objects.equals(this.cropId, otherCrop.cropId) &&
+                    plantId == otherCrop.plantId &&
+                    startDate != null && startDate.equals(otherCrop.startDate) &&
+                    area == otherCrop.area;
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        int startCode = startDate != null ? startDate.hashCode() : 0;
+        return (int) plantId ^ (startCode << 16);
+    }
+
     @Override
     public String toString() {
         return String.format("Crop [ cropId: %d, plantId: %d, startDate: %s, area: %f ]",

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

@@ -0,0 +1,26 @@
+package ch.zhaw.gartenverwaltung.types;
+
+import java.time.MonthDay;
+
+public enum Seasons {
+    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;
+
+    Seasons(String startDate, String endDate) {
+        this.startDate = startDate;
+        this.endDate = endDate;
+    }
+
+    public MonthDay getStartDate() {
+        return MonthDay.parse(this.startDate);
+    }
+    public MonthDay getEndDate() {
+        return MonthDay.parse(this.endDate);
+    }
+}

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

@@ -15,29 +15,33 @@ public class Task {
     private final LocalDate startDate;
     private Integer interval;
     private LocalDate endDate;
+    private long cropId;
 
     /**
      * 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) {
+    public Task(String name, String description, LocalDate startDate, long cropId) {
         this.name = name;
         this.description = description;
         this.startDate = startDate;
+        this.cropId = cropId;
     }
 
-    public Task(String name, String description, LocalDate startDate, LocalDate endDate, int interval) {
+    public Task(String name, String description, LocalDate startDate, LocalDate endDate, int interval, long cropId) {
         this.name = name;
         this.description = description;
         this.startDate = startDate;
         this.endDate = endDate;
         this.interval = interval;
+        this.cropId = cropId;
     }
 
     // Builder-pattern-style setters
@@ -55,10 +59,7 @@ public class Task {
     }
 
     public boolean isInTimePeriode(LocalDate searchStartDate, LocalDate searchEndDate){
-        if(startDate.isAfter(searchStartDate) &&startDate.isBefore(searchEndDate)){
-            return true;
-        }
-        return false;
+        return startDate.isAfter(searchStartDate) && startDate.isBefore(searchEndDate);
     }
 
     // Getters
@@ -66,6 +67,7 @@ public class Task {
     public String getName() { return name; }
     public String getDescription() { return description; }
     public LocalDate getStartDate() { return startDate; }
+    public long getCropId() { return cropId; }
 
     public Optional<Integer> getInterval() {
         return Optional.ofNullable(interval);

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

@@ -44,8 +44,8 @@ public class TaskTemplate {
         this.relativeStartDate = relativeStartDate;
     }
 
-    public Task generateTask(LocalDate realStartDate) {
-        Task task = new Task(name, description, realStartDate.plusDays(relativeStartDate));
+    public Task generateTask(LocalDate realStartDate, long cropId) {
+        Task task = new Task(name, description, realStartDate.plusDays(relativeStartDate), cropId);
         if (relativeEndDate != null) {
             task.withEndDate(realStartDate.plusDays(relativeEndDate));
         }

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

@@ -3,7 +3,6 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.geometry.Rectangle2D?>
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.control.SplitPane?>
@@ -16,8 +15,9 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<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">
+<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">
    <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>
@@ -30,7 +30,7 @@
                               <Font name="System Bold" size="30.0" />
                            </font>
                         </Label>
-                        <TextField fx:id="search_plants" onKeyTyped="#searchForPlant" promptText="Search for Plant Name" />
+                        <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="580.0" HBox.hgrow="ALWAYS" />
@@ -75,30 +75,7 @@
                           <content>
                             <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
                                  <children>
-                                    <VBox layoutX="37.0" layoutY="-19.0" prefHeight="180.66666666666666" prefWidth="310.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                                       <children>
-                                          <CheckBox fx:id="spring_filter" mnemonicParsing="false" onAction="#filterSpring" text="Spring">
-                                             <padding>
-                                                <Insets top="10.0" />
-                                             </padding>
-                                          </CheckBox>
-                                          <CheckBox fx:id="sommer_filter" mnemonicParsing="false" onAction="#filterSommer" text="Sommer">
-                                             <padding>
-                                                <Insets top="10.0" />
-                                             </padding>
-                                          </CheckBox>
-                                          <CheckBox fx:id="autum_filter" mnemonicParsing="false" onAction="#filterAutum" text="Autum">
-                                             <padding>
-                                                <Insets top="10.0" />
-                                             </padding>
-                                          </CheckBox>
-                                          <CheckBox fx:id="winter_filter" mnemonicParsing="false" onAction="#filterWinter" text="Winter">
-                                             <padding>
-                                                <Insets top="10.0" />
-                                             </padding>
-                                          </CheckBox>
-                                       </children>
-                                    </VBox>
+                                    <VBox fx:id="seasons" layoutX="37.0" layoutY="-19.0" prefHeight="180.66666666666666" prefWidth="310.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
                                  </children>
                               </AnchorPane>
                           </content>

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

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

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

@@ -5,7 +5,8 @@
   "description": "Plant the seeds, crops in de bed.",
   "startDate" : "2022-05-01",
   "endDate" : "2022-05-01",
-  "interval" : 0
+  "interval" : 0,
+    "cropID" : 0
   },
   {
     "id" : 2,
@@ -13,7 +14,8 @@
     "description": "water the plant, so that the soil is wet around the plant.",
     "startDate" : "2022-05-01",
     "endDate" : "2022-09-01",
-    "interval" : 2
+    "interval" : 2,
+    "cropID" : 0
   },
   {
     "id" : 3,
@@ -21,7 +23,8 @@
     "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
+    "interval" : 28,
+    "cropID" : 0
   },
   {
     "id" : 4,
@@ -29,7 +32,8 @@
     "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
+    "interval" : 0,
+    "cropID" : 0
   },
   {
     "id" : 5,
@@ -37,7 +41,8 @@
     "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
+    "interval" : 5,
+    "cropID" : 0
   },
   {
     "id" : 6,
@@ -45,6 +50,7 @@
     "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
+    "interval" : 0,
+    "cropID" : 0
   }
 ]

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

@@ -0,0 +1,105 @@
+package ch.zhaw.gartenverwaltung.io;
+
+import ch.zhaw.gartenverwaltung.types.Crop;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class JsonGardenPlanTest {
+    private GardenPlan testDatabase;
+    private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+    /**
+     * Files to isolate the test-units
+     */
+    private final URL dbDataSource = this.getClass().getResource("user-crops.json");
+    private final URL testFile = this.getClass().getResource("test-user-crops.json");
+
+    @BeforeEach
+    void connectToDb() throws URISyntaxException, IOException {
+        assertNotNull(testFile);
+        assertNotNull(dbDataSource);
+        Files.copy(Path.of(testFile.toURI()), Path.of(dbDataSource.toURI()), StandardCopyOption.REPLACE_EXISTING);
+        testDatabase = new JsonGardenPlan(dbDataSource);
+    }
+
+
+    @Test
+    @DisplayName("Check if results are retrieved completely.")
+    void getCropsNotEmpty() {
+        List<Crop> testList;
+        try {
+            testList = testDatabase.getCrops();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        Assertions.assertEquals(3, testList.size());
+
+        List<Long> plantIds = testList.stream().map(Crop::getPlantId).collect(Collectors.toList());
+        List<Long> expected = Arrays.asList(1L, 1L, 0L);
+        Assertions.assertEquals(expected, plantIds);
+    }
+
+    @Test
+    @DisplayName("Check whether single access works.")
+    void getCropById() throws IOException {
+        Optional<Crop> testCrop = testDatabase.getCropById(1);
+        assertTrue(testCrop.isPresent());
+        Assertions.assertEquals(1, testCrop.get().getPlantId());
+    }
+
+
+    @Test
+    @DisplayName("Check for a nonexisting crop.")
+    void getCropByIdMustFail() throws IOException {
+        Optional<Crop> testCrop = testDatabase.getCropById(99);
+        Assertions.assertFalse(testCrop.isPresent());
+    }
+
+    @Test
+    @DisplayName("Add new Crop.")
+    void addNewCrop() {
+        Crop crop = new Crop(3L, LocalDate.parse("2023-02-22", formatter));
+        try {
+            testDatabase.saveCrop(crop);
+            assertTrue(crop.getCropId().isPresent());
+            Optional<Crop> testCrop = testDatabase.getCropById(crop.getCropId().get());
+
+            assertTrue(testCrop.isPresent());
+            Assertions.assertEquals(crop, testCrop.get());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Test
+    @DisplayName("Remove crop")
+    void removeCrop(){
+        try {
+            Optional<Crop> crop = testDatabase.getCropById(2L);
+            Assertions.assertTrue(crop.isPresent());
+            testDatabase.removeCrop(crop.get());
+            crop = testDatabase.getCropById(2L);
+            Assertions.assertFalse(crop.isPresent());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
+

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

@@ -8,7 +8,6 @@ import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
-import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
@@ -16,7 +15,6 @@ import java.util.stream.Collectors;
 
 public class JsonPlantDatabaseTest {
     PlantDatabase testDatabase;
-    SimpleDateFormat formatter = new SimpleDateFormat("dd.MM.yyyy");
 
     @BeforeEach
     void connectToDb() {
@@ -26,7 +24,7 @@ public class JsonPlantDatabaseTest {
 
     @Test
     @DisplayName("Check if results are retrieved completely")
-    void getPlantList() {
+    void getPlantListNotEmpty() {
         List<Plant> testList;
         try {
             testList = testDatabase.getPlantList(HardinessZone.ZONE_8A);
@@ -40,12 +38,26 @@ public class JsonPlantDatabaseTest {
         Assertions.assertEquals(expected,names);
     }
 
+    @Test
+    @DisplayName("Check if results are retrieved correctly when empty")
+    void getPlantListEmpty() {
+        List<Plant> testList;
+        try {
+            testList = testDatabase.getPlantList(HardinessZone.ZONE_1A);
+        } catch (IOException | HardinessZoneNotSetException e) {
+            throw new RuntimeException(e);
+        }
+        Assertions.assertEquals(0, testList.size());
+
+
+    }
+
     @Test
     @DisplayName("Check whether single access works.")
-    void getPlantById() {
+    void getPlantByIdAndZone() {
         Optional<Plant> testPlant;
         try {
-            testPlant = testDatabase.getPlantById(HardinessZone.ZONE_8A,1);
+            testPlant = testDatabase.getPlantById(HardinessZone.ZONE_8A, 1);
         } catch (IOException | HardinessZoneNotSetException e) {
             throw new RuntimeException(e);
         }
@@ -53,12 +65,23 @@ public class JsonPlantDatabaseTest {
         Assertions.assertEquals("Early Carrot", testPlant.get().name());
     }
 
+    @Test
+    @DisplayName("Check whether single access respects zone correctly.")
+    void getPlantByIdAndWrongZone() throws HardinessZoneNotSetException, IOException {
+        Optional<Plant> testPlant = testDatabase.getPlantById(HardinessZone.ZONE_1A, 1);
+        Assertions.assertFalse(testPlant.isPresent());
+        testPlant = testDatabase.getPlantById(HardinessZone.ZONE_8A, 1);
+        Assertions.assertTrue(testPlant.isPresent());
+
+        Assertions.assertEquals("Early Carrot", testPlant.get().name());
+    }
+
     @Test
     @DisplayName("Check for a nonexisting plant.")
     void getPlantByIdMustFail() {
         Optional<Plant> testPlant;
         try {
-            testPlant = testDatabase.getPlantById(HardinessZone.ZONE_8A,99);
+            testPlant = testDatabase.getPlantById(HardinessZone.ZONE_8A, 99);
         } catch (IOException | HardinessZoneNotSetException e) {
             throw new RuntimeException(e);
         }

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

@@ -34,4 +34,14 @@ public class JsonTaskDatabaseTest {
         Assertions.assertTrue(taskList.size()>0);
         */
     }
+
+    @Test
+    void getTaskForCrop() {
+        // TODO implement Test
+    }
+
+    @Test
+    void removeTasksForCrop() {
+        // TODO implement Test
+    }
 }

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

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

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

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

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

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