From 5830ee5180ab6e86c3490abfee2f842c81799578 Mon Sep 17 00:00:00 2001
From: Elias Csomor <csomoeli@students.zhaw.ch>
Date: Fri, 9 Dec 2022 17:13:05 +0100
Subject: [PATCH 1/6] fixing execution and notification dates in test db

---
 .../ch/zhaw/gartenverwaltung/io/template-taskdb.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/resources/ch/zhaw/gartenverwaltung/io/template-taskdb.json b/src/test/resources/ch/zhaw/gartenverwaltung/io/template-taskdb.json
index b10124d..53ea6c3 100644
--- a/src/test/resources/ch/zhaw/gartenverwaltung/io/template-taskdb.json
+++ b/src/test/resources/ch/zhaw/gartenverwaltung/io/template-taskdb.json
@@ -26,8 +26,8 @@
     "name" : "fertilize plant",
     "description": "The fertilizer has to be mixed with water. Then fertilize the plants soil with the mixture",
     "startDate" : "2022-06-01",
-    "nextExecution": "2022-05-01",
-    "nextNotification": "2022-05-01",
+    "nextExecution": "2022-06-01",
+    "nextNotification": "2022-06-01",
     "endDate" : "2022-08-01",
     "interval" : 28,
     "cropId" : 0
@@ -37,8 +37,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-05-01",
-    "nextNotification": "2022-05-01",
+    "nextExecution": "2022-07-01",
+    "nextNotification": "2022-07-01",
     "endDate" : "2022-07-01",
     "interval" : 0,
     "cropId" : 0
@@ -59,8 +59,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-05-01",
-    "nextNotification": "2022-05-01",
+    "nextExecution": "2022-09-01",
+    "nextNotification": "2022-09-01",
     "endDate" : "2022-09-01",
     "interval" : 0,
     "cropId" : 0

From 56020a7529a5064010cdac6224bdc96fedb2cf03 Mon Sep 17 00:00:00 2001
From: Elias Csomor <csomoeli@students.zhaw.ch>
Date: Fri, 9 Dec 2022 17:35:41 +0100
Subject: [PATCH 2/6] Setup Platform for runLater in GardenSchedule

Otherwise Test planTaskForCrop crashes due to unitialized Platform
---
 .../gartenverwaltung/models/GardenScheduleTest.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/test/java/ch/zhaw/gartenverwaltung/models/GardenScheduleTest.java b/src/test/java/ch/zhaw/gartenverwaltung/models/GardenScheduleTest.java
index 8bce1be..4f45242 100644
--- a/src/test/java/ch/zhaw/gartenverwaltung/models/GardenScheduleTest.java
+++ b/src/test/java/ch/zhaw/gartenverwaltung/models/GardenScheduleTest.java
@@ -3,6 +3,9 @@ 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;
 
@@ -29,6 +32,16 @@ class GardenScheduleTest {
     List<TaskTemplate> exampleTaskTemplateList;
     GardenSchedule model;
 
+    @BeforeAll
+    static void setUpAll() {
+        Platform.startup(()->{});
+    }
+
+    @AfterAll
+    static void tearDownAll() {
+        Platform.exit();
+    }
+
     @BeforeEach
     void setUp() throws IOException, HardinessZoneNotSetException {
         createExampleTaskList();

From 96dc0ad827cb5f2ce5b858c66daf0afb0c1f4a4c Mon Sep 17 00:00:00 2001
From: giavaphi <giavaphi@students.zhaw.ch>
Date: Fri, 9 Dec 2022 19:38:22 +0100
Subject: [PATCH 3/6] fix show all tasks

---
 .../MyScheduleController.java                 | 30 +++++++++++++++----
 .../models/GardenSchedule.java                | 10 -------
 .../ch/zhaw/gartenverwaltung/MySchedule.fxml  | 12 ++++----
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/main/java/ch/zhaw/gartenverwaltung/MyScheduleController.java b/src/main/java/ch/zhaw/gartenverwaltung/MyScheduleController.java
index b72ad05..ec23853 100644
--- a/src/main/java/ch/zhaw/gartenverwaltung/MyScheduleController.java
+++ b/src/main/java/ch/zhaw/gartenverwaltung/MyScheduleController.java
@@ -3,15 +3,15 @@ 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.beans.property.SimpleListProperty;
-import javafx.collections.FXCollections;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
@@ -51,9 +51,15 @@ 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() {
+    public void init() throws IOException {
         setCellFactoryCropListView();
         setCellFactoryTaskListView();
         scheduledPlants_listview.itemsProperty().bind(garden.getPlantedCrops());
@@ -61,6 +67,19 @@ public class MyScheduleController {
         week_listView.itemsProperty().bind(taskListProperty);
         lookForSelectedListEntries();
         information_label.setText("");
+
+        gardenSchedule.getTasksUpcomingWeek();
+        TaskList.TaskListObserver taskListObserver = newTaskList -> {
+            Platform.runLater(() -> {
+                try {
+                    gardenSchedule.getTasksUpcomingWeek();
+                    scheduledPlants_listview.getSelectionModel().clearSelection();
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            });
+        };
+        gardenSchedule.setTaskListObserver(taskListObserver);
     }
 
     /**
@@ -81,6 +100,8 @@ public class MyScheduleController {
      * set cellFactory for the crops.
      */
     private void setCellFactoryCropListView() {
+        MultipleSelectionModel<Crop> selectionModel = scheduledPlants_listview.getSelectionModel();
+        selectionModel.setSelectionMode(SelectionMode.MULTIPLE);
         scheduledPlants_listview.setCellFactory(param -> new ListCell<>() {
             @Override
             protected void updateItem(Crop crop, boolean empty) {
@@ -133,8 +154,6 @@ public class MyScheduleController {
         } else {
             gardenSchedule.getTasksUpcomingWeek();
         }
-        //taskListProperty.clear();
-        //taskListProperty.addAll(taskLists);
     }
 
     /**
@@ -200,5 +219,4 @@ public class MyScheduleController {
                 });
     }
 
-
 }
diff --git a/src/main/java/ch/zhaw/gartenverwaltung/models/GardenSchedule.java b/src/main/java/ch/zhaw/gartenverwaltung/models/GardenSchedule.java
index 2e3eb3d..7118b2d 100644
--- a/src/main/java/ch/zhaw/gartenverwaltung/models/GardenSchedule.java
+++ b/src/main/java/ch/zhaw/gartenverwaltung/models/GardenSchedule.java
@@ -32,16 +32,6 @@ public class GardenSchedule {
     public GardenSchedule(TaskList taskList, PlantList plantList) throws IOException {
         this.taskList = taskList;
         this.plantList = plantList;
-        TaskList.TaskListObserver taskListObserver = newTaskList -> {
-            Platform.runLater(() -> {
-                try {
-                    getTasksUpcomingWeek();
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            });
-        };
-        setTaskListObserver(taskListObserver);
     }
 
     public ListProperty<List<Task>> getWeeklyTaskListProperty() {
diff --git a/src/main/resources/ch/zhaw/gartenverwaltung/MySchedule.fxml b/src/main/resources/ch/zhaw/gartenverwaltung/MySchedule.fxml
index 1e31955..07ba3bf 100644
--- a/src/main/resources/ch/zhaw/gartenverwaltung/MySchedule.fxml
+++ b/src/main/resources/ch/zhaw/gartenverwaltung/MySchedule.fxml
@@ -1,6 +1,7 @@
 <?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?>
@@ -19,11 +20,12 @@
             </Label>
             <HBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="541.0" prefWidth="867.0" spacing="10.0" VBox.vgrow="ALWAYS">
                <children>
-                  <ListView fx:id="scheduledPlants_listview" maxWidth="1.7976931348623157E308" prefHeight="522.0" prefWidth="271.0" HBox.hgrow="NEVER">
-                     <HBox.margin>
-                        <Insets />
-                     </HBox.margin>
-                  </ListView>
+                  <VBox prefHeight="497.0" prefWidth="237.0" spacing="10.0" HBox.hgrow="NEVER">
+                     <children>
+                        <ListView fx:id="scheduledPlants_listview" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="522.0" prefWidth="271.0" VBox.vgrow="ALWAYS" />
+                        <Button maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#showAllTasks" styleClass="button-class" text="Show All Tasks" VBox.vgrow="NEVER" />
+                     </children>
+                  </VBox>
                   <VBox maxWidth="1.7976931348623157E308" prefHeight="537.0" prefWidth="650.0" spacing="10.0" HBox.hgrow="ALWAYS">
                      <children>
                         <ListView fx:id="week_listView" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">

From 5f7d6908755ca36ce092bd8ef1d3bd2480d6d8ac Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Fri, 9 Dec 2022 21:27:13 +0100
Subject: [PATCH 4/6] fixed not showing past tasks

---
 .../ch/zhaw/gartenverwaltung/models/GardenSchedule.java    | 7 ++-----
 src/main/java/ch/zhaw/gartenverwaltung/types/Task.java     | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ch/zhaw/gartenverwaltung/models/GardenSchedule.java b/src/main/java/ch/zhaw/gartenverwaltung/models/GardenSchedule.java
index 2e3eb3d..74d67dd 100644
--- a/src/main/java/ch/zhaw/gartenverwaltung/models/GardenSchedule.java
+++ b/src/main/java/ch/zhaw/gartenverwaltung/models/GardenSchedule.java
@@ -176,13 +176,10 @@ public class GardenSchedule {
             dayTaskList.add(new ArrayList<>());
             final int finalI = i;
             weekTasks.forEach(task -> {
-                if (task.getNextExecution() == null) {
-                    task.isDone();
-                } else {
+            if(task.getNextExecution() != null) {
                     LocalDate checkDate = task.getNextExecution();
-
                     do {
-                        if (date.equals(checkDate) && !date.isAfter(task.getEndDate().orElse(LocalDate.MIN))) {
+                        if (date.equals(task.getNextExecution()) || (date.equals(checkDate) && !date.isAfter(task.getEndDate().orElse(LocalDate.MIN)))) {
                             dayTaskList.get(finalI).add(task);
                         }
                         checkDate = checkDate.plusDays(task.getInterval().orElse(0));
diff --git a/src/main/java/ch/zhaw/gartenverwaltung/types/Task.java b/src/main/java/ch/zhaw/gartenverwaltung/types/Task.java
index d235918..c6eb57a 100644
--- a/src/main/java/ch/zhaw/gartenverwaltung/types/Task.java
+++ b/src/main/java/ch/zhaw/gartenverwaltung/types/Task.java
@@ -107,7 +107,7 @@ public class Task {
      * @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) && nextExecution.isAfter(searchStartDate));
+        return  (endDate.isAfter(searchStartDate) && startDate.isBefore(searchEndDate)) || ((nextExecution != null && nextExecution.isBefore(searchEndDate.plusDays(1)) && nextExecution.isAfter(searchStartDate.minusDays(1))));
     }
 
     /**

From 76197a19dfa9a2eab9e056516169389d852c0740 Mon Sep 17 00:00:00 2001
From: Elias Csomor <csomoeli@students.zhaw.ch>
Date: Sat, 10 Dec 2022 12:48:06 +0100
Subject: [PATCH 5/6] extending tests and adding integration test

and better precision when comparing results
---
 .../gartenverwaltung/io/JsonTaskListTest.java | 90 +++++++++++++++++--
 .../models/GardenScheduleTest.java            | 12 ++-
 .../gartenverwaltung/io/template-taskdb.json  | 22 +++++
 3 files changed, 115 insertions(+), 9 deletions(-)

diff --git a/src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskListTest.java b/src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskListTest.java
index 2a515d7..2f8959e 100644
--- a/src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskListTest.java
+++ b/src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskListTest.java
@@ -1,7 +1,12 @@
 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;
 
@@ -13,6 +18,7 @@ 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;
@@ -27,6 +33,22 @@ 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);
@@ -35,6 +57,10 @@ public class JsonTaskListTest {
         testDatabase = new JsonTaskList(dbDataSource);
     }
 
+    private void reloadDb() {
+        testDatabase = new JsonTaskList(dbDataSource);
+    }
+
     @Test
     @DisplayName("Check if results are retrieved completely")
     void getTasks() {
@@ -47,7 +73,8 @@ public class JsonTaskListTest {
             throw new RuntimeException(e);
         }
 
-        Assertions.assertEquals(3, taskList.size());
+        List<Long> ids = taskList.stream().map(t -> t.getId().orElse(0L)).toList();
+        Assertions.assertEquals(Arrays.asList(1L, 2L, 5L), ids);
 
     }
 
@@ -65,7 +92,8 @@ public class JsonTaskListTest {
                 throw new RuntimeException(e);
             }
 
-            Assertions.assertEquals(4, taskList.size());
+            List<Long> ids = taskList.stream().map(t -> t.getId().orElse(0L)).toList();
+            Assertions.assertEquals(Arrays.asList(1L, 2L, 5L, 9L), ids);
 
         } catch (IOException e) {
             throw new RuntimeException(e);
@@ -83,7 +111,8 @@ public class JsonTaskListTest {
             taskList = testDatabase.getTaskList(LocalDate.parse("2022-04-30", formatter),
                     LocalDate.parse("2022-05-31", formatter));
 
-            Assertions.assertEquals(2, taskList.size());
+            List<Long> ids = taskList.stream().map(t -> t.getId().orElse(0L)).toList();
+            Assertions.assertEquals(Arrays.asList(1L, 5L), ids);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -100,8 +129,8 @@ public class JsonTaskListTest {
             throw new RuntimeException(e);
         }
 
-        Assertions.assertEquals(6, taskList.size());
-
+        List<Long> ids = taskList.stream().map(t -> t.getId().orElse(0L)).toList();
+        Assertions.assertEquals(Arrays.asList(1L, 2L, 3L, 4L, 5L, 6L), ids);
     }
 
 
@@ -116,10 +145,20 @@ 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(){
+    void testDefaultConstructor() {
         JsonTaskList db = new JsonTaskList();
         try {
             assertNotNull(db.getTaskForCrop(0));
@@ -138,6 +177,43 @@ public class JsonTaskListTest {
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
-        verify(mockObs, times(1)).onChange(ArgumentMatchers.anyList());
+
+        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);
+        }
+
     }
 }
\ No newline at end of file
diff --git a/src/test/java/ch/zhaw/gartenverwaltung/models/GardenScheduleTest.java b/src/test/java/ch/zhaw/gartenverwaltung/models/GardenScheduleTest.java
index 4f45242..67928a9 100644
--- a/src/test/java/ch/zhaw/gartenverwaltung/models/GardenScheduleTest.java
+++ b/src/test/java/ch/zhaw/gartenverwaltung/models/GardenScheduleTest.java
@@ -34,12 +34,17 @@ class GardenScheduleTest {
 
     @BeforeAll
     static void setUpAll() {
+        try{
         Platform.startup(()->{});
+        }catch (IllegalStateException ise){
+            //ignore double launches
+
+        }
     }
 
     @AfterAll
     static void tearDownAll() {
-        Platform.exit();
+        //Dont do: Platform.exit();
     }
 
     @BeforeEach
@@ -234,5 +239,8 @@ class GardenScheduleTest {
         testTaskList.getTaskList(LocalDate.MIN,LocalDate.MAX).get(0);
     }
 
-
+    @Test
+    void testPlantNotFoundException() throws HardinessZoneNotSetException, IOException {
+        assertThrowsExactly(PlantNotFoundException.class, () -> { model.planTasksForCrop(new Crop(0, exampleStartDate)); });
+    }
 }
\ No newline at end of file
diff --git a/src/test/resources/ch/zhaw/gartenverwaltung/io/template-taskdb.json b/src/test/resources/ch/zhaw/gartenverwaltung/io/template-taskdb.json
index 53ea6c3..cec82ae 100644
--- a/src/test/resources/ch/zhaw/gartenverwaltung/io/template-taskdb.json
+++ b/src/test/resources/ch/zhaw/gartenverwaltung/io/template-taskdb.json
@@ -64,5 +64,27 @@
     "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
   }
 ]
\ No newline at end of file

From fb217970400c027cc20f347460bf34e291fdd023 Mon Sep 17 00:00:00 2001
From: David Guler <gulerdav@students.zhaw.ch>
Date: Sat, 10 Dec 2022 13:22:40 +0100
Subject: [PATCH 6/6] added screenshots to tutorial

---
 .../gartenverwaltung/TutorialController.java  | 17 +++--
 .../ch/zhaw/gartenverwaltung/CropDetail.fxml  |  2 +-
 .../ch/zhaw/gartenverwaltung/Tutorial.fxml    | 69 ++++++++++++++-----
 3 files changed, 65 insertions(+), 23 deletions(-)

diff --git a/src/main/java/ch/zhaw/gartenverwaltung/TutorialController.java b/src/main/java/ch/zhaw/gartenverwaltung/TutorialController.java
index eb4ad5d..2e0b1db 100644
--- a/src/main/java/ch/zhaw/gartenverwaltung/TutorialController.java
+++ b/src/main/java/ch/zhaw/gartenverwaltung/TutorialController.java
@@ -22,6 +22,8 @@ public class TutorialController {
     public ImageView imgAddNewPlant;
     public ImageView imgTaskList;
     public ImageView imgSelectDate;
+    public ImageView imgAddTaskButton;
+    public ImageView imgDetailDeleteButtons;
 
     private int page = 0;
 
@@ -30,10 +32,17 @@ public class TutorialController {
         switchViews();
         setButtonAbilities();
 
-        Image placeholder = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
-        imgAddNewPlant.setImage(placeholder);
-        imgSelectDate.setImage(placeholder);
-        imgTaskList.setImage(placeholder);
+        Image addNewPlantImage = new Image(String.valueOf(PlantsController.class.getResource("add-new-plant.png")));
+        Image selectSowHarvestImage = new Image(String.valueOf(PlantsController.class.getResource("select-sow-harvest.png")));
+        Image scheduleImage = new Image(String.valueOf(PlantsController.class.getResource("schedule.png")));
+        Image detailDeleteButtonsImage = new Image(String.valueOf(PlantsController.class.getResource("details-delete.png")));
+        Image addTaskImage = new Image(String.valueOf(PlantsController.class.getResource("add-task.png")));
+
+        imgAddNewPlant.setImage(addNewPlantImage);
+        imgSelectDate.setImage(selectSowHarvestImage);
+        imgDetailDeleteButtons.setImage(detailDeleteButtonsImage);
+        imgAddTaskButton.setImage(addTaskImage);
+        imgTaskList.setImage(scheduleImage);
     }
 
     public void viewNextPage() {
diff --git a/src/main/resources/ch/zhaw/gartenverwaltung/CropDetail.fxml b/src/main/resources/ch/zhaw/gartenverwaltung/CropDetail.fxml
index 6a2e116..89ff698 100644
--- a/src/main/resources/ch/zhaw/gartenverwaltung/CropDetail.fxml
+++ b/src/main/resources/ch/zhaw/gartenverwaltung/CropDetail.fxml
@@ -89,7 +89,7 @@
                         <Insets bottom="10.0" />
                      </VBox.margin>
                   </ListView>
-                  <Button styleClass="button-class" fx:id="addTask_button" mnemonicParsing="false" onAction="#addTask" prefHeight="25.0" prefWidth="45.0" VBox.vgrow="NEVER">
+                  <Button styleClass="button-class" fx:id="addTask_button" mnemonicParsing="false" onAction="#addTask" prefHeight="25.0" prefWidth="120.0" VBox.vgrow="NEVER" text="Add Task">
                      <VBox.margin>
                         <Insets />
                      </VBox.margin>
diff --git a/src/main/resources/ch/zhaw/gartenverwaltung/Tutorial.fxml b/src/main/resources/ch/zhaw/gartenverwaltung/Tutorial.fxml
index d3481df..93bb2d0 100644
--- a/src/main/resources/ch/zhaw/gartenverwaltung/Tutorial.fxml
+++ b/src/main/resources/ch/zhaw/gartenverwaltung/Tutorial.fxml
@@ -14,7 +14,7 @@
 <?import javafx.scene.text.Text?>
 <?import javafx.scene.text.TextFlow?>
 
-<BorderPane maxHeight="470.0" maxWidth="724.0" minHeight="470.0" minWidth="724.0" prefHeight="470.0" prefWidth="724.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.TutorialController">
+<BorderPane maxHeight="470.0" maxWidth="724.0" minHeight="470.0" minWidth="724.0" prefHeight="470.0" prefWidth="724.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.TutorialController">
    <bottom>
       <HBox alignment="CENTER" prefHeight="0.0" prefWidth="724.0" BorderPane.alignment="CENTER">
          <children>
@@ -22,9 +22,9 @@
             <Separator prefWidth="50.0" visible="false" HBox.hgrow="ALWAYS" />
             <ButtonBar prefHeight="40.0" prefWidth="200.0">
               <buttons>
-                  <Button styleClass="button-class" cancelButton="true" contentDisplay="CENTER" graphicTextGap="5.0" mnemonicParsing="false" text="Close" onAction="#closeTutorial"/>
-                <Button styleClass="button-class" fx:id="previousPageButton" mnemonicParsing="false" text="Previous" onAction="#viewPreviousPage"/>
-                  <Button styleClass="button-class" fx:id="nextPageButton" defaultButton="true" mnemonicParsing="false" text="Next" onAction="#viewNextPage" />
+                  <Button cancelButton="true" contentDisplay="CENTER" graphicTextGap="5.0" mnemonicParsing="false" onAction="#closeTutorial" styleClass="button-class" text="Close" />
+                <Button fx:id="previousPageButton" mnemonicParsing="false" onAction="#viewPreviousPage" styleClass="button-class" text="Previous" />
+                  <Button fx:id="nextPageButton" defaultButton="true" mnemonicParsing="false" onAction="#viewNextPage" styleClass="button-class" text="Next" />
               </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="Managing Your Crops">
+                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Adding 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="200.0" pickOnBounds="true" preserveRatio="true" />
+                        <ImageView fx:id="imgSelectDate" fitHeight="150.0" fitWidth="400.0" pickOnBounds="true" preserveRatio="true" />
                      </children>
                   </HBox>
                </children>
@@ -83,7 +83,50 @@
                   <Insets />
                </opaqueInsets>
             </VBox>
-            <VBox prefHeight="200.0" prefWidth="100.0">
+            <VBox layoutX="30.0" layoutY="30.0" prefHeight="200.0" prefWidth="100.0">
+               <children>
+                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Managing Your Crops">
+                     <font>
+                        <Font size="24.0" />
+                     </font>
+                  </Text>
+                  <Separator prefWidth="200.0">
+                     <VBox.margin>
+                        <Insets bottom="15.0" top="10.0" />
+                     </VBox.margin>
+                  </Separator>
+                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="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>
@@ -111,19 +154,9 @@
                            </HBox.margin>
                         </TextFlow>
                         <Separator prefWidth="200.0" visible="false" HBox.hgrow="ALWAYS" />
-                        <ImageView fx:id="imgTaskList" fitHeight="98.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" />
+                        <ImageView fx:id="imgTaskList" fitHeight="200.0" fitWidth="400.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 />