Javadocs and code cleanup

Fix tasklist filtering past tasks

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

@@ -12,6 +12,7 @@ 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;
@@ -133,8 +134,14 @@ public class CropDetailController {
             initializeTaskListProperty(crop);
 
             TaskList.TaskListObserver taskListObserver = newTaskList -> {
-                taskListProperty.clear();
-                taskListProperty.addAll(gardenSchedule.getTaskListForCrop(crop.getCropId().get()));
+                Platform.runLater(() -> {
+                    taskListProperty.clear();
+                    try {
+                        taskListProperty.addAll(gardenSchedule.getTaskListForCrop(crop.getCropId().get()));
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                });
             };
             gardenSchedule.setTaskListObserver(taskListObserver);
 

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;
@@ -24,6 +24,7 @@ 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;
 
@@ -51,9 +52,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 +68,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 +101,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 +155,6 @@ public class MyScheduleController {
         } else {
             gardenSchedule.getTasksUpcomingWeek();
         }
-        //taskListProperty.clear();
-        //taskListProperty.addAll(taskLists);
     }
 
     /**
@@ -189,6 +209,12 @@ public class MyScheduleController {
         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) {
@@ -202,5 +228,4 @@ public class MyScheduleController {
                 });
     }
 
-
 }

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

@@ -7,6 +7,7 @@ import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
+import java.io.File;
 
 /**
  * Controller class for the Tutorial.fxml file
@@ -22,6 +23,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 +33,27 @@ 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);
+        setImageView(imgAddNewPlant, "add-new-plant.png");
+        setImageView(imgSelectDate, "select-sow-harvest.png");
+        setImageView(imgDetailDeleteButtons, "details-delete.png");
+        setImageView(imgTaskList, "schedule.png");
+        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) {
+        File file = new File(String.valueOf(PlantsController.class.getResource(fileName)));
+        Image image;
+        if (file.exists()) {
+            image = new Image(String.valueOf(PlantsController.class.getResource(fileName)));
+        } else {
+            image = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
+        }
+        imageView.setImage(image);
     }
 
     public void viewNextPage() {

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

@@ -17,27 +17,38 @@ 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;
 
-    private void movePastTasks() throws IOException {
-        List<Task> taskList = this.taskList.getTaskList(LocalDate.MIN, LocalDate.now().minusDays(1));
-        taskList.forEach(task -> {
-            if (!task.isDone()) {
-                task.setNextExecution(LocalDate.now());
-            }
-        });
-    }
-
     public BackgroundTasks(TaskList taskList, CropList cropList, PlantList plantList) {
         this.taskList = taskList;
         notifier = new Notifier(taskList, plantList, cropList);
         weatherGardenTaskPlaner = new WeatherGradenTaskPlanner(taskList, plantList, cropList);
     }
 
+    /**
+     * 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 {

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

@@ -13,6 +13,9 @@ 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;
@@ -25,6 +28,13 @@ public class Notifier {
         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()){
@@ -38,6 +48,12 @@ public class Notifier {
         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))) {

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

@@ -10,16 +10,20 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * Class to send E-Mails
+ */
 public class EMailSender {
 
-
-    public 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 {
-        // TODO replace printMail with implementation
-        printMail(recipients, subject, text); // TODO Remove Printing E-Mail to console to test it
+        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");

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

@@ -5,6 +5,10 @@ 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,
@@ -14,6 +18,10 @@ public record SmtpCredentials(
         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);
@@ -23,6 +31,10 @@ public record SmtpCredentials(
         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
@@ -32,10 +44,11 @@ public record SmtpCredentials(
         };
     }
 
+    /**
+     * 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,5 +1,8 @@
 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

@@ -9,11 +9,14 @@ import ch.zhaw.gartenverwaltung.types.*;
 
 import java.io.IOException;
 import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
+import static java.util.stream.Collectors.toList;
+
 /**
  * The WeatherGardenTaskPlanner creates Tasks based on weather events and the rain amount from the last days
- *
  */
 public class WeatherGradenTaskPlanner {
     private final TaskList taskList;
@@ -43,8 +46,7 @@ public class WeatherGradenTaskPlanner {
     private void getSevereWeatherEvents() throws IOException {
         SevereWeather actualWeather = weatherService.causeSevereWeather(1);
         if (SevereWeather.HAIL.equals(actualWeather)) {
-            //ToDo creates hail task all 3 seconds, pls fix
-            //createPreHailTask();
+            createPreHailTask();
         } else if (SevereWeather.FROST.equals(actualWeather)) {
             createPreFrostTask();
         } else if (SevereWeather.SNOW.equals(actualWeather)) {
@@ -63,11 +65,27 @@ public class WeatherGradenTaskPlanner {
      */
     private void createPreHailTask() throws IOException {
 
-        Task preHailTask = new Task("Hail",
-                                    "During a summer Thunderstorm it could hail heavily. THe Hail could damage the crops. To prevent damage cover the plants with a strong tarpaulin",
-                                    dateSevereWeather.minusDays(1L),dateSevereWeather.plusDays(1L),1L);
-        taskList.saveTask(preHailTask);
+        List<Crop> actualCrops = cropList.getCrops();
 
+        for (Crop crop : actualCrops) {
+            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> actualCropTaskList = taskList.getTaskForCrop(crop.getCropId().orElse(-1L));
+            List<Task> hailTasklist = actualCropTaskList.stream().filter(task -> task.getName().equals("Hail")).toList();
+
+            List<Task> hailTaskListAtDate = new ArrayList<>();
+            for (Task task : hailTasklist) {
+                if (task.getStartDate() == (preHailTask.getStartDate())) {
+                    hailTaskListAtDate.add(task);
+                }
+            }
+
+            if(hailTaskListAtDate.isEmpty() && hailTasklist.isEmpty()){
+                taskList.saveTask(preHailTask);
+            }
+        }
     }
 
     /**
@@ -75,10 +93,26 @@ public class WeatherGradenTaskPlanner {
      * @throws IOException If the database cannot be accessed
      */
     private void createPreFrostTask() throws IOException {
-        Task preFrostTask = new Task("Frost",
-                                    "The temperatur falls below zero degrees, cover especially the root with wool",
-                                    dateSevereWeather.minusDays(1L),dateSevereWeather.plusDays(1L),1L);
-        taskList.saveTask(preFrostTask);
+        List<Crop> actualCrops = cropList.getCrops();
+        for (Crop crop : actualCrops) {
+
+            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> actualCropTaskList = taskList.getTaskForCrop(crop.getCropId().orElse(-1L));
+            List<Task> frostTasklist = actualCropTaskList.stream().filter(task -> task.getName().equals("Frost")).toList();
+
+            List<Task> frostTaskListAtDate = new ArrayList<>();
+            for (Task task : frostTasklist) {
+                if (task.getStartDate() == preFrostTask.getStartDate()) {
+                    frostTaskListAtDate.add(task);
+                }
+            }
+            if(frostTaskListAtDate.isEmpty() && frostTasklist.isEmpty()){
+                taskList.saveTask(preFrostTask);
+            }
+        }
     }
 
     /**
@@ -86,10 +120,27 @@ public class WeatherGradenTaskPlanner {
      * @throws IOException If the database cannot be accessed
      */
     private void createPreSnowTask() throws IOException {
-        Task preSnowTask = new Task("Snow",
-                                    "The weather brings little snowfall. Cover your crops",
-                                    dateSevereWeather.minusDays(1L),dateSevereWeather.plusDays(1L),1L);
-        taskList.saveTask(preSnowTask);
+        List<Crop> actualCrops = cropList.getCrops();
+        for (Crop crop : actualCrops) {
+
+            Task preSnowTask = new Task("Snow",
+                    "The weather brings little snowfall. Cover your crops",
+                    dateSevereWeather, dateSevereWeather.plusDays(1L), crop.getCropId().orElse(-1L));
+
+            List<Task> actualCropTaskList = taskList.getTaskForCrop(crop.getCropId().orElse(-1L));
+            List<Task> snowTasklist = actualCropTaskList.stream().filter(task -> task.getName().equals("Snow")).toList();
+
+            List<Task> snowTaskListAtDate = new ArrayList<>();
+            for (Task task : snowTasklist) {
+                if (task.getStartDate() == preSnowTask.getStartDate()) {
+                    snowTaskListAtDate.add(task);
+                }
+            }
+            if(snowTaskListAtDate .isEmpty() && snowTasklist.isEmpty()){
+                taskList.saveTask(preSnowTask);
+            }
+
+        }
     }
 
     /**

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

@@ -1,7 +1,6 @@
 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;
@@ -9,6 +8,11 @@ public class WeatherService {
     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;
@@ -19,6 +23,11 @@ public class WeatherService {
 
     }
 
+    /**
+     * 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;

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

@@ -152,6 +152,11 @@ public class AppLoader {
                 });
     }
 
+    /**
+     * Method to get any AppDependency
+     * @param type Class of Dependency
+     * @return the App dependency
+     */
     public Object getAppDependency(Class<?> type) {
         return dependencies.get(type.getSimpleName());
     }

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

@@ -1,5 +1,8 @@
 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/InvalidJsonException.java

@@ -2,6 +2,9 @@ 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/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() {
@@ -176,14 +166,12 @@ 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);
+                            break;
                         }
                         checkDate = checkDate.plusDays(task.getInterval().orElse(0));
                     } while (!(task.getInterval().orElse(0) == 0) && checkDate.isBefore(LocalDate.now().plusDays(listLength)));

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

@@ -1,5 +1,8 @@
 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

@@ -40,7 +40,6 @@ 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/Task.java

@@ -63,6 +63,7 @@ public class Task {
         this.startDate = startDate;
         nextExecution = startDate;
         this.endDate = endDate;
+        this.cropId = cropId;
     }
 
     /**
@@ -107,7 +108,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))));
     }
 
     /**

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

@@ -4,6 +4,9 @@ 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;

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>

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">

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 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 />

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

@@ -52,7 +52,7 @@ public class WeatherGardenTaskPlannerTest {
         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().minusDays(1L),LocalDate.now().plusDays(1L),3L);
+                LocalDate.now(),LocalDate.now().plusDays(1L),3L);
 
         taskList = new JsonTaskList(testFile);