created sortByNextExecution Comparator

Feature gui overhaul m3

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

@@ -1,5 +1,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.models.Garden;
@@ -10,14 +11,18 @@ 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.beans.property.ListProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.collections.FXCollections;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.geometry.Pos;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
+import javafx.scene.control.*;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.VBox;
+import javafx.scene.layout.Priority;
 import javafx.stage.Stage;
 
 import java.io.IOException;
@@ -35,7 +40,12 @@ public class CropDetailController {
     @Inject
     private Garden garden;
 
+    @Inject
+    AppLoader appLoader;
+
     private static final Logger LOG = Logger.getLogger(CropDetailController.class.getName());
+    private final ListProperty<Task> taskListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<Pest> pestListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
 
     @FXML
     private ImageView imageView;
@@ -52,9 +62,6 @@ public class CropDetailController {
     @FXML
     private Label description_label;
 
-    @FXML
-    private VBox growthPhases_vbox;
-
     @FXML
     private Label location_label;
 
@@ -64,9 +71,6 @@ public class CropDetailController {
     @FXML
     private Button location_button;
 
-    @FXML
-    private VBox pests_vbox;
-
     @FXML
     private Label soil_label;
 
@@ -74,11 +78,17 @@ public class CropDetailController {
     private Label spacing_label;
 
     @FXML
-    private Button editTaskList_button;
+    private Button addTask_button;
 
     @FXML
-    void editTaskList() {
+    private ListView<Task> taskList_listView;
 
+    @FXML
+    private ListView<Pest> pests_listView;
+
+    @FXML
+    void addTask() throws IOException {
+        createTaskDialog(true, null);
     }
 
     /**
@@ -128,25 +138,65 @@ public class CropDetailController {
             }
             area_label.setText("");
             location_label.setText("");
-            createTaskLists(crop);
-            createPestList(plant);
+
+            setTaskListProperty(crop);
+            taskList_listView.itemsProperty().bind(taskListProperty);
+
+            pestListProperty.addAll(plant.pests());
+            pests_listView.itemsProperty().bind(pestListProperty);
+
+
         } catch (HardinessZoneNotSetException | IOException e) {
             throw new PlantNotFoundException();
         }
-        setIconToButton(editTaskList_button, "editIcon.png");
+        setIconToButton(addTask_button, "addIcon.png");
         setIconToButton(area_button, "areaIcon.png");
         setIconToButton(location_button, "locationIcon.png");
+        setCellFactoryPests();
+        setCellFactoryTasks();
     }
 
-    private void createTaskLists(Crop crop) {
+    private void setCellFactoryTasks() {
+        taskList_listView.setCellFactory(param -> new ListCell<>() {
+            @Override
+            protected void updateItem(Task task, boolean empty) {
+                super.updateItem(task, empty);
+
+                if (empty || task == null) {
+                    setText(null);
+                    setGraphic(null);
+                } else {
+                    setText("");
+                    setGraphic(createTaskHBox(task));
+                }
+            }
+        });
+    }
+
+    private void setCellFactoryPests() {
+        pests_listView.setCellFactory(param -> new ListCell<>() {
+            @Override
+            protected void updateItem(Pest pest, boolean empty) {
+                super.updateItem(pest, empty);
+
+                if (empty || pest == null) {
+                    setText(null);
+                    setGraphic(null);
+                } else {
+                    setText("");
+                    setGraphic(createPestHBox(pest));
+                }
+            }
+        });
+    }
+
+    private void setTaskListProperty(Crop crop) {
         crop.getCropId().ifPresent(id -> {
             List<Task> taskList;
             try {
                 taskList = gardenSchedule.getTaskListForCrop(id);
-                for (Task task : taskList) {
-                    Label label = new Label(task.getDescription());
-                    growthPhases_vbox.getChildren().add(label);
-                }
+                taskListProperty.clear();
+                taskListProperty.addAll(taskList);
             } catch (IOException e) {
                 // TODO: Alert
                 LOG.log(Level.SEVERE, "Could not get task list for crop", e.getCause());
@@ -154,22 +204,37 @@ public class CropDetailController {
         });
     }
 
-    private void createPestList(Plant plant) {
-        List<Pest> pests = plant.pests();
-        for (Pest pest : pests) {
-            Label label = new Label(pest.name() + ":");
-            label.setStyle("-fx-font-weight: bold");
-            HBox hBox = new HBox();
-            hBox.fillHeightProperty();
-            Label label1 = new Label(pest.description());
-            label1.setAlignment(Pos.TOP_LEFT);
-            label1.setWrapText(true);
-            label1.setMaxWidth(600);
-            label1.setMaxHeight(100);
-            Button button = new Button("Get Counter Measures");
-            hBox.getChildren().addAll(label1, button);
-            pests_vbox.getChildren().addAll(label, hBox);
-        }
+    private HBox createTaskHBox(Task task) {
+        HBox hBox = new HBox();
+        Label taskName = new Label(task.getName()+": ");
+        taskName.setStyle("-fx-font-weight: bold");
+        Label taskDescription = new Label(task.getDescription());
+        taskDescription.setWrapText(true);
+        taskDescription.setMaxWidth(2000);
+        HBox.setHgrow(taskDescription, Priority.ALWAYS);
+
+        Button edit = new Button();
+        Button delete = new Button();
+        setIconToButton(edit, "editIcon.png");
+        setIconToButton(delete, "deleteIcon.png");
+        edit.setOnAction(getEditTaskEvent(task));
+
+        hBox.getChildren().addAll(taskName, taskDescription, edit, delete);
+        return hBox;
+    }
+
+    private HBox createPestHBox(Pest pest) {
+        Label label = new Label(pest.name() + ":    ");
+        label.setStyle("-fx-font-weight: bold");
+        HBox hBox = new HBox();
+        hBox.fillHeightProperty();
+        Label label1 = new Label(pest.description());
+        label1.setAlignment(Pos.TOP_LEFT);
+        label1.setWrapText(true);
+        label1.setMaxWidth(600);
+        Button button = new Button("Get Counter Measures");
+        hBox.getChildren().addAll(label, label1, button);
+        return hBox;
     }
 
     /**
@@ -184,4 +249,55 @@ public class CropDetailController {
         imageView.setPreserveRatio(true);
         button.setGraphic(imageView);
     }
+
+    private EventHandler<ActionEvent> getEditTaskEvent(Task task) {
+        return (event) -> {
+            try {
+                createTaskDialog(false, task);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        };
+    }
+
+    private void createTaskDialog(boolean newTask, Task givenTask) throws IOException {
+        Dialog<Task> dialog = new Dialog<>();
+        dialog.setTitle("Set Task");
+        dialog.setHeaderText("Add/Edit Task:");
+        dialog.setResizable(false);
+
+        DialogPane dialogPane = dialog.getDialogPane();
+
+        ButtonType saveTask;
+        if(newTask) {
+            saveTask = new ButtonType("Add", ButtonBar.ButtonData.OK_DONE);
+        } else {
+            saveTask = new ButtonType("Save", ButtonBar.ButtonData.OK_DONE);
+        }
+        dialogPane.getButtonTypes().addAll(saveTask, ButtonType.CANCEL);
+
+        if (appLoader.loadPaneToDialog("TaskFormular.fxml", dialogPane) instanceof TaskFormularController controller) {
+            controller.setCorp(this.crop);
+            if (!newTask) {
+                controller.setTaskValue(givenTask);
+            }
+            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 {
+                            //ToDo method to edit task
+                            setTaskListProperty(this.crop);
+                        }
+                    });
+        }
+
+    }
 }

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

@@ -0,0 +1,86 @@
+package ch.zhaw.gartenverwaltung;
+
+import ch.zhaw.gartenverwaltung.types.Crop;
+import ch.zhaw.gartenverwaltung.types.Task;
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+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.net.URL;
+import java.time.LocalDate;
+import java.util.ResourceBundle;
+
+public class TaskFormularController implements Initializable {
+    private Crop crop;
+
+    @FXML
+    private TextArea description_area;
+
+    @FXML
+    private DatePicker end_datePicker;
+
+    @FXML
+    private TextField interval_field;
+
+    @FXML
+    private DatePicker start_datePicker;
+
+    @FXML
+    private TextField taskName_field;
+
+
+    public Task returnResult() {
+        Task task = new Task(taskName_field.getText(), description_area.getText(),
+                start_datePicker.getValue(), end_datePicker.getValue(),
+                Integer.parseInt(interval_field.getText()), crop.getCropId().get());
+        return task;
+    }
+
+    public void setCorp(Crop crop) {
+        this.crop = crop;
+    }
+
+    public void setTaskValue(Task task) {
+        taskName_field.setText(task.getName());
+        description_area.setText(task.getDescription());
+        start_datePicker.setValue(task.getStartDate());
+        end_datePicker.setValue(task.getEndDate().orElse(null));
+        if(task.getInterval().orElse(null)!=null) {
+            interval_field.setText(task.getInterval().get().toString());
+        } else {
+            interval_field.setText(null);
+        }
+    }
+
+    private Callback<DatePicker, DateCell> getDayCellFactory() {
+
+        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) {
+                    setDisable(false);
+                    setStyle("-fx-background-color: #32CD32;");
+                }
+            }
+        };
+    }
+
+    @Override
+    public void initialize(URL location, ResourceBundle resources) {
+        start_datePicker.setDayCellFactory(getDayCellFactory());
+        start_datePicker.setEditable(false);
+
+        end_datePicker.setDayCellFactory(getDayCellFactory());
+        end_datePicker.setEditable(false);
+    }
+}

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

@@ -103,9 +103,9 @@ public class JsonTaskList implements TaskList {
         if(taskMap.isEmpty()) {
             loadTaskListFromFile();
         }
-        if(task.getId() == 0) {
-            task.withId(idProvider.incrementAndGet());
-        }
+        long id = task.getId().orElse(idProvider.incrementAndGet());
+
+        taskMap.put(id, task.withId(id));
         writeTaskListToFile();
     }
 
@@ -121,8 +121,9 @@ public class JsonTaskList implements TaskList {
         if(taskMap.isEmpty()) {
             loadTaskListFromFile();
         }
-        if(taskMap.containsKey(task.getId())){
-            taskMap.remove(task.getId());
+        Long taskId = task.getId().orElseThrow(IOException::new);
+        if(taskMap.containsKey(taskId)){
+            taskMap.remove(taskId);
             writeTaskListToFile();
         }
     }
@@ -162,7 +163,7 @@ public class JsonTaskList implements TaskList {
 
             taskMap = result.stream()
                     .collect(HashMap::new,
-                        (res, task) -> res.put(task.getId(), task),
+                        (res, task) -> res.put(task.getId().orElse(0L), task),
                         (existing, replacement) -> {});
         }
 

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

@@ -9,6 +9,7 @@ import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 public class GardenSchedule {
@@ -19,6 +20,7 @@ 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);
 
     /**
      * Constructor to create Database Objects.
@@ -46,7 +48,8 @@ public class GardenSchedule {
      */
     public void planTasksForCrop(Crop crop) throws PlantNotFoundException, HardinessZoneNotSetException, IOException {
         Plant plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).orElseThrow(PlantNotFoundException::new);
-        for (GrowthPhase growthPhase : plant.lifecycle()) {
+        int growPhaseGroup = plant.getGrowphaseGroupForDate(crop.getStartDate());
+        for (GrowthPhase growthPhase : plant.lifecycleForGroup(growPhaseGroup)) {
             for (TaskTemplate taskTemplate : growthPhase.taskTemplates()) {
                 addTask(taskTemplate.generateTask(crop.getStartDate(), crop.getCropId().orElse(0L)));
             }
@@ -135,10 +138,22 @@ 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 < 7; i++) {
+        for(int i = 0; i < listLength; i++) {
             LocalDate date = LocalDate.now().plusDays(i);
-            dayTaskList.add(taskList.getTaskList(date, date));
+            dayTaskList.add(new ArrayList<>());
+            final int finalI = i;
+            weekTasks.forEach(task -> {
+                LocalDate checkDate = task.getNextExecution();
+                do {
+                    if (date.equals(checkDate) && !date.isAfter(task.getEndDate().orElse(LocalDate.MIN))) {
+                        dayTaskList.get(finalI).add(task);
+                    }
+                    checkDate = checkDate.plusDays(task.getInterval().orElse(0));
+                } while (task.getInterval().isPresent() && checkDate.isBefore(LocalDate.now().plusDays(listLength)));
+            });
         }
         return dayTaskList;
     }
@@ -149,11 +164,8 @@ public class GardenSchedule {
      * @throws IOException If the database cannot be accessed
      */
     public List<List<Task>> getTasksUpcomingWeekForCrop(Long cropId) throws IOException {
-        List<List<Task>> dayTaskList = new ArrayList<>();
-        for(int i = 0; i < 7; i++) {
-            LocalDate date = LocalDate.now().plusDays(i);
-            dayTaskList.add(filterListByCrop(taskList.getTaskList(date, date), cropId));
-        }
+        List<List<Task>> dayTaskList = getTasksUpcomingWeek();
+        dayTaskList.forEach(taskList -> taskList.removeIf(task -> task.getCropId() != cropId));
         return dayTaskList;
     }
 
@@ -165,7 +177,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), sortByStartDate);
+        return getSortedTaskList(taskList.getTaskList(start, end), sortByNextExecution);
     }
 
     /**

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

@@ -39,6 +39,16 @@ public record Plant(
                 .collect(Collectors.toList());
     }
 
+    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; // TODO implement
+    }
+
     /**
      * get sow date from given harvest day from lifecycle group
      * @param harvestDate date of the harvest

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

@@ -9,12 +9,14 @@ import java.util.Optional;
  * May be created using the builder pattern.
  */
 public class Task {
-    private long id;
+    private Long id;
     private final String name;
     private final String description;
     private final LocalDate startDate;
     private Integer interval;
     private LocalDate endDate;
+    private LocalDate nextExecution;
+    private LocalDate nextNotification;
     private long cropId;
 
     /**
@@ -25,12 +27,16 @@ public class Task {
         name= "";
         description= "";
         startDate = LocalDate.now();
+        endDate = startDate;
+        nextExecution = startDate;
     }
 
     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;
     }
 
@@ -38,6 +44,7 @@ public class Task {
         this.name = name;
         this.description = description;
         this.startDate = startDate;
+        nextExecution = startDate;
         this.endDate = endDate;
         this.interval = interval;
         this.cropId = cropId;
@@ -58,11 +65,33 @@ public class Task {
     }
 
     public boolean isInTimePeriode(LocalDate searchStartDate, LocalDate searchEndDate){
-        return startDate.isAfter(searchStartDate) && startDate.isBefore(searchEndDate);
+        return endDate.isAfter(searchStartDate) && startDate.isBefore(searchEndDate);
+    }
+
+    public void done(){
+        if(interval != null && !nextExecution.plusDays(interval).isAfter(endDate)){
+            nextExecution = nextExecution.plusDays(interval);
+        } else {
+            nextExecution = null;
+        }
+    }
+
+    public boolean isDone(){
+        return nextExecution == null;
+    }
+
+    public void setNextExecution(LocalDate nextExecution) {
+        this.nextExecution = nextExecution;
+    }
+
+    public void setNextNotification(LocalDate nextNotification) {
+        this.nextNotification = nextNotification;
     }
 
     // Getters
-    public long getId() { return id; }
+    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; }
     public LocalDate getStartDate() { return startDate; }

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

@@ -16,10 +16,6 @@ public class TaskTemplate {
     @JsonProperty
     private Integer interval;
 
-    // TODO: reconsider if we need this
-    @JsonProperty
-    private boolean isOptional = false;
-
     /**
      * Default constructor
      * (Used by deserializer)
@@ -34,6 +30,7 @@ public class TaskTemplate {
     public void setRelativeEndDate(Integer relativeEndDate) {
         this.relativeEndDate = relativeEndDate;
     }
+
     public void setInterval(Integer interval) {
         this.interval = interval;
     }
@@ -45,13 +42,10 @@ public class TaskTemplate {
     }
 
     public Task generateTask(LocalDate realStartDate, long cropId) {
-        Task task = new Task(name, description, realStartDate.plusDays(relativeStartDate), cropId);
-        if (relativeEndDate != null) {
-            task.withEndDate(realStartDate.plusDays(relativeEndDate));
-        }
-        if (interval != null) {
-            task.withInterval(interval);
-        }
-        return task;
+        LocalDate endDate = relativeEndDate != null ? realStartDate.plusDays(relativeEndDate) : null;
+
+        return new Task(name, description, realStartDate.plusDays(relativeStartDate), cropId)
+                .withInterval(interval)
+                .withEndDate(endDate);
     }
 }

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

@@ -3,6 +3,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ListView?>
 <?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
@@ -12,13 +13,11 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 
-
-<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">
+<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 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 maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="503.0" prefWidth="897.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>
@@ -85,22 +84,22 @@
                         <Insets bottom="10.0" />
                      </VBox.margin>
                   </Label>
-                  <VBox fx:id="growthPhases_vbox" prefHeight="135.0" prefWidth="879.0">
+                  <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>
-                  </VBox>
-                  <Button fx:id="editTaskList_button" mnemonicParsing="false" onAction="#editTaskList" prefHeight="25.0" prefWidth="45.0">
+                  </ListView>
+                  <Button fx:id="addTask_button" mnemonicParsing="false" onAction="#addTask" prefHeight="25.0" prefWidth="45.0">
                      <VBox.margin>
                         <Insets bottom="10.0" />
                      </VBox.margin>
                   </Button>
                   <Label text="Pests:" />
-                  <VBox fx:id="pests_vbox" prefHeight="200.0" prefWidth="100.0">
+                  <ListView fx:id="pests_listView" maxHeight="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
                      <VBox.margin>
                         <Insets bottom="10.0" />
                      </VBox.margin>
-                  </VBox>
+                  </ListView>
                   <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="NEVER">
                      <children>
                         <Label text="Area:">

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

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.DatePicker?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?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">
+   <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>
+            <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
+         </padding>
+         <children>
+            <HBox alignment="CENTER_LEFT" prefHeight="35.0" prefWidth="560.0">
+               <children>
+                  <Label maxWidth="1.7976931348623157E308" text="Task name:" HBox.hgrow="ALWAYS" />
+                  <TextField fx:id="taskName_field" promptText="Task Name" />
+               </children>
+            </HBox>
+            <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" />
+               </children>
+            </HBox>
+            <HBox alignment="CENTER_LEFT" layoutX="30.0" layoutY="30.0" prefHeight="35.0" prefWidth="560.0">
+               <children>
+                  <Label maxWidth="1.7976931348623157E308" text="Start Date:" HBox.hgrow="ALWAYS" />
+                  <DatePicker fx:id="start_datePicker" />
+               </children>
+            </HBox>
+            <HBox alignment="CENTER_LEFT" layoutX="30.0" layoutY="143.0" prefHeight="35.0" prefWidth="560.0">
+               <children>
+                  <Label maxWidth="1.7976931348623157E308" text="End Date:" HBox.hgrow="ALWAYS" />
+                  <DatePicker fx:id="end_datePicker" />
+               </children>
+            </HBox>
+            <HBox alignment="CENTER_LEFT" layoutX="30.0" layoutY="30.0" prefHeight="35.0" prefWidth="560.0">
+               <children>
+                  <Label maxWidth="1.7976931348623157E308" text="Interval:" HBox.hgrow="ALWAYS" />
+                  <TextField fx:id="interval_field" promptText="Interval (e.g. 0, 1, 3 ...)" />
+               </children>
+            </HBox>
+         </children>
+      </VBox>
+   </children>
+</AnchorPane>

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

@@ -32,8 +32,7 @@
             "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,
-            "isOptional": false
+            "interval": null
           }
         ]
       },
@@ -54,8 +53,7 @@
             "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,
-            "isOptional": false
+            "interval": 21
           }
         ]
       },
@@ -76,8 +74,7 @@
             "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,
-            "isOptional": false
+            "interval": null
           }
         ]
       }
@@ -106,8 +103,7 @@
             "relativeStartDate": 0,
             "relativeEndDate": 0,
             "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": null,
-            "isOptional": false
+            "interval": null
           }
         ]
       },
@@ -130,8 +126,7 @@
             "relativeStartDate": 0,
             "relativeEndDate": null,
             "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": 15,
-            "isOptional": true
+            "interval": 15
           }
         ]
       },
@@ -152,8 +147,7 @@
             "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,
-            "isOptional": false
+            "interval": null
           }
         ]
       }
@@ -184,17 +178,15 @@
           "litersPerSqM": 15,
           "interval": 4,
           "notes": [
-
           ]
         },
         "taskTemplates": [
           {
-            "name": "hilling",
+            "name": "Plant Sets",
             "relativeStartDate": 0,
             "relativeEndDate": 0,
-            "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": null,
-            "isOptional": false
+            "description": "Plant the sets about 5cm deep into the soil.",
+            "interval": null
           }
         ]
       },
@@ -217,8 +209,7 @@
             "relativeStartDate": 0,
             "relativeEndDate": null,
             "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": 15,
-            "isOptional": true
+            "interval": 15
           }
         ]
       },
@@ -232,7 +223,6 @@
           "litersPerSqM": 0,
           "interval": null,
           "notes": [
-
           ]
         },
         "taskTemplates": [
@@ -241,8 +231,7 @@
             "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,
-            "isOptional": false
+            "interval": null
           }
         ]
       }

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

@@ -1,56 +1,68 @@
 [
   {
-  "id" : 1,
-  "name" : "sow plant",
-  "description": "Plant the seeds, crops in de bed.",
-  "startDate" : "2022-05-01",
-  "endDate" : "2022-05-01",
-  "interval" : 0,
-    "cropId" : 0
+    "id": 1,
+    "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,
+    "cropId": 0
   },
   {
-    "id" : 2,
-    "name" : "water plant",
+    "id": 2,
+    "name": "water plant",
     "description": "water the plant, so that the soil is wet around the plant.",
-    "startDate" : "2022-05-01",
-    "endDate" : "2022-09-01",
-    "interval" : 2,
-    "cropId" : 0
+    "startDate": "2022-05-01",
+    "nextExecution": "2022-05-01",
+    "nextNotification": "2022-05-01",
+    "endDate": "2022-09-01",
+    "interval": 2,
+    "cropId": 0
   },
   {
-    "id" : 3,
-    "name" : "fertilize plant",
+    "id": 3,
+    "name": "fertilize plant",
     "description": "The fertilizer has to be mixed with water. Then fertilize the plants soil with the mixture",
-    "startDate" : "2022-06-01",
-    "endDate" : "2022-08-01",
-    "interval" : 28,
-    "cropId" : 0
+    "startDate": "2022-06-01",
+    "nextExecution": "2022-06-01",
+    "nextNotification": "2022-06-01",
+    "endDate": "2022-08-01",
+    "interval": 28,
+    "cropId": 0
   },
   {
-    "id" : 4,
-    "name" : "covering plant",
+    "id": 4,
+    "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",
-    "endDate" : "2022-07-01",
-    "interval" : 0,
-    "cropId" : 0
+    "startDate": "2022-07-01",
+    "nextExecution": "2022-07-01",
+    "nextNotification": "2022-07-01",
+    "endDate": "2022-07-01",
+    "interval": null,
+    "cropId": 0
   },
   {
-    "id" : 5,
-    "name" : "look after plant",
+    "id": 5,
+    "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",
-    "endDate" : "2022-09-01",
-    "interval" : 5,
-    "cropId" : 0
+    "startDate": "2022-05-01",
+    "nextExecution": "2022-05-01",
+    "nextNotification": "2022-05-01",
+    "endDate": "2022-09-01",
+    "interval": 5,
+    "cropId": 0
   },
   {
-    "id" : 6,
-    "name" : "harvest plant",
+    "id": 6,
+    "name": "harvest plant",
     "description": "Pull the ripe vegetables out from the soil. Clean them with clear, fresh water. ",
-    "startDate" : "2022-09-01",
-    "endDate" : "2022-09-01",
-    "interval" : 0,
-    "cropId" : 0
+    "startDate": "2022-09-01",
+    "nextExecution": "2022-09-01",
+    "nextNotification": "2022-09-01",
+    "endDate": "2022-09-01",
+    "interval": null,
+    "cropId": 0
   }
 ]

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

@@ -72,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;

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

@@ -55,8 +55,8 @@ public class GardenPlanModelTest {
                         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(10, 2), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>())));
 
-        exampleCropOnion = new Crop(examplePlantOnion.id(),  LocalDate.of(2023,3,1));
-        exampleCropOnion.withId(3);
+        exampleCropOnion = new Crop(examplePlantOnion.id(), LocalDate.of(2023, 3, 1))
+                .withId(3);
         examplePlantCarrot = new Plant(
                 1,
                 "Early Carrot",
@@ -67,18 +67,18 @@ public class GardenPlanModelTest {
                 "sandy to loamy, loose soil, free of stones",
                 new ArrayList<>(),
                 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<>())));
-        exampleCropCarrot = new Crop(examplePlantCarrot.id(), LocalDate.now());
-        exampleCropCarrot.withId(5);
+        exampleCropCarrot = new Crop(examplePlantCarrot.id(), LocalDate.now())
+                .withId(5);
 
-        exampleCrop1 = new Crop(1, LocalDate.of(2023,2,25));
-        exampleCrop1.withId(0);
-        exampleCrop1.withArea(0.5);
-        exampleCrop2 = new Crop(1,LocalDate.of(2023,3,1));
-        exampleCrop2.withId(1);
-        exampleCrop2.withArea(0.5);
-        exampleCrop3 = new Crop(0,LocalDate.of(2023,3,1));
-        exampleCrop3.withId(2);
-        exampleCrop3.withArea(1.0);
+        exampleCrop1 = new Crop(1, LocalDate.of(2023, 2, 25))
+                .withId(0)
+                .withArea(0.5);
+        exampleCrop2 = new Crop(1, LocalDate.of(2023, 3, 1))
+                .withId(1)
+                .withArea(0.5);
+        exampleCrop3 = new Crop(0, LocalDate.of(2023, 3, 1))
+                .withId(2)
+                .withArea(1.0);
 
         exampleCrops = new ArrayList<>();
         exampleCrops.add(exampleCrop1);
@@ -107,7 +107,7 @@ public class GardenPlanModelTest {
     @Test
     void plantAsCrop() throws HardinessZoneNotSetException, IOException, PlantNotFoundException {
 
-        model.plantAsCrop(examplePlantOnion, LocalDate.of(2023,3,1));
+        model.plantAsCrop(examplePlantOnion, LocalDate.of(2023, 3, 1));
         Optional<Crop> exampleCrop = model.getCrop(2L);
         assertTrue(exampleCrop.isPresent());
         assertEquals(model.getCrops().get(2), exampleCrop.get());
@@ -119,6 +119,6 @@ public class GardenPlanModelTest {
         exampleCrop1.withId(2);
         exampleCrop1.withArea(1.5);
         model.removeCrop(exampleCrop1);
-        assertEquals(2,model.getCrops().size());
+        assertEquals(2, model.getCrops().size());
     }
 }

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

@@ -1,38 +1,49 @@
-package ch.zhaw.gartenverwaltung.taskList;
+package ch.zhaw.gartenverwaltung.models;
 
 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 ch.zhaw.gartenverwaltung.types.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.time.LocalDate;
+import java.time.MonthDay;
 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;
-    Map<Long, Plant> examplePlantMap;
+    List<TaskTemplate> exampleTaskTemplateList;
     GardenSchedule model;
 
     @BeforeEach
-    void setUp() throws IOException {
+    void setUp() throws IOException, HardinessZoneNotSetException {
         createExampleTaskList();
+        createExampleTaskTemplateList();
+        createExamplePlantList();
         taskList = mockTaskDatabase(exampleTaskList);
-        plantList = mockPlantDatabase(examplePlantMap);
+        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)));
 
@@ -54,18 +65,39 @@ class GardenScheduleTest {
         return taskList;
     }
 
-    private PlantList mockPlantDatabase(Map<Long, Plant> examplePlantMap) {
-        return new PlantList() {
-            @Override
-            public List<Plant> getPlantList(HardinessZone zone) {
-                return null;
-            }
+    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));
+    }
 
-            @Override
-            public Optional<Plant> getPlantById(HardinessZone zone, long id) {
-                return Optional.ofNullable(examplePlantMap.get(id));
-            }
-        };
+    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<>(),
+                List.of(
+                        new GrowthPhase(MonthDay.of(6, 4), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, List.of(
+                                exampleTaskTemplateList.get(0),
+                                exampleTaskTemplateList.get(1)
+                        )),
+                        new GrowthPhase(MonthDay.of(4, 3), MonthDay.of(12, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, List.of(
+                                exampleTaskTemplateList.get(2),
+                                exampleTaskTemplateList.get(3)
+                        ))
+                )));
     }
 
     void createExampleTaskList() {
@@ -74,15 +106,9 @@ class GardenScheduleTest {
         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));
+        exampleTaskList.add(new Task("name", "description", LocalDate.now().minusDays(10), LocalDate.now().plusDays(4),2, 2L));
     }
 
-    void createExamplePlantMap() {
-        examplePlantMap = new HashMap<>();
-    }
-
-
-
     @Test
     void addTask() throws IOException {
         Task taskToAdd = new Task("name", "description", LocalDate.now(), 1L);
@@ -132,19 +158,22 @@ class GardenScheduleTest {
         assertEquals(7, dayList.size());
 
         //Check day 0
-        assertEquals(1, dayList.get(0).size());
-        assertEquals(exampleTaskList.get(2), dayList.get(0).get(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());
-        assertEquals(exampleTaskList.get(1), dayList.get(1).get(0));
+        assertTrue(dayList.get(1).contains(exampleTaskList.get(1)));
 
         //Check day 2
-        assertEquals(0, dayList.get(2).size());
+        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(0, dayList.get(4).size());
+        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
@@ -156,4 +185,17 @@ class GardenScheduleTest {
         model.removeTasksForCrop(1L);
         verify(taskList, times(1)).removeTasksForCrop(1L);
     }
+
+    @Test
+    void planTasksForCrop() throws HardinessZoneNotSetException, PlantNotFoundException, IOException {
+        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));
+    }
 }

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

@@ -32,8 +32,7 @@
             "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,
-            "isOptional": false
+            "interval": null
           }
         ]
       },
@@ -54,8 +53,7 @@
             "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,
-            "isOptional": false
+            "interval": 21
           }
         ]
       },
@@ -76,8 +74,7 @@
             "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,
-            "isOptional": false
+            "interval": null
           }
         ]
       }
@@ -106,8 +103,7 @@
             "relativeStartDate": 0,
             "relativeEndDate": 0,
             "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": null,
-            "isOptional": false
+            "interval": null
           }
         ]
       },
@@ -130,8 +126,7 @@
             "relativeStartDate": 0,
             "relativeEndDate": null,
             "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": 15,
-            "isOptional": true
+            "interval": 15
           }
         ]
       },
@@ -152,8 +147,7 @@
             "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,
-            "isOptional": false
+            "interval": null
           }
         ]
       }
@@ -193,8 +187,7 @@
             "relativeStartDate": 0,
             "relativeEndDate": 0,
             "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": null,
-            "isOptional": false
+            "interval": null
           }
         ]
       },
@@ -217,8 +210,7 @@
             "relativeStartDate": 0,
             "relativeEndDate": null,
             "description": "Mound up the soil around the plant until just the top few leaves show above the soil. ",
-            "interval": 15,
-            "isOptional": true
+            "interval": 15
           }
         ]
       },
@@ -241,8 +233,7 @@
             "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,
-            "isOptional": false
+            "interval": null
           }
         ]
       }