README.md

@@ -1,19 +1,32 @@
-# GardenPlanner
+# PM3-HS22-IT21b_WIN-Team1
+PM3 FivePlants Gartenverwaltung
 
-##	Installations- und Gebrauchsanweisung
+## Class Diagram
-### Vorbedingungen
+Umletino: https://www.umletino.com/umletino.html
- - Das Java Runtime Environment (JRE) muss in der Version 17 auf Ihrem Computer installiert sein.
- - Das Java Development Kit (JDK) muss in der Version 17 auf Ihrem Computer installiert sein.
 
-### Installation und Starten der Applikation
+Draft File: doc/ClassDiagramDraft.uxf
-1. Laden sie die neuste Version der Applikation herunter. Sie finden die Applikation hier:
-      https://github.zhaw.ch/schrom01/PM3-HS22-IT21b_WIN-Team1/tags
-2. Extrahieren sie die heruntergeladene ZIP-Datei
-3. Öffnen sie ein Kommandozeilenfenster und navigieren sie an den Speicherort der Entpack-ten Applikation.
-4. Führen sie den Befehl: «./gradlew.bat run» (auf Windows) oder «./gradlew run» (auf ma-cOS und Linux) aus.
 
-###	Anwendung
+## Branch model
-Eine Bedienungsanleitung finden Sie im Dokument ["Technischer Bericht II"](doc/PM3-HS22-IT21b_WIN-Technischer_Bericht_II-Team1.pdf) im Kapitel 6.3.3.
+- production branch: `main`
 
-## Projektdokumentation
+This branch has a working version of the code.
-Die gesamte Projektdokumentation ist im Dokument ["Technischer Bericht II"](doc/PM3-HS22-IT21b_WIN-Technischer_Bericht_II-Team1.pdf) zu finden.
+
+- development branch: `dev`
+
+This branch should contain a running (although not necessarily working) version of the code. Working states are to be merged into the `main` branch regularly.
+
+- feature:       `feature_xy_<Milestone>`
+
+These branches contain features in active development. When the code is ready it will be merged into the `dev` branch.
+
+- bugfix:        `bugfix_xy_<Milestone>`
+
+These branches are for bugfixes.
+
+- documentation: `doc_xy_<Milestone>`
+
+These branches are for javadoc and project documentation (such as the readme, class diagrams etc.).
+
+
+## User Manual
+- Search Plant List: if first Char is '#': only exact match in ID.

build.gradle

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

doc/Classdiagramm/ClassDiagramDraft.uxf

@@ -0,0 +1,92 @@
+<diagram program="umletino" version="15.0.0"><zoom_level>10</zoom_level><element><id>UMLClass</id><coordinates><x>720</x><y>30</y><w>100</w><h>30</h></coordinates><panel_attributes>Main</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1240</x><y>250</y><w>300</w><h>140</h></coordinates><panel_attributes>&lt;&lt;Interface&gt;&gt;
+PlantDatabase
+--
++ getPlantList(zone: HardinessZone): List&lt;Plant&gt;
++ getPlant(id: long): Optional&lt;Plant&gt;</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>940</x><y>580</y><w>220</w><h>40</h></coordinates><panel_attributes>TaskListController</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1240</x><y>10</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>1210</x><y>580</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>590</x><y>560</y><w>250</w><h>110</h></coordinates><panel_attributes>GardenPlanModel
+--
+- tasks: ListProperty&lt;Task&gt;
+- gardenPlan: GardenPlan
+--
++ savePlanting(planting: UserPlanting)
++ removePlanting(planting: UserPlanting)</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>340</x><y>550</y><w>180</w><h>80</h></coordinates><panel_attributes>GardenPlanController</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1660</x><y>720</y><w>490</w><h>240</h></coordinates><panel_attributes>Task
+--
++ id: long
++ name: String {readOnly}
++ description: String {readOnly}
++ startDate: Date {readOnly}
++ isReadOnly: 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>1170</x><y>760</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>780</x><y>310</y><w>100</w><h>100</h></coordinates><panel_attributes>MainWindow</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>440</x><y>180</y><w>180</w><h>130</h></coordinates><panel_attributes>MainWindowController</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1340</x><y>1070</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>1640</x><y>1210</y><w>240</w><h>140</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>1620</x><y>1040</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>1620</x><y>10</y><w>260</w><h>150</h></coordinates><panel_attributes>&lt;&lt;Record&gt;&gt;
+GrowthPhase
+--
++ startDate: Date
++ endDate: Date 
++ type: GrowthPhaseType
+
+</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>1530</x><y>80</y><w>110</w><h>30</h></coordinates><panel_attributes>lt=&lt;-&gt;&gt;&gt;&gt;&gt;</panel_attributes><additional_attributes>90;10;10;10</additional_attributes></element><element><id>Text</id><coordinates><x>420</x><y>0</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>1440</x><y>820</y><w>240</w><h>30</h></coordinates><panel_attributes>lt=&lt;.</panel_attributes><additional_attributes>220;10;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>1300</x><y>690</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>UMLClass</id><coordinates><x>600</x><y>980</y><w>210</w><h>120</h></coordinates><panel_attributes>&lt;&lt;Record&gt;&gt;
+UserPlanting
+--
++ plantId: long
++ asSowing: boolean
++ startDate: Date
++ area: int</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>1380</x><y>180</y><w>30</w><h>90</h></coordinates><panel_attributes>lt=&lt;.</panel_attributes><additional_attributes>10;10;10;70</additional_attributes></element><element><id>UMLClass</id><coordinates><x>1950</x><y>10</y><w>140</w><h>120</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>1870</x><y>70</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>Relation</id><coordinates><x>1150</x><y>590</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>700</x><y>890</y><w>30</w><h>110</h></coordinates><panel_attributes>lt=&lt;.</panel_attributes><additional_attributes>10;90;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>510</x><y>580</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>570</x><y>760</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>690</x><y>660</y><w>30</w><h>120</h></coordinates><panel_attributes>lt=&lt;.</panel_attributes><additional_attributes>10;100;10;10</additional_attributes></element><element><id>UMLClass</id><coordinates><x>60</x><y>390</y><w>180</w><h>80</h></coordinates><panel_attributes>PlantingCell
+{extends ListCell&lt;&gt;}</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>0</x><y>540</y><w>290</w><h>80</h></coordinates><panel_attributes>PlantingCellFactory
+{implements Callback&lt;ListView&lt;UserPlanting&gt; &gt;}</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>140</x><y>460</y><w>30</w><h>100</h></coordinates><panel_attributes>lt=&lt;.</panel_attributes><additional_attributes>10;10;10;80</additional_attributes></element><element><id>Relation</id><coordinates><x>1750</x><y>1130</y><w>30</w><h>100</h></coordinates><panel_attributes>lt=&lt;.</panel_attributes><additional_attributes>10;80;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>1350</x><y>890</y><w>120</w><h>200</h></coordinates><panel_attributes>lt=&lt;.</panel_attributes><additional_attributes>10;10;100;180</additional_attributes></element><element><id>Relation</id><coordinates><x>1380</x><y>890</y><w>260</w><h>220</h></coordinates><panel_attributes>lt=&lt;.</panel_attributes><additional_attributes>10;10;240;200</additional_attributes></element><element><id>UMLClass</id><coordinates><x>1090</x><y>1060</y><w>200</w><h>50</h></coordinates><panel_attributes>JsonTaskDatabase</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>1180</x><y>890</y><w>30</w><h>190</h></coordinates><panel_attributes>lt=&lt;&lt;-</panel_attributes><additional_attributes>10;10;10;170</additional_attributes></element><element><id>UMLClass</id><coordinates><x>1620</x><y>310</y><w>200</w><h>50</h></coordinates><panel_attributes>JsonPlantDatabase</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>1530</x><y>320</y><w>110</w><h>30</h></coordinates><panel_attributes>lt=&lt;&lt;-</panel_attributes><additional_attributes>10;10;90;10</additional_attributes></element><element><id>UMLClass</id><coordinates><x>300</x><y>800</y><w>200</w><h>50</h></coordinates><panel_attributes>JsonGardenPlan</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>490</x><y>810</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>280</x><y>570</y><w>80</w><h>30</h></coordinates><panel_attributes>lt=&lt;.</panel_attributes><additional_attributes>10;10;60;10</additional_attributes></element><element><id>Relation</id><coordinates><x>850</x><y>400</y><w>220</w><h>200</h></coordinates><panel_attributes>lt=&lt;.</panel_attributes><additional_attributes>200;180;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>440</x><y>400</y><w>390</w><h>170</h></coordinates><panel_attributes>lt=&lt;.</panel_attributes><additional_attributes>10;150;370;10</additional_attributes></element><element><id>UMLClass</id><coordinates><x>850</x><y>120</y><w>160</w><h>60</h></coordinates><panel_attributes>PlantListController</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>760</x><y>50</y><w>90</w><h>280</h></coordinates><panel_attributes>lt=&lt;.</panel_attributes><additional_attributes>70;260;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>610</x><y>230</y><w>190</w><h>140</h></coordinates><panel_attributes>lt=&lt;.</panel_attributes><additional_attributes>10;10;170;120</additional_attributes></element><element><id>Relation</id><coordinates><x>870</x><y>170</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>1020</x><y>290</y><w>160</w><h>60</h></coordinates><panel_attributes>PlantListModel</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>1000</x><y>150</y><w>110</w><h>160</h></coordinates><panel_attributes>lt=&lt;.</panel_attributes><additional_attributes>90;140;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>1170</x><y>310</y><w>90</w><h>30</h></coordinates><panel_attributes>lt=&lt;.</panel_attributes><additional_attributes>70;10;10;10</additional_attributes></element></diagram>

doc/Classdiagramm/layer-diagram.uxf

@@ -0,0 +1,7 @@
+<diagram program="umletino" version="15.0.0"><zoom_level>10</zoom_level><element><id>UMLPackage</id><coordinates><x>390</x><y>60</y><w>340</w><h>100</h></coordinates><panel_attributes>UI</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>390</x><y>180</y><w>460</w><h>120</h></coordinates><panel_attributes>Domain</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>390</x><y>330</y><w>460</w><h>120</h></coordinates><panel_attributes>Technical Services</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>400</x><y>90</y><w>100</w><h>60</h></coordinates><panel_attributes>Views (JFX)</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>400</x><y>220</y><w>100</w><h>60</h></coordinates><panel_attributes>IO</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>400</x><y>370</y><w>100</w><h>60</h></coordinates><panel_attributes>Jackson</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>510</x><y>220</y><w>100</w><h>60</h></coordinates><panel_attributes>Types</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>620</x><y>220</y><w>100</w><h>60</h></coordinates><panel_attributes>Models</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>510</x><y>90</y><w>110</w><h>60</h></coordinates><panel_attributes>Controllers (JFX)</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>510</x><y>370</y><w>100</w><h>60</h></coordinates><panel_attributes>Logging</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>620</x><y>370</y><w>100</w><h>60</h></coordinates><panel_attributes>JavaFX</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>730</x><y>220</y><w>110</w><h>60</h></coordinates><panel_attributes>Services</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>730</x><y>370</y><w>110</w><h>60</h></coordinates><panel_attributes>HTTP/API</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>570</x><y>150</y><w>90</w><h>70</h></coordinates><panel_attributes>lt=.&gt;
+</panel_attributes><additional_attributes>70;10;10;50</additional_attributes></element><element><id>Relation</id><coordinates><x>570</x><y>290</y><w>110</w><h>80</h></coordinates><panel_attributes>lt=.&gt;
+</panel_attributes><additional_attributes>90;10;10;60</additional_attributes></element><element><id>Relation</id><coordinates><x>340</x><y>120</y><w>350</w><h>400</h></coordinates><panel_attributes>lt=.&gt;
+</panel_attributes><additional_attributes>60;10;10;10;10;380;330;380;330;310</additional_attributes></element><element><id>Relation</id><coordinates><x>770</x><y>270</y><w>30</w><h>120</h></coordinates><panel_attributes>lt=.&gt;
+</panel_attributes><additional_attributes>10;10;10;100</additional_attributes></element><element><id>Relation</id><coordinates><x>360</x><y>250</y><w>60</w><h>180</h></coordinates><panel_attributes>lt=.&gt;
+</panel_attributes><additional_attributes>40;10;10;10;10;160;40;160</additional_attributes></element><element><id>Relation</id><coordinates><x>610</x><y>120</y><w>70</w><h>120</h></coordinates><panel_attributes>lt=.&gt;
+</panel_attributes><additional_attributes>10;10;50;10;50;100</additional_attributes></element></diagram>

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>

doc/Dömanenmodell/Diagram 2022-10-17 09-22-54.uxf

@@ -0,0 +1,70 @@
+<diagram program="umletino" version="15.0.0"><zoom_level>12</zoom_level><element><id>UMLClass</id><coordinates><x>852</x><y>372</y><w>120</w><h>72</h></coordinates><panel_attributes>Gardener
+--
+Name
+Type</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>144</x><y>372</y><w>120</w><h>120</h></coordinates><panel_attributes>Plant
+--
+name
+description</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>600</x><y>372</y><w>120</w><h>84</h></coordinates><panel_attributes>Garden
+--
+Location
+hardiness zone</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>384</x><y>372</y><w>120</w><h>72</h></coordinates><panel_attributes>Bed
+--
+Area</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1152</x><y>624</y><w>120</w><h>36</h></coordinates><panel_attributes>Weather</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>852</x><y>816</y><w>120</w><h>36</h></coordinates><panel_attributes>Calendar</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>852</x><y>96</y><w>144</w><h>72</h></coordinates><panel_attributes>Community
+--
+Plant Information
+</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>288</x><y>636</y><w>120</w><h>72</h></coordinates><panel_attributes>Growth phase
+--
+duration</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>852</x><y>624</y><w>120</w><h>84</h></coordinates><panel_attributes>Gardening task
+--
+start date
+end date
+interval</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>852</x><y>156</y><w>120</w><h>240</h></coordinates><panel_attributes>lt=-
+m1=0..*
+m2=1..*
+&lt; is part of </panel_attributes><additional_attributes>10;180;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>708</x><y>372</y><w>168</w><h>60</h></coordinates><panel_attributes>lt=-
+m1=1
+m2=1..*
+&lt; has </panel_attributes><additional_attributes>120;20;10;20</additional_attributes></element><element><id>Relation</id><coordinates><x>252</x><y>372</y><w>156</w><h>60</h></coordinates><panel_attributes>lt=-
+m1=1
+m2=0..*
+&lt; contains </panel_attributes><additional_attributes>110;20;10;20</additional_attributes></element><element><id>Relation</id><coordinates><x>252</x><y>444</y><w>156</w><h>216</h></coordinates><panel_attributes>lt=-
+m1=1
+m2=1..*
+has &gt;</panel_attributes><additional_attributes>10;10;80;10;80;160</additional_attributes></element><element><id>Relation</id><coordinates><x>492</x><y>372</y><w>132</w><h>60</h></coordinates><panel_attributes>lt=-
+m1=1
+m2=1..*
+&lt; contains </panel_attributes><additional_attributes>90;20;10;20</additional_attributes></element><element><id>Relation</id><coordinates><x>900</x><y>432</y><w>120</w><h>216</h></coordinates><panel_attributes>lt=-
+m1=1
+m2=1..*
+&lt; manages </panel_attributes><additional_attributes>10;10;10;160</additional_attributes></element><element><id>Relation</id><coordinates><x>960</x><y>624</y><w>216</w><h>60</h></coordinates><panel_attributes>lt=-
+m1=1
+m2=1..*
+&lt; manipulates</panel_attributes><additional_attributes>160;20;10;20</additional_attributes></element><element><id>Relation</id><coordinates><x>900</x><y>696</y><w>108</w><h>144</h></coordinates><panel_attributes>lt=-
+m1=1
+m2=0..*
+&lt; contains</panel_attributes><additional_attributes>10;10;10;100</additional_attributes></element><element><id>Relation</id><coordinates><x>960</x><y>408</y><w>468</w><h>468</h></coordinates><panel_attributes>lt=-
+m1=1
+m2=1
+&lt; informs </panel_attributes><additional_attributes>10;360;310;360;310;10;10;10</additional_attributes></element><element><id>UMLClass</id><coordinates><x>12</x><y>636</y><w>120</w><h>84</h></coordinates><panel_attributes>Need
+--
+start date
+end date</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>60</x><y>432</y><w>108</w><h>228</h></coordinates><panel_attributes>lt=-
+m1=1..*
+m2=1..*
+has &gt;</panel_attributes><additional_attributes>10;170;10;10;70;10</additional_attributes></element><element><id>Relation</id><coordinates><x>60</x><y>672</y><w>816</w><h>120</h></coordinates><panel_attributes>lt=-
+m1=1
+m2=1
+requires &gt;</panel_attributes><additional_attributes>660;10;520;10;520;80;10;80;10;40</additional_attributes></element><element><id>UMLClass</id><coordinates><x>456</x><y>588</y><w>120</w><h>36</h></coordinates><panel_attributes>Team
+</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>564</x><y>432</y><w>312</w><h>180</h></coordinates><panel_attributes>lt=-
+m1=1
+m2=1..*
+contains of &gt;</panel_attributes><additional_attributes>10;130;240;10</additional_attributes></element><element><id>Relation</id><coordinates><x>564</x><y>600</y><w>312</w><h>60</h></coordinates><panel_attributes>lt=-
+m1=1
+m2=0..*
+manages &gt;</panel_attributes><additional_attributes>10;20;240;20</additional_attributes></element><element><id>Relation</id><coordinates><x>960</x><y>156</y><w>216</w><h>240</h></coordinates><panel_attributes>lt=-
+m1=0..n
+m2=1..n
+exchanges Informatione &gt;</panel_attributes><additional_attributes>10;10;10;180</additional_attributes></element><element><id>Relation</id><coordinates><x>120</x><y>648</y><w>192</w><h>60</h></coordinates><panel_attributes>lt=-
+m1=0..n
+m2=1
+&lt; contains </panel_attributes><additional_attributes>10;20;140;20</additional_attributes></element></diagram>

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

@@ -3,7 +3,6 @@ package ch.zhaw.gartenverwaltung;
 import ch.zhaw.gartenverwaltung.bootstrap.AppLoader;
 import ch.zhaw.gartenverwaltung.bootstrap.Inject;
 import ch.zhaw.gartenverwaltung.io.PlantList;
-import ch.zhaw.gartenverwaltung.io.TaskList;
 import ch.zhaw.gartenverwaltung.models.Garden;
 import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
 import ch.zhaw.gartenverwaltung.models.GardenSchedule;
@@ -12,7 +11,6 @@ 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.application.Platform;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
@@ -24,19 +22,14 @@ import javafx.scene.control.*;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.Pane;
 import javafx.scene.layout.Priority;
 import javafx.stage.Stage;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-/**
- * Controller class for the CropDetail.fxml file
- */
 public class CropDetailController {
     private Crop crop;
 
@@ -69,9 +62,15 @@ public class CropDetailController {
     @FXML
     private Label description_label;
 
+    @FXML
+    private Label location_label;
+
     @FXML
     private Label light_label;
 
+    @FXML
+    private Button location_button;
+
     @FXML
     private Label soil_label;
 
@@ -88,7 +87,7 @@ public class CropDetailController {
     private ListView<Pest> pests_listView;
 
     @FXML
-    void addTask() throws IOException, HardinessZoneNotSetException {
+    void addTask() throws IOException {
         createTaskDialog(true, null);
     }
 
@@ -105,8 +104,16 @@ public class CropDetailController {
      * open dialog to set area
      */
     @FXML
-    void setArea() throws IOException {
+    void setArea() {
-        openTextFieldDialog();
+
+    }
+
+    /**
+     * open dialog to set location
+     */
+    @FXML
+    void setLocation() {
+
     }
 
     /**
@@ -129,22 +136,10 @@ public class CropDetailController {
             if (plant.image() != null) {
                 imageView.setImage(plant.image());
             }
-            area_label.setText(String.valueOf(crop.getArea()));
+            area_label.setText("");
-
+            location_label.setText("");
-            initializeTaskListProperty(crop);
-
-            TaskList.TaskListObserver taskListObserver = newTaskList -> {
-                Platform.runLater(() -> {
-                    taskListProperty.clear();
-                    try {
-                        taskListProperty.addAll(gardenSchedule.getTaskListForCrop(crop.getCropId().get()));
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                });
-            };
-            gardenSchedule.setTaskListObserver(taskListObserver);
 
+            setTaskListProperty(crop);
             taskList_listView.itemsProperty().bind(taskListProperty);
 
             pestListProperty.addAll(plant.pests());
@@ -156,13 +151,11 @@ public class CropDetailController {
         }
         setIconToButton(addTask_button, "addIcon.png");
         setIconToButton(area_button, "areaIcon.png");
+        setIconToButton(location_button, "locationIcon.png");
         setCellFactoryPests();
         setCellFactoryTasks();
     }
 
-    /**
-     * cell Factory for TaskListView
-     */
     private void setCellFactoryTasks() {
         taskList_listView.setCellFactory(param -> new ListCell<>() {
             @Override
@@ -180,9 +173,6 @@ public class CropDetailController {
         });
     }
 
-    /**
-     * cell Factory for PestListView
-     */
     private void setCellFactoryPests() {
         pests_listView.setCellFactory(param -> new ListCell<>() {
             @Override
@@ -200,11 +190,7 @@ public class CropDetailController {
         });
     }
 
-    /**
+    private void setTaskListProperty(Crop crop) {
-     * initialize task list
-     * @param crop {@link Crop} that is selected
-     */
-    private void initializeTaskListProperty(Crop crop) {
         crop.getCropId().ifPresent(id -> {
             List<Task> taskList;
             try {
@@ -212,59 +198,42 @@ public class CropDetailController {
                 taskListProperty.clear();
                 taskListProperty.addAll(taskList);
             } catch (IOException e) {
+                // TODO: Alert
                 LOG.log(Level.SEVERE, "Could not get task list for crop", e.getCause());
             }
         });
     }
 
-    /**
-     * Creates a {@link HBox} for the given {@link Task}.
-     * @param task {@link Task} which is selected
-     * @return {@link HBox} that was created
-     */
     private HBox createTaskHBox(Task task) {
-        HBox hBox = new HBox(10);
+        HBox hBox = new HBox();
         Label taskName = new Label(task.getName()+": ");
-        taskName.setMinWidth(100);
-        taskName.setMaxSize(Double.MAX_VALUE, Double.MAX_VALUE);
         taskName.setStyle("-fx-font-weight: bold");
         Label taskDescription = new Label(task.getDescription());
         taskDescription.setWrapText(true);
-        taskDescription.setMaxSize(600, Double.MAX_VALUE);
+        taskDescription.setMaxWidth(2000);
-        Pane puffer = new Pane();
+        HBox.setHgrow(taskDescription, Priority.ALWAYS);
-        HBox.setHgrow(puffer, Priority.ALWAYS);
-
 
         Button edit = new Button();
         Button delete = new Button();
-        edit.getStyleClass().add("button-class");
-        delete.getStyleClass().add("button-class");
-        HBox.setHgrow(edit, Priority.NEVER);
-        HBox.setHgrow(delete, Priority.NEVER);
         setIconToButton(edit, "editIcon.png");
         setIconToButton(delete, "deleteIcon.png");
         edit.setOnAction(getEditTaskEvent(task));
-        delete.setOnAction(deleteTask(task));
 
-        hBox.getChildren().addAll(taskName, taskDescription, puffer, edit, delete);
+        hBox.getChildren().addAll(taskName, taskDescription, edit, delete);
         return hBox;
     }
 
-    /**
-     * Creates a {@link HBox} for the given {@link Pest}.
-     * @param pest {@link Pest} which is selected
-     * @return {@link HBox} that was created
-     */
     private HBox createPestHBox(Pest pest) {
         Label label = new Label(pest.name() + ":    ");
         label.setStyle("-fx-font-weight: bold");
         HBox hBox = new HBox();
         hBox.fillHeightProperty();
-        Label description = new Label(pest.description());
+        Label label1 = new Label(pest.description());
-        description.setAlignment(Pos.TOP_LEFT);
+        label1.setAlignment(Pos.TOP_LEFT);
-        description.setWrapText(true);
+        label1.setWrapText(true);
-        description.setMaxWidth(800);
+        label1.setMaxWidth(600);
-        hBox.getChildren().addAll(label, description);
+        Button button = new Button("Get Counter Measures");
+        hBox.getChildren().addAll(label, label1, button);
         return hBox;
     }
 
@@ -281,40 +250,17 @@ public class CropDetailController {
         button.setGraphic(imageView);
     }
 
-    /**
-     * opens dialog of {@link Task} edit.
-     * @param task {@link Task}
-     * @return {@link EventHandler} for the case of editing a {@link Task}
-     */
     private EventHandler<ActionEvent> getEditTaskEvent(Task task) {
         return (event) -> {
             try {
                 createTaskDialog(false, task);
-            } catch (IOException | HardinessZoneNotSetException e) {
+            } catch (IOException e) {
                 e.printStackTrace();
             }
         };
     }
 
-    /**
+    private void createTaskDialog(boolean newTask, Task givenTask) throws IOException {
-     * opens alert of {@link Task} deletion.
-     * @param task {@link Task}
-     * @return {@link EventHandler} for the case of deleting a {@link Task}
-     */
-    private EventHandler<ActionEvent> deleteTask(Task task) {
-        return (event) -> {
-            showDeleteTask(task);
-        };
-    }
-
-    /**
-     * opens a dialog to create a new Task or edit the given Task
-     * @param newTask boolean if it is a new Task
-     * @param givenTask {@link Task} which was selected
-     * @throws IOException Exception
-     * @throws HardinessZoneNotSetException Exception
-     */
-    private void createTaskDialog(boolean newTask, Task givenTask) throws IOException, HardinessZoneNotSetException {
         Dialog<Task> dialog = new Dialog<>();
         dialog.setTitle("Set Task");
         dialog.setHeaderText("Add/Edit Task:");
@@ -322,10 +268,6 @@ public class CropDetailController {
 
         DialogPane dialogPane = dialog.getDialogPane();
 
-        dialogPane.getStylesheets().add(
-                Objects.requireNonNull(getClass().getResource("bootstrap/dialogStyle.css")).toExternalForm());
-        dialogPane.getStyleClass().add("myDialog");
-
         ButtonType saveTask;
         if(newTask) {
             saveTask = new ButtonType("Add", ButtonBar.ButtonData.OK_DONE);
@@ -336,94 +278,26 @@ public class CropDetailController {
 
         if (appLoader.loadPaneToDialog("TaskFormular.fxml", dialogPane) instanceof TaskFormularController controller) {
             controller.setCorp(this.crop);
-            controller.initSaveButton((Button) dialogPane.lookupButton(saveTask));
             if (!newTask) {
                 controller.setTaskValue(givenTask);
             }
-            dialog.setResultConverter(button -> button.equals(saveTask) ? controller.returnResult(this.crop) : null);
+            dialog.setResultConverter(button -> button.equals(saveTask) ? controller.returnResult() : null);
 
             dialog.showAndWait()
                     .ifPresent(task -> {
                         if (newTask) {
                             try {
                                 gardenSchedule.addTask(task);
+                                setTaskListProperty(this.crop);
                             } catch (IOException e) {
                                 e.printStackTrace();
                             }
                         } else {
-                            try {
+                            //ToDo method to edit task
-                                gardenSchedule.addTask(givenTask.updateTask(task));
+                            setTaskListProperty(this.crop);
-                            } catch (IOException e) {
-                                throw new RuntimeException(e);
-                            }
                         }
                     });
         }
 
     }
-
-    /**
-     * opens TextField Dialog to enter the plant area.
-     * @throws IOException Exception
-     */
-    private void openTextFieldDialog() throws IOException {
-        Dialog<String> dialog = new Dialog<>();
-        dialog.setTitle("set Text Area");
-        dialog.setHeaderText("set Text Area");
-        dialog.setResizable(false);
-
-        DialogPane dialogPane = dialog.getDialogPane();
-
-        dialogPane.getStylesheets().add(
-                Objects.requireNonNull(getClass().getResource("bootstrap/dialogStyle.css")).toExternalForm());
-        dialogPane.getStyleClass().add("myDialog");
-
-        ButtonType save = new ButtonType("Save", ButtonBar.ButtonData.OK_DONE);
-        dialogPane.getButtonTypes().addAll(save, ButtonType.CANCEL);
-
-        if (appLoader.loadPaneToDialog("TextFieldFormular.fxml", dialogPane) instanceof TextFieldFormularController controller) {
-            controller.setDescription_label("Text Area");
-            controller.setValueTextArea(area_label.getText());
-            controller.initSaveButton((Button) dialogPane.lookupButton(save));
-
-            dialog.setResultConverter(button -> button.equals(save) ? controller.getValue() : null);
-
-            dialog.showAndWait()
-                    .ifPresent(string -> {
-                        try {
-                            garden.updateCrop(this.crop.withArea(Double.parseDouble(string)));
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                        }
-                        area_label.setText(string);
-                    });
-        }
-    }
-
-    /**
-     * Alert to delete Task.
-     * @param task {@link Task} which is being deleted
-     */
-    private void showDeleteTask(Task task) {
-        Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
-        alert.setTitle("Delete " + task.getName());
-        alert.setHeaderText("Are you sure want to delete this Task?");
-
-        DialogPane dialogPane = alert.getDialogPane();
-
-        dialogPane.getStylesheets().add(
-                Objects.requireNonNull(getClass().getResource("bootstrap/dialogStyle.css")).toExternalForm());
-        dialogPane.getStyleClass().add("myDialog");
-
-        alert.showAndWait()
-                .ifPresent(buttonType -> {
-                    if (buttonType == ButtonType.OK) {
-                        try {
-                            gardenSchedule.removeTask(task);
-                        } catch (IOException e) {
-                            LOG.log(Level.SEVERE, "Could not remove crop.", e);
-                        }
-                    }
-                });
-    }
 }

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

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

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

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

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

@@ -8,9 +8,6 @@ import javafx.scene.image.ImageView;
 import java.net.URL;
 import java.util.ResourceBundle;
 
-/**
- * Controller class for the Home.fxml file
- */
 public class HomeController implements Initializable {
 
     @FXML
@@ -37,11 +34,6 @@ public class HomeController implements Initializable {
         setImages(imageViewPhilippe, "");
     }
 
-    /**
-     * set image to image view
-     * @param imageView the imageView to update
-     * @param photoName the file name of the photo
-     */
     private void setImages(ImageView imageView, String photoName) {
         Image img;
         if (photoName.equals("")) {

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

@@ -1,59 +0,0 @@
-package ch.zhaw.gartenverwaltung;
-
-import ch.zhaw.gartenverwaltung.bootstrap.AppLoader;
-import ch.zhaw.gartenverwaltung.backgroundtasks.BackgroundTasks;
-import ch.zhaw.gartenverwaltung.io.CropList;
-import ch.zhaw.gartenverwaltung.io.PlantList;
-import ch.zhaw.gartenverwaltung.io.TaskList;
-import ch.zhaw.gartenverwaltung.models.Garden;
-import ch.zhaw.gartenverwaltung.types.Crop;
-import javafx.application.Application;
-import javafx.stage.Stage;
-
-import java.io.IOException;
-import java.util.Timer;
-
-/**
- * Main class of the Application
- */
-public class Main extends Application {
-    Timer backGroundTaskTimer = new Timer();
-    BackgroundTasks backgroundTasks;
-
-    /**
-     * Method which is automatically called if Application is starting. It loads the scenes to stage and shows the stage.
-     * It creates a new Instance of BackgroundTasks and schedules them with a Timer instance to execute them every minute.
-     * @param stage Stage to show
-     * @throws IOException If loading Scenes can not access the fxml Resource File
-     */
-    @Override
-    public void start(Stage stage) throws IOException {
-        AppLoader appLoader = new AppLoader();
-
-        appLoader.loadSceneToStage("MainFXML.fxml", stage);
-
-        stage.setTitle("Gartenverwaltung");
-        stage.show();
-
-        backgroundTasks = new BackgroundTasks((TaskList) appLoader.getAppDependency(TaskList.class),(CropList) appLoader.getAppDependency(CropList.class), (PlantList) appLoader.getAppDependency(PlantList.class));
-        backGroundTaskTimer.scheduleAtFixedRate(backgroundTasks, 0, 60000);
-
-    }
-
-    /**
-     * Method which is automatically called when application is stopped.
-     * It cancels the timer to not execute the background tasks anymore.
-     */
-    @Override
-    public void stop(){
-        backGroundTaskTimer.cancel();
-    }
-
-    /**
-     * The Main method launches the application
-     * @param args There are no arguments needed.
-     */
-    public static void main(String[] args) {
-        launch();
-    }
-}

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

@@ -16,13 +16,9 @@ import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
 
 import java.io.IOException;
-import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-/**
- * Controller class for the MainFXML.fxml file
- */
 public class MainFXMLController {
     private static final Logger LOG = Logger.getLogger(MainFXMLController.class.getName());
 
@@ -56,6 +52,7 @@ public class MainFXMLController {
     @FXML
     void goToHome() {
         showPaneAsMainView("Home.fxml");
+        styleChangeButton(home_button);
     }
 
     /**
@@ -64,6 +61,7 @@ public class MainFXMLController {
     @FXML
     void goToMyPlants() {
         showPaneAsMainView("MyGarden.fxml");
+        styleChangeButton(myGarden_button);
     }
 
     /**
@@ -72,6 +70,7 @@ public class MainFXMLController {
     @FXML
     void goToMySchedule() {
         showPaneAsMainView("MySchedule.fxml");
+        styleChangeButton(mySchedule_button);
     }
 
     /**
@@ -87,10 +86,6 @@ public class MainFXMLController {
 
         DialogPane dialogPane = dialog.getDialogPane();
 
-        dialogPane.getStylesheets().add(
-                Objects.requireNonNull(getClass().getResource("bootstrap/dialogStyle.css")).toExternalForm());
-        dialogPane.getStyleClass().add("myDialog");
-
         ButtonType saveSettings = new ButtonType("Save", ButtonBar.ButtonData.OK_DONE);
         dialogPane.getButtonTypes().addAll(saveSettings, ButtonType.CANCEL);
 
@@ -157,6 +152,10 @@ public class MainFXMLController {
         appLoader.loadAndCacheFxml("Plants.fxml");
     }
 
+    private void styleChangeButton(Button button) {
+        //ToDo changeStyle of the menu buttons
+    }
+
     /**
      * loads the default FXML File
      * {@inheritDoc}
@@ -167,6 +166,7 @@ public class MainFXMLController {
         try {
             preloadPanes();
             showPaneAsMainView("MyGarden.fxml");
+            styleChangeButton(myGarden_button);
         } catch (IOException e) {
             LOG.log(Level.SEVERE, "Failed to load FXML-Pane!", e);
         }
@@ -176,10 +176,6 @@ public class MainFXMLController {
         tutorial_button.visibleProperty().bind(Settings.getInstance().getShowTutorialProperty());
     }
 
-    /**
-     * close Tutorial Window
-     * @param windowEvent event
-     */
     private void closeWindowHandler(WindowEvent windowEvent) {
         tutorialModal.close();
     }

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

@@ -19,7 +19,6 @@ 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;
 
@@ -28,9 +27,6 @@ import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-/**
- * Controller class for the MyGarden.fxml file
- */
 public class MyGardenController {
     private static final Logger LOG = Logger.getLogger(MyGardenController.class.getName());
     @Inject
@@ -55,6 +51,7 @@ public class MyGardenController {
     @AfterInject
     @SuppressWarnings("unused")
     public void init() {
+        System.out.println("once");
         setIconToButton(addPlant_button, "addIcon.png");
         myGarden_listView.itemsProperty().bind(garden.getPlantedCrops());
         setCellFactory();
@@ -100,6 +97,7 @@ public class MyGardenController {
      * @throws IOException exception
      */
     private HBox createHBoxForListView(Crop crop) throws HardinessZoneNotSetException, IOException {
+        //ToDo add better design
         Plant plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).get();
         HBox hBox = new HBox(10);
         ImageView imageView = new ImageView();
@@ -112,35 +110,17 @@ public class MyGardenController {
         }
         hBox.setMinHeight(100);
         Label label = new Label(plant.name());
-        label.setMinWidth(100);
+        label.setMaxWidth(2000);
-
+        HBox.setHgrow(label, Priority.ALWAYS);
-        VBox vbox = new VBox(10);
-        HBox startDateHBox = new HBox(10);
-        Label startDateDescription = new Label("Start Date:");
-        startDateDescription.setMinWidth(75);
-        Label startDate = new Label(crop.getStartDate().toString());
-        startDateHBox.getChildren().addAll(startDateDescription, startDate);
-        HBox endDateHBox = new HBox(10);
-        Label endDateDescription = new Label("End Date:");
-        endDateDescription.setMinWidth(75);
-        Label endDate = new Label(crop.getStartDate().plusDays(plant.timeToHarvest(0)).toString());
-        endDateHBox.getChildren().addAll(endDateDescription, endDate);
-        vbox.getChildren().addAll(startDateHBox, endDateHBox);
-
-        vbox.setMaxWidth(2000);
-        HBox.setHgrow(vbox, Priority.ALWAYS);
 
         Button details = new Button();
         Button delete = new Button();
-        details.getStyleClass().add("button-class");
-        delete.getStyleClass().add("button-class");
-
         setIconToButton(details, "detailsIcon.png");
         setIconToButton(delete, "deleteIcon.png");
         details.setOnAction(getGoToCropDetailEvent(crop));
         delete.setOnAction(getDeleteCropEvent(crop));
         
-        hBox.getChildren().addAll(imageView, label, vbox, details, delete);
+        hBox.getChildren().addAll(imageView, label, details, delete);
         return hBox;
     }
 
@@ -173,6 +153,7 @@ public class MyGardenController {
                 stage.setResizable(true);
                 stage.showAndWait();
             } catch (IOException | PlantNotFoundException e) {
+                // TODO: show error alert
                 LOG.log(Level.SEVERE, "Could not load plant details.", e);
             }
         };
@@ -203,12 +184,6 @@ public class MyGardenController {
         Plant plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).get();
         Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
         alert.setTitle("Delete " + plant.name());
-        DialogPane dialogPane = alert.getDialogPane();
-
-        dialogPane.getStylesheets().add(
-                Objects.requireNonNull(getClass().getResource("bootstrap/dialogStyle.css")).toExternalForm());
-        dialogPane.getStyleClass().add("myDialog");
-
         alert.setHeaderText("Are you sure want to delete this Crop?");
         alert.setContentText("Deleting this crop will remove all associated tasks from your schedule.");
 
@@ -218,6 +193,7 @@ public class MyGardenController {
                         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/MyScheduleController.java

@@ -3,34 +3,25 @@ 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.io.TaskList;
 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.application.Platform;
-import javafx.beans.property.ListProperty;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
 import javafx.fxml.FXML;
-import javafx.scene.control.*;
+import javafx.scene.control.Label;
-import javafx.scene.layout.HBox;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
 import javafx.scene.layout.Pane;
-import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
 
 import java.io.IOException;
 import java.time.LocalDate;
 import java.util.List;
-import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-/**
- * Controller class for the MySchedule.fxml file
- */
 public class MyScheduleController {
     private static final Logger LOG = Logger.getLogger(MyScheduleController.class.getName());
 
@@ -44,7 +35,46 @@ public class MyScheduleController {
     private PlantList plantList;
 
     @FXML
-    private ListView<List<Task>> week_listView;
+    private Label day1_label;
+
+    @FXML
+    private Pane day1_pane;
+
+    @FXML
+    private Label day2_label;
+
+    @FXML
+    private Pane day2_pane;
+
+    @FXML
+    private Label day3_label;
+
+    @FXML
+    private Pane day3_pane;
+
+    @FXML
+    private Label day4_label;
+
+    @FXML
+    private Pane day4_pane;
+
+    @FXML
+    private Label day5_label;
+
+    @FXML
+    private Pane day5_pane;
+
+    @FXML
+    private Label day6_label;
+
+    @FXML
+    private Pane day6_pane;
+
+    @FXML
+    private Label day7_label;
+
+    @FXML
+    private Pane day7_pane;
 
     @FXML
     private Label information_label;
@@ -52,40 +82,21 @@ public class MyScheduleController {
     @FXML
     private ListView<Crop> scheduledPlants_listview;
 
-    @FXML
-    private void showAllTasks(ActionEvent actionEvent) throws IOException {
-        gardenSchedule.getTasksUpcomingWeek();
-        scheduledPlants_listview.getSelectionModel().clearSelection();
-    }
-
     @AfterInject
     @SuppressWarnings("unused")
-    public void init() throws IOException {
+    public void init() {
-        setCellFactoryCropListView();
+        setCellFactoryListView();
-        setCellFactoryTaskListView();
         scheduledPlants_listview.itemsProperty().bind(garden.getPlantedCrops());
-        ListProperty<List<Task>> taskListProperty = gardenSchedule.getWeeklyTaskListProperty();
-        week_listView.itemsProperty().bind(taskListProperty);
         lookForSelectedListEntries();
+        setDayLabels();
         information_label.setText("");
-
-        gardenSchedule.getTasksUpcomingWeek();
-        TaskList.TaskListObserver taskListObserver = newTaskList -> {
-            Platform.runLater(() -> {
         try {
-                    gardenSchedule.getTasksUpcomingWeek();
+            loadTaskList();
-                    scheduledPlants_listview.getSelectionModel().clearSelection();
         } catch (IOException e) {
-                    throw new RuntimeException(e);
+            e.printStackTrace();
         }
-            });
-        };
-        gardenSchedule.setTaskListObserver(taskListObserver);
     }
 
-    /**
-     * sort scheduler to selected crop
-     */
     private void lookForSelectedListEntries() {
         scheduledPlants_listview.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
             selectedCrop = newValue;
@@ -97,12 +108,18 @@ public class MyScheduleController {
         });
     }
 
-    /**
+    private void setDayLabels() {
-     * set cellFactory for the crops.
+        LocalDate today = LocalDate.now();
-     */
+        day1_label.setText(today.getDayOfWeek().toString());
-    private void setCellFactoryCropListView() {
+        day2_label.setText(today.plusDays(1).getDayOfWeek().toString());
-        MultipleSelectionModel<Crop> selectionModel = scheduledPlants_listview.getSelectionModel();
+        day3_label.setText(today.plusDays(2).getDayOfWeek().toString());
-        selectionModel.setSelectionMode(SelectionMode.MULTIPLE);
+        day4_label.setText(today.plusDays(3).getDayOfWeek().toString());
+        day5_label.setText(today.plusDays(4).getDayOfWeek().toString());
+        day6_label.setText(today.plusDays(5).getDayOfWeek().toString());
+        day7_label.setText(today.plusDays(6).getDayOfWeek().toString());
+    }
+
+    private void setCellFactoryListView() {
         scheduledPlants_listview.setCellFactory(param -> new ListCell<>() {
             @Override
             protected void updateItem(Crop crop, boolean empty) {
@@ -124,108 +141,33 @@ public class MyScheduleController {
         });
     }
 
-    /**
-     * set CallFactory for the given Tasks
-     */
-    private void setCellFactoryTaskListView() {
-        week_listView.setCellFactory(param -> new ListCell<>() {
-            @Override
-            protected void updateItem(List<Task> taskList, boolean empty) {
-                super.updateItem(taskList, empty);
-
-                if (empty || taskList == null) {
-                    setText(null);
-                    setGraphic(null);
-                } else {
-                    setText("");
-                    setGraphic(weekTaskVBox(taskList, this.getIndex()));
-                }
-            }
-        });
-    }
-
-    /**
-     * update task list
-     * @throws IOException exception
-     */
     private void loadTaskList() throws IOException {
         List<List<Task>> taskLists;
         if (selectedCrop != null) {
-            gardenSchedule.getTasksUpcomingWeekForCrop(selectedCrop.getCropId().get());
+            taskLists = gardenSchedule.getTasksUpcomingWeekForCrop(selectedCrop.getCropId().get());
         } else {
-            gardenSchedule.getTasksUpcomingWeek();
+            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) {
-     * Create a {@link VBox} of the given TaskList.
+        //ToDo update pane with task list
-     * @param tasks List of {@link Task}s
+        VBox vBox = new VBox();
-     * @param dayIndex index of the day
-     * @return {@link VBox} of the given Task of the day
-     */
-    private VBox weekTaskVBox(List<Task> tasks, int dayIndex) {
-        VBox vBox = new VBox(10);
-        LocalDate today = LocalDate.now();
-        Label weekDay = new Label(today.plusDays(dayIndex).getDayOfWeek().toString());
-        weekDay.setStyle("-fx-font-weight: bold; -fx-underline: true");
-        vBox.getChildren().add(weekDay);
         for (Task task : tasks) {
-            HBox hBox = new HBox(10);
+            Label label = new Label(task.getDescription());
-            Label taskName = new Label(task.getName() + ":");
+            vBox.getChildren().add(label);
-            taskName.setStyle("-fx-font-weight: bold");
-            taskName.setMinWidth(100);
-            taskName.setMaxSize(Double.MAX_VALUE, Double.MAX_VALUE);
-            hBox.getChildren().addAll(taskName);
-
-            HBox hBoxDescription = new HBox();
-            Label taskDescription = new Label(task.getDescription());
-            taskDescription.setWrapText(true);
-            taskDescription.setMaxSize(600, Double.MAX_VALUE);
-            Pane puffer = new Pane();
-            HBox.setHgrow(puffer, Priority.ALWAYS);
-            Button button = new Button("Task completed!");
-            button.getStyleClass().add("button-class");
-
-            button.setOnAction(new EventHandler<ActionEvent>() {
-                @Override
-                public void handle(ActionEvent event) {
-                    showConfirmation(task);
         }
-            });
+        pane.getChildren().add(vBox);
-            HBox.setHgrow(button, Priority.NEVER);
-            hBoxDescription.getChildren().addAll(taskDescription, puffer, button);
-            vBox.getChildren().addAll(hBox, hBoxDescription);
-        }
-        return vBox;
     }
 
-    /**
-     * Alert to confirm that task has been completed.
-     * @param task {@link Task} which is selected
-     */
-    private void showConfirmation(Task task) {
-        Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
-        alert.setTitle("Task Completed?");
-        alert.setHeaderText("Are you sure you have completed this task?");
-        alert.setContentText("Confirming that you have completed the task will remove it from the schedule.");
-
-        DialogPane dialogPane = alert.getDialogPane();
-
-        dialogPane.getStylesheets().add(
-                Objects.requireNonNull(getClass().getResource("bootstrap/dialogStyle.css")).toExternalForm());
-        dialogPane.getStyleClass().add("myDialog");
-
-        alert.showAndWait()
-                .ifPresent(buttonType -> {
-                    if (buttonType == ButtonType.OK) {
-                        task.done();
-                        try {
-                            loadTaskList();
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                });
-    }
 
 }

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

@@ -25,13 +25,9 @@ import javafx.scene.layout.VBox;
 import java.io.IOException;
 import java.time.LocalDate;
 import java.util.List;
-import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-/**
- * Controller class for the Plants.fxml file
- */
 public class PlantsController {
     private static final Logger LOG = Logger.getLogger(PlantsController.class.getName());
 
@@ -83,10 +79,6 @@ public class PlantsController {
 
         DialogPane dialogPane = dateSelection.getDialogPane();
 
-        dialogPane.getStylesheets().add(
-                Objects.requireNonNull(getClass().getResource("bootstrap/dialogStyle.css")).toExternalForm());
-        dialogPane.getStyleClass().add("myDialog");
-
         ButtonType sowButton = new ButtonType("Save", ButtonBar.ButtonData.OK_DONE);
         dialogPane.getButtonTypes().addAll(sowButton, ButtonType.CANCEL);
 
@@ -241,11 +233,11 @@ public class PlantsController {
             RadioButton radioButton = new RadioButton(season.getName());
             radioButton.setToggleGroup(seasonGroup);
             radioButton.setPadding(new Insets(0, 0, 10, 0));
-            if (season.equals(Seasons.ALLSEASONS)) {
+            if (season.equals(Seasons.AllSEASONS)) {
                 radioButton.setSelected(true);
             }
             radioButton.selectedProperty().addListener((observable, oldValue, newValue) -> {
-                if (season.equals(Seasons.ALLSEASONS)) {
+                if (season.equals(Seasons.AllSEASONS)) {
                     fillPlantListWithHardinessZone();
                 } else {
                     try {

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

@@ -8,10 +8,6 @@ import javafx.util.Callback;
 
 import java.time.LocalDate;
 
-/**
- * Controller class for the SelectSowDay.fxml file
- * Gets opened with a dialog.
- */
 public class SelectSowDayController {
     private Plant selectedPlant;
 

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

@@ -1,63 +1,14 @@
 package ch.zhaw.gartenverwaltung;
 
-import ch.zhaw.gartenverwaltung.backgroundtasks.email.SmtpCredentials;
 import ch.zhaw.gartenverwaltung.types.HardinessZone;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Singleton Class to store default Settings and User Settings
- */
 public class Settings {
-    /*
-     * The Class instance to use everywhere
-     */
-
-    private static final Settings instance;
-    /**
-     * The current Hardiness zone initialized as default value Zone_8A
-     */
     private HardinessZone currentHardinessZone = HardinessZone.ZONE_8A;
-    /**
+    private static Settings instance;
-     * Setting to show or hide the Tutorial in Main Menu
-     */
     private final BooleanProperty showTutorial = new SimpleBooleanProperty(false);
-    /**
-     * The SMTP Credentials which are used to send E-Mail Notifications
-     * The following Google Account is created for Testing:
-     * E-Mail Address: pm3.hs22.it21b.win.team1@gmail.com
-     * Account Password: Gartenverwaltung.PM3.2022
-     * SMTP Password: bisefhhjtrrhtoqr
-     */
-    private SmtpCredentials smtpCredentials = new SmtpCredentials("imap.gmail.com", "587", "pm3.hs22.it21b.win.team1@gmail.com", "pm3.hs22.it21b.win.team1@gmail.com", "bisefhhjtrrhtoqr", true);
-    /**
-     * List of Receivers for E-Mailnotifications. Multiple E-Mailadresses can be separated by ";"
-     * Following Public E-mail address  was used for Testing: pm3.hs22.it21b.win.team1@mailinator.com
-     * The E-Mail inbox of this address can be found here: https://www.mailinator.com/v4/public/inboxes.jsp?to=pm3.hs22.it21b.win.team1
-     */
-    private String mailNotificationReceivers = "pm3.hs22.it21b.win.team1@mailinator.com";
-    /**
-     * String Template to create E-Mail Subject for Notifications
-     * Variables: Task Name
-     */
-    private String mailNotificationSubjectTemplate = "Task %s is due!";
-    /**
-     * String Template to create E-Mail Text for Notifications
-     * Variables: Task Name, plant Name, nextExecution, Task description
-     */
-    private String mailNotificationTextTemplate = "Dear user\nYour gardentask %s for plant %s is due at %tF. Don't forget to confirm in your application if the task is done.\nTask description:\n%s";
 
-    /**
-     * Location of the garden can be set by user (Used for Weather Service)
-     */
-    private String location = "";
-
-    /*
-      Create Instance of Settings
-     */
     static {
         instance = new Settings();
     }
@@ -66,21 +17,14 @@ public class Settings {
         return Settings.instance;
     }
 
-    /**
-     * Private constructor to prevent Classes from creating more instances
-     */
     private Settings() {}
 
     public HardinessZone getCurrentHardinessZone() {
         return currentHardinessZone;
     }
 
-    /**
-     * Method to set the current Hardiness Zone. If no Hardiness Zone is given the default zone (ZONE_8A) will be used.
-     * @param currentHardinessZone the new Hardiness Zone
-     */
     public void setCurrentHardinessZone(HardinessZone currentHardinessZone) {
-        this.currentHardinessZone = Objects.requireNonNullElse(currentHardinessZone, HardinessZone.ZONE_8A);
+        this.currentHardinessZone = currentHardinessZone;
     }
 
     public void setShowTutorial (boolean showTutorial) {
@@ -94,28 +38,4 @@ public class Settings {
     public boolean getShowTutorial() {
         return this.showTutorial.get();
     }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public String getLocation() {
-        return this.location;
-    }
-  
-    public SmtpCredentials getSmtpCredentials() {
-        return smtpCredentials;
-    }
-
-    public String getMailNotificationReceivers() {
-        return mailNotificationReceivers;
-    }
-
-    public String getMailNotificationSubjectTemplate() {
-        return mailNotificationSubjectTemplate;
-    }
-
-    public String getMailNotificationTextTemplate() {
-        return mailNotificationTextTemplate;
-    }
 }

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

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

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

@@ -1,38 +1,21 @@
 package ch.zhaw.gartenverwaltung;
 
-import ch.zhaw.gartenverwaltung.bootstrap.AfterInject;
-import ch.zhaw.gartenverwaltung.bootstrap.Inject;
-import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
-import ch.zhaw.gartenverwaltung.io.PlantList;
-import ch.zhaw.gartenverwaltung.models.Garden;
-import ch.zhaw.gartenverwaltung.models.GardenSchedule;
 import ch.zhaw.gartenverwaltung.types.Crop;
-import ch.zhaw.gartenverwaltung.types.Plant;
 import ch.zhaw.gartenverwaltung.types.Task;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
-import javafx.scene.control.*;
+import javafx.scene.control.DateCell;
+import javafx.scene.control.DatePicker;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TextField;
 import javafx.util.Callback;
 
-import java.io.IOException;
 import java.net.URL;
 import java.time.LocalDate;
 import java.util.ResourceBundle;
 
-/**
- * Controller class for the TaskFormular.fxml file
- */
 public class TaskFormularController implements Initializable {
     private Crop crop;
-    private Plant plant;
-    private Task task = null;
-
-    @Inject
-    private GardenSchedule gardenSchedule;
-    @Inject
-    private Garden garden;
-    @Inject
-    private PlantList plantList;
 
     @FXML
     private TextArea description_area;
@@ -49,43 +32,19 @@ public class TaskFormularController implements Initializable {
     @FXML
     private TextField taskName_field;
 
-    @AfterInject
-    @SuppressWarnings("unused")
 
-    /**
+    public Task returnResult() {
-     * returns the edited or added {@link Task}
-     * @param crop {@link Crop} which was selected
-     * @return {@link Task} which was edited or added
-     */
-    public Task returnResult(Crop crop) {
-        int interval = 0;
-        if (interval_field.getText() != null && !(interval_field.getText().isEmpty() || interval_field.getText().equals(""))) {
-            interval = Integer.parseInt(interval_field.getText());
-        }
         Task task = new Task(taskName_field.getText(), description_area.getText(),
                 start_datePicker.getValue(), end_datePicker.getValue(),
-                interval, crop.getCropId().get());
+                Integer.parseInt(interval_field.getText()), crop.getCropId().get());
-        if (this.task != null) return this.task.updateTask(task);
         return task;
     }
 
-    /**
+    public void setCorp(Crop crop) {
-     * set selected crop and get the plant from the crop.
-     * @param crop {@link Crop} which was selected
-     * @throws HardinessZoneNotSetException exception
-     * @throws IOException exception
-     */
-    public void setCorp(Crop crop) throws HardinessZoneNotSetException, IOException {
         this.crop = crop;
-        this.plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).get();
     }
 
-    /**
-     * set the values of task into the labels and datePicker.
-     * @param task {@link Task} which was given
-     */
     public void setTaskValue(Task task) {
-        this.task = task;
         taskName_field.setText(task.getName());
         description_area.setText(task.getDescription());
         start_datePicker.setValue(task.getStartDate());
@@ -97,11 +56,7 @@ public class TaskFormularController implements Initializable {
         }
     }
 
-    /**
+    private Callback<DatePicker, DateCell> getDayCellFactory() {
-     * dayCellFactory of the start date
-     * @return {@link Callback} of the dayCellFactory
-     */
-    private Callback<DatePicker, DateCell> getDayCellFactoryStartDate() {
 
         return (datePicker) -> new DateCell() {
             private final LocalDate today = LocalDate.now();
@@ -112,79 +67,20 @@ public class TaskFormularController implements Initializable {
                 setDisable(true);
                 setStyle("-fx-background-color: #ffc0cb;");
 
-                if (item.compareTo(today) > 0 && item.compareTo(crop.getStartDate()) > 0 && item.compareTo(crop.getStartDate().plusDays(plant.timeToHarvest(0))) < 0) {
+                if (item.compareTo(today) > 0 && item.compareTo(crop.getStartDate()) > 0) {
                     setDisable(false);
                     setStyle("-fx-background-color: #32CD32;");
                 }
-
-                if (end_datePicker.getValue() != null && item.compareTo(end_datePicker.getValue()) > 0) {
-                    setDisable(true);
-                    setStyle("-fx-background-color: #ffc0cb;");
-                }
             }
         };
     }
 
-    /**
-     * dayCellFactory of the end date
-     * @return {@link Callback} of the dayCellFactory
-     */
-    private Callback<DatePicker, DateCell> getDayCellFactoryEndDate() {
-
-        return (datePicker) -> new DateCell() {
-            private final LocalDate today = LocalDate.now();
-
-            @Override
-            public void updateItem(LocalDate item, boolean empty) {
-                super.updateItem(item, empty);
-                setDisable(true);
-                setStyle("-fx-background-color: #ffc0cb;");
-
-                if (item.compareTo(today) > 0 && item.compareTo(crop.getStartDate()) > 0 && item.compareTo(crop.getStartDate().plusDays(plant.timeToHarvest(0))) < 0) {
-                    setDisable(false);
-                    setStyle("-fx-background-color: #32CD32;");
-                }
-
-                if (start_datePicker.getValue() != null && item.compareTo(start_datePicker.getValue()) < 0) {
-                    setDisable(true);
-                    setStyle("-fx-background-color: #ffc0cb;");
-                }
-            }
-        };
-    }
-
-    /**
-     * disable button until condition meet.
-     * @param button {@link Button} which was given
-     */
-    public void initSaveButton(Button button) {
-        interval_field.textProperty().addListener((observable, oldValue, newValue) -> {
-            if (newValue != null && !newValue.matches("\\d*")) {
-                interval_field.setText(newValue.replaceAll("[^\\d]", ""));
-            }
-        });
-
-        button.disableProperty().bind(start_datePicker.valueProperty().isNull()
-                .or(taskName_field.textProperty().isEmpty())
-                .or(description_area.textProperty().isEmpty()));
-    }
-
-    /**
-     * initialize dayCellFactories
-     * @param location
-     * The location used to resolve relative paths for the root object, or
-     * {@code null} if the location is not known.
-     *
-     * @param resources
-     * The resources used to localize the root object, or {@code null} if
-     * the root object was not localized.
-     */
     @Override
     public void initialize(URL location, ResourceBundle resources) {
-        start_datePicker.setDayCellFactory(getDayCellFactoryStartDate());
+        start_datePicker.setDayCellFactory(getDayCellFactory());
         start_datePicker.setEditable(false);
 
-        end_datePicker.setDayCellFactory(getDayCellFactoryEndDate());
+        end_datePicker.setDayCellFactory(getDayCellFactory());
         end_datePicker.setEditable(false);
     }
 }

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

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

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

@@ -7,11 +7,7 @@ import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
-import java.io.InputStream;
 
-/**
- * Controller class for the Tutorial.fxml file
- */
 public class TutorialController {
 
     @FXML
@@ -23,8 +19,6 @@ public class TutorialController {
     public ImageView imgAddNewPlant;
     public ImageView imgTaskList;
     public ImageView imgSelectDate;
-    public ImageView imgAddTaskButton;
-    public ImageView imgDetailDeleteButtons;
 
     private int page = 0;
 
@@ -33,27 +27,10 @@ public class TutorialController {
         switchViews();
         setButtonAbilities();
 
-        setImageView(imgAddNewPlant, "add-new-plant.png");
+        Image placeholder = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
-        setImageView(imgSelectDate, "select-sow-harvest.png");
+        imgAddNewPlant.setImage(placeholder);
-        setImageView(imgDetailDeleteButtons, "details-delete.png");
+        imgSelectDate.setImage(placeholder);
-        setImageView(imgTaskList, "schedule.png");
+        imgTaskList.setImage(placeholder);
-        setImageView(imgAddTaskButton, "add-task.png");
-    }
-
-    /**
-     * update the given image view with screenshot or placeholder image.
-     * @param imageView the image view to update
-     * @param fileName the file name of the source
-     */
-    private void setImageView(ImageView imageView, String fileName) {
-        InputStream is = PlantsController.class.getResourceAsStream("screenshots/" + fileName);
-        Image image;
-        if (is != null) {
-            image = new Image(String.valueOf(PlantsController.class.getResource("screenshots/" + fileName)));
-        } else {
-            image = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
-        }
-        imageView.setImage(image);
     }
 
     public void viewNextPage() {
@@ -67,25 +44,16 @@ public class TutorialController {
         setButtonAbilities();
     }
 
-    /**
-     * disable next or close button according to the location of button
-     */
     private void setButtonAbilities() {
         previousPageButton.setDisable(page <= 0);
         nextPageButton.setDisable(page >= tourPages.getChildren().size() - 1);
     }
 
-    /**
-     * switch to next view
-     */
     private void switchViews() {
         tourPages.getChildren().forEach(node -> node.setOpacity(0));
         tourPages.getChildren().get(page).setOpacity(1);
     }
 
-    /**
-     * close Tutorial
-     */
     public void closeTutorial() {
         Stage root = (Stage) tourPages.getScene().getWindow();
         root.close();

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

@@ -1,74 +0,0 @@
-package ch.zhaw.gartenverwaltung.backgroundtasks;
-
-import ch.zhaw.gartenverwaltung.CropDetailController;
-import ch.zhaw.gartenverwaltung.backgroundtasks.weather.WeatherGradenTaskPlanner;
-import ch.zhaw.gartenverwaltung.io.CropList;
-import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
-import ch.zhaw.gartenverwaltung.io.PlantList;
-import ch.zhaw.gartenverwaltung.io.TaskList;
-import ch.zhaw.gartenverwaltung.models.PlantNotFoundException;
-import ch.zhaw.gartenverwaltung.types.Task;
-
-import javax.mail.MessagingException;
-import java.io.IOException;
-import java.time.LocalDate;
-import java.util.List;
-import java.util.TimerTask;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Class with tasks which must be executed periodic and not triggered by user. Method run must be called in a fix interval.
- */
-public class BackgroundTasks extends TimerTask {
-    private static final Logger LOG = Logger.getLogger(CropDetailController.class.getName());
-    private final TaskList taskList;
-    private final Notifier notifier;
-    private final WeatherGradenTaskPlanner weatherGardenTaskPlaner;
-
-    public BackgroundTasks(TaskList taskList, CropList cropList, PlantList plantList) {
-        this.taskList = taskList;
-        notifier = new Notifier(taskList, plantList, cropList);
-        weatherGardenTaskPlaner = new WeatherGradenTaskPlanner(taskList, plantList, cropList);
-    }
-
-    /**
-     * Changes the field "nextExecution" of all tasks if it's in the past to the actual date as long as they are not done.
-     * @throws IOException if the taskList can't be read.
-     */
-    private void movePastTasks() throws IOException {
-        List<Task> taskList = this.taskList.getTaskList(LocalDate.MIN.plusDays(1), LocalDate.now().minusDays(1));
-        for (Task task : taskList) {
-            if (!task.isDone()) {
-                task.setNextExecution(LocalDate.now());
-                this.taskList.saveTask(task);
-            }
-        }
-    }
-
-    /**
-     * Method to call if Tasks should be executed. It calls all Background tasks after each other.
-     */
-    @Override
-    public void run() {
-        try {
-            movePastTasks();
-        } catch (IOException e) {
-            e.printStackTrace();
-            LOG.log(Level.WARNING, "Could not execute Background Task: move past Tasks ", e.getCause());
-        }
-        try {
-            weatherGardenTaskPlaner.refreshTasks();
-        } catch (IOException | HardinessZoneNotSetException | PlantNotFoundException e) {
-            e.printStackTrace();
-            LOG.log(Level.WARNING, "Could not execute Background Task: Refresh Tasks by WeatherGardenTaskPlaner ", e.getCause());
-        }
-        try {
-            notifier.sendNotifications();
-        } catch (IOException | MessagingException | HardinessZoneNotSetException e) {
-            e.printStackTrace();
-            LOG.log(Level.WARNING, "Could not execute Background Task: send Notification for due Tasks", e.getCause());
-        }
-    }
-}
-

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

@@ -1,66 +0,0 @@
-package ch.zhaw.gartenverwaltung.backgroundtasks;
-
-import ch.zhaw.gartenverwaltung.Settings;
-import ch.zhaw.gartenverwaltung.backgroundtasks.email.EMailSender;
-import ch.zhaw.gartenverwaltung.io.CropList;
-import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
-import ch.zhaw.gartenverwaltung.io.PlantList;
-import ch.zhaw.gartenverwaltung.io.TaskList;
-import ch.zhaw.gartenverwaltung.types.Crop;
-import ch.zhaw.gartenverwaltung.types.Task;
-
-import javax.mail.MessagingException;
-import java.io.IOException;
-import java.time.LocalDate;
-
-/**
- * Class to send Notifications to the user
- */
-public class Notifier {
-    private final TaskList taskList;
-    private final CropList cropList;
-    private final PlantList plantList;
-    private final EMailSender eMailSender = new EMailSender();
-
-    public Notifier(TaskList taskList, PlantList plantList, CropList cropList) {
-        this.taskList = taskList;
-        this.cropList = cropList;
-        this.plantList = plantList;
-    }
-
-    /**
-     * Method to send a Notification to the user for e specific Task
-     * @param task The task to use for notification
-     * @throws IOException if tasklist can not be read
-     * @throws MessagingException if E-Mail can not be sent for any reason
-     * @throws HardinessZoneNotSetException if hardiness zone is not set in plant list.
-     */
-    private void sendNotification(Task task) throws IOException, MessagingException, HardinessZoneNotSetException {
-        String plantName = "unkown plant";
-        if(cropList.getCropById((task.getCropId())).isPresent()){
-            Crop crop = cropList.getCropById(task.getCropId()).get();
-            if(plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).isPresent()) {
-                plantName = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).get().name();
-            }
-        }
-        String messageSubject = String.format(Settings.getInstance().getMailNotificationSubjectTemplate(), task.getName());
-        String messageText = String.format(Settings.getInstance().getMailNotificationTextTemplate(), task.getName(), plantName, task.getNextExecution(), task.getDescription());
-        eMailSender.sendMails(Settings.getInstance().getMailNotificationReceivers(), messageSubject, messageText);
-    }
-
-    /**
-     * Sends a notification to the user for each task which is due and not done every day as long as it's not done.
-     * @throws IOException if tasklist can not be read
-     * @throws MessagingException if E-Mail can not be sent for any reason
-     * @throws HardinessZoneNotSetException if hardiness zone is not set in plant list.
-     */
-    public void sendNotifications() throws IOException, MessagingException, HardinessZoneNotSetException {
-        for (Task task : taskList.getTaskList(LocalDate.MIN, LocalDate.MAX)) {
-            if (task.getNextNotification() != null && task.getNextNotification().isBefore(LocalDate.now().minusDays(1))) {
-                sendNotification(task);
-                task.setNextNotification(LocalDate.now().plusDays(1));
-                taskList.saveTask(task);
-            }
-        }
-    }
-}

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

@@ -1,44 +0,0 @@
-package ch.zhaw.gartenverwaltung.backgroundtasks.email;
-
-import ch.zhaw.gartenverwaltung.Settings;
-
-import javax.mail.*;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Class to send E-Mails
- */
-public class EMailSender {
-
-    /**
-     * Method to send E-Mail to one or multiple recipients
-     * @param recipients recipients E-Mail addresses separated by ";"
-     * @param subject Subject of the E-Mail
-     * @param text E-Mail message Text as rear text or html
-     * @throws MessagingException If sending the E-Mail fails for any reason
-     */
-    public void sendMails(String recipients, String subject, String text) throws MessagingException {
-        printMail(recipients, subject, text);
-        MimeMessage message = new MimeMessage(Settings.getInstance().getSmtpCredentials().getSession());
-        message.addHeader("Content-type", "text/HTML; charset=UTF-8");
-        message.addHeader("format", "flowed");
-        message.addHeader("Content-Transfer-Encoding", "8bit");
-        message.setFrom(new InternetAddress(Settings.getInstance().getSmtpCredentials().fromAddress()));
-        message.setReplyTo(InternetAddress.parse(Settings.getInstance().getSmtpCredentials().fromAddress(), false));
-        message.setSubject(subject);
-        message.setText(text);
-        message.setSentDate(new Date());
-        message.setRecipients(Message.RecipientType.TO, InternetAddress.parse(recipients, false));
-        Transport.send(message);
-    }
-
-    private void printMail(String receiver, String subject, String text){
-        System.out.printf("\nSending E-Mail:\nTo: %s\nSubject: %s\nMessage:\n%s\n", receiver, subject, text);
-    }
-
-}

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

@@ -1,54 +0,0 @@
-package ch.zhaw.gartenverwaltung.backgroundtasks.email;
-
-import javax.mail.PasswordAuthentication;
-import javax.mail.Session;
-import java.net.Authenticator;
-import java.util.Properties;
-
-/**
- * Class to store SMTP Credentials to send E-Mails and create
- * corresponding Session Object
- */
-public record SmtpCredentials(
-        String host,
-        String port,
-        String fromAddress,
-        String username,
-        String password,
-        boolean startTLS
-        ) {
-
-    /**
-     * Creates a Properties Object with SMTP Server Information
-     * @return the created Properties Object
-     */
-    private Properties getProperties() {
-        Properties properties = new Properties();
-        properties.put("mail.smtp.host", host);
-        properties.put("mail.smtp.port", port);
-        properties.put("mail.smtp.auth", "true");
-        properties.put("mail.smtp.starttls.enable", startTLS ? "true" : "false");
-        return properties;
-    }
-
-    /**
-     * Creates a javax.mail.Authenticator Object with username and password for SMTP Server
-     * @return the created javax.mail.Authenticator Object
-     */
-    private javax.mail.Authenticator getAuthenticator() {
-        return new javax.mail.Authenticator() {
-            @Override
-            protected PasswordAuthentication getPasswordAuthentication() {
-                return new PasswordAuthentication(username, password);
-            }
-        };
-    }
-
-    /**
-     * Method to get the Session Instance with the given SMTP Credentials
-     * @return the Session Instance
-     */
-    public Session getSession() {
-        return Session.getInstance(getProperties(), getAuthenticator());
-    }
-}

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

@@ -1,8 +0,0 @@
-package ch.zhaw.gartenverwaltung.backgroundtasks.weather;
-
-/**
- * Enum of possible Weather events
- */
-public enum SevereWeather {
-    FROST,SNOW,HAIL,NO_SEVERE_WEATHER,RAIN
-}

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

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

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

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

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

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

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

@@ -1,8 +1,12 @@
 package ch.zhaw.gartenverwaltung.bootstrap;
 
-import ch.zhaw.gartenverwaltung.CropDetailController;
+import ch.zhaw.gartenverwaltung.HelloApplication;
-import ch.zhaw.gartenverwaltung.Main;
+import ch.zhaw.gartenverwaltung.io.CropList;
-import ch.zhaw.gartenverwaltung.io.*;
+import ch.zhaw.gartenverwaltung.io.JsonCropList;
+import ch.zhaw.gartenverwaltung.io.JsonPlantList;
+import ch.zhaw.gartenverwaltung.io.JsonTaskList;
+import ch.zhaw.gartenverwaltung.io.PlantList;
+import ch.zhaw.gartenverwaltung.io.TaskList;
 import ch.zhaw.gartenverwaltung.models.Garden;
 import ch.zhaw.gartenverwaltung.models.GardenSchedule;
 import ch.zhaw.gartenverwaltung.models.PlantListModel;
@@ -18,15 +22,8 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
-/**
- * Class responsible for bootstrapping the application wide dependencies
- * and injecting them into JavaFX Controllers.
- */
 public class AppLoader {
-    private static final Logger LOG = Logger.getLogger(CropDetailController.class.getName());
     /**
      * Caching the panes
      */
@@ -35,25 +32,18 @@ public class AppLoader {
     /**
      * Application-wide dependencies
      */
-    private final Map<String, Object> dependencies = new HashMap<>();
+    private final PlantList plantList = new JsonPlantList();
+    private final CropList cropList = new JsonCropList();
+    private final TaskList taskList = new JsonTaskList();
+
+    private final GardenSchedule gardenSchedule = new GardenSchedule(taskList, plantList);
+    private final Garden garden = new Garden(gardenSchedule, cropList);
+
 
     public AppLoader() throws IOException {
-        PlantList plantList = new JsonPlantList();
-        CropList cropList = new JsonCropList();
-        TaskList taskList = new JsonTaskList();
-        GardenSchedule gardenSchedule = new GardenSchedule(taskList, plantList);
-
-        dependencies.put(PlantList.class.getSimpleName(), plantList);
-        dependencies.put(CropList.class.getSimpleName(), cropList);
-        dependencies.put(TaskList.class.getSimpleName(), taskList);
-
-        dependencies.put(PlantListModel.class.getSimpleName(), new PlantListModel(plantList));
-
-        dependencies.put(GardenSchedule.class.getSimpleName(), gardenSchedule);
-        dependencies.put(Garden.class.getSimpleName(), new Garden(gardenSchedule, cropList));
-        dependencies.put(AppLoader.class.getSimpleName(), this);
     }
 
+
     /**
      * Loads and returns a {@link Pane} (cached).
      *
@@ -81,12 +71,9 @@ public class AppLoader {
      * @throws IOException if the file could not be loaded
      */
     public Object loadSceneToStage(String fxmlFile, Stage appendee) throws IOException {
-        FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(Main.class.getResource(fxmlFile)));
+        FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(HelloApplication.class.getResource(fxmlFile)));
         Pane root = loader.load();
-        Scene scene = new Scene(root);
+        appendee.setScene(new Scene(root));
-        String css = Objects.requireNonNull(this.getClass().getResource("styles.css")).toExternalForm();
-        appendee.setScene(scene);
-        scene.getStylesheets().add(css);
         Object controller = loader.getController();
         annotationInject(controller);
         return controller;
@@ -103,7 +90,7 @@ public class AppLoader {
      * @throws IOException if the file could not be loaded
      */
     public Object loadPaneToDialog(String fxmlFile, DialogPane appendee) throws IOException {
-        FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(Main.class.getResource(fxmlFile)));
+        FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(HelloApplication.class.getResource(fxmlFile)));
         appendee.setContent(loader.load());
         Object controller = loader.getController();
         annotationInject(controller);
@@ -118,7 +105,7 @@ public class AppLoader {
      * @throws IOException if the file could not be loaded
      */
     public void loadAndCacheFxml(String fxmlFile) throws IOException {
-        FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(Main.class.getResource(fxmlFile)));
+        FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(HelloApplication.class.getResource(fxmlFile)));
         Pane pane = loader.load();
         panes.put(fxmlFile, pane);
         annotationInject(loader.getController());
@@ -145,23 +132,26 @@ public class AppLoader {
                 });
 
         Arrays.stream(controller.getClass().getMethods())
-                .filter(method -> method.isAnnotationPresent(AfterInject.class) && method.getParameterCount() == 0)
+                .filter(method -> method.isAnnotationPresent(AfterInject.class))
                 .forEach(afterInjectMethod -> {
+                    if (afterInjectMethod.getParameterCount() == 0) {
                         try {
                             afterInjectMethod.invoke(controller);
                         } catch (IllegalAccessException | InvocationTargetException e) {
-                        LOG.log(Level.SEVERE, "Could not invoke afterInjectMethod", e.getCause());
                             e.printStackTrace();
                         }
+                    }
                 });
     }
 
-    /**
+    private Object getAppDependency(Class<?> type) {
-     * Method to get any AppDependency
+        return switch (type.getSimpleName()) {
-     * @param type Class of Dependency
+            case "Garden" -> garden;
-     * @return the App dependency
+            case "PlantList" -> plantList;
-     */
+            case "PlantListModel" -> new PlantListModel(plantList);
-    public Object getAppDependency(Class<?> type) {
+            case "GardenSchedule" -> gardenSchedule;
-        return dependencies.get(type.getSimpleName());
+            case "AppLoader" -> this;
+            default -> null;
+        };
     }
 }

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

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

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

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

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

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

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

@@ -1,8 +1,5 @@
 package ch.zhaw.gartenverwaltung.io;
 
-/**
- * Exceptionm which is thrown if Hardiness zone is not set in plant list.
- */
 public class HardinessZoneNotSetException extends Exception {
     public HardinessZoneNotSetException() {
         super("HardinessZone must be set to retrieve plants!");

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

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

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

@@ -2,9 +2,6 @@ package ch.zhaw.gartenverwaltung.io;
 
 import java.io.IOException;
 
-/**
- * Excption which is thrown if a JSON file has a invalid File format.
- */
 class InvalidJsonException extends IOException {
     public InvalidJsonException(String reason) {
         super(reason);

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

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

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

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

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

@@ -13,15 +13,14 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 /**
- * Implements the {@link TaskList} interface for reading and writing {@link Task} objects
+ * Implements the {@link TaskList} interface for loading and writing {@link Task} objects
- * from and to a local JSON file.
+ * from and to a JSON file.
  * The reads are cached to minimize file-io operations.
  */
 public class JsonTaskList implements TaskList {
@@ -30,7 +29,6 @@ public class JsonTaskList implements TaskList {
     private final static String INVALID_DATASOURCE_MSG = "Invalid datasource specified!";
 
     private Map<Long, Task> taskMap = Collections.emptyMap();
-    private final List<TaskListObserver> subscribers = new ArrayList<>();
 
     /**
      * Creating constant objects required to deserialize the {@link LocalDate} classes
@@ -45,17 +43,9 @@ public class JsonTaskList implements TaskList {
         timeModule.addSerializer(LocalDate.class, dateSerializer);
     }
 
-    /**
-     * Default constructor. Uses a file from the app resources.
-     */
     public JsonTaskList() {
         this.dataSource = getClass().getResource("taskdb.json");
     }
-
-    /**
-     * Constructor to use a specified {@link URL} as a {@link #dataSource}
-     * @param dataSource A {@link URL} to the file to be used as a data source
-     */
     public JsonTaskList(URL dataSource) {
         this.dataSource = dataSource;
     }
@@ -67,11 +57,11 @@ public class JsonTaskList implements TaskList {
      * @see TaskList#getTaskList(LocalDate, LocalDate)
      */
     @Override
-    public synchronized List<Task> getTaskList(LocalDate start, LocalDate end) throws IOException{
+    public List<Task> getTaskList(LocalDate start, LocalDate end) throws IOException{
         if(taskMap.isEmpty()) {
             loadTaskListFromFile();
         }
-        return taskMap.values().stream().filter(task -> task.isInTimePeriod(start, end)).toList();
+        return taskMap.values().stream().filter(task -> task.isInTimePeriode(start, end)).toList();
     }
 
     /**
@@ -80,7 +70,7 @@ public class JsonTaskList implements TaskList {
      * @return List of Tasks for given Crop
      */
     @Override
-    public synchronized List<Task> getTaskForCrop(long cropId) throws IOException {
+    public List<Task> getTaskForCrop(long cropId) throws IOException {
         if(taskMap.isEmpty()) {
             loadTaskListFromFile();
         }
@@ -96,9 +86,7 @@ public class JsonTaskList implements TaskList {
         if(taskMap.isEmpty()) {
             loadTaskListFromFile();
         }
-        taskMap.entrySet().removeIf(entry -> entry.getValue().getCropId() == cropId);
+        taskMap.values().removeIf(task -> task.getCropId() == cropId);
-        writeTaskListToFile();
-        notifySubscribers();
     }
 
     /**
@@ -111,7 +99,7 @@ public class JsonTaskList implements TaskList {
      * @see TaskList#saveTask(Task)
      */
     @Override
-    public synchronized void saveTask(Task task) throws IOException {
+    public void saveTask(Task task) throws IOException {
         if(taskMap.isEmpty()) {
             loadTaskListFromFile();
         }
@@ -119,7 +107,6 @@ public class JsonTaskList implements TaskList {
 
         taskMap.put(id, task.withId(id));
         writeTaskListToFile();
-        notifySubscribers();
     }
 
     /**
@@ -139,25 +126,6 @@ public class JsonTaskList implements TaskList {
             taskMap.remove(taskId);
             writeTaskListToFile();
         }
-        notifySubscribers();
-    }
-
-    /**
-     * {@inheritDoc}
-     * @param observer The change handler
-     */
-    @Override
-    public void subscribe(TaskListObserver observer) {
-        subscribers.add(observer);
-    }
-
-    /**
-     * Calls the change handler method on all registered observers.
-     */
-    private void notifySubscribers() throws IOException {
-        for (TaskListObserver subscriber : subscribers) {
-            subscriber.onChange(taskMap.values().stream().toList());
-        }
     }
 
     /**

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

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

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

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

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

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

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

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

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

@@ -13,17 +13,18 @@ import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.net.URL;
 
-/**
- * Used by the Jackson Library to deserialize a String to a {@link Image}
- */
 public class PlantImageDeserializer extends JsonDeserializer<Image> {
 
     @Override
     public Image deserialize(JsonParser parser, DeserializationContext context) throws IOException {
         Image result = null;
-        InputStream is = PlantList.class.getResourceAsStream(String.format("images/%s", parser.getText()));
+        URL imageUrl = PlantList.class.getResource(String.format("images/%s", parser.getText()));
-        if (is != null) {
+        if (imageUrl != null) {
+            try (InputStream is = new FileInputStream(new File(imageUrl.toURI()))) {
                 result = new Image(is);
+            } catch (IllegalArgumentException | URISyntaxException e) {
+                throw new IOException(String.format("Cannot find Image \"%s\"\n", imageUrl.getFile()));
+            }
         }
         return result;
     }

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

@@ -50,6 +50,8 @@ public class Garden {
      */
     public void plantAsCrop(Plant plant, LocalDate plantingDate) throws IOException, HardinessZoneNotSetException, PlantNotFoundException {
         Crop crop = new Crop(plant.id(), plantingDate);
+        //TODO Add Area to Plant
+        //crop.withArea(0);
         cropList.saveCrop(crop);
         gardenSchedule.planTasksForCrop(crop);
         plantedCrops.clear();
@@ -68,19 +70,6 @@ public class Garden {
         plantedCrops.clear();
         plantedCrops.addAll(cropList.getCrops());
     }
-
-    /**
-     * Updates the {@link Crop} from the file and the cache
-     *
-     * @param crop The crop which is being updated
-     * @throws IOException If the database cannot be accessed
-     */
-    public void updateCrop(Crop crop) throws IOException {
-        cropList.saveCrop(crop);
-        plantedCrops.clear();
-        plantedCrops.addAll(cropList.getCrops());
-    }
-
     /**
      * Returns a list of {@link Crop}s which are currently in the gardenplan.
      *

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

@@ -3,10 +3,6 @@ package ch.zhaw.gartenverwaltung.models;
 import ch.zhaw.gartenverwaltung.Settings;
 import ch.zhaw.gartenverwaltung.io.*;
 import ch.zhaw.gartenverwaltung.types.*;
-import javafx.application.Platform;
-import javafx.beans.property.ListProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.collections.FXCollections;
 
 import java.io.IOException;
 import java.time.LocalDate;
@@ -23,29 +19,15 @@ public class GardenSchedule {
      * Comparators to create sorted Task List
      */
     static final Comparator<Task> sortByStartDate = Comparator.comparing(Task::getStartDate);
-    static final Comparator<Task> sortByNextExecution = Comparator.comparing(Task::getNextExecution);
-    private final ListProperty<List<Task>> weeklyTaskListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
 
     /**
      * Constructor to create Database Objects.
      */
-    public GardenSchedule(TaskList taskList, PlantList plantList) throws IOException {
+    public GardenSchedule(TaskList taskList, PlantList plantList) {
         this.taskList = taskList;
         this.plantList = plantList;
     }
 
-    public ListProperty<List<Task>> getWeeklyTaskListProperty() {
-        return weeklyTaskListProperty;
-    }
-
-    /**
-     * subscribe task list observer to get notifications
-     * @param observer the task list which will be ovserved
-     */
-    public void setTaskListObserver(TaskList.TaskListObserver observer) {
-        taskList.subscribe(observer);
-    }
-
     /**
      * Method to save a new Task to Task Database
      * @param task the Task to save
@@ -64,12 +46,7 @@ public class GardenSchedule {
      */
     public void planTasksForCrop(Crop crop) throws PlantNotFoundException, HardinessZoneNotSetException, IOException {
         Plant plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).orElseThrow(PlantNotFoundException::new);
-        int growPhaseGroup = plant.getGrowphaseGroupForDate(crop.getStartDate());
+        for (GrowthPhase growthPhase : plant.lifecycle()) {
-        addTask(new Task("watering Task", "pour water over the plant circa : "+ plant.wateringCycle().litersPerSqM() +" per square meter",
-                crop.getStartDate(), crop.getStartDate().plusDays(plant.timeToHarvest(0)),
-                plant.wateringCycle().interval(), crop.getCropId().orElse(0L)));
-
-        for (GrowthPhase growthPhase : plant.lifecycleForGroup(growPhaseGroup)) {
             for (TaskTemplate taskTemplate : growthPhase.taskTemplates()) {
                 addTask(taskTemplate.generateTask(crop.getStartDate(), crop.getCropId().orElse(0L)));
             }
@@ -158,40 +135,26 @@ public class GardenSchedule {
      * @throws IOException If the database cannot be accessed
      */
     public List<List<Task>> getTasksUpcomingWeek() throws IOException {
-        final int listLength = 7;
-        List<Task> weekTasks = taskList.getTaskList(LocalDate.now(), LocalDate.now().plusDays(listLength - 1));
         List<List<Task>> dayTaskList = new ArrayList<>();
-        for(int i = 0; i < listLength; i++) {
+        for(int i = 0; i < 7; i++) {
             LocalDate date = LocalDate.now().plusDays(i);
-            dayTaskList.add(new ArrayList<>());
+            dayTaskList.add(taskList.getTaskList(date, date));
-            final int finalI = i;
-            weekTasks.forEach(task -> {
-            if(task.getNextExecution() != null) {
-                    LocalDate checkDate = task.getNextExecution();
-                    do {
-                        if (date.equals(task.getNextExecution()) || (date.equals(checkDate) && !date.isAfter(task.getEndDate().orElse(LocalDate.MIN)))) {
-                            dayTaskList.get(finalI).add(task);
-                            break;
         }
-                        checkDate = checkDate.plusDays(task.getInterval().orElse(0));
-                    } while (!(task.getInterval().orElse(0) == 0) && checkDate.isBefore(LocalDate.now().plusDays(listLength)));
-                }
-            });
-        }
-        weeklyTaskListProperty.clear();
-        weeklyTaskListProperty.addAll(dayTaskList);
         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 void getTasksUpcomingWeekForCrop(Long cropId) throws IOException {
+    public List<List<Task>> getTasksUpcomingWeekForCrop(Long cropId) throws IOException {
-        List<List<Task>> dayTaskList = getTasksUpcomingWeek();
+        List<List<Task>> dayTaskList = new ArrayList<>();
-        dayTaskList.forEach(taskList -> taskList.removeIf(task -> task.getCropId() != cropId));
+        for(int i = 0; i < 7; i++) {
-        weeklyTaskListProperty.clear();
+            LocalDate date = LocalDate.now().plusDays(i);
-        weeklyTaskListProperty.addAll(dayTaskList);
+            dayTaskList.add(filterListByCrop(taskList.getTaskList(date, date), cropId));
+        }
+        return dayTaskList;
     }
 
     /**
@@ -202,7 +165,7 @@ public class GardenSchedule {
      * @throws IOException If the database cannot be accessed
      */
     public List<Task> getFilteredTaskList(LocalDate start, LocalDate end) throws IOException {
-        return getSortedTaskList(taskList.getTaskList(start, end), sortByNextExecution);
+        return getSortedTaskList(taskList.getTaskList(start, end), sortByStartDate);
     }
 
     /**
@@ -212,6 +175,6 @@ public class GardenSchedule {
      * @return a sorted coppy of the given Tasklist
      */
     private List<Task> getSortedTaskList(List<Task> taskList, Comparator<Task> comparator) {
-        return taskList.stream().filter(task -> task.getNextExecution() != null).sorted(comparator).collect(Collectors.toList());
+        return taskList.stream().sorted(comparator).collect(Collectors.toList());
     }
 }

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

@@ -1,6 +1,5 @@
 package ch.zhaw.gartenverwaltung.models;
 
-import ch.zhaw.gartenverwaltung.Settings;
 import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
 import ch.zhaw.gartenverwaltung.io.PlantList;
 import ch.zhaw.gartenverwaltung.types.GrowthPhaseType;
@@ -17,6 +16,7 @@ import java.util.stream.Collectors;
 
 public class PlantListModel {
     private final PlantList plantList;
+    private HardinessZone currentZone;
 
     /**
      * Comparators to create sorted Plant List
@@ -33,15 +33,15 @@ public class PlantListModel {
     }
 
     private void setDefaultZone() {
-        Settings.getInstance().setCurrentHardinessZone(null);
+        currentZone = HardinessZone.ZONE_8A; // TODO: get Default Zone from Settings
     }
 
     public void setCurrentZone(HardinessZone currentZone) {
-        Settings.getInstance().setCurrentHardinessZone(currentZone);
+        this.currentZone = currentZone;
     }
 
     public HardinessZone getCurrentZone() {
-        return Settings.getInstance().getCurrentHardinessZone();
+        return currentZone;
     }
 
     /**

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

@@ -1,8 +1,5 @@
 package ch.zhaw.gartenverwaltung.models;
 
-/**
- * Exception which is thrown if there is no plant in plant Database with the given id.
- */
 public class PlantNotFoundException extends Exception {
     public PlantNotFoundException() {
         super("The selected Plant was not found in Database!");

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

@@ -4,9 +4,6 @@ import java.time.LocalDate;
 import java.util.Objects;
 import java.util.Optional;
 
-/**
- * Represents a crop, meaning a specific plant growing at a specific time.
- */
 public class Crop {
     private Long cropId = null;
     private final long plantId;
@@ -40,6 +37,7 @@ public class Crop {
     public Optional<Long> getCropId() {
         return Optional.ofNullable(cropId);
     }
+
     public long getPlantId() { return plantId; }
     public LocalDate getStartDate() { return startDate; }
     public double getArea() { return area; }

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

@@ -7,23 +7,12 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import java.time.MonthDay;
 import java.util.List;
 
-/**
+
- * Represents a growth phase of a plant.
- * Plants go through several phases during their life (sowing, germinating, growing, ..., harvest).
- * These phases are characterized by what kinds of tasks need to be executed by the gardener to stay alive.
- * This class represents one such phase.
- *
- * @param startDate The earliest date on which this phase can start
- * @param endDate The latest date on which this phase can start
- * @param group Which group this phase belongs to (if the growth phase can occur multiple times a year, default: 0)
- * @param type What {@link GrowthPhaseType} this represents
- * @param zone The hardiness zone for which this growth phase is valid
- * @param taskTemplates The (undated) tasks required to be performed by the gardener
- */
 public record GrowthPhase(
         MonthDay startDate,
         MonthDay endDate,
         int group,
+        WateringCycle wateringCycle,
         @JsonDeserialize(using = GrowthPhaseTypeDeserializer.class) GrowthPhaseType type,
         @JsonDeserialize(using = HardinessZoneDeserializer.class) HardinessZone zone,
         List<TaskTemplate> taskTemplates) {

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

@@ -1,9 +1,5 @@
 package ch.zhaw.gartenverwaltung.types;
 
-/**
- * Enumerates the different possible types of {@link GrowthPhase}.
- * (Subject to later expansion)
- */
 public enum GrowthPhaseType {
     SOW, PLANT, REPLANT, HARVEST
 }

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

@@ -1,11 +1,4 @@
 package ch.zhaw.gartenverwaltung.types;
 
-/**
- * Represents a pest or pathogen which may afflict a plant.
- *
- * @param name The name of the pest
- * @param description A description of the pest
- * @param measures Measures that can be taken against the pest.
- */
 public record Pest(String name, String description, String measures) {
 }

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

@@ -9,20 +9,6 @@ import java.util.stream.Collectors;
 
 import static java.time.temporal.ChronoUnit.DAYS;
 
-/**
- * Represents a plant
- *
- * @param id A unique identifier
- * @param name The name of the plant
- * @param description A description of the plant
- * @param image An image representing the plant
- * @param spacing The amount of space needed between individual plants of this type
- * @param light The amount of light preferred by the plant (h/d)
- * @param soil The type of soil required for the plant
- * @param pests {@link Pest}s that may afflict the plant
- * @param wateringCycle The {@link WateringCycle} required by the plant
- * @param lifecycle A list of {@link GrowthPhase}s constituting the plants lifecycle
- */
 public record Plant(
         long id,
         String name,
@@ -32,7 +18,6 @@ public record Plant(
         int light,
         String soil,
         List<Pest> pests,
-        WateringCycle wateringCycle,
         List<GrowthPhase> lifecycle) {
 
     /**
@@ -44,10 +29,9 @@ public record Plant(
     }
 
     /**
-     * Get all {@link GrowthPhase}s of a lifecycle group
+     * get all growthPhases of lifecycle group
-     *
+     * @param group lifecycle group
-     * @param group The lifecycle group
+     * @return list of growthPhases
-     * @return A list of {@link GrowthPhase}s
      */
     public List<GrowthPhase> lifecycleForGroup(int group) {
         return lifecycle.stream()
@@ -56,58 +40,34 @@ public record Plant(
     }
 
     /**
-     * Given a {@link LocalDate}, determines which lifecycle group contains it.
+     * get sow date from given harvest day from lifecycle group
-     *
-     * @param date The date to look for
-     * @return Which lifecycle group the date is in
-     */
-    public int getGrowphaseGroupForDate(LocalDate date) {
-        for(GrowthPhase growthPhase : lifecycle){
-            MonthDay plantingDate = MonthDay.of(date.getMonth().getValue(), date.getDayOfMonth());
-            if(plantingDate.isAfter(growthPhase.startDate()) && plantingDate.isBefore(growthPhase.endDate())){
-                return growthPhase.group();
-            }
-        }
-        return 0;
-    }
-
-    /**
-     * Get sow date from given harvest date from lifecycle group
-     *
      * @param harvestDate date of the harvest
-     * @return {@link LocalDate} of sow date
+     * @return LocaleDate of sow date
      */
     public LocalDate sowDateFromHarvestDate(LocalDate harvestDate) {
         return harvestDate.minusDays(timeToHarvest(lifecycleGroupFromHarvestDate(harvestDate)));
     }
 
     /**
-     * Calculate the number of days between sow and harvest date for lifecycle 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()
-                .filter(growthPhase -> growthPhase.type().equals(GrowthPhaseType.SOW))
+                .filter(growthPhase -> !growthPhase.type().equals(GrowthPhaseType.SOW))
                 .findFirst()
                 .orElseThrow();
         GrowthPhase harvest = activeLifecycle.stream()
-                .filter(growthPhase -> growthPhase.type().equals(GrowthPhaseType.HARVEST))
+                .filter(growthPhase -> !growthPhase.type().equals(GrowthPhaseType.HARVEST))
                 .findFirst()
                 .orElseThrow();
 
         int currentYear = LocalDate.now().getYear();
-        return (int) DAYS.between(sow.startDate().atYear(currentYear),harvest.startDate().atYear(currentYear));
+        return (int) DAYS.between(harvest.startDate().atYear(currentYear), sow.startDate().atYear(currentYear));
     }
 
-    /**
-     * Given a harvest date, determines which lifecycle group it belongs to.
-     *
-     * @param harvestDate The harvest date
-     * @return Which lifecycle group the harvest date is in
-     */
     public int lifecycleGroupFromHarvestDate(LocalDate harvestDate) {
         return lifecycle.stream()
                 .filter(growthPhase -> growthPhase.type().equals(GrowthPhaseType.HARVEST) &&

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

@@ -2,12 +2,8 @@ package ch.zhaw.gartenverwaltung.types;
 
 import java.time.MonthDay;
 
-/**
- * Describes the 4 Seasons in terms of {@link java.time.LocalDate}s
- * Also describes "All Seasons" as the full year.
- */
 public enum Seasons {
-    ALLSEASONS("--01-01", "--12-31", "All Seasons"),
+    AllSEASONS("--01-01", "--12-31", "All Seasons"),
     SPRING("--03-01", "--05-30", "Spring"),
     SUMMER("--06-01", "--08-30", "Summer"),
     AUTUMN("--09-01", "--11-30", "Autumn"),

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

@@ -1,86 +1,43 @@
 package ch.zhaw.gartenverwaltung.types;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import java.time.LocalDate;
 import java.util.Optional;
 
 /**
- * Represents a Task
+ * Models a Task
  * May be created using the builder pattern.
  */
 public class Task {
     private Long id;
-    private String name;
+    private final String name;
-    private String description;
+    private final String description;
-    private LocalDate startDate;
+    private final LocalDate startDate;
     private Integer interval;
     private LocalDate endDate;
-    private LocalDate nextExecution;
-    private LocalDate nextNotification;
     private long cropId;
 
     /**
-     * Default constructor
+     * default constructor
      * (used by Json deserializer)
      */
     public Task(){
         name= "";
         description= "";
         startDate = LocalDate.now();
-        endDate = startDate;
-        nextExecution = startDate;
     }
 
-    /**
-     * Constructor for a non-repeating task related to a {@link Crop}
-     *
-     * @param name The name of the task
-     * @param description A description of the task
-     * @param startDate The start date of the task
-     * @param cropId The id of the crop to which the task belongs
-     */
     public Task(String name, String description, LocalDate startDate, long cropId) {
         this.name = name;
         this.description = description;
         this.startDate = startDate;
-        this.endDate = startDate;
-        nextExecution = startDate;
         this.cropId = cropId;
     }
 
-    /**
-     * Constructor for weather events
-     *
-     * @param name The name of the task
-     * @param description A description of the task
-     * @param startDate The start date of the task
-     * @param endDate The maximum date on which the task should be executed
-     */
-    public Task(String name, String description, LocalDate startDate, LocalDate endDate, long cropId) {
-        this.name = name;
-        this.description = description;
-        this.startDate = startDate;
-        nextExecution = startDate;
-        this.endDate = endDate;
-        this.cropId = cropId;
-    }
-
-    /**
-     * Full constructor (without id)
-     *
-     * @param name The name of the task
-     * @param description A description of the task
-     * @param startDate The start date of the task
-     * @param endDate The maximum date on which the task should be executed
-     * @param interval The number of days between executions
-     * @param cropId The id of the crop to which the task belongs
-     */
     public Task(String name, String description, LocalDate startDate, LocalDate endDate, int interval, long cropId) {
         this.name = name;
         this.description = description;
         this.startDate = startDate;
-        nextExecution = startDate;
         this.endDate = endDate;
         this.interval = interval;
         this.cropId = cropId;
@@ -100,46 +57,11 @@ public class Task {
         return this;
     }
 
-    /**
+    public boolean isInTimePeriode(LocalDate searchStartDate, LocalDate searchEndDate){
-     * Checks if the Task is within a specific date range.
+        return startDate.isAfter(searchStartDate) && startDate.isBefore(searchEndDate);
-     *
-     * @param searchStartDate The minimum date
-     * @param searchEndDate The maximum date
-     * @return Whether the Task is within the given range
-     */
-    public boolean isInTimePeriod(LocalDate searchStartDate, LocalDate searchEndDate) {
-        return  (endDate.isAfter(searchStartDate) && startDate.isBefore(searchEndDate)) || ((nextExecution != null && nextExecution.isBefore(searchEndDate.plusDays(1)) && nextExecution.isAfter(searchStartDate.minusDays(1))));
-    }
-
-    /**
-     * Marks a specific execution of a Task as done.
-     */
-    public void done(){
-        if(interval != null && interval != 0 && !nextExecution.plusDays(interval).isAfter(endDate)){
-            nextExecution = nextExecution.plusDays(interval);
-            nextNotification = nextExecution;
-        } else {
-            nextExecution = null;
-            nextNotification = null;
-        }
-    }
-
-    @JsonIgnore
-    public boolean isDone(){
-        return nextExecution == null;
-    }
-
-    public void setNextExecution(LocalDate nextExecution) {
-        this.nextExecution = nextExecution;
-    }
-
-    public void setNextNotification(LocalDate nextNotification) {
-        this.nextNotification = nextNotification;
     }
 
     // Getters
-    public LocalDate getNextNotification() { return nextNotification; }
-    public LocalDate getNextExecution() { return nextExecution; }
     public Optional<Long> getId() { return Optional.ofNullable(id); }
     public String getName() { return name; }
     public String getDescription() { return description; }
@@ -152,20 +74,4 @@ public class Task {
     public Optional<LocalDate> getEndDate() {
         return Optional.ofNullable(endDate);
     }
-
-    /**
-     * Updates the fields of this Task using the values of the given Task
-     *
-     * @param task The task whose fields to copy
-     * @return This task with the fields already updated
-     */
-    public Task updateTask(Task task) {
-        this.name = task.getName();
-        this.description = task.getDescription();
-        this.startDate = task.getStartDate();
-        this.endDate = task.getEndDate().orElse(null);
-        this.interval = task.getInterval().orElse(0);
-        this.cropId = task.getCropId();
-        return this;
-    }
 }

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

@@ -4,9 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.time.LocalDate;
 
-/**
- * Class which represents a Task if the start and enddate is not known yet.
- */
 public class TaskTemplate {
     @JsonProperty
     private final String name;
@@ -19,6 +16,10 @@ public class TaskTemplate {
     @JsonProperty
     private Integer interval;
 
+    // TODO: reconsider if we need this
+    @JsonProperty
+    private boolean isOptional = false;
+
     /**
      * Default constructor
      * (Used by deserializer)
@@ -44,19 +45,8 @@ public class TaskTemplate {
         this.relativeStartDate = relativeStartDate;
     }
 
-    /**
-     * Create a concrete {@link Task} given a concrete start date
-     *
-     * @param realStartDate The start date of the {@link GrowthPhase} to which the {@link #relativeStartDate} is relative.
-     * @param cropId The crop for which the task should be generated.
-     * @return The created {@link Task}
-     */
     public Task generateTask(LocalDate realStartDate, long cropId) {
-        LocalDate endDate = relativeEndDate != null ? realStartDate.plusDays(relativeEndDate) : realStartDate;
+        LocalDate endDate = relativeEndDate != null ? realStartDate.plusDays(relativeEndDate) : null;
-
-        if (interval == null) {
-            this.interval = 0;
-        }
 
         return new Task(name, description, realStartDate.plusDays(relativeStartDate), cropId)
                 .withInterval(interval)

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

@@ -1,12 +1,5 @@
 package ch.zhaw.gartenverwaltung.types;
 
-/**
- * Describes the cycle in which a {@link Plant} should be watered
- *
- * @param litersPerSqM How many litres of water per square metre of ground
- * @param interval The interval (days)
- * @param notes Notes on the cycle
- */
 public record WateringCycle(
         int litersPerSqM,
         int interval,

src/main/java/module-info.java

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

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

@@ -15,32 +15,35 @@
 
 <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="785.0" prefWidth="899.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.CropDetailController">
    <children>
-      <ScrollPane fitToHeight="true" fitToWidth="true" prefHeight="759.0" prefWidth="664.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <ScrollPane fitToWidth="true" prefHeight="759.0" prefWidth="664.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <content>
-            <VBox fx:id="cropDetailVBox" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="781.0" prefWidth="897.0" spacing="5.0">
+            <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="781.0" prefWidth="897.0">
+               <padding>
+                  <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+               </padding>
                <children>
-                  <Button styleClass="button-class" mnemonicParsing="false" onAction="#goBack" prefHeight="25.0" prefWidth="91.0" text="Go Back">
+                  <Button mnemonicParsing="false" onAction="#goBack" prefHeight="25.0" prefWidth="91.0" text="Go Back">
                      <VBox.margin>
                         <Insets bottom="10.0" />
                      </VBox.margin>
                   </Button>
-                  <Label styleClass="page-title" fx:id="cropName_label" text="Label">
+                  <Label fx:id="cropName_label" text="Label">
                      <VBox.margin>
                         <Insets bottom="10.0" />
                      </VBox.margin>
                   </Label>
-                  <HBox maxHeight="1.7976931348623157E308" prefHeight="268.0" prefWidth="855.0" spacing="10.0" VBox.vgrow="NEVER">
+                  <HBox prefHeight="265.0" prefWidth="879.0">
                      <children>
-                        <GridPane styleClass="custom-container" maxWidth="1.7976931348623157E308" prefHeight="231.0" prefWidth="555.0" HBox.hgrow="ALWAYS">
+                        <GridPane maxWidth="1.7976931348623157E308" prefHeight="296.0" prefWidth="577.0" HBox.hgrow="ALWAYS">
                           <columnConstraints>
                             <ColumnConstraints halignment="LEFT" hgrow="SOMETIMES" maxWidth="284.0" minWidth="10.0" prefWidth="97.33334350585938" />
                             <ColumnConstraints hgrow="SOMETIMES" maxWidth="488.99999237060547" minWidth="10.0" prefWidth="481.9999898274739" />
                           </columnConstraints>
                           <rowConstraints>
-                            <RowConstraints maxHeight="149.66665903727215" minHeight="10.0" prefHeight="126.33328501383463" valignment="TOP" vgrow="SOMETIMES" />
+                            <RowConstraints maxHeight="149.66665903727215" minHeight="10.0" prefHeight="149.66665903727215" valignment="TOP" vgrow="SOMETIMES" />
-                            <RowConstraints maxHeight="187.9999647140503" minHeight="10.0" prefHeight="45.00002034505208" vgrow="SOMETIMES" />
+                            <RowConstraints maxHeight="187.9999647140503" minHeight="10.0" prefHeight="51.00000762939453" vgrow="SOMETIMES" />
-                            <RowConstraints maxHeight="105.66662597656247" minHeight="10.0" prefHeight="46.33331298828125" vgrow="SOMETIMES" />
+                            <RowConstraints maxHeight="105.66662597656247" minHeight="10.0" prefHeight="54.0" vgrow="SOMETIMES" />
-                              <RowConstraints maxHeight="105.66662597656247" minHeight="10.0" prefHeight="45.66668701171875" vgrow="SOMETIMES" />
+                              <RowConstraints maxHeight="105.66662597656247" minHeight="10.0" prefHeight="46.66666666666666" vgrow="SOMETIMES" />
                           </rowConstraints>
                            <children>
                               <Label prefHeight="17.0" prefWidth="65.0" text="Description:">
@@ -72,58 +75,67 @@
                                  </GridPane.margin>
                               </Label>
                            </children>
-                           <padding>
-                              <Insets bottom="5.0" left="10.0" right="5.0" top="5.0" />
-                           </padding>
                         </GridPane>
-                        <ImageView fx:id="imageView" fitHeight="250.0" fitWidth="250.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER" />
+                        <ImageView fx:id="imageView" fitHeight="300.0" fitWidth="300.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER" />
                      </children>
                   </HBox>
                   <Label text="Tasks:">
                      <VBox.margin>
-                        <Insets />
+                        <Insets bottom="10.0" />
                      </VBox.margin>
                   </Label>
-                  <ListView fx:id="taskList_listView" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" prefHeight="100.0" prefWidth="869.0" VBox.vgrow="ALWAYS">
+                  <ListView fx:id="taskList_listView" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="877.0" VBox.vgrow="ALWAYS">
                      <VBox.margin>
                         <Insets bottom="10.0" />
                      </VBox.margin>
                   </ListView>
-                  <Button styleClass="button-class" fx:id="addTask_button" mnemonicParsing="false" onAction="#addTask" prefHeight="25.0" prefWidth="120.0" VBox.vgrow="NEVER" text="Add Task">
+                  <Button fx:id="addTask_button" mnemonicParsing="false" onAction="#addTask" prefHeight="25.0" prefWidth="45.0">
                      <VBox.margin>
-                        <Insets />
+                        <Insets bottom="10.0" />
                      </VBox.margin>
                   </Button>
-                  <Label text="Pests:" VBox.vgrow="NEVER" />
+                  <Label text="Pests:" />
-                  <ListView fx:id="pests_listView" maxHeight="1.7976931348623157E308" minHeight="-Infinity" prefHeight="100.0" prefWidth="855.0" VBox.vgrow="SOMETIMES">
+                  <ListView fx:id="pests_listView" maxHeight="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
                      <VBox.margin>
-                        <Insets />
+                        <Insets bottom="10.0" />
                      </VBox.margin>
                   </ListView>
-                  <HBox alignment="CENTER_LEFT" prefHeight="27.0" prefWidth="869.0" VBox.vgrow="NEVER">
+                  <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="NEVER">
                      <children>
                         <Label text="Area:">
                            <HBox.margin>
                               <Insets right="60.0" />
                            </HBox.margin>
                         </Label>
-                        <Label fx:id="area_label" minWidth="-Infinity" prefWidth="50.0" text="Label">
+                        <Label fx:id="area_label" text="Label">
                            <HBox.margin>
                               <Insets right="10.0" />
                            </HBox.margin>
                         </Label>
-                        <Button styleClass="button-class" fx:id="area_button" mnemonicParsing="false" onAction="#setArea" prefHeight="25.0" prefWidth="116.0" text="Set Area" />
+                        <Button fx:id="area_button" mnemonicParsing="false" onAction="#setArea" prefHeight="25.0" prefWidth="116.0" text="Set Area" />
                      </children>
                      <VBox.margin>
-                        <Insets />
+                        <Insets bottom="10.0" />
                      </VBox.margin>
                   </HBox>
+                  <HBox alignment="CENTER_LEFT" layoutX="20.0" layoutY="719.0" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="NEVER">
+                     <children>
+                        <Label text="Location:">
+                           <HBox.margin>
+                              <Insets right="40.0" />
+                           </HBox.margin>
+                        </Label>
+                        <Label fx:id="location_label" text="Label">
+                           <HBox.margin>
+                              <Insets right="10.0" />
+                           </HBox.margin>
+                        </Label>
+                        <Button fx:id="location_button" mnemonicParsing="false" onAction="#setLocation" prefHeight="25.0" prefWidth="115.0" text="Set Location" />
+                     </children>
+                  </HBox>
                </children>
             </VBox>
          </content>
-         <padding>
-            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-         </padding>
       </ScrollPane>
    </children>
 </AnchorPane>

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

@@ -6,24 +6,26 @@
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
 <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="1091.0" prefWidth="1060.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.HomeController">
    <children>
       <ScrollPane fitToWidth="true" prefHeight="1157.0" prefWidth="1060.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-         <padding>
-            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-         </padding>
          <content>
-            <VBox fx:id="homeVBox" prefHeight="1047.0" prefWidth="1019.0" spacing="10.0">
+            <VBox prefHeight="1091.0" prefWidth="1058.0">
                <children>
-                  <Label styleClass="page-title" text="Garden Management">
+                  <Pane prefHeight="1085.0" prefWidth="1018.0">
+                     <children>
+                        <VBox prefHeight="1047.0" prefWidth="1019.0">
+                           <children>
+                              <Label text="Garden Management">
                                  <font>
                                     <Font size="34.0" />
                                  </font>
                                  <VBox.margin>
-                        <Insets />
+                                    <Insets bottom="30.0" />
                                  </VBox.margin>
                               </Label>
                               <Label alignment="TOP_LEFT" prefHeight="22.0" prefWidth="1039.0" text="This Application was created to help the user manage his or her garden. For this the Application has many functionalities:" wrapText="true">
@@ -31,11 +33,9 @@
                                     <Font size="14.0" />
                                  </font>
                                  <VBox.margin>
-                        <Insets />
+                                    <Insets bottom="10.0" />
                                  </VBox.margin>
                               </Label>
-                  <VBox styleClass="vbox" prefHeight="200.0" prefWidth="100.0" spacing="5.0">
-                     <children>
                               <Label text="Base Functionalities:">
                                  <font>
                                     <Font name="System Bold" size="14.0" />
@@ -46,107 +46,86 @@
                                     <Font size="14.0" />
                                  </font>
                               </Label>
-                        <Label text="- The user can filter the plants according to seasons, hardiness zone and search query">
+                              <Label layoutX="10.0" layoutY="62.0" text="- The user can filter the plants according to seasons, hardiness zone and search query">
                                  <font>
                                     <Font size="14.0" />
                                  </font>
                               </Label>
-                        <Label text="- The user can select the harverst or sow date. ">
+                              <Label layoutX="10.0" layoutY="62.0" text="- The user can select the harverst or sow date. ">
                                  <font>
                                     <Font size="14.0" />
                                  </font>
                               </Label>
-                        <Label text="- The user can get a detailed information of the plant he wants to harvest.">
+                              <Label layoutX="10.0" layoutY="102.0" text="- The user can get a detailed information of the plant he wants to harvest.">
                                  <font>
                                     <Font size="14.0" />
                                  </font>
                               </Label>
-                        <Label text="- The user can get view the task list of the given plant.">
+                              <Label layoutX="10.0" layoutY="122.0" text="- The user can get view the task list of the given plant.">
                                  <font>
                                     <Font size="14.0" />
                                  </font>
                               </Label>
-                        <Label text="- The user can get the tasks of the next seven days in the scheduler.">
+                              <Label layoutX="10.0" layoutY="142.0" text="- The user can get the tasks of the next seven days in the scheduler.">
                                  <font>
                                     <Font size="14.0" />
                                  </font>
                                  <VBox.margin>
-                              <Insets />
+                                    <Insets bottom="10.0" />
                                  </VBox.margin>
                               </Label>
-                     </children>
+                              <Label layoutX="10.0" layoutY="42.0" text="Advanced Functionalities:">
-                     <padding>
-                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                     </padding>
-                  </VBox>
-                  <VBox styleClass="vbox" prefHeight="200.0" prefWidth="100.0" spacing="5.0">
-                     <children>
-                        <Label text="Advanced Functionalities:">
                                  <font>
                                     <Font name="System Bold" size="14.0" />
                                  </font>
                               </Label>
-                        <Label text="- The user can edit the task list and add custom tasks.">
+                              <Label layoutX="10.0" layoutY="62.0" text="- The user can edit the task list and add custom tasks.">
                                  <font>
                                     <Font size="14.0" />
                                  </font>
                               </Label>
-                        <Label text="- The user can set the area (sqare meter) for the plants.">
+                              <Label layoutX="10.0" layoutY="212.0" text="- The user can set the area (sqare meter) for the plants.">
                                  <font>
                                     <Font size="14.0" />
                                  </font>
                               </Label>
-                        <Label text="- The user can set the location (PLZ) for the plants.">
+                              <Label layoutX="10.0" layoutY="232.0" text="- The user can set the location (PLZ) for the plants.">
                                  <font>
                                     <Font size="14.0" />
                                  </font>
                               </Label>
-                        <Label text="- The user can set the pesticide which will be used, which will create additonal tasks.">
+                              <Label layoutX="10.0" layoutY="162.0" text="- The user can set the pesticide which will be used, which will create additonal tasks.">
                                  <font>
                                     <Font size="14.0" />
                                  </font>
                                  <VBox.margin>
-                              <Insets />
+                                    <Insets bottom="10.0" />
                                  </VBox.margin>
                               </Label>
-                     </children>
+                              <Label layoutX="10.0" layoutY="192.0" text="Weather Forcast:">
-                     <padding>
-                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                     </padding>
-                  </VBox>
-                  <VBox styleClass="vbox" prefHeight="200.0" prefWidth="100.0" spacing="5.0">
-                     <children>
-                        <Label text="Weather Forcast:">
                                  <font>
                                     <Font name="System Bold" size="14.0" />
                                  </font>
                               </Label>
-                        <Label text="- According to the location the weather forcast will crate or delete tasks.">
+                              <Label layoutX="10.0" layoutY="212.0" text="- According to the location the weather forcast will crate or delete tasks.">
                                  <font>
                                     <Font size="14.0" />
                                  </font>
                               </Label>
-                        <Label text="- The user receives notifications that aditional tasks werde created or some tasks were deleted.">
+                              <Label layoutX="10.0" layoutY="272.0" text="- The user receives notifications that aditional tasks werde created or some tasks were deleted.">
                                  <font>
                                     <Font size="14.0" />
                                  </font>
                                  <VBox.margin>
-                              <Insets />
+                                    <Insets bottom="10.0" />
                                  </VBox.margin>
                               </Label>
-                     </children>
-                     <padding>
-                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                     </padding>
-                  </VBox>
-                  <VBox styleClass="vbox" prefHeight="200.0" prefWidth="100.0" spacing="15.0">
-                     <children>
                               <Label text="Created by:">
                                  <font>
                                     <Font name="System Bold" size="14.0" />
                                  </font>
                                  <VBox.margin>
-                              <Insets />
+                                    <Insets bottom="10.0" />
                                  </VBox.margin>
                               </Label>
                               <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0">
@@ -156,16 +135,11 @@
                                           <Insets right="30.0" />
                                        </HBox.margin>
                                     </ImageView>
-                              <Label minWidth="150.0" text="Elias Csomor" />
+                                    <Label text="Elias Csomor" />
-                              <Label minWidth="200.0" text="csomoeli@students.zhaw.ch" />
-                              <Label text="Assistent Project Lead/Developer" />
                                  </children>
                                  <VBox.margin>
-                              <Insets />
+                                    <Insets bottom="15.0" />
                                  </VBox.margin>
-                           <padding>
-                              <Insets left="50.0" />
-                           </padding>
                               </HBox>
                               <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0">
                                  <children>
@@ -174,16 +148,11 @@
                                           <Insets right="30.0" />
                                        </HBox.margin>
                                     </ImageView>
-                              <Label minWidth="150.0" text="Philippe Giavarini" />
+                                    <Label text="Philippe Giavarini" />
-                              <Label minWidth="200.0" text="giavaphi@students.zhaw.ch" />
-                              <Label text="Project Lead/Developer" />
                                  </children>
                                  <VBox.margin>
-                              <Insets />
+                                    <Insets bottom="15.0" />
                                  </VBox.margin>
-                           <padding>
-                              <Insets left="50.0" />
-                           </padding>
                               </HBox>
                               <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0">
                                  <children>
@@ -192,16 +161,11 @@
                                           <Insets right="30.0" />
                                        </HBox.margin>
                                     </ImageView>
-                              <Label minWidth="150.0" text="David Guler" />
+                                    <Label text="David Guler" />
-                              <Label minWidth="200.0" text="gulerdav@students.zhaw.ch" />
-                              <Label text="Developer" />
                                  </children>
                                  <VBox.margin>
-                              <Insets />
+                                    <Insets bottom="15.0" />
                                  </VBox.margin>
-                           <padding>
-                              <Insets left="50.0" />
-                           </padding>
                               </HBox>
                               <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0">
                                  <children>
@@ -210,16 +174,11 @@
                                           <Insets right="30.0" />
                                        </HBox.margin>
                                     </ImageView>
-                              <Label minWidth="150.0" text="Gian-Andrea Hutter" />
+                                    <Label text="Gian-Andrea Hutter" />
-                              <Label minWidth="200.0" text="huttergia@students.zhaw.ch" />
-                              <Label text="Developer" />
                                  </children>
                                  <VBox.margin>
-                              <Insets />
+                                    <Insets bottom="15.0" />
                                  </VBox.margin>
-                           <padding>
-                              <Insets left="50.0" />
-                           </padding>
                               </HBox>
                               <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0">
                                  <children>
@@ -228,24 +187,24 @@
                                           <Insets right="30.0" />
                                        </HBox.margin>
                                     </ImageView>
-                              <Label minWidth="150.0" text="Roman Schenk" />
+                                    <Label text="Roman Schenk" />
-                              <Label minWidth="200.0" text="schrom01@students.zhaw.ch" />
-                              <Label text="Developer" />
                                  </children>
                                  <VBox.margin>
-                              <Insets />
+                                    <Insets bottom="15.0" />
                                  </VBox.margin>
-                           <padding>
-                              <Insets left="50.0" />
-                           </padding>
                               </HBox>
                            </children>
+                        </VBox>
+                     </children>
+                     <VBox.margin>
+                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                     </VBox.margin>
+                  </Pane>
+               </children>
                <padding>
                   <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                </padding>
             </VBox>
-               </children>
-            </VBox>
          </content>
       </ScrollPane>
    </children>

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

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

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

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

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

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

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

@@ -4,72 +4,59 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.SplitPane?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.control.TitledPane?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="plantsRoot" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="1000.0" prefHeight="853.0" prefWidth="1219.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.PlantsController">
+<AnchorPane maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="1000.0" prefHeight="853.0"
+            prefWidth="1219.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1"
+            fx:controller="ch.zhaw.gartenverwaltung.PlantsController"
+            fx:id="plantsRoot">
    <children>
-      <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <SplitPane dividerPositions="0.7377363661277062" layoutX="539.0" layoutY="266.0" prefHeight="853.0" prefWidth="1219.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+        <items>
+          <AnchorPane maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
                <children>
-            <Label styleClass="page-title" prefHeight="45.0" prefWidth="903.0" text="Plants" VBox.vgrow="NEVER">
+                  <VBox maxWidth="1.7976931348623157E308" prefHeight="850.6666666666666" prefWidth="894.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                     <children>
+                        <Label prefHeight="45.0" prefWidth="903.0" text="Plants">
                            <font>
                               <Font name="System Bold" size="30.0" />
                            </font>
                         </Label>
-            <HBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="100.0" prefWidth="200.0" spacing="10.0" VBox.vgrow="ALWAYS">
+                        <TextField fx:id="search_plants" promptText="Search for Plant Name" />
-               <children>
+                        <HBox alignment="CENTER_LEFT" prefHeight="480.0" prefWidth="881.0" VBox.vgrow="ALWAYS">
-                <AnchorPane maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0" HBox.hgrow="ALWAYS">
-                     <children>
-                        <VBox maxWidth="1.7976931348623157E308" prefHeight="850.6666666666666" prefWidth="894.0" spacing="10.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                           <children>
-                              <TextField fx:id="search_plants" promptText="Search for Plant Name" VBox.vgrow="NEVER" />
-                              <HBox alignment="CENTER_LEFT" minHeight="300.0" prefHeight="480.0" prefWidth="881.0" spacing="10.0" VBox.vgrow="ALWAYS">
                            <children>
                               <ListView fx:id="list_plants" maxWidth="1.7976931348623157E308" prefHeight="497.0" prefWidth="400.0" HBox.hgrow="ALWAYS" />
-                                    <Pane styleClass="custom-container" maxHeight="1.7976931348623157E308" maxWidth="300.0" minWidth="300.0" prefHeight="200.0" prefWidth="200.0" HBox.hgrow="NEVER">
+                              <ImageView fx:id="img_plant" fitWidth="300" pickOnBounds="true" preserveRatio="true" HBox.hgrow="NEVER" />
-                                       <children>
-                                          <ImageView fx:id="img_plant" fitWidth="300" pickOnBounds="true" preserveRatio="true" />
-                                       </children>
-                                    </Pane>
                            </children>
                         </HBox>
-                              <VBox styleClass="vbox" maxHeight="1.7976931348623157E308" prefHeight="237.0" prefWidth="879.0" VBox.vgrow="ALWAYS">
+                        <Label prefHeight="33.0" prefWidth="919.0" text="Plant Information:">
-                                 <children>
-                                    <Label maxHeight="1.7976931348623157E308" prefHeight="33.0" prefWidth="919.0" text="Plant Information:" VBox.vgrow="NEVER">
                            <font>
                               <Font name="System Bold" size="12.0" />
                            </font>
+                           <padding>
+                              <Insets top="15.0" />
+                           </padding>
                         </Label>
-                                    <Label fx:id="description_plant" alignment="TOP_LEFT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="96.0" prefWidth="879.0" text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet." textAlignment="JUSTIFY" wrapText="true" VBox.vgrow="ALWAYS">
+                        <Label fx:id="description_plant" alignment="TOP_LEFT" maxWidth="1.7976931348623157E308" prefHeight="194.0" prefWidth="893.0" text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet." textAlignment="JUSTIFY" wrapText="true">
                            <padding>
                               <Insets bottom="10.0" top="10.0" />
                            </padding>
                         </Label>
-                                    <Button styleClass="button-class" fx:id="selectSowDay_button" alignment="CENTER" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#selectSowDate" prefHeight="38.0" prefWidth="917.0" text="Select Harvest/Sow Day" VBox.vgrow="NEVER" />
+                        <Button fx:id="selectSowDay_button" alignment="CENTER" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#selectSowDate" prefHeight="38.0" prefWidth="917.0" text="Select Harvest/Sow Day" />
-                                 </children>
-                                 <VBox.margin>
-                                    <Insets />
-                                 </VBox.margin>
-                                 <padding>
-                                    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                                 </padding>
-                              </VBox>
                      </children>
                   </VBox>
                </children>
-                     <HBox.margin>
-                        <Insets />
-                     </HBox.margin>
             </AnchorPane>
-                <AnchorPane styleClass="custom-container" maxWidth="300.0" minHeight="0.0" minWidth="300.0" prefHeight="160.0" prefWidth="100.0">
+          <AnchorPane maxWidth="300.0" minHeight="0.0" minWidth="300.0" prefHeight="160.0" prefWidth="100.0">
                <children>
-                        <VBox layoutX="38.0" layoutY="100.0" prefHeight="850.6666666666666" prefWidth="316.6666666666667" spacing="10.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                  <VBox layoutX="38.0" layoutY="100.0" prefHeight="850.6666666666666" prefWidth="316.6666666666667" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                      <children>
                         <Label text="Filter">
                            <font>
@@ -78,7 +65,7 @@
                         </Label>
                         <TitledPane animated="false" text="Seasons">
                           <content>
-                                  <AnchorPane styleClass="custom-container" minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+                            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
                                  <children>
                                     <VBox fx:id="seasons" layoutX="37.0" layoutY="-19.0" prefHeight="180.66666666666666" prefWidth="310.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
                                  </children>
@@ -87,7 +74,7 @@
                         </TitledPane>
                         <TitledPane animated="false" text="Climate Zones">
                           <content>
-                                  <AnchorPane styleClass="custom-container" minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+                            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
                                  <children>
                                     <VBox fx:id="climate_zones" layoutX="36.0" layoutY="-19.0" prefHeight="180.66666666666666" prefWidth="310.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
                                  </children>
@@ -97,16 +84,11 @@
                      </children>
                   </VBox>
                </children>
+            </AnchorPane>
+        </items>
          <padding>
             <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
          </padding>
-                  </AnchorPane>
+      </SplitPane>
    </children>
-            </HBox>
-         </children>
-      </VBox>
-   </children>
-   <padding>
-      <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-   </padding>
 </AnchorPane>

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

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

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

@@ -9,7 +9,9 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="259.0" prefWidth="390.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.TaskFormularController">
+
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="259.0" prefWidth="390.0" xmlns="http://javafx.com/javafx/17"
+            xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.TaskFormularController">
    <children>
       <VBox layoutX="14.0" layoutY="14.0" prefHeight="272.0" prefWidth="390.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <padding>
@@ -25,7 +27,7 @@
             <HBox prefHeight="77.0" prefWidth="350.0">
                <children>
                   <Label maxWidth="1.7976931348623157E308" text="Description:" HBox.hgrow="ALWAYS" />
-                  <TextArea fx:id="description_area" prefHeight="73.0" prefWidth="206.0" promptText="Description" wrapText="true" />
+                  <TextArea fx:id="description_area" prefHeight="73.0" prefWidth="206.0" promptText="Description" />
                </children>
             </HBox>
             <HBox alignment="CENTER_LEFT" layoutX="30.0" layoutY="30.0" prefHeight="35.0" prefWidth="560.0">

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

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

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

@@ -22,9 +22,9 @@
             <Separator prefWidth="50.0" visible="false" HBox.hgrow="ALWAYS" />
             <ButtonBar prefHeight="40.0" prefWidth="200.0">
               <buttons>
-                  <Button cancelButton="true" contentDisplay="CENTER" graphicTextGap="5.0" mnemonicParsing="false" onAction="#closeTutorial" styleClass="button-class" text="Close" />
+                  <Button cancelButton="true" contentDisplay="CENTER" graphicTextGap="5.0" mnemonicParsing="false" text="Close" onAction="#closeTutorial"/>
-                <Button fx:id="previousPageButton" mnemonicParsing="false" onAction="#viewPreviousPage" styleClass="button-class" text="Previous" />
+                <Button fx:id="previousPageButton" mnemonicParsing="false" text="Previous" onAction="#viewPreviousPage"/>
-                  <Button fx:id="nextPageButton" defaultButton="true" mnemonicParsing="false" onAction="#viewNextPage" styleClass="button-class" text="Next" />
+                  <Button fx:id="nextPageButton" defaultButton="true" mnemonicParsing="false" text="Next" onAction="#viewNextPage" />
               </buttons>
             </ButtonBar>
          </children>
@@ -38,7 +38,7 @@
          <children>
             <VBox layoutX="30.0" layoutY="26.0" opacity="0.0" prefHeight="200.0" prefWidth="100.0">
                <children>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Adding Crops">
+                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Managing Your Crops">
                      <font>
                         <Font size="24.0" />
                      </font>
@@ -75,7 +75,7 @@
                            </children>
                         </TextFlow>
                         <Separator prefWidth="200.0" visible="false" HBox.hgrow="ALWAYS" />
-                        <ImageView fx:id="imgSelectDate" fitHeight="150.0" fitWidth="400.0" pickOnBounds="true" preserveRatio="true" />
+                        <ImageView fx:id="imgSelectDate" fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" />
                      </children>
                   </HBox>
                </children>
@@ -83,50 +83,7 @@
                   <Insets />
                </opaqueInsets>
             </VBox>
-            <VBox layoutX="30.0" layoutY="30.0" prefHeight="200.0" prefWidth="100.0">
+            <VBox prefHeight="200.0" prefWidth="100.0">
-               <children>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Managing Your Crops">
-                     <font>
-                        <Font size="24.0" />
-                     </font>
-                  </Text>
-                  <Separator prefWidth="200.0">
-                     <VBox.margin>
-                        <Insets bottom="15.0" top="10.0" />
-                     </VBox.margin>
-                  </Separator>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Once you've added a crop to your garden, it will be displayed in the &quot;My Garden&quot; tab.">
-                     <VBox.margin>
-                        <Insets bottom="20.0" />
-                     </VBox.margin>
-                  </Text>
-                  <HBox prefHeight="100.0" prefWidth="200.0">
-                     <children>
-                        <TextFlow lineSpacing="4.0" prefHeight="200.0" prefWidth="500.0">
-                           <children>
-                              <Text strokeType="OUTSIDE" strokeWidth="0.0" text="On the right hand side of the listing, you'll see two buttons.&#10;&#10;Button with the &quot;trash can&quot; icon lets you remove a crop from your garden plan. This will also delete all associated tasks.&#10;&#10;The button on the left will display the details of the crop in a new window." />
-                           </children>
-                        </TextFlow>
-                        <Separator prefWidth="200.0" visible="false" HBox.hgrow="ALWAYS" />
-                        <ImageView fitHeight="70.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" fx:id="imgDetailDeleteButtons"/>
-                     </children></HBox>
-                  <HBox layoutX="10.0" layoutY="105.0" prefHeight="100.0" prefWidth="200.0">
-                     <children>
-                        <TextFlow lineSpacing="4.0" prefHeight="200.0" prefWidth="500.0">
-                           <children>
-                              <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Here, you can also add your own custom tasks, by clicking the &quot;Add Task&quot; button.&#10;In the subsequently shown dialog, you can enter the corresponding details.&#10;&#10;Note: If you want to make a task recurring, you need to set both an interval (in days) AND an end date, so the task won't repeat for all eternity." />
-                           </children>
-                        </TextFlow>
-                        <Separator prefWidth="200.0" visible="false" HBox.hgrow="ALWAYS" />
-                        <ImageView fitHeight="150.0" fitWidth="400.0" pickOnBounds="true" preserveRatio="true" fx:id="imgAddTaskButton"/>
-                     </children>
-                  </HBox>
-               </children>
-               <opaqueInsets>
-                  <Insets />
-               </opaqueInsets>
-            </VBox>
-            <VBox opacity="0.0" prefHeight="200.0" prefWidth="100.0">
                <children>
                   <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Managing Your Tasks">
                      <font>
@@ -154,9 +111,19 @@
                            </HBox.margin>
                         </TextFlow>
                         <Separator prefWidth="200.0" visible="false" HBox.hgrow="ALWAYS" />
-                        <ImageView fx:id="imgTaskList" fitHeight="200.0" fitWidth="400.0" pickOnBounds="true" preserveRatio="true" />
+                        <ImageView fx:id="imgTaskList" fitHeight="98.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" />
                      </children>
                   </HBox>
+                  <HBox prefHeight="100.0" prefWidth="200.0">
+                     <children>
+                        <TextFlow lineSpacing="4.0" prefHeight="200.0" prefWidth="500.0">
+                           <children>
+                              <Text strokeType="OUTSIDE" strokeWidth="0.0" text="You can also add your own custom tasks, by clicking the &quot;Add Task&quot; button.&#10;In the subsequently shown dialog, you can enter the corresponding details.&#10;&#10;Note: If you want to make a task recurring, you need to set both an interval (in days) AND an end date, so the task won't repeat for all eternity." />
+                           </children>
+                        </TextFlow>
+                        <Separator prefWidth="200.0" visible="false" HBox.hgrow="ALWAYS" />
+                        <ImageView fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" />
+                     </children></HBox>
                </children>
                <opaqueInsets>
                   <Insets />

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

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

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

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

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

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

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

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

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

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

src/test/java/ch/zhaw/gartenverwaltung/backgroundtasks/weather/WeatherGardenTaskPlannerTest.java

@@ -1,91 +0,0 @@
-package ch.zhaw.gartenverwaltung.backgroundtasks.weather;
-
-import ch.zhaw.gartenverwaltung.io.*;
-import ch.zhaw.gartenverwaltung.models.PlantNotFoundException;
-import ch.zhaw.gartenverwaltung.types.*;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.io.IOException;
-import java.net.URL;
-import java.time.LocalDate;
-import java.time.MonthDay;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class WeatherGardenTaskPlannerTest {
-    private final URL testFile = JsonCropListTest.class.getResource("test-taskdb.json");
-    Plant examplePlantOnion;
-    Crop exampleCropOnion;
-    Task exampleTask;
-    Task exampleWeatherTask;
-    List<Crop> cropList;
-    List<Plant> plantList;
-    TaskList taskList;
-
-    @BeforeEach
-    void setUp() {
-        examplePlantOnion = new Plant(
-                20,
-                "summertime onion",
-                "Onion, (Allium cepa), herbaceous biennial plant in the amaryllis family (Amaryllidaceae) grown for its edible bulb. The onion is likely native to southwestern Asia but is now grown throughout the world, chiefly in the temperate zones. Onions are low in nutrients but are valued for their flavour and are used widely in cooking. They add flavour to such dishes as stews, roasts, soups, and salads and are also served as a cooked vegetable.",
-                null,
-                "15,30,2",
-                0,
-                "sandy to loamy, loose soil, free of stones",
-                new ArrayList<>(),
-                new WateringCycle(15, 3, null),
-                List.of(new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()),
-                        new GrowthPhase(MonthDay.of(4, 3), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
-                        new GrowthPhase(MonthDay.of(8, 5), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
-                        new GrowthPhase(MonthDay.of(2, 8), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
-                        new GrowthPhase(MonthDay.of(10, 2), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())));
-
-        exampleCropOnion = new Crop(examplePlantOnion.id(), LocalDate.of(2022, 12, 5))
-                .withId(3L);
-        exampleTask = new Task("water plant","water the plant until the ground is wet enough",LocalDate.now(), LocalDate.now().plusDays(2L),3L);
-        exampleTask.setNextExecution(LocalDate.now().plusDays(1L));
-        exampleWeatherTask = new Task("Hail",
-                "During a summer Thunderstorm it could hail heavily. THe Hail could damage the crops. To prevent damage cover the plants with a strong tarpaulin",
-                LocalDate.now(),LocalDate.now().plusDays(1L),3L);
-
-        taskList = new JsonTaskList(testFile);
-
-        plantList = new ArrayList<>();
-        plantList.add(examplePlantOnion);
-
-        cropList = new ArrayList<>();
-        cropList.add(exampleCropOnion);
-
-    }
-
-    CropList mockCropList(List<Crop> cropList) throws IOException {
-        CropList croplist = mock(CropList.class);
-        when(croplist.getCrops()).thenReturn(cropList);
-        when(croplist.getCropById(3)).thenReturn(java.util.Optional.ofNullable(exampleCropOnion));
-        return croplist;
-    }
-
-    PlantList mockPlantDatabase(List<Plant> plantList) throws HardinessZoneNotSetException, IOException {
-        PlantList plantDatabase = mock(JsonPlantList.class);
-        when(plantDatabase.getPlantList(HardinessZone.ZONE_8A)).thenReturn(plantList);
-        when(plantDatabase.getPlantById(HardinessZone.ZONE_8A,20)).thenReturn(Optional.of(plantList.get(0)));
-        return plantDatabase;
-    }
-
-    @Test
-    void refreshtasks() throws HardinessZoneNotSetException, IOException, PlantNotFoundException {
-        WeatherGradenTaskPlanner weatherGradenTaskPlanner = new WeatherGradenTaskPlanner(taskList, mockPlantDatabase(plantList), mockCropList(cropList));
-        taskList.saveTask(exampleTask);
-        weatherGradenTaskPlanner.refreshTasks();
-        assertEquals(exampleTask.getName(),taskList.getTaskList(LocalDate.now(),LocalDate.now().plusDays(7)).get(0).getName());
-        assertEquals(LocalDate.now().plusDays(2L),taskList.getTaskList(LocalDate.now(),LocalDate.now().plusDays(7)).get(0).getNextExecution());
-        assertEquals(exampleWeatherTask.getName(),taskList.getTaskList(LocalDate.now(),LocalDate.now().plusDays(7)).get(1).getName());
-        assertEquals(exampleWeatherTask.getStartDate(),taskList.getTaskList(LocalDate.now(),LocalDate.now().plusDays(7)).get(1).getStartDate());
-    }
-}

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

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

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

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

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

@@ -1,14 +1,7 @@
 package ch.zhaw.gartenverwaltung.io;
 
-import ch.zhaw.gartenverwaltung.models.GardenSchedule;
-import ch.zhaw.gartenverwaltung.models.PlantNotFoundException;
-import ch.zhaw.gartenverwaltung.types.Crop;
 import ch.zhaw.gartenverwaltung.types.Task;
-import javafx.application.Platform;
 import org.junit.jupiter.api.*;
-import org.mockito.ArgumentCaptor;
-import org.mockito.ArgumentMatchers;
-import org.mockito.Mockito;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -18,12 +11,9 @@ 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 static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 
 public class JsonTaskListTest {
 
@@ -33,22 +23,6 @@ public class JsonTaskListTest {
     private final URL dbDataSource = this.getClass().getResource("test-taskdb.json");
     private final URL testFile = this.getClass().getResource("template-taskdb.json");
 
-
-    @BeforeAll
-    static void setUpAll() {
-        try{
-            Platform.startup(()->{});
-        }catch (IllegalStateException ise){
-            //ignore double launches
-
-        }
-    }
-
-    @AfterAll
-    static void tearDownAll() {
-        //Dont do: Platform.exit();
-    }
-
     @BeforeEach
     void connectToDb() throws URISyntaxException, IOException {
         assertNotNull(testFile);
@@ -57,10 +31,6 @@ public class JsonTaskListTest {
         testDatabase = new JsonTaskList(dbDataSource);
     }
 
-    private void reloadDb() {
-        testDatabase = new JsonTaskList(dbDataSource);
-    }
-
     @Test
     @DisplayName("Check if results are retrieved completely")
     void getTasks() {
@@ -73,27 +43,26 @@ public class JsonTaskListTest {
             throw new RuntimeException(e);
         }
 
-        List<Long> ids = taskList.stream().map(t -> t.getId().orElse(0L)).toList();
+        Assertions.assertEquals(3, taskList.size());
-        Assertions.assertEquals(Arrays.asList(1L, 2L, 5L), ids);
 
     }
 
+    @Disabled("disabled until adding works.")
     @Test
     @DisplayName("Add task.")
     void addTask() {
-        Task task = new Task("Testtask", "This is a test Task.", LocalDate.parse("2022-05-01", formatter), 1);
+        Task task = new Task("Testtask", "This is a test Task.", LocalDate.parse("01.05.2022", formatter), 1);
         try {
             testDatabase.saveTask(task);
             List<Task> taskList;
             try {
-                taskList = testDatabase.getTaskList(LocalDate.parse("2022-04-30", formatter),
+                taskList = testDatabase.getTaskList(LocalDate.parse("30.04.2022", formatter),
-                        LocalDate.parse("2022-05-31", formatter));
+                        LocalDate.parse("31.05.2022", formatter));
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
 
-            List<Long> ids = taskList.stream().map(t -> t.getId().orElse(0L)).toList();
+            Assertions.assertEquals(4, taskList.size());
-            Assertions.assertEquals(Arrays.asList(1L, 2L, 5L, 9L), ids);
 
         } catch (IOException e) {
             throw new RuntimeException(e);
@@ -103,7 +72,8 @@ public class JsonTaskListTest {
     @Test
     @DisplayName("Remove task.")
     void removeTask() {
-        Task task = new Task("Dummy", "Dummy", LocalDate.parse("2022-05-31", formatter), 1).withId(2);
+        Task task = new Task("Dummy", "Dummy", LocalDate.parse("2022-05-31", formatter), 1)
+                .withId(2);
         try {
             testDatabase.removeTask(task);
             List<Task> taskList;
@@ -111,8 +81,7 @@ public class JsonTaskListTest {
             taskList = testDatabase.getTaskList(LocalDate.parse("2022-04-30", formatter),
                     LocalDate.parse("2022-05-31", formatter));
 
-            List<Long> ids = taskList.stream().map(t -> t.getId().orElse(0L)).toList();
+            Assertions.assertEquals(2, taskList.size());
-            Assertions.assertEquals(Arrays.asList(1L, 5L), ids);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -129,11 +98,11 @@ public class JsonTaskListTest {
             throw new RuntimeException(e);
         }
 
-        List<Long> ids = taskList.stream().map(t -> t.getId().orElse(0L)).toList();
+        Assertions.assertEquals(6, taskList.size());
-        Assertions.assertEquals(Arrays.asList(1L, 2L, 3L, 4L, 5L, 6L), ids);
+
     }
 
-
+    @Disabled("Disabled until removing works")
     @Test
     void removeTasksForCrop() {
         List<Task> taskList;
@@ -145,75 +114,5 @@ public class JsonTaskListTest {
         }
 
         Assertions.assertEquals(0, taskList.size());
-
-        try {
-            taskList = testDatabase.getTaskForCrop(1);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-
-        List<Long> ids = (taskList.stream().map( task -> task.getId().orElse(0L)).toList());
-        Assertions.assertEquals(Arrays.asList(7L, 8L), ids);
-
-    }
-
-    @Test
-    void testDefaultConstructor() {
-        JsonTaskList db = new JsonTaskList();
-        try {
-            assertNotNull(db.getTaskForCrop(0));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-
-    }
-
-    @Test
-    void testSubscription() throws IOException {
-        TaskList.TaskListObserver mockObs = Mockito.mock(TaskList.TaskListObserver.class);
-        testDatabase.subscribe(mockObs);
-        try {
-            testDatabase.removeTasksForCrop(0);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-
-        ArgumentCaptor<List<Task>> captor = ArgumentCaptor.forClass(List.class);
-
-        verify(mockObs, times(1)).onChange(captor.capture());
-        List<Long> ids = captor.getValue().stream().map(t -> t.getId().orElse(0L)).toList();
-        Assertions.assertEquals(Arrays.asList(7L, 8L), ids);
-    }
-
-    @Test
-    @Tag("IntegrationTest")
-    void testComplete() {
-        JsonPlantList plantList = new JsonPlantList();
-        try {
-            testDatabase.removeTasksForCrop(0);
-            testDatabase.removeTasksForCrop(1);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        GardenSchedule gardenSchedule = null;
-        try {
-            gardenSchedule = new GardenSchedule(testDatabase, plantList);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        Crop crop = new Crop(3L, LocalDate.parse("2022-12-01", formatter));
-
-        try {
-            gardenSchedule.planTasksForCrop(crop);
-
-            reloadDb();
-
-            List<Task> tasks = gardenSchedule.getTaskList();
-            List<String> tasknames = (tasks.stream().map( task -> task.getName().substring(0,3).toLowerCase()).toList());
-            Assertions.assertEquals(Arrays.asList("ger","wat","hil","har"), tasknames);
-        } catch (IOException | PlantNotFoundException | HardinessZoneNotSetException e) {
-            throw new RuntimeException(e);
-        }
-
     }
 }

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

@@ -49,12 +49,11 @@ public class GardenPlanModelTest {
                 0,
                 "sandy to loamy, loose soil, free of stones",
                 new ArrayList<>(),
-                new WateringCycle(15, 0, null),
+                List.of(new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()),
-                List.of(new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()),
+                        new GrowthPhase(MonthDay.of(4, 3), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
-                        new GrowthPhase(MonthDay.of(4, 3), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
+                        new GrowthPhase(MonthDay.of(8, 5), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
-                        new GrowthPhase(MonthDay.of(8, 5), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
+                        new GrowthPhase(MonthDay.of(2, 8), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
-                        new GrowthPhase(MonthDay.of(2, 8), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
+                        new GrowthPhase(MonthDay.of(10, 2), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())));
-                        new GrowthPhase(MonthDay.of(10, 2), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())));
 
         exampleCropOnion = new Crop(examplePlantOnion.id(), LocalDate.of(2023, 3, 1))
                 .withId(3);
@@ -67,8 +66,7 @@ public class GardenPlanModelTest {
                 0,
                 "sandy to loamy, loose soil, free of stones",
                 new ArrayList<>(),
-                new WateringCycle(25, 0, null),
+                List.of(new GrowthPhase(MonthDay.of(4, 4), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())));
-                List.of(new GrowthPhase(MonthDay.of(4, 4), MonthDay.of(12, 4), 0, GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())));
         exampleCropCarrot = new Crop(examplePlantCarrot.id(), LocalDate.now())
                 .withId(5);
 

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

@@ -1,246 +0,0 @@
-package ch.zhaw.gartenverwaltung.models;
-
-import ch.zhaw.gartenverwaltung.io.*;
-import ch.zhaw.gartenverwaltung.models.GardenSchedule;
-import ch.zhaw.gartenverwaltung.types.*;
-import javafx.application.Platform;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.time.LocalDate;
-import java.time.MonthDay;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-class GardenScheduleTest {
-    LocalDate exampleStartDate = LocalDate.of(2020, 2, 2);
-    TaskList taskList;
-    PlantList plantList;
-    List<Plant> examplePlantList;
-    List<Task> exampleTaskList;
-    List<TaskTemplate> exampleTaskTemplateList;
-    GardenSchedule model;
-
-    @BeforeAll
-    static void setUpAll() {
-        try{
-        Platform.startup(()->{});
-        }catch (IllegalStateException ise){
-            //ignore double launches
-
-        }
-    }
-
-    @AfterAll
-    static void tearDownAll() {
-        //Dont do: Platform.exit();
-    }
-
-    @BeforeEach
-    void setUp() throws IOException, HardinessZoneNotSetException {
-        createExampleTaskList();
-        createExampleTaskTemplateList();
-        createExamplePlantList();
-        taskList = mockTaskDatabase(exampleTaskList);
-        plantList = mockPlantDatabase(examplePlantList);
-        model = new GardenSchedule(taskList, plantList);
-    }
-
-    PlantList mockPlantDatabase(List<Plant> plantList) throws HardinessZoneNotSetException, IOException {
-        PlantList plantDatabase = mock(JsonPlantList.class);
-        when(plantDatabase.getPlantList(HardinessZone.ZONE_8A)).thenReturn(plantList);
-        when(plantDatabase.getPlantById(HardinessZone.ZONE_8A,20)).thenReturn(Optional.of(examplePlantList.get(0)));
-        return plantDatabase;
-    }
-
-    private TaskList mockTaskDatabase(List<Task> exampleTaskList) throws IOException {
-        TaskList taskList = mock(JsonTaskList.class);
-        when(taskList.getTaskList(LocalDate.MIN, LocalDate.MAX)).thenReturn(exampleTaskList);
-        when(taskList.getTaskList(LocalDate.now(), LocalDate.now().plusDays(7 - 1))).thenReturn(exampleTaskList);
-
-        when(taskList.getTaskList(LocalDate.now(), LocalDate.MAX)).thenReturn((exampleTaskList.subList(1, 4)));
-
-        List<Task> pastTasks = new ArrayList<>();
-        pastTasks.add(exampleTaskList.get(0));
-        pastTasks.add(exampleTaskList.get(2));
-        pastTasks.add(exampleTaskList.get(4));
-        when(taskList.getTaskList(LocalDate.MIN, LocalDate.now())).thenReturn(pastTasks);
-
-
-        when(taskList.getTaskList(LocalDate.now(), LocalDate.now())).thenReturn(List.of(exampleTaskList.get(2)));
-        when(taskList.getTaskList(LocalDate.now().plusDays(1L), LocalDate.now().plusDays(1L))).thenReturn(List.of(exampleTaskList.get(1)));
-        when(taskList.getTaskList(LocalDate.now().plusDays(2L), LocalDate.now().plusDays(2L))).thenReturn(List.of());
-        when(taskList.getTaskList(LocalDate.now().plusDays(3L), LocalDate.now().plusDays(3L))).thenReturn(List.of());
-        when(taskList.getTaskList(LocalDate.now().plusDays(4L), LocalDate.now().plusDays(4L))).thenReturn(List.of());
-        when(taskList.getTaskList(LocalDate.now().plusDays(5L), LocalDate.now().plusDays(5L))).thenReturn(List.of());
-        when(taskList.getTaskList(LocalDate.now().plusDays(6L), LocalDate.now().plusDays(6L))).thenReturn(List.of());
-
-        return taskList;
-    }
-
-    void createExampleTaskTemplateList(){
-        exampleTaskTemplateList = new ArrayList<>();
-        exampleTaskTemplateList.add(mock(TaskTemplate.class));
-        exampleTaskTemplateList.add(mock(TaskTemplate.class));
-        exampleTaskTemplateList.add(mock(TaskTemplate.class));
-        exampleTaskTemplateList.add(mock(TaskTemplate.class));
-        when(exampleTaskTemplateList.get(0).generateTask(exampleStartDate, 30)).thenReturn(exampleTaskList.get(0));
-        when(exampleTaskTemplateList.get(1).generateTask(exampleStartDate, 30)).thenReturn(exampleTaskList.get(1));
-        when(exampleTaskTemplateList.get(2).generateTask(exampleStartDate, 30)).thenReturn(exampleTaskList.get(2));
-        when(exampleTaskTemplateList.get(3).generateTask(exampleStartDate, 30)).thenReturn(exampleTaskList.get(3));
-    }
-
-    void createExamplePlantList(){
-        examplePlantList = new ArrayList<>();
-        examplePlantList.add(new Plant(
-                20,
-                "summertime onion",
-                "Onion, (Allium cepa), herbaceous biennial plant in the amaryllis family (Amaryllidaceae) grown for its edible bulb. The onion is likely native to southwestern Asia but is now grown throughout the world, chiefly in the temperate zones. Onions are low in nutrients but are valued for their flavour and are used widely in cooking. They add flavour to such dishes as stews, roasts, soups, and salads and are also served as a cooked vegetable.",
-                null,
-                "15,30,2",
-                0,
-                "sandy to loamy, loose soil, free of stones",
-                new ArrayList<>(),
-                new WateringCycle(15, 0, null),
-                List.of(
-
-                        new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0,  GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, List.of(
-                                exampleTaskTemplateList.get(0),
-                                exampleTaskTemplateList.get(1)
-                        )),
-                        new GrowthPhase(MonthDay.of(4, 3), MonthDay.of(12, 4), 0,  GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, List.of(
-                                exampleTaskTemplateList.get(2),
-                                exampleTaskTemplateList.get(3)
-                        )),
-                        new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0,  GrowthPhaseType.SOW, HardinessZone.ZONE_8A, List.of(
-
-                        ))
-                )));
-    }
-
-    void createExampleTaskList() {
-        exampleTaskList = new ArrayList<>();
-        exampleTaskList.add(new Task("name", "description", LocalDate.now().minusDays(1), 1L));
-        exampleTaskList.add(new Task("name", "description", LocalDate.now().plusDays(1), 2L));
-        exampleTaskList.add(new Task("name", "description", LocalDate.now(), 1L));
-        exampleTaskList.add(new Task("name", "description", LocalDate.of(9019, 5, 5), 1L));
-        exampleTaskList.add(new Task("name", "description", LocalDate.now().minusDays(10), LocalDate.now().plusDays(4),2, 2L));
-    }
-
-    @Test
-    void addTask() throws IOException {
-        Task taskToAdd = new Task("name", "description", LocalDate.now(), 1L);
-        model.addTask(taskToAdd);
-        verify(taskList, times(1)).saveTask(taskToAdd);
-    }
-
-    @Test
-    void removeTask() throws IOException {
-        Task taskToRemove = new Task("name", "description", LocalDate.now(), 1L);
-        model.removeTask(taskToRemove);
-        verify(taskList, times(1)).removeTask(taskToRemove);
-    }
-
-    @Test
-    void getTaskList() throws IOException {
-        List<Task> listToCheck = model.getTaskList();
-        assertEquals(5, listToCheck.size());
-        assertEquals(exampleTaskList.get(4), listToCheck.get(0));
-        assertEquals(exampleTaskList.get(0), listToCheck.get(1));
-        assertEquals(exampleTaskList.get(2), listToCheck.get(2));
-        assertEquals(exampleTaskList.get(1), listToCheck.get(3));
-        assertEquals(exampleTaskList.get(3), listToCheck.get(4));
-    }
-
-    @Test
-    void getFutureTasks() throws IOException {
-        List<Task> listToCheck = model.getFutureTasks();
-        assertEquals(3, listToCheck.size());
-        assertEquals(exampleTaskList.get(2), listToCheck.get(0));
-        assertEquals(exampleTaskList.get(1), listToCheck.get(1));
-        assertEquals(exampleTaskList.get(3), listToCheck.get(2));
-    }
-
-    @Test
-    void getPastTasks() throws IOException {
-        List<Task> listToCheck = model.getPastTasks();
-        assertEquals(3, listToCheck.size());
-        assertEquals(exampleTaskList.get(4), listToCheck.get(0));
-        assertEquals(exampleTaskList.get(0), listToCheck.get(1));
-        assertEquals(exampleTaskList.get(2), listToCheck.get(2));
-    }
-
-    @Test
-    void getTasksUpcomingWeek() throws IOException {
-        List<List<Task>> dayList = model.getTasksUpcomingWeek();
-        assertEquals(7, dayList.size());
-
-        //Check day 0
-        assertEquals(2, dayList.get(0).size());
-        assertTrue(dayList.get(0).contains(exampleTaskList.get(2)));
-        assertTrue(dayList.get(0).contains(exampleTaskList.get(4)));
-
-        //Check day 1
-        assertEquals(1, dayList.get(1).size());
-        assertTrue(dayList.get(1).contains(exampleTaskList.get(1)));
-
-        //Check day 2
-        assertEquals(1, dayList.get(2).size());
-        assertTrue(dayList.get(2).contains(exampleTaskList.get(4)));
-        //Check day 3
-        assertEquals(0, dayList.get(3).size());
-        //Check day 4
-        assertEquals(1, dayList.get(4).size());
-        assertTrue(dayList.get(4).contains(exampleTaskList.get(4)));
-        //Check day 5
-        assertEquals(0, dayList.get(5).size());
-        //Check day 6
-        assertEquals(0, dayList.get(6).size());
-    }
-
-    @Test
-    void removeTasksForCrop() throws IOException {
-        model.removeTasksForCrop(1L);
-        verify(taskList, times(1)).removeTasksForCrop(1L);
-    }
-
-    @Test
-    void planTasksForCrop() throws HardinessZoneNotSetException, PlantNotFoundException, IOException, URISyntaxException {
-        model.planTasksForCrop(new Crop(20, exampleStartDate).withId(30));
-        verify(exampleTaskTemplateList.get(0), times(1)).generateTask(exampleStartDate, 30);
-        verify(exampleTaskTemplateList.get(1), times(1)).generateTask(exampleStartDate, 30);
-        verify(exampleTaskTemplateList.get(2), times(1)).generateTask(exampleStartDate, 30);
-        verify(exampleTaskTemplateList.get(3), times(1)).generateTask(exampleStartDate, 30);
-        verify(taskList, times(1)).saveTask(exampleTaskList.get(0));
-        verify(taskList, times(1)).saveTask(exampleTaskList.get(1));
-        verify(taskList, times(1)).saveTask(exampleTaskList.get(2));
-        verify(taskList, times(1)).saveTask(exampleTaskList.get(3));
-
-         final URL dbDataSource = this.getClass().getResource("test-taskdb.json");
-         final URL testFile = this.getClass().getResource("template-taskdb.json");
-
-        Files.copy(Path.of(testFile.toURI()), Path.of(dbDataSource.toURI()), StandardCopyOption.REPLACE_EXISTING);
-        JsonTaskList testTaskList = new JsonTaskList(dbDataSource);
-
-        model = spy(new GardenSchedule(testTaskList,plantList));
-        model.planTasksForCrop(new Crop(20, exampleStartDate).withId(30));
-        assertEquals(5,testTaskList.getTaskList(LocalDate.MIN,LocalDate.MAX).size());
-        testTaskList.getTaskList(LocalDate.MIN,LocalDate.MAX).get(0);
-    }
-
-    @Test
-    void testPlantNotFoundException() throws HardinessZoneNotSetException, IOException {
-        assertThrowsExactly(PlantNotFoundException.class, () -> { model.planTasksForCrop(new Crop(0, exampleStartDate)); });
-    }
-}

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

@@ -49,12 +49,11 @@ class PlantListModelTest {
                 0,
                 "sandy to loamy, loose soil, free of stones",
                 new ArrayList<>(),
-                new WateringCycle(25, 0, null),
+                List.of(new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()),
-                List.of(new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0,  GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()),
+                        new GrowthPhase(MonthDay.of(4, 3), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
-                        new GrowthPhase(MonthDay.of(4, 3), MonthDay.of(12, 4), 0,  GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
+                        new GrowthPhase(MonthDay.of(8, 5), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
-                        new GrowthPhase(MonthDay.of(8, 5), MonthDay.of(12, 4), 0,  GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
+                        new GrowthPhase(MonthDay.of(2, 8), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
-                        new GrowthPhase(MonthDay.of(2, 8), MonthDay.of(12, 4), 0,  GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()),
+                        new GrowthPhase(MonthDay.of(10, 2), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())))
-                        new GrowthPhase(MonthDay.of(10, 2), MonthDay.of(12, 4), 0,  GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())))
         );
         examplePlantList.add(new Plant(
                 0,
@@ -65,9 +64,8 @@ class PlantListModelTest {
                 6,
                 "sandy",
                 new ArrayList<>(),
-                new WateringCycle(0, 0, null),
+                List.of(new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()),
-                List.of(new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0,  GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()),
+                        new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())))
-                        new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0,  GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())))
         );
         examplePlantList.add(new Plant(
                 1,
@@ -78,8 +76,7 @@ class PlantListModelTest {
                 0,
                 "sandy to loamy, loose soil, free of stones",
                 new ArrayList<>(),
-                new WateringCycle(25, 0, null),
+                List.of(new GrowthPhase(MonthDay.of(4, 4), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())))
-                List.of(new GrowthPhase(MonthDay.of(4, 4), MonthDay.of(12, 4), 0,  GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())))
         );
     }
 
@@ -101,7 +98,7 @@ class PlantListModelTest {
 
     @Test
     void setCurrentZone() {
-        checkCurrentZone(HardinessZone.ZONE_8A);
+        checkCurrentZone(HardinessZone.ZONE_8A); // TODO change to get default zone from config
         model.setCurrentZone(HardinessZone.ZONE_1A);
         checkCurrentZone(HardinessZone.ZONE_1A);
         model.setCurrentZone(HardinessZone.ZONE_8A);

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

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

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

@@ -1,98 +0,0 @@
-package ch.zhaw.gartenverwaltung.types;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import java.time.LocalDate;
-import java.time.MonthDay;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class PlantTest {
-
-    Plant testPlant;
-
-    @BeforeEach
-    void setUp() {
-        List<GrowthPhase> growthPhases = new ArrayList<>();
-        growthPhases.add(new GrowthPhase(MonthDay.of(2, 1), MonthDay.of(4, 4), 0, GrowthPhaseType.SOW, HardinessZone.ZONE_8A, new ArrayList<>()));
-        growthPhases.add(new GrowthPhase(MonthDay.of(4, 2), MonthDay.of(6, 5), 0,  GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()));
-        growthPhases.add(new GrowthPhase(MonthDay.of(6, 3), MonthDay.of(8, 6), 0,  GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()));
-        growthPhases.add(new GrowthPhase(MonthDay.of(3, 1), MonthDay.of(5, 4), 1,  GrowthPhaseType.SOW, HardinessZone.ZONE_8A, new ArrayList<>()));
-        growthPhases.add(new GrowthPhase(MonthDay.of(5, 2), MonthDay.of(7, 5), 1,  GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()));
-        growthPhases.add(new GrowthPhase(MonthDay.of(7, 3), MonthDay.of(9, 6), 1,  GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()));
-        growthPhases.add(new GrowthPhase(MonthDay.of(4, 1), MonthDay.of(6, 4), 0,  GrowthPhaseType.SOW, HardinessZone.ZONE_1A, new ArrayList<>()));
-        growthPhases.add(new GrowthPhase(MonthDay.of(6, 2), MonthDay.of(8, 5), 0,  GrowthPhaseType.PLANT, HardinessZone.ZONE_1A, new ArrayList<>()));
-        growthPhases.add(new GrowthPhase(MonthDay.of(7, 2), MonthDay.of(9, 5), 0,  GrowthPhaseType.PLANT, HardinessZone.ZONE_1A, new ArrayList<>()));
-        growthPhases.add(new GrowthPhase(MonthDay.of(8, 3), MonthDay.of(10, 6), 0,  GrowthPhaseType.HARVEST, HardinessZone.ZONE_1A, new ArrayList<>()));
-
-        testPlant = new Plant(
-                20,
-                "summertime onion",
-                "Onion, (Allium cepa), herbaceous biennial plant in the amaryllis family (Amaryllidaceae) grown for its edible bulb. The onion is likely native to southwestern Asia but is now grown throughout the world, chiefly in the temperate zones. Onions are low in nutrients but are valued for their flavour and are used widely in cooking. They add flavour to such dishes as stews, roasts, soups, and salads and are also served as a cooked vegetable.",
-                null,
-                "15,30,2",
-                0,
-                "sandy to loamy, loose soil, free of stones",
-                new ArrayList<>(),
-                new WateringCycle(25, 0, null),
-                growthPhases);
-    }
-
-    @AfterEach
-    void tearDown() {
-    }
-
-    @Test
-    void inZone() {
-        assertEquals(7,testPlant.lifecycleForGroup(0).size());
-        testPlant.inZone(HardinessZone.ZONE_8A);
-        assertEquals(3,testPlant.lifecycleForGroup(0).size());
-        assertEquals(Arrays.asList(3,5,7),testPlant.lifecycleForGroup(1).stream().map(gp ->gp.startDate().getMonthValue()).toList() );
-        testPlant.inZone(HardinessZone.ZONE_1A);
-        assertEquals(0,testPlant.lifecycleForGroup(0).size());
-    }
-
-    @Test
-    void lifecycleForGroup() {
-        assertEquals(Arrays.asList(2,4,6,4,6,7,8),testPlant.lifecycleForGroup(0).stream().map(gp ->gp.startDate().getMonthValue()).toList() );
-        assertEquals(Arrays.asList(3,5,7),testPlant.lifecycleForGroup(1).stream().map(gp ->gp.startDate().getMonthValue()).toList() );
-
-    }
-
-    @Test
-    void sowDateFromHarvestDate() {
-        assertEquals(LocalDate.of(2022,8,1),
-                testPlant.sowDateFromHarvestDate(LocalDate.of(2022,12,1))
-        );
-    }
-
-    @Test
-    void timeToHarvest() {
-        testPlant.inZone(HardinessZone.ZONE_8A);
-        assertEquals(122,testPlant.timeToHarvest(0));
-    }
-
-    @Test
-    void lifecycleGroupFromHarvestDate() {
-        testPlant.inZone(HardinessZone.ZONE_8A);
-        assertEquals(0,testPlant.lifecycleGroupFromHarvestDate(LocalDate.of(2022,6,30)));
-        assertEquals(1,testPlant.lifecycleGroupFromHarvestDate(LocalDate.of(2022,8,30)));
-    }
-
-    @Test
-    void isDateInPhase() {
-        assertTrue(testPlant.isDateInPhase(LocalDate.of(2022,6,30),GrowthPhaseType.HARVEST));
-        assertTrue(testPlant.isDateInPhase(LocalDate.of(2022,8,30),GrowthPhaseType.HARVEST));
-        assertTrue(testPlant.isDateInPhase(LocalDate.of(2022,2,1),GrowthPhaseType.SOW));
-        assertTrue(testPlant.isDateInPhase(LocalDate.of(2022,4,2),GrowthPhaseType.PLANT));
-        assertFalse(testPlant.isDateInPhase(LocalDate.of(2022,6,30),GrowthPhaseType.SOW));
-
-
-    }
-}

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

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

src/test/resources/ch/zhaw/gartenverwaltung/backgroundtask/weather/test-taskdb.json

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

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

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

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

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

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

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

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

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

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

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