Merge pull request #70 from schrom01/tests_and_fixes_M3

Tests and fixes m3

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

@@ -22,6 +22,7 @@ import javafx.scene.control.*;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
+import javafx.scene.layout.Pane;
 import javafx.scene.layout.Priority;
 import javafx.stage.Stage;
 
@@ -87,7 +88,7 @@ public class CropDetailController {
     private ListView<Pest> pests_listView;
 
     @FXML
-    void addTask() throws IOException {
+    void addTask() throws IOException, HardinessZoneNotSetException {
         createTaskDialog(true, null);
     }
 
@@ -136,7 +137,7 @@ public class CropDetailController {
             if (plant.image() != null) {
                 imageView.setImage(plant.image());
             }
-            area_label.setText("");
+            area_label.setText(String.valueOf(crop.getArea()));
             location_label.setText("");
 
             setTaskListProperty(crop);
@@ -205,22 +206,28 @@ public class CropDetailController {
     }
 
     private HBox createTaskHBox(Task task) {
-        HBox hBox = new HBox();
+        HBox hBox = new HBox(10);
         Label taskName = new Label(task.getName()+": ");
+        taskName.setMinWidth(100);
+        taskName.setMaxSize(Double.MAX_VALUE, Double.MAX_VALUE);
         taskName.setStyle("-fx-font-weight: bold");
         Label taskDescription = new Label(task.getDescription());
         taskDescription.setWrapText(true);
-        taskDescription.setMaxWidth(2000);
+        taskDescription.setMaxSize(600, Double.MAX_VALUE);
-        HBox.setHgrow(taskDescription, Priority.ALWAYS);
+        Pane puffer = new Pane();
+        HBox.setHgrow(puffer, Priority.ALWAYS);
+
 
         Button edit = new Button();
         Button delete = new Button();
+        HBox.setHgrow(edit, Priority.NEVER);
+        HBox.setHgrow(delete, Priority.NEVER);
         setIconToButton(edit, "editIcon.png");
         setIconToButton(delete, "deleteIcon.png");
         edit.setOnAction(getEditTaskEvent(task));
         delete.setOnAction(deleteTask(task));
 
-        hBox.getChildren().addAll(taskName, taskDescription, edit, delete);
+        hBox.getChildren().addAll(taskName, taskDescription, puffer, edit, delete);
         return hBox;
     }
 
@@ -229,12 +236,15 @@ public class CropDetailController {
         label.setStyle("-fx-font-weight: bold");
         HBox hBox = new HBox();
         hBox.fillHeightProperty();
-        Label label1 = new Label(pest.description());
+        Label description = new Label(pest.description());
-        label1.setAlignment(Pos.TOP_LEFT);
+        description.setAlignment(Pos.TOP_LEFT);
-        label1.setWrapText(true);
+        description.setWrapText(true);
-        label1.setMaxWidth(600);
+        description.setMaxWidth(600);
+        Pane puffer = new Pane();
+        HBox.setHgrow(puffer, Priority.ALWAYS);
         Button button = new Button("Get Counter Measures");
-        hBox.getChildren().addAll(label, label1, button);
+        HBox.setHgrow(button, Priority.NEVER);
+        hBox.getChildren().addAll(label, description, puffer, button);
         return hBox;
     }
 
@@ -255,7 +265,7 @@ public class CropDetailController {
         return (event) -> {
             try {
                 createTaskDialog(false, task);
-            } catch (IOException e) {
+            } catch (IOException | HardinessZoneNotSetException e) {
                 e.printStackTrace();
             }
         };
@@ -267,7 +277,7 @@ public class CropDetailController {
         };
     }
 
-    private void createTaskDialog(boolean newTask, Task givenTask) throws IOException {
+    private void createTaskDialog(boolean newTask, Task givenTask) throws IOException, HardinessZoneNotSetException {
         Dialog<Task> dialog = new Dialog<>();
         dialog.setTitle("Set Task");
         dialog.setHeaderText("Add/Edit Task:");
@@ -289,7 +299,7 @@ public class CropDetailController {
             if (!newTask) {
                 controller.setTaskValue(givenTask);
             }
-            dialog.setResultConverter(button -> button.equals(saveTask) ? controller.returnResult() : null);
+            dialog.setResultConverter(button -> button.equals(saveTask) ? controller.returnResult(this.crop) : null);
 
             dialog.showAndWait()
                     .ifPresent(task -> {
@@ -334,8 +344,11 @@ public class CropDetailController {
                             //ToDo method to set location
                             location_label.setText(string);
                         } else {
-                            System.out.println(string);
+                            try {
-                            //ToDo method to set area of crop in garden
+                                garden.updateCrop(this.crop.withArea(Double.parseDouble(string)));
+                            } catch (IOException e) {
+                                e.printStackTrace();
+                            }
                             area_label.setText(string);
                         }
                     });

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/MyGardenController.java

@@ -51,7 +51,6 @@ public class MyGardenController {
     @AfterInject
     @SuppressWarnings("unused")
     public void init() {
-        System.out.println("once");
         setIconToButton(addPlant_button, "addIcon.png");
         myGarden_listView.itemsProperty().bind(garden.getPlantedCrops());
         setCellFactory();

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

@@ -9,11 +9,14 @@ import ch.zhaw.gartenverwaltung.models.GardenSchedule;
 import ch.zhaw.gartenverwaltung.types.Crop;
 import ch.zhaw.gartenverwaltung.types.Plant;
 import ch.zhaw.gartenverwaltung.types.Task;
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
-import javafx.scene.control.Label;
+import javafx.scene.control.*;
-import javafx.scene.control.ListCell;
+import javafx.scene.layout.HBox;
-import javafx.scene.control.ListView;
 import javafx.scene.layout.Pane;
+import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
 
 import java.io.IOException;
@@ -24,6 +27,7 @@ import java.util.logging.Logger;
 
 public class MyScheduleController {
     private static final Logger LOG = Logger.getLogger(MyScheduleController.class.getName());
+    private final ListProperty<List<Task>> taskListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
 
     private Crop selectedCrop = null;
 
@@ -35,46 +39,7 @@ public class MyScheduleController {
     private PlantList plantList;
 
     @FXML
-    private Label day1_label;
+    private ListView<List<Task>> week_listView;
-
-    @FXML
-    private Pane day1_pane;
-
-    @FXML
-    private Label day2_label;
-
-    @FXML
-    private Pane day2_pane;
-
-    @FXML
-    private Label day3_label;
-
-    @FXML
-    private Pane day3_pane;
-
-    @FXML
-    private Label day4_label;
-
-    @FXML
-    private Pane day4_pane;
-
-    @FXML
-    private Label day5_label;
-
-    @FXML
-    private Pane day5_pane;
-
-    @FXML
-    private Label day6_label;
-
-    @FXML
-    private Pane day6_pane;
-
-    @FXML
-    private Label day7_label;
-
-    @FXML
-    private Pane day7_pane;
 
     @FXML
     private Label information_label;
@@ -85,10 +50,11 @@ public class MyScheduleController {
     @AfterInject
     @SuppressWarnings("unused")
     public void init() {
-        setCellFactoryListView();
+        setCellFactoryCropListView();
+        setCellFactoryTaskListView();
         scheduledPlants_listview.itemsProperty().bind(garden.getPlantedCrops());
+        week_listView.itemsProperty().bind(taskListProperty);
         lookForSelectedListEntries();
-        setDayLabels();
         information_label.setText("");
         try {
             loadTaskList();
@@ -108,18 +74,7 @@ public class MyScheduleController {
         });
     }
 
-    private void setDayLabels() {
+    private void setCellFactoryCropListView() {
-        LocalDate today = LocalDate.now();
-        day1_label.setText(today.getDayOfWeek().toString());
-        day2_label.setText(today.plusDays(1).getDayOfWeek().toString());
-        day3_label.setText(today.plusDays(2).getDayOfWeek().toString());
-        day4_label.setText(today.plusDays(3).getDayOfWeek().toString());
-        day5_label.setText(today.plusDays(4).getDayOfWeek().toString());
-        day6_label.setText(today.plusDays(5).getDayOfWeek().toString());
-        day7_label.setText(today.plusDays(6).getDayOfWeek().toString());
-    }
-
-    private void setCellFactoryListView() {
         scheduledPlants_listview.setCellFactory(param -> new ListCell<>() {
             @Override
             protected void updateItem(Crop crop, boolean empty) {
@@ -141,6 +96,23 @@ public class MyScheduleController {
         });
     }
 
+    private void setCellFactoryTaskListView() {
+        week_listView.setCellFactory(param -> new ListCell<>() {
+            @Override
+            protected void updateItem(List<Task> taskList, boolean empty) {
+                super.updateItem(taskList, empty);
+
+                if (empty || taskList == null) {
+                    setGraphic(null);
+                    setText(null);
+                } else {
+                    setText("");
+                    setGraphic(weekTaskVBox(taskList, this.getIndex()));
+                }
+            }
+        });
+    }
+
     private void loadTaskList() throws IOException {
         List<List<Task>> taskLists;
         if (selectedCrop != null) {
@@ -148,25 +120,66 @@ public class MyScheduleController {
         } else {
             taskLists = gardenSchedule.getTasksUpcomingWeek();
         }
-        if (!taskLists.isEmpty()) {
+        taskListProperty.clear();
-            viewTaskListOfDay(day1_pane, taskLists.get(0));
+        taskListProperty.addAll(taskLists);
-            viewTaskListOfDay(day2_pane, taskLists.get(1));
-            viewTaskListOfDay(day3_pane, taskLists.get(2));
-            viewTaskListOfDay(day4_pane, taskLists.get(3));
-            viewTaskListOfDay(day5_pane, taskLists.get(4));
-            viewTaskListOfDay(day6_pane, taskLists.get(5));
-            viewTaskListOfDay(day7_pane, taskLists.get(6));
-        }
     }
 
-    private void viewTaskListOfDay(Pane pane, List<Task> tasks) {
+    private VBox weekTaskVBox(List<Task> tasks, int dayIndex) {
-        //ToDo update pane with task list
+        VBox vBox = new VBox(10);
-        VBox vBox = new VBox();
+        LocalDate today = LocalDate.now();
+        Label weekDay = new Label(today.plusDays(dayIndex).getDayOfWeek().toString());
+        weekDay.setStyle("-fx-font-weight: bold; -fx-underline: true");
+        vBox.getChildren().add(weekDay);
         for (Task task : tasks) {
-            Label label = new Label(task.getDescription());
+            HBox hBox = new HBox(10);
-            vBox.getChildren().add(label);
+            Label taskName = new Label(task.getName() + ":");
+            taskName.setStyle("-fx-font-weight: bold");
+            taskName.setMinWidth(100);
+            taskName.setMaxSize(Double.MAX_VALUE, Double.MAX_VALUE);
+            hBox.getChildren().addAll(taskName);
+
+            HBox hBoxDescription = new HBox();
+            Label taskDescription = new Label(task.getDescription());
+            taskDescription.setWrapText(true);
+            taskDescription.setMaxSize(600, Double.MAX_VALUE);
+            Pane puffer = new Pane();
+            HBox.setHgrow(puffer, Priority.ALWAYS);
+            CheckBox checkBox = new CheckBox("Task completed?");
+            checkBox.selectedProperty().addListener((observable, oldValue, newValue) -> {
+                if (newValue) {
+                    showConfirmation(task, checkBox);
+                }
+            });
+            HBox.setHgrow(checkBox, Priority.NEVER);
+            hBoxDescription.getChildren().addAll(taskDescription, puffer, checkBox);
+            vBox.getChildren().addAll(hBox, hBoxDescription);
         }
-        pane.getChildren().add(vBox);
+        return vBox;
+    }
+
+    /**
+     * Alert to confirm that task has been completed.
+     * @param task {@link Task} which is selected
+     */
+    private void showConfirmation(Task task, CheckBox checkBox) {
+        Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
+        alert.setTitle("Task Completed?");
+        alert.setHeaderText("Are you sure you have completed this task?");
+        alert.setContentText("Confirming that you have completed the task will remove it from the schedule.");
+
+        alert.showAndWait()
+                .ifPresent(buttonType -> {
+                    if (buttonType == ButtonType.OK) {
+                        task.done();
+                        try {
+                            loadTaskList();
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    } else {
+                        checkBox.setSelected(false);
+                    }
+                });
     }
 
 

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

@@ -233,11 +233,11 @@ public class PlantsController {
             RadioButton radioButton = new RadioButton(season.getName());
             radioButton.setToggleGroup(seasonGroup);
             radioButton.setPadding(new Insets(0, 0, 10, 0));
-            if (season.equals(Seasons.AllSEASONS)) {
+            if (season.equals(Seasons.ALLSEASONS)) {
                 radioButton.setSelected(true);
             }
             radioButton.selectedProperty().addListener((observable, oldValue, newValue) -> {
-                if (season.equals(Seasons.AllSEASONS)) {
+                if (season.equals(Seasons.ALLSEASONS)) {
                     fillPlantListWithHardinessZone();
                 } else {
                     try {

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

@@ -1,23 +1,35 @@
 package ch.zhaw.gartenverwaltung;
 
+import ch.zhaw.gartenverwaltung.bootstrap.AfterInject;
+import ch.zhaw.gartenverwaltung.bootstrap.Inject;
+import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
+import ch.zhaw.gartenverwaltung.io.PlantList;
+import ch.zhaw.gartenverwaltung.models.Garden;
+import ch.zhaw.gartenverwaltung.models.GardenSchedule;
 import ch.zhaw.gartenverwaltung.types.Crop;
+import ch.zhaw.gartenverwaltung.types.Plant;
 import ch.zhaw.gartenverwaltung.types.Task;
-import javafx.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.*;
 import javafx.util.Callback;
 
+import java.io.IOException;
 import java.net.URL;
 import java.time.LocalDate;
 import java.util.ResourceBundle;
 
 public class TaskFormularController implements Initializable {
     private Crop crop;
+    private Plant plant;
+    private Task task = null;
+
+    @Inject
+    private GardenSchedule gardenSchedule;
+    @Inject
+    private Garden garden;
+    @Inject
+    private PlantList plantList;
 
     @FXML
     private TextArea description_area;
@@ -34,19 +46,28 @@ public class TaskFormularController implements Initializable {
     @FXML
     private TextField taskName_field;
 
+    @AfterInject
+    @SuppressWarnings("unused")
 
-    public Task returnResult() {
+    public Task returnResult(Crop crop) {
+        int interval = 0;
+        if (!(interval_field.getText().isEmpty() || interval_field.getText().equals(""))) {
+            interval = Integer.parseInt(interval_field.getText());
+        }
         Task task = new Task(taskName_field.getText(), description_area.getText(),
                 start_datePicker.getValue(), end_datePicker.getValue(),
-                Integer.parseInt(interval_field.getText()), crop.getCropId().get());
+                interval, crop.getCropId().get());
+        if (this.task != null) return this.task.updateTask(task);
         return task;
     }
 
-    public void setCorp(Crop crop) {
+    public void setCorp(Crop crop) throws HardinessZoneNotSetException, IOException {
         this.crop = crop;
+        this.plant = plantList.getPlantById(Settings.getInstance().getCurrentHardinessZone(), crop.getPlantId()).get();
     }
 
     public void setTaskValue(Task task) {
+        this.task = task;
         taskName_field.setText(task.getName());
         description_area.setText(task.getDescription());
         start_datePicker.setValue(task.getStartDate());
@@ -69,7 +90,7 @@ public class TaskFormularController implements Initializable {
                 setDisable(true);
                 setStyle("-fx-background-color: #ffc0cb;");
 
-                if (item.compareTo(today) > 0 && item.compareTo(crop.getStartDate()) > 0) {
+                if (item.compareTo(today) > 0 && item.compareTo(crop.getStartDate()) > 0 && item.compareTo(crop.getStartDate().plusDays(plant.timeToHarvest(0))) < 0) {
                     setDisable(false);
                     setStyle("-fx-background-color: #32CD32;");
                 }
@@ -93,7 +114,7 @@ public class TaskFormularController implements Initializable {
                 setDisable(true);
                 setStyle("-fx-background-color: #ffc0cb;");
 
-                if (item.compareTo(today) > 0 && item.compareTo(crop.getStartDate()) > 0) {
+                if (item.compareTo(today) > 0 && item.compareTo(crop.getStartDate()) > 0 && item.compareTo(crop.getStartDate().plusDays(plant.timeToHarvest(0))) < 0) {
                     setDisable(false);
                     setStyle("-fx-background-color: #32CD32;");
                 }
@@ -114,12 +135,8 @@ public class TaskFormularController implements Initializable {
         });
 
         button.disableProperty().bind(start_datePicker.valueProperty().isNull()
-                .or(end_datePicker.valueProperty().isNull())
                 .or(taskName_field.textProperty().isEmpty())
-                .or(description_area.textProperty().isEmpty())
+                .or(description_area.textProperty().isEmpty()));
-                .or(interval_field.textProperty().isEmpty()));
-
-
     }
 
     @Override

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

@@ -27,6 +27,15 @@ public class TextFieldFormularController {
     }
 
     public void initSaveButton(Button button) {
+        text_area.textProperty().addListener((observable, oldValue, newValue) -> {
+            if (newValue.matches("\\d*\\.?\\d*")) {
+                text_area.setText(newValue);
+            } else {
+                text_area.setText(oldValue);
+            }
+        });
+
         button.disableProperty().bind(text_area.textProperty().isEmpty());
     }
+
 }

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).
@@ -135,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

@@ -20,8 +20,8 @@ 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 {
@@ -45,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;
     }
@@ -88,7 +96,8 @@ public class JsonTaskList implements TaskList {
         if(taskMap.isEmpty()) {
             loadTaskListFromFile();
         }
-        taskMap.values().removeIf(task -> task.getCropId() == cropId);
+        taskMap.entrySet().removeIf(entry -> entry.getValue().getCropId() == cropId);
+        writeTaskListToFile();
         notifySubscribers();
     }
 

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

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/Garden.java

@@ -70,6 +70,19 @@ public class Garden {
         plantedCrops.clear();
         plantedCrops.addAll(cropList.getCrops());
     }
+
+    /**
+     * Updates the {@link Crop} from the file and the cache
+     *
+     * @param crop The crop which is being updated
+     * @throws IOException If the database cannot be accessed
+     */
+    public void updateCrop(Crop crop) throws IOException {
+        cropList.saveCrop(crop);
+        plantedCrops.clear();
+        plantedCrops.addAll(cropList.getCrops());
+    }
+
     /**
      * Returns a list of {@link Crop}s which are currently in the gardenplan.
      *

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

@@ -146,13 +146,18 @@ public class GardenSchedule {
             dayTaskList.add(new ArrayList<>());
             final int finalI = i;
             weekTasks.forEach(task -> {
-                LocalDate checkDate = task.getNextExecution();
+                if (task.getNextExecution() == null) {
-                do {
+                    task.isDone();
-                    if (date.equals(checkDate) && !date.isAfter(task.getEndDate().orElse(LocalDate.MIN))) {
+                } else {
-                        dayTaskList.get(finalI).add(task);
+                    LocalDate checkDate = task.getNextExecution();
-                    }
+
-                    checkDate = checkDate.plusDays(task.getInterval().orElse(0));
+                    do {
-                } while (task.getInterval().isPresent() && checkDate.isBefore(LocalDate.now().plusDays(listLength)));
+                        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().orElse(0) == 0) && checkDate.isBefore(LocalDate.now().plusDays(listLength)));
+                }
             });
         }
         return dayTaskList;
@@ -187,6 +192,6 @@ public class GardenSchedule {
      * @return a sorted coppy of the given Tasklist
      */
     private List<Task> getSortedTaskList(List<Task> taskList, Comparator<Task> comparator) {
-        return taskList.stream().sorted(comparator).collect(Collectors.toList());
+        return taskList.stream().filter(task -> task.getNextExecution() != null).sorted(comparator).collect(Collectors.toList());
     }
 }

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

@@ -66,16 +66,16 @@ public record Plant(
     public int timeToHarvest(int group) {
         List<GrowthPhase> activeLifecycle = lifecycleForGroup(group);
         GrowthPhase sow = activeLifecycle.stream()
-                .filter(growthPhase -> !growthPhase.type().equals(GrowthPhaseType.SOW))
+                .filter(growthPhase -> growthPhase.type().equals(GrowthPhaseType.SOW))
                 .findFirst()
                 .orElseThrow();
         GrowthPhase harvest = activeLifecycle.stream()
-                .filter(growthPhase -> !growthPhase.type().equals(GrowthPhaseType.HARVEST))
+                .filter(growthPhase -> growthPhase.type().equals(GrowthPhaseType.HARVEST))
                 .findFirst()
                 .orElseThrow();
 
         int currentYear = LocalDate.now().getYear();
-        return (int) DAYS.between(harvest.startDate().atYear(currentYear), sow.startDate().atYear(currentYear));
+        return (int) DAYS.between(sow.startDate().atYear(currentYear),harvest.startDate().atYear(currentYear));
     }
 
     public int lifecycleGroupFromHarvestDate(LocalDate harvestDate) {

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

@@ -3,7 +3,7 @@ package ch.zhaw.gartenverwaltung.types;
 import java.time.MonthDay;
 
 public enum Seasons {
-    AllSEASONS("--01-01", "--12-31", "All Seasons"),
+    ALLSEASONS("--01-01", "--12-31", "All Seasons"),
     SPRING("--03-01", "--05-30", "Spring"),
     SUMMER("--06-01", "--08-30", "Summer"),
     AUTUMN("--09-01", "--11-30", "Autumn"),

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

@@ -10,14 +10,15 @@ import java.util.Optional;
  */
 public class Task {
     private Long id;
-    private final String name;
+    private String name;
-    private final String description;
+    private String description;
-    private final LocalDate startDate;
+    private LocalDate startDate;
     private Integer interval;
     private LocalDate endDate;
     private LocalDate nextExecution;
     private LocalDate nextNotification;
     private long cropId;
+    private boolean done;
 
     /**
      * default constructor
@@ -69,7 +70,7 @@ public class Task {
     }
 
     public void done(){
-        if(interval != null && !nextExecution.plusDays(interval).isAfter(endDate)){
+        if(interval != null && interval != 0 && !nextExecution.plusDays(interval).isAfter(endDate)){
             nextExecution = nextExecution.plusDays(interval);
         } else {
             nextExecution = null;
@@ -103,4 +104,14 @@ public class Task {
     public Optional<LocalDate> getEndDate() {
         return Optional.ofNullable(endDate);
     }
+
+    public Task updateTask(Task task) {
+        this.name = task.getName();
+        this.description = task.getDescription();
+        this.startDate = task.getStartDate();
+        this.endDate = task.getEndDate().orElse(null);
+        this.interval = task.getInterval().orElse(0);
+        this.cropId = task.getCropId();
+        return this;
+    }
 }

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

@@ -42,7 +42,7 @@ public class TaskTemplate {
     }
 
     public Task generateTask(LocalDate realStartDate, long cropId) {
-        LocalDate endDate = relativeEndDate != null ? realStartDate.plusDays(relativeEndDate) : null;
+        LocalDate endDate = relativeEndDate != null ? realStartDate.plusDays(relativeEndDate) : realStartDate;
 
         if (interval == null) {
             this.interval = 0;

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

@@ -107,7 +107,7 @@
                               <Insets right="60.0" />
                            </HBox.margin>
                         </Label>
-                        <Label fx:id="area_label" text="Label">
+                        <Label fx:id="area_label" minWidth="-Infinity" prefWidth="50.0" text="Label">
                            <HBox.margin>
                               <Insets right="10.0" />
                            </HBox.margin>
@@ -125,7 +125,7 @@
                               <Insets right="40.0" />
                            </HBox.margin>
                         </Label>
-                        <Label fx:id="location_label" text="Label">
+                        <Label fx:id="location_label" minHeight="-Infinity" prefWidth="50.0" text="Label">
                            <HBox.margin>
                               <Insets right="10.0" />
                            </HBox.margin>

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

@@ -7,14 +7,14 @@
 
 <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="938.0" prefWidth="1110.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.MainFXMLController">
    <children>
-      <HBox maxWidth="35.0" minHeight="35.0" prefHeight="38.0" prefWidth="1110.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <HBox fx:id="menubar" maxWidth="35.0" minHeight="40.0" prefHeight="38.0" prefWidth="1110.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
-            <Button fx:id="home_button" mnemonicParsing="false" onAction="#goToHome" prefHeight="38.0" prefWidth="40.0" HBox.hgrow="NEVER" />
+            <Button fx:id="home_button" mnemonicParsing="false" onAction="#goToHome" prefHeight="38.0" prefWidth="38.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="#showTutorial" prefHeight="38.0" prefWidth="121.0" text="Tutorial" />
-            <Pane maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS" />
+            <Pane fx:id="menu_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" />
+            <Button fx:id="settings_button" mnemonicParsing="false" onAction="#openSettings" prefHeight="38.0" prefWidth="38.0" HBox.hgrow="NEVER" />
          </children>
       </HBox>
       <AnchorPane fx:id="mainPane" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="35.0" />

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

@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Pane?>
-<?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="572.0" prefWidth="867.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.MyScheduleController">
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="572.0" prefWidth="867.0"
-            xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.gartenverwaltung.MyScheduleController">
    <children>
       <Label layoutX="14.0" layoutY="14.0" text="MySchedule">
          <font>
@@ -22,41 +18,18 @@
       </Label>
       <HBox layoutY="31.0" prefHeight="541.0" prefWidth="867.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="50.0">
          <children>
-            <ListView fx:id="scheduledPlants_listview" maxWidth="1.7976931348623157E308" prefHeight="522.0" prefWidth="365.0" HBox.hgrow="NEVER" />
+            <ListView fx:id="scheduledPlants_listview" maxWidth="1.7976931348623157E308" prefHeight="522.0" prefWidth="271.0" HBox.hgrow="NEVER">
+               <HBox.margin>
+                  <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+               </HBox.margin></ListView>
             <VBox maxWidth="1.7976931348623157E308" prefHeight="537.0" prefWidth="650.0" HBox.hgrow="ALWAYS">
                <children>
-                  <GridPane alignment="CENTER_LEFT" gridLinesVisible="true" maxWidth="1.7976931348623157E308" prefHeight="403.0" prefWidth="575.0" VBox.vgrow="ALWAYS">
+                  <ListView fx:id="week_listView" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
-                    <columnConstraints>
+                     <VBox.margin>
-                      <ColumnConstraints fillWidth="false" hgrow="NEVER" maxWidth="278.0" minWidth="100.0" prefWidth="173.0" />
+                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                      <ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" minWidth="10.0" prefWidth="402.0" />
+                     </VBox.margin>
-                    </columnConstraints>
+                  </ListView>
-                    <rowConstraints>
+                  <Pane prefHeight="131.0" prefWidth="593.0" VBox.vgrow="NEVER">
-                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                    </rowConstraints>
-                     <children>
-                        <Label fx:id="day1_label" alignment="CENTER" prefHeight="32.0" prefWidth="173.0" text="Label" />
-                        <Label fx:id="day2_label" alignment="CENTER" prefHeight="29.0" prefWidth="173.0" text="Label" GridPane.rowIndex="1" />
-                        <Label fx:id="day3_label" alignment="CENTER" prefHeight="32.0" prefWidth="172.0" text="Label" GridPane.rowIndex="2" />
-                        <Label fx:id="day4_label" alignment="CENTER" prefHeight="35.0" prefWidth="173.0" text="Label" GridPane.rowIndex="3" />
-                        <Label fx:id="day5_label" alignment="CENTER" prefHeight="31.0" prefWidth="173.0" text="Label" GridPane.rowIndex="4" />
-                        <Label fx:id="day6_label" alignment="CENTER" prefHeight="31.0" prefWidth="173.0" text="Label" GridPane.rowIndex="5" />
-                        <Label fx:id="day7_label" alignment="CENTER" prefHeight="35.0" prefWidth="173.0" text="Label" GridPane.rowIndex="6" />
-                        <Pane fx:id="day1_pane" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" />
-                        <Pane fx:id="day2_pane" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                        <Pane fx:id="day3_pane" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                        <Pane fx:id="day4_pane" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-                        <Pane fx:id="day5_pane" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-                        <Pane fx:id="day6_pane" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="5" />
-                        <Pane fx:id="day7_pane" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="6" />
-                     </children>
-                  </GridPane>
-                  <Pane prefHeight="119.0" prefWidth="575.0" VBox.vgrow="NEVER">
                      <children>
                         <Label alignment="TOP_LEFT" layoutX="14.0" layoutY="14.0" prefHeight="17.0" prefWidth="550.0" text="Importants Information:" wrapText="true">
                            <font>
@@ -65,6 +38,9 @@
                         </Label>
                         <Label fx:id="information_label" alignment="TOP_LEFT" layoutX="14.0" layoutY="31.0" maxWidth="1.7976931348623157E308" prefHeight="82.0" prefWidth="550.0" text="Label" wrapText="true" />
                      </children>
+                     <VBox.margin>
+                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                     </VBox.margin>
                   </Pane>
                </children>
             </VBox>

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

@@ -9,9 +9,7 @@
 <?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">
-<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>
@@ -27,7 +25,7 @@
             <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" />
+                  <TextArea fx:id="description_area" prefHeight="73.0" prefWidth="206.0" promptText="Description" wrapText="true" />
                </children>
             </HBox>
             <HBox alignment="CENTER_LEFT" layoutX="30.0" layoutY="30.0" prefHeight="35.0" prefWidth="560.0">

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

@@ -1,6 +1,25 @@
-.button{
+/*
-    -fx-text-fill: rgb(49, 89, 23);
+
-    -fx-border-color: rgb(49, 89, 23);
+#home_button, #myGarden_button,
-    -fx-border-radius: 5;
+#mySchedule_button, #settings_button,
-    -fx-padding: 3 6 6 6;
+#tutorial_button, #menu_pane {
+    -fx-text-fill: white;
+    -fx-background-color: rgb(0,128,0);
 }
+
+#menubar {
+    -fx-background-color: rgb(0,128,0);
+}
+
+#home_button:hover, #myGarden_button:hover,
+#mySchedule_button:hover, #settings_button:hover,
+#tutorial_button:hover,
+#home_button:focused, #myGarden_button:focused,
+#mySchedule_button:focused, #settings_button:focused,
+#tutorial_button:focused{
+    -fx-background-color: darkgreen;
+}
+
+.root, .split-pane {
+    -fx-background-color: linear-gradient(green 0%, lawngreen 33%, lightgreen 66%, #eee 100%);
+}./

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

@@ -245,5 +245,86 @@
         "measures": "less water"
       }
     ]
+  },
+  {
+    "id": 3,
+    "name": "Test Potato",
+    "description": "The potato is a tuber, round or oval, with small white roots called  'eyes', that are growth buds. The size varies depending on the variety; the colour of the skin can be white, yellow or even purple.",
+    "light": 6,
+    "spacing": "35",
+    "soil": "sandy",
+    "image": "potato.jpg",
+    "pests": [
+      {
+        "name": "Rot",
+        "description": "Rot, any of several plant diseases, caused by any of hundreds of species of soil-borne bacteria, fungi, and funguslike organisms (Oomycota). Rot diseases are characterized by plant decomposition and putrefaction. The decay may be hard, dry, spongy, watery, mushy, or slimy and may affect any plant part.",
+        "measures": "Less water."
+      }
+    ],
+    "lifecycle": [
+      {
+        "startDate": "12-01",
+        "endDate": "12-02",
+        "type": "SOW",
+        "zone": "ZONE_8A",
+        "group": 0,
+        "wateringCycle": {
+          "litersPerSqM": 0,
+          "interval": null,
+          "notes": []
+        },
+        "taskTemplates": [
+          {
+            "name": "Germinate",
+            "relativeStartDate": -3,
+            "relativeEndDate": 0,
+            "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
+          }
+        ]
+      },
+      {
+        "startDate": "12-03",
+        "endDate": "12-15",
+        "type": "PLANT",
+        "zone": "ZONE_8A",
+        "group": 0,
+        "wateringCycle": {
+          "litersPerSqM": 25,
+          "interval": 7,
+          "notes": []
+        },
+        "taskTemplates": [
+          {
+            "name": "hilling",
+            "relativeStartDate": 0,
+            "relativeEndDate": 10,
+            "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": 1
+          }
+        ]
+      },
+      {
+        "startDate": "12-16",
+        "endDate": "12-18",
+        "type": "HARVEST",
+        "zone": "ZONE_8A",
+        "group": 0,
+        "wateringCycle": {
+          "litersPerSqM": 0,
+          "interval": null,
+          "notes": []
+        },
+        "taskTemplates": [
+          {
+            "name": "Harvest",
+            "relativeStartDate": 0,
+            "relativeEndDate": 4,
+            "description": "Once the foliage has wilted and dried completely, harvest on a dry day. Store in a dark and cool location.",
+            "interval": null
+          }
+        ]
+      }
+    ]
   }
 ]

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

@@ -30,6 +30,7 @@ public class JsonCropListTest {
      */
     private final URL dbDataSource = this.getClass().getResource("test-user-crops.json");
     private final URL testFile = this.getClass().getResource("template-user-crops.json");
+    private final URL corruptTestFile = this.getClass().getResource("corrupt-template-user-crops.json");
 
     @BeforeEach
     void connectToDb() throws URISyntaxException, IOException {
@@ -101,5 +102,13 @@ public class JsonCropListTest {
             throw new RuntimeException(e);
         }
     }
+
+    @Test
+    void detectCorruptJsonResource(){
+        JsonCropList tL = new JsonCropList(corruptTestFile);
+        Assertions.assertThrows(InvalidJsonException.class, () -> {
+            tL.getCrops();
+        });
+    }
 }
 

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

@@ -15,6 +15,7 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class JsonPlantListTest {
     private final URL testFile = this.getClass().getResource("test-plantdb.json");
@@ -62,6 +63,8 @@ public class JsonPlantListTest {
     void getPlantByIdAndZone() {
         Optional<Plant> testPlant;
         try {
+            assertThrows(HardinessZoneNotSetException.class, () -> testDatabase.getPlantById(null,1).get());
+
             testPlant = testDatabase.getPlantById(HardinessZone.ZONE_8A, 1);
         } catch (IOException | HardinessZoneNotSetException e) {
             throw new RuntimeException(e);
@@ -95,5 +98,16 @@ public class JsonPlantListTest {
 
     }
 
+    @Test
+    void testDefaultConstructor(){
+        JsonPlantList db = new JsonPlantList();
+        try {
+            assertNotNull(db.getPlantList(HardinessZone.ZONE_8A));
+        } catch (IOException | HardinessZoneNotSetException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
 }
 

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

@@ -2,6 +2,8 @@ package ch.zhaw.gartenverwaltung.io;
 
 import ch.zhaw.gartenverwaltung.types.Task;
 import org.junit.jupiter.api.*;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -14,6 +16,8 @@ import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 public class JsonTaskListTest {
 
@@ -47,17 +51,16 @@ public class JsonTaskListTest {
 
     }
 
-    @Disabled("disabled until adding works.")
     @Test
     @DisplayName("Add task.")
     void addTask() {
-        Task task = new Task("Testtask", "This is a test Task.", LocalDate.parse("01.05.2022", formatter), 1);
+        Task task = new Task("Testtask", "This is a test Task.", LocalDate.parse("2022-05-01", formatter), 1);
         try {
             testDatabase.saveTask(task);
             List<Task> taskList;
             try {
-                taskList = testDatabase.getTaskList(LocalDate.parse("30.04.2022", formatter),
+                taskList = testDatabase.getTaskList(LocalDate.parse("2022-04-30", formatter),
-                        LocalDate.parse("31.05.2022", formatter));
+                        LocalDate.parse("2022-05-31", formatter));
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
@@ -72,8 +75,7 @@ public class JsonTaskListTest {
     @Test
     @DisplayName("Remove task.")
     void removeTask() {
-        Task task = new Task("Dummy", "Dummy", LocalDate.parse("2022-05-31", formatter), 1)
+        Task task = new Task("Dummy", "Dummy", LocalDate.parse("2022-05-31", formatter), 1).withId(2);
-                .withId(2);
         try {
             testDatabase.removeTask(task);
             List<Task> taskList;
@@ -102,7 +104,7 @@ public class JsonTaskListTest {
 
     }
 
-    @Disabled("Disabled until removing works")
+
     @Test
     void removeTasksForCrop() {
         List<Task> taskList;
@@ -115,4 +117,27 @@ public class JsonTaskListTest {
 
         Assertions.assertEquals(0, taskList.size());
     }
+
+    @Test
+    void testDefaultConstructor(){
+        JsonTaskList db = new JsonTaskList();
+        try {
+            assertNotNull(db.getTaskForCrop(0));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    @Test
+    void testSubscription() {
+        TaskList.TaskListObserver mockObs = Mockito.mock(TaskList.TaskListObserver.class);
+        testDatabase.subscribe(mockObs);
+        try {
+            testDatabase.removeTasksForCrop(0);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        verify(mockObs, times(1)).onChange(ArgumentMatchers.anyList());
+    }
 }

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

@@ -188,6 +188,7 @@ class GardenScheduleTest {
 
     @Test
     void planTasksForCrop() throws HardinessZoneNotSetException, PlantNotFoundException, IOException {
+        assertThrows(PlantNotFoundException.class,()-> model.planTasksForCrop(new Crop()));
         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);

src/test/java/ch/zhaw/gartenverwaltung/types/PlantTest.java

@@ -0,0 +1,97 @@
+package ch.zhaw.gartenverwaltung.types;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import java.time.LocalDate;
+import java.time.MonthDay;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class PlantTest {
+
+    Plant testPlant;
+
+    @BeforeEach
+    void setUp() {
+        List<GrowthPhase> growthPhases = new ArrayList<>();
+        growthPhases.add(new GrowthPhase(MonthDay.of(2, 1), MonthDay.of(4, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.SOW, HardinessZone.ZONE_8A, new ArrayList<>()));
+        growthPhases.add(new GrowthPhase(MonthDay.of(4, 2), MonthDay.of(6, 5), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()));
+        growthPhases.add(new GrowthPhase(MonthDay.of(6, 3), MonthDay.of(8, 6), 0, new WateringCycle(0, 0, null), GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()));
+        growthPhases.add(new GrowthPhase(MonthDay.of(3, 1), MonthDay.of(5, 4), 1, new WateringCycle(0, 0, null), GrowthPhaseType.SOW, HardinessZone.ZONE_8A, new ArrayList<>()));
+        growthPhases.add(new GrowthPhase(MonthDay.of(5, 2), MonthDay.of(7, 5), 1, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_8A, new ArrayList<>()));
+        growthPhases.add(new GrowthPhase(MonthDay.of(7, 3), MonthDay.of(9, 6), 1, new WateringCycle(0, 0, null), GrowthPhaseType.HARVEST, HardinessZone.ZONE_8A, new ArrayList<>()));
+        growthPhases.add(new GrowthPhase(MonthDay.of(4, 1), MonthDay.of(6, 4), 0, new WateringCycle(0, 0, null), GrowthPhaseType.SOW, HardinessZone.ZONE_1A, new ArrayList<>()));
+        growthPhases.add(new GrowthPhase(MonthDay.of(6, 2), MonthDay.of(8, 5), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_1A, new ArrayList<>()));
+        growthPhases.add(new GrowthPhase(MonthDay.of(7, 2), MonthDay.of(9, 5), 0, new WateringCycle(0, 0, null), GrowthPhaseType.PLANT, HardinessZone.ZONE_1A, new ArrayList<>()));
+        growthPhases.add(new GrowthPhase(MonthDay.of(8, 3), MonthDay.of(10, 6), 0, new WateringCycle(0, 0, null), GrowthPhaseType.HARVEST, HardinessZone.ZONE_1A, new ArrayList<>()));
+
+        testPlant = 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<>(),
+                growthPhases);
+    }
+
+    @AfterEach
+    void tearDown() {
+    }
+
+    @Test
+    void inZone() {
+        assertEquals(7,testPlant.lifecycleForGroup(0).size());
+        testPlant.inZone(HardinessZone.ZONE_8A);
+        assertEquals(3,testPlant.lifecycleForGroup(0).size());
+        assertEquals(Arrays.asList(3,5,7),testPlant.lifecycleForGroup(1).stream().map(gp ->gp.startDate().getMonthValue()).toList() );
+        testPlant.inZone(HardinessZone.ZONE_1A);
+        assertEquals(0,testPlant.lifecycleForGroup(0).size());
+    }
+
+    @Test
+    void lifecycleForGroup() {
+        assertEquals(Arrays.asList(2,4,6,4,6,7,8),testPlant.lifecycleForGroup(0).stream().map(gp ->gp.startDate().getMonthValue()).toList() );
+        assertEquals(Arrays.asList(3,5,7),testPlant.lifecycleForGroup(1).stream().map(gp ->gp.startDate().getMonthValue()).toList() );
+
+    }
+
+    @Test
+    void sowDateFromHarvestDate() {
+        assertEquals(LocalDate.of(2022,8,1),
+                testPlant.sowDateFromHarvestDate(LocalDate.of(2022,12,1))
+        );
+    }
+
+    @Test
+    void timeToHarvest() {
+        testPlant.inZone(HardinessZone.ZONE_8A);
+        assertEquals(122,testPlant.timeToHarvest(0));
+    }
+
+    @Test
+    void lifecycleGroupFromHarvestDate() {
+        testPlant.inZone(HardinessZone.ZONE_8A);
+        assertEquals(0,testPlant.lifecycleGroupFromHarvestDate(LocalDate.of(2022,6,30)));
+        assertEquals(1,testPlant.lifecycleGroupFromHarvestDate(LocalDate.of(2022,8,30)));
+    }
+
+    @Test
+    void isDateInPhase() {
+        assertTrue(testPlant.isDateInPhase(LocalDate.of(2022,6,30),GrowthPhaseType.HARVEST));
+        assertTrue(testPlant.isDateInPhase(LocalDate.of(2022,8,30),GrowthPhaseType.HARVEST));
+        assertTrue(testPlant.isDateInPhase(LocalDate.of(2022,2,1),GrowthPhaseType.SOW));
+        assertTrue(testPlant.isDateInPhase(LocalDate.of(2022,4,2),GrowthPhaseType.PLANT));
+        assertFalse(testPlant.isDateInPhase(LocalDate.of(2022,6,30),GrowthPhaseType.SOW));
+
+
+    }
+}

src/test/java/ch/zhaw/gartenverwaltung/types/SeasonsTest.java

@@ -0,0 +1,38 @@
+package ch.zhaw.gartenverwaltung.types;
+
+import org.junit.jupiter.api.Test;
+
+import java.time.MonthDay;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class SeasonsTest {
+
+    @Test
+    void getStartDate() {
+        assertEquals(MonthDay.of(1,1), Seasons.ALLSEASONS.getStartDate());
+        assertEquals(MonthDay.of(3,1), Seasons.SPRING.getStartDate());
+        assertEquals(MonthDay.of(6,1), Seasons.SUMMER.getStartDate());
+        assertEquals(MonthDay.of(9,1), Seasons.AUTUMN.getStartDate());
+        assertEquals(MonthDay.of(12,1), Seasons.WINTER.getStartDate());
+    }
+
+    @Test
+    void getEndDate() {
+        assertEquals(MonthDay.of(12,31), Seasons.ALLSEASONS.getEndDate());
+        assertEquals(MonthDay.of(5,30), Seasons.SPRING.getEndDate());
+        assertEquals(MonthDay.of(8,30), Seasons.SUMMER.getEndDate());
+        assertEquals(MonthDay.of(11,30), Seasons.AUTUMN.getEndDate());
+        assertEquals(MonthDay.of(2,28), Seasons.WINTER.getEndDate());
+    }
+
+    @Test
+    void getName() {
+        assertEquals("All Seasons", Seasons.ALLSEASONS.getName());
+        assertEquals("Spring", Seasons.SPRING.getName());
+        assertEquals("Summer", Seasons.SUMMER.getName());
+        assertEquals("Autumn", Seasons.AUTUMN.getName());
+        assertEquals("Winter", Seasons.WINTER.getName());
+
+    }
+}

src/test/resources/ch/zhaw/gartenverwaltung/io/corrupt-template-user-crops.json

@@ -0,0 +1,7 @@
+[
+  {
+    "plantId": 1,
+    "startDate": "2023-02-25",
+    "area": 0.5
+  }
+]