refactor: javadoc and dependencies in HashMap

completed Tests for GardenScheduleTest and new Structure of Task

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

@@ -104,16 +104,16 @@ public class CropDetailController {
      * open dialog to set area
      */
     @FXML
-    void setArea() {
+    void setArea() throws IOException {
-
+        openTextFieldDialog("set Text Area", "Text Area", area_label.getText(), false);
     }
 
     /**
      * open dialog to set location
      */
     @FXML
-    void setLocation() {
+    void setLocation() throws IOException {
-
+        openTextFieldDialog("set Location", "Location", location_label.getText(), true);
     }
 
     /**
@@ -218,6 +218,7 @@ public class CropDetailController {
         setIconToButton(edit, "editIcon.png");
         setIconToButton(delete, "deleteIcon.png");
         edit.setOnAction(getEditTaskEvent(task));
+        delete.setOnAction(deleteTask(task));
 
         hBox.getChildren().addAll(taskName, taskDescription, edit, delete);
         return hBox;
@@ -260,6 +261,12 @@ public class CropDetailController {
         };
     }
 
+    private EventHandler<ActionEvent> deleteTask(Task task) {
+        return (event) -> {
+            showDeleteTask(task);
+        };
+    }
+
     private void createTaskDialog(boolean newTask, Task givenTask) throws IOException {
         Dialog<Task> dialog = new Dialog<>();
         dialog.setTitle("Set Task");
@@ -278,6 +285,7 @@ public class CropDetailController {
 
         if (appLoader.loadPaneToDialog("TaskFormular.fxml", dialogPane) instanceof TaskFormularController controller) {
             controller.setCorp(this.crop);
+            controller.initSaveButton((Button) dialogPane.lookupButton(saveTask));
             if (!newTask) {
                 controller.setTaskValue(givenTask);
             }
@@ -300,4 +308,56 @@ public class CropDetailController {
         }
 
     }
+
+    private void openTextFieldDialog(String title, String labelDescription, String value, boolean isLocation) throws IOException {
+        Dialog<String> dialog = new Dialog<>();
+        dialog.setTitle(title);
+        dialog.setHeaderText(title);
+        dialog.setResizable(false);
+
+        DialogPane dialogPane = dialog.getDialogPane();
+
+        ButtonType save = new ButtonType("Save", ButtonBar.ButtonData.OK_DONE);
+        dialogPane.getButtonTypes().addAll(save, ButtonType.CANCEL);
+
+        if (appLoader.loadPaneToDialog("TextFieldFormular.fxml", dialogPane) instanceof TextFieldFormularController controller) {
+            controller.setDescription_label(labelDescription);
+            controller.setValueTextArea(value);
+            controller.initSaveButton((Button) dialogPane.lookupButton(save));
+
+            dialog.setResultConverter(button -> button.equals(save) ? controller.getValue() : null);
+
+            dialog.showAndWait()
+                    .ifPresent(string -> {
+                        if (isLocation) {
+                            System.out.println(string);
+                            //ToDo method to set location
+                            location_label.setText(string);
+                        } else {
+                            System.out.println(string);
+                            //ToDo method to set area of crop in garden
+                            area_label.setText(string);
+                        }
+                    });
+        }
+    }
+
+    private void showDeleteTask(Task task) {
+        Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
+        alert.setTitle("Delete " + task.getName());
+        alert.setHeaderText("Are you sure want to delete this Task?");
+
+        alert.showAndWait()
+                .ifPresent(buttonType -> {
+                    if (buttonType == ButtonType.OK) {
+                        try {
+                            gardenSchedule.removeTask(task);
+                            setTaskListProperty(this.crop);
+                        } catch (IOException e) {
+                            // TODO: Show error alert
+                            LOG.log(Level.SEVERE, "Could not remove crop.", e);
+                        }
+                    }
+                });
+    }
 }

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

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

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

@@ -11,6 +11,9 @@ import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.Pane;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import javafx.stage.WindowEvent;
 
 import java.io.IOException;
 import java.util.logging.Level;
@@ -40,6 +43,9 @@ public class MainFXMLController {
     @FXML
     private Button tutorial_button;
 
+    private final Stage tutorialModal = new Stage();
+
+
     /**
      * go to home pane
      */
@@ -95,11 +101,23 @@ public class MainFXMLController {
     }
 
     /**
-     * go to Tutorial pane
+     * Show the tutorial window
      */
-    public void goToTutorial() {
+    public void showTutorial() {
-        showPaneAsMainView("Tutorial.fxml");
+        if (!tutorialModal.isShowing()) {
-        styleChangeButton(tutorial_button);
+            if (tutorialModal.getScene() == null) {
+                try {
+                    appLoader.loadSceneToStage("Tutorial.fxml", tutorialModal);
+                    tutorialModal.initModality(Modality.NONE);
+                    tutorialModal.setResizable(false);
+                    tutorialModal.sizeToScene();
+                } catch (IOException e) {
+                    LOG.log(Level.SEVERE, "Could not load Tutorial");
+                }
+            }
+            tutorialModal.show();
+        }
+        tutorialModal.requestFocus();
     }
 
     /**
@@ -132,7 +150,6 @@ public class MainFXMLController {
         appLoader.loadAndCacheFxml("MyGarden.fxml");
         appLoader.loadAndCacheFxml("MySchedule.fxml");
         appLoader.loadAndCacheFxml("Plants.fxml");
-        appLoader.loadAndCacheFxml("Tutorial.fxml");
     }
 
     private void styleChangeButton(Button button) {
@@ -153,12 +170,14 @@ public class MainFXMLController {
         } catch (IOException e) {
             LOG.log(Level.SEVERE, "Failed to load FXML-Pane!", e);
         }
+        mainPane.getScene().getWindow().setOnCloseRequest(this::closeWindowHandler);
         setIconToButton(home_button, "homeIcon.png");
         setIconToButton(settings_button, "settingsIcon.png");
-        Settings.getInstance().getShowTutorialProperty().addListener((observable, oldValue, newValue) -> {
+        tutorial_button.visibleProperty().bind(Settings.getInstance().getShowTutorialProperty());
-            tutorial_button.setVisible(newValue);
+    }
-        });
+
-        tutorial_button.setVisible(Settings.getInstance().getShowTutorial());
+    private void closeWindowHandler(WindowEvent windowEvent) {
+        tutorialModal.close();
     }
 
     /**
@@ -173,7 +192,4 @@ public class MainFXMLController {
         imageView.setPreserveRatio(true);
         button.setGraphic(imageView);
     }
-
-
 }
-

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

@@ -2,12 +2,14 @@ package ch.zhaw.gartenverwaltung;
 
 import ch.zhaw.gartenverwaltung.types.Crop;
 import ch.zhaw.gartenverwaltung.types.Task;
+import javafx.beans.binding.Binding;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
-import javafx.scene.control.DateCell;
+import javafx.scene.control.*;
-import javafx.scene.control.DatePicker;
-import javafx.scene.control.TextArea;
-import javafx.scene.control.TextField;
 import javafx.util.Callback;
 
 import java.net.URL;
@@ -56,7 +58,7 @@ public class TaskFormularController implements Initializable {
         }
     }
 
-    private Callback<DatePicker, DateCell> getDayCellFactory() {
+    private Callback<DatePicker, DateCell> getDayCellFactoryStartDate() {
 
         return (datePicker) -> new DateCell() {
             private final LocalDate today = LocalDate.now();
@@ -71,16 +73,61 @@ public class TaskFormularController implements Initializable {
                     setDisable(false);
                     setStyle("-fx-background-color: #32CD32;");
                 }
+
+                if (end_datePicker.getValue() != null && item.compareTo(end_datePicker.getValue()) > 0) {
+                    setDisable(true);
+                    setStyle("-fx-background-color: #ffc0cb;");
+                }
             }
         };
     }
 
+    private Callback<DatePicker, DateCell> getDayCellFactoryEndDate() {
+
+        return (datePicker) -> new DateCell() {
+            private final LocalDate today = LocalDate.now();
+
+            @Override
+            public void updateItem(LocalDate item, boolean empty) {
+                super.updateItem(item, empty);
+                setDisable(true);
+                setStyle("-fx-background-color: #ffc0cb;");
+
+                if (item.compareTo(today) > 0 && item.compareTo(crop.getStartDate()) > 0) {
+                    setDisable(false);
+                    setStyle("-fx-background-color: #32CD32;");
+                }
+
+                if (start_datePicker.getValue() != null && item.compareTo(start_datePicker.getValue()) < 0) {
+                    setDisable(true);
+                    setStyle("-fx-background-color: #ffc0cb;");
+                }
+            }
+        };
+    }
+
+    public void initSaveButton(Button button) {
+        interval_field.textProperty().addListener((observable, oldValue, newValue) -> {
+            if (!newValue.matches("\\d*")) {
+                interval_field.setText(newValue.replaceAll("[^\\d]", ""));
+            }
+        });
+
+        button.disableProperty().bind(start_datePicker.valueProperty().isNull()
+                .or(end_datePicker.valueProperty().isNull())
+                .or(taskName_field.textProperty().isEmpty())
+                .or(description_area.textProperty().isEmpty())
+                .or(interval_field.textProperty().isEmpty()));
+
+
+    }
+
     @Override
     public void initialize(URL location, ResourceBundle resources) {
-        start_datePicker.setDayCellFactory(getDayCellFactory());
+        start_datePicker.setDayCellFactory(getDayCellFactoryStartDate());
         start_datePicker.setEditable(false);
 
-        end_datePicker.setDayCellFactory(getDayCellFactory());
+        end_datePicker.setDayCellFactory(getDayCellFactoryEndDate());
         end_datePicker.setEditable(false);
     }
 }

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

@@ -0,0 +1,32 @@
+package ch.zhaw.gartenverwaltung;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+
+public class TextFieldFormularController {
+
+    @FXML
+    private Label description_label;
+
+    @FXML
+    private TextField text_area;
+
+
+    public void setDescription_label(String string) {
+        description_label.setText(string);
+    }
+
+    public void setValueTextArea(String string) {
+        text_area.setText(string);
+    }
+
+    public String getValue() {
+        return text_area.getText();
+    }
+
+    public void initSaveButton(Button button) {
+        button.disableProperty().bind(text_area.textProperty().isEmpty());
+    }
+}

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

@@ -1,6 +1,61 @@
 package ch.zhaw.gartenverwaltung;
 
 
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.StackPane;
+import javafx.stage.Stage;
+
 public class TutorialController {
 
+    @FXML
+    public Button previousPageButton;
+    @FXML
+    public Button nextPageButton;
+    @FXML
+    public StackPane tourPages;
+    public ImageView imgAddNewPlant;
+    public ImageView imgTaskList;
+    public ImageView imgSelectDate;
+
+    private int page = 0;
+
+    @FXML
+    public void initialize() {
+        switchViews();
+        setButtonAbilities();
+
+        Image placeholder = new Image(String.valueOf(PlantsController.class.getResource("placeholder.png")));
+        imgAddNewPlant.setImage(placeholder);
+        imgSelectDate.setImage(placeholder);
+        imgTaskList.setImage(placeholder);
+    }
+
+    public void viewNextPage() {
+        page++;
+        switchViews();
+        setButtonAbilities();
+    }
+    public void viewPreviousPage() {
+        page--;
+        switchViews();
+        setButtonAbilities();
+    }
+
+    private void setButtonAbilities() {
+        previousPageButton.setDisable(page <= 0);
+        nextPageButton.setDisable(page >= tourPages.getChildren().size() - 1);
+    }
+
+    private void switchViews() {
+        tourPages.getChildren().forEach(node -> node.setOpacity(0));
+        tourPages.getChildren().get(page).setOpacity(1);
+    }
+
+    public void closeTutorial() {
+        Stage root = (Stage) tourPages.getScene().getWindow();
+        root.close();
+    }
 }

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

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

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

@@ -23,6 +23,10 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
+/**
+ * Class responsible for bootstrapping the application wide dependencies
+ * and injecting them into JavaFX Controllers.
+ */
 public class AppLoader {
     /**
      * Caching the panes
@@ -32,17 +36,24 @@ public class AppLoader {
     /**
      * Application-wide dependencies
      */
-    private final PlantList plantList = new JsonPlantList();
+    private final Map<String, Object> dependencies = new HashMap<>();
-    private final CropList cropList = new JsonCropList();
-    private final TaskList taskList = new JsonTaskList();
-
-    private final GardenSchedule gardenSchedule = new GardenSchedule(taskList, plantList);
-    private final Garden garden = new Garden(gardenSchedule, cropList);
-
 
     public AppLoader() throws IOException {
-    }
+        PlantList plantList = new JsonPlantList();
+        CropList cropList = new JsonCropList();
+        TaskList taskList = new JsonTaskList();
+        GardenSchedule gardenSchedule = new GardenSchedule(taskList, plantList);
 
+        dependencies.put(PlantList.class.getSimpleName(), plantList);
+        dependencies.put(CropList.class.getSimpleName(), cropList);
+        dependencies.put(TaskList.class.getSimpleName(), taskList);
+
+        dependencies.put(PlantListModel.class.getSimpleName(), new PlantListModel(plantList));
+
+        dependencies.put(GardenSchedule.class.getSimpleName(), gardenSchedule);
+        dependencies.put(Garden.class.getSimpleName(), new Garden(gardenSchedule, cropList));
+        dependencies.put(AppLoader.class.getSimpleName(), this);
+    }
 
     /**
      * Loads and returns a {@link Pane} (cached).
@@ -73,7 +84,10 @@ public class AppLoader {
     public Object loadSceneToStage(String fxmlFile, Stage appendee) throws IOException {
         FXMLLoader loader = new FXMLLoader(Objects.requireNonNull(HelloApplication.class.getResource(fxmlFile)));
         Pane root = loader.load();
-        appendee.setScene(new Scene(root));
+        Scene scene = new Scene(root);
+        String css = Objects.requireNonNull(this.getClass().getResource("styles.css")).toExternalForm();
+        appendee.setScene(scene);
+        scene.getStylesheets().add(css);
         Object controller = loader.getController();
         annotationInject(controller);
         return controller;
@@ -132,26 +146,18 @@ public class AppLoader {
                 });
 
         Arrays.stream(controller.getClass().getMethods())
-                .filter(method -> method.isAnnotationPresent(AfterInject.class))
+                .filter(method -> method.isAnnotationPresent(AfterInject.class) && method.getParameterCount() == 0)
                 .forEach(afterInjectMethod -> {
-                    if (afterInjectMethod.getParameterCount() == 0) {
+                    try {
-                        try {
+                        afterInjectMethod.invoke(controller);
-                            afterInjectMethod.invoke(controller);
+                    } catch (IllegalAccessException | InvocationTargetException e) {
-                        } catch (IllegalAccessException | InvocationTargetException e) {
+                        // TODO: Log
-                            e.printStackTrace();
+                        e.printStackTrace();
-                        }
                     }
                 });
     }
 
     private Object getAppDependency(Class<?> type) {
-        return switch (type.getSimpleName()) {
+        return dependencies.get(type.getSimpleName());
-            case "Garden" -> garden;
-            case "PlantList" -> plantList;
-            case "PlantListModel" -> new PlantListModel(plantList);
-            case "GardenSchedule" -> gardenSchedule;
-            case "AppLoader" -> this;
-            default -> null;
-        };
     }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -13,14 +13,15 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 /**
- * Implements the {@link TaskList} interface for loading and writing {@link Task} objects
+ * Implements the {@link TaskList} interface for reading and writing {@link Task} objects
- * from and to a JSON file.
+ * from and to a local JSON file.
  * The reads are cached to minimize file-io operations.
  */
 public class JsonTaskList implements TaskList {
@@ -29,6 +30,7 @@ public class JsonTaskList implements TaskList {
     private final static String INVALID_DATASOURCE_MSG = "Invalid datasource specified!";
 
     private Map<Long, Task> taskMap = Collections.emptyMap();
+    private final List<TaskListObserver> subscribers = new ArrayList<>();
 
     /**
      * Creating constant objects required to deserialize the {@link LocalDate} classes
@@ -43,9 +45,17 @@ public class JsonTaskList implements TaskList {
         timeModule.addSerializer(LocalDate.class, dateSerializer);
     }
 
+    /**
+     * Default constructor. Uses a file from the app resources.
+     */
     public JsonTaskList() {
         this.dataSource = getClass().getResource("taskdb.json");
     }
+
+    /**
+     * Constructor to use a specified {@link URL} as a {@link #dataSource}
+     * @param dataSource A {@link URL} to the file to be used as a data source
+     */
     public JsonTaskList(URL dataSource) {
         this.dataSource = dataSource;
     }
@@ -87,6 +97,7 @@ public class JsonTaskList implements TaskList {
             loadTaskListFromFile();
         }
         taskMap.values().removeIf(task -> task.getCropId() == cropId);
+        notifySubscribers();
     }
 
     /**
@@ -107,6 +118,7 @@ public class JsonTaskList implements TaskList {
 
         taskMap.put(id, task.withId(id));
         writeTaskListToFile();
+        notifySubscribers();
     }
 
     /**
@@ -126,6 +138,25 @@ public class JsonTaskList implements TaskList {
             taskMap.remove(taskId);
             writeTaskListToFile();
         }
+        notifySubscribers();
+    }
+
+    /**
+     * {@inheritDoc}
+     * @param observer The change handler
+     */
+    @Override
+    public void subscribe(TaskListObserver observer) {
+        subscribers.add(observer);
+    }
+
+    /**
+     * Calls the change handler method on all registered observers.
+     */
+    private void notifySubscribers() {
+        for (TaskListObserver subscriber : subscribers) {
+            subscriber.onChange(taskMap.values().stream().toList());
+        }
     }
 
     /**

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

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

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

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

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

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

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

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

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

@@ -13,6 +13,9 @@ import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.net.URL;
 
+/**
+ * Used by the Jackson Library to deserialize a String to a {@link Image}
+ */
 public class PlantImageDeserializer extends JsonDeserializer<Image> {
 
     @Override

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.
@@ -136,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;
     }
@@ -150,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<>();
+        List<List<Task>> dayTaskList = getTasksUpcomingWeek();
-        for(int i = 0; i < 7; i++) {
+        dayTaskList.forEach(taskList -> taskList.removeIf(task -> task.getCropId() != cropId));
-            LocalDate date = LocalDate.now().plusDays(i);
-            dayTaskList.add(filterListByCrop(taskList.getTaskList(date, date), cropId));
-        }
         return dayTaskList;
     }
 
@@ -166,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/Task.java

@@ -27,6 +27,7 @@ public class Task {
         name= "";
         description= "";
         startDate = LocalDate.now();
+        endDate = startDate;
         nextExecution = startDate;
     }
 
@@ -34,6 +35,7 @@ public class Task {
         this.name = name;
         this.description = description;
         this.startDate = startDate;
+        this.endDate = startDate;
         nextExecution = startDate;
         this.cropId = cropId;
     }
@@ -63,7 +65,7 @@ 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(){

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

@@ -44,6 +44,10 @@ public class TaskTemplate {
     public Task generateTask(LocalDate realStartDate, long cropId) {
         LocalDate endDate = relativeEndDate != null ? realStartDate.plusDays(relativeEndDate) : null;
 
+        if (interval == null) {
+            this.interval = 0;
+        }
+
         return new Task(name, description, realStartDate.plusDays(relativeStartDate), cropId)
                 .withInterval(interval)
                 .withEndDate(endDate);

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

@@ -12,7 +12,7 @@
             <Button fx:id="home_button" mnemonicParsing="false" onAction="#goToHome" prefHeight="38.0" prefWidth="40.0" HBox.hgrow="NEVER" />
             <Button fx:id="myGarden_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#goToMyPlants" prefHeight="38.0" prefWidth="121.0" text="My Garden" />
             <Button fx:id="mySchedule_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#goToMySchedule" prefHeight="38.0" prefWidth="121.0" text="My Schedule" />
-            <Button fx:id="tutorial_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#goToTutorial" prefHeight="38.0" prefWidth="121.0" text="Tutorial" />
+            <Button fx:id="tutorial_button" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" onAction="#showTutorial" prefHeight="38.0" prefWidth="121.0" text="Tutorial" />
             <Pane maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS" />
             <Button fx:id="settings_button" maxHeight="1.7976931348623157E308" mnemonicParsing="false" onAction="#openSettings" prefHeight="38.0" prefWidth="40.0" HBox.hgrow="NEVER" />
          </children>

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

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

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

@@ -1,27 +1,141 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Button?>
-<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.control.ButtonBar?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+<?import javafx.scene.text.TextFlow?>
 
-
+<BorderPane maxHeight="470.0" maxWidth="724.0" minHeight="470.0" minWidth="724.0" prefHeight="470.0" prefWidth="724.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.TutorialController">
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17"
+   <bottom>
-            xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.TutorialController">
+      <HBox alignment="CENTER" prefHeight="0.0" prefWidth="724.0" BorderPane.alignment="CENTER">
-   <children>
-      <VBox layoutX="7.0" layoutY="8.0" prefHeight="200.0" prefWidth="100.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
-            <Label text="Tutorial">
+            <CheckBox mnemonicParsing="false" text="Don't show again" />
-               <font>
+            <Separator prefWidth="50.0" visible="false" HBox.hgrow="ALWAYS" />
-                  <Font size="18.0" />
+            <ButtonBar prefHeight="40.0" prefWidth="200.0">
-               </font>
+              <buttons>
-            </Label>
+                  <Button cancelButton="true" contentDisplay="CENTER" graphicTextGap="5.0" mnemonicParsing="false" text="Close" onAction="#closeTutorial"/>
-            <Label text="To be added" />
+                <Button fx:id="previousPageButton" mnemonicParsing="false" text="Previous" onAction="#viewPreviousPage"/>
+                  <Button fx:id="nextPageButton" defaultButton="true" mnemonicParsing="false" text="Next" onAction="#viewNextPage" />
+              </buttons>
+            </ButtonBar>
          </children>
          <padding>
-            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
          </padding>
-      </VBox>
+      </HBox>
-   </children>
+   </bottom>
-</AnchorPane>
+   <center>
+      <StackPane fx:id="tourPages" prefHeight="150.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+         <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">
+                     <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="In the &quot;My Garden&quot; tab, you can see all of the plants you're planning on growing.">
+                     <VBox.margin>
+                        <Insets bottom="20.0" />
+                     </VBox.margin>
+                  </Text>
+                  <HBox prefHeight="100.0" prefWidth="200.0">
+                     <children>
+                        <TextFlow lineSpacing="4.0" prefHeight="90.0" prefWidth="500.0">
+                           <children>
+                              <Text strokeType="OUTSIDE" strokeWidth="0.0" text="To get started, click on the &quot;Add new Plant&quot; button in the bottom left. This will open a list of all the plants you can grow.&#10;Use the search bar at the top, the filters on the left, or simply browse the list until you've found a plant you want to grow in your garden." wrappingWidth="345.80316162109375" />
+                           </children>
+                           <HBox.margin>
+                              <Insets bottom="20.0" />
+                           </HBox.margin>
+                        </TextFlow>
+                        <Separator prefWidth="200.0" visible="false" HBox.hgrow="ALWAYS" />
+                        <ImageView fx:id="imgAddNewPlant" 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="Once you've found what you're looking for, click the &quot;Select Sow/Harvest Date&quot; button at the bottom of the window.&#10;In the subsequently shown dialog, you can select the date you'd like to sow or harvest the crop. The date selector shows possible dates in green. Confirm your selection with the &quot;Save&quot; button." />
+                           </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" />
+                     </children>
+                  </HBox>
+               </children>
+               <opaqueInsets>
+                  <Insets />
+               </opaqueInsets>
+            </VBox>
+            <VBox prefHeight="200.0" prefWidth="100.0">
+               <children>
+                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Managing Your Tasks">
+                     <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="In the &quot;My Schedule&quot; tab, you can see all of the tasks you need to complete for a successful harvest.">
+                     <VBox.margin>
+                        <Insets bottom="20.0" />
+                     </VBox.margin>
+                  </Text>
+                  <HBox prefHeight="100.0" prefWidth="200.0">
+                     <children>
+                        <TextFlow lineSpacing="4.0" prefHeight="90.0" prefWidth="500.0">
+                           <children>
+                              <Text strokeType="OUTSIDE" strokeWidth="0.0" text="You can view the tasks for a specific crop by selecting it from the left sidebar.&#10;To see all tasks again, click the &quot;Clear Filter&quot; button at the bottom." wrappingWidth="345.80316162109375" />
+                           </children>
+                           <HBox.margin>
+                              <Insets bottom="20.0" />
+                           </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" />
+                     </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 />
+               </opaqueInsets>
+            </VBox>
+         </children>
+         <BorderPane.margin>
+            <Insets />
+         </BorderPane.margin>
+         <padding>
+            <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
+         </padding>
+      </StackPane>
+   </center>
+</BorderPane>

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

@@ -0,0 +1,6 @@
+.button{
+    -fx-text-fill: rgb(49, 89, 23);
+    -fx-border-color: rgb(49, 89, 23);
+    -fx-border-radius: 5;
+    -fx-padding: 3 6 6 6;
+}

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

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

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

@@ -15,7 +15,7 @@ import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
 class GardenScheduleTest {
-    LocalDate exampleStartDate = LocalDate.of(2020, 02, 02);
+    LocalDate exampleStartDate = LocalDate.of(2020, 2, 2);
     TaskList taskList;
     PlantList plantList;
     List<Plant> examplePlantList;
@@ -43,6 +43,7 @@ class GardenScheduleTest {
     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)));
 
@@ -105,7 +106,7 @@ 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));
     }
 
     @Test
@@ -157,19 +158,22 @@ class GardenScheduleTest {
         assertEquals(7, dayList.size());
 
         //Check day 0
-        assertEquals(1, dayList.get(0).size());
+        assertEquals(2, dayList.get(0).size());
-        assertEquals(exampleTaskList.get(2), dayList.get(0).get(0));
+        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

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,
+            "interval": null
-            "isOptional": false
           }
         ]
       },
@@ -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,
+            "interval": 21
-            "isOptional": false
           }
         ]
       },
@@ -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,
+            "interval": null
-            "isOptional": false
           }
         ]
       }
@@ -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,
+            "interval": null
-            "isOptional": false
           }
         ]
       },
@@ -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,
+            "interval": 15
-            "isOptional": true
           }
         ]
       },
@@ -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,
+            "interval": null
-            "isOptional": false
           }
         ]
       }
@@ -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,
+            "interval": null
-            "isOptional": false
           }
         ]
       },
@@ -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,
+            "interval": 15
-            "isOptional": true
           }
         ]
       },
@@ -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,
+            "interval": null
-            "isOptional": false
           }
         ]
       }