#23 bugfix testclass WeatherGradenTaskPlannerTest and bugfix Task and WeatherGradenTaskPlanner

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

@@ -22,8 +22,6 @@ public class TutorialController {
     public ImageView imgAddNewPlant;
     public ImageView imgTaskList;
     public ImageView imgSelectDate;
-    public ImageView imgAddTaskButton;
-    public ImageView imgDetailDeleteButtons;
 
     private int page = 0;
 
@@ -32,17 +30,10 @@ public class TutorialController {
         switchViews();
         setButtonAbilities();
 
-        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);
+        Image placeholder = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
+        imgAddNewPlant.setImage(placeholder);
+        imgSelectDate.setImage(placeholder);
+        imgTaskList.setImage(placeholder);
     }
 
     public void viewNextPage() {

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

@@ -25,11 +25,12 @@ public class BackgroundTasks extends TimerTask {
 
     private void movePastTasks() throws IOException {
         List<Task> taskList = this.taskList.getTaskList(LocalDate.MIN, LocalDate.now().minusDays(1));
-        taskList.forEach(task -> {
+        for (Task task : taskList) {
             if (!task.isDone()) {
                 task.setNextExecution(LocalDate.now());
+                this.taskList.saveTask(task);
             }
-        });
+        }
     }
 
     public BackgroundTasks(TaskList taskList, CropList cropList, PlantList plantList) {

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

@@ -9,8 +9,12 @@ 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
  *
@@ -43,8 +47,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 +66,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 +94,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 +121,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/types/Task.java

@@ -63,6 +63,7 @@ public class Task {
         this.startDate = startDate;
         nextExecution = startDate;
         this.endDate = endDate;
+        this.cropId = cropId;
     }
 
     /**

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="120.0" VBox.vgrow="NEVER" text="Add Task">
+                  <Button styleClass="button-class" fx:id="addTask_button" mnemonicParsing="false" onAction="#addTask" prefHeight="25.0" prefWidth="45.0" VBox.vgrow="NEVER">
                      <VBox.margin>
                         <Insets />
                      </VBox.margin>

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/19" 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/17" 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 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" />
+                  <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" />
               </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">
-               <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">
+            <VBox 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/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);
 

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

@@ -3,9 +3,6 @@ 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;
 
@@ -32,16 +29,6 @@ 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();

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-06-01",
-    "nextNotification": "2022-06-01",
+    "nextExecution": "2022-05-01",
+    "nextNotification": "2022-05-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-07-01",
-    "nextNotification": "2022-07-01",
+    "nextExecution": "2022-05-01",
+    "nextNotification": "2022-05-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-09-01",
-    "nextNotification": "2022-09-01",
+    "nextExecution": "2022-05-01",
+    "nextNotification": "2022-05-01",
     "endDate" : "2022-09-01",
     "interval" : 0,
     "cropId" : 0