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

@@ -22,14 +22,13 @@ public class Main extends Application {
         AppLoader appLoader = new AppLoader();
 
         backgroundTasks = new BackgroundTasks((TaskList) appLoader.getAppDependency(TaskList.class),(CropList) appLoader.getAppDependency(CropList.class), (PlantList) appLoader.getAppDependency(PlantList.class));
+        // TODO reduce period
+        backGroundTaskTimer.scheduleAtFixedRate(backgroundTasks, 0, 1000);
 
         appLoader.loadSceneToStage("MainFXML.fxml", stage);
 
         stage.setTitle("Gartenverwaltung");
         stage.show();
-
-        backGroundTaskTimer.scheduleAtFixedRate(backgroundTasks, 0, 60000);
-
     }
 
     @Override

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

@@ -3,15 +3,15 @@ package ch.zhaw.gartenverwaltung;
 import ch.zhaw.gartenverwaltung.bootstrap.AfterInject;
 import ch.zhaw.gartenverwaltung.bootstrap.Inject;
 import ch.zhaw.gartenverwaltung.io.PlantList;
-import ch.zhaw.gartenverwaltung.io.TaskList;
 import ch.zhaw.gartenverwaltung.models.Garden;
 import ch.zhaw.gartenverwaltung.io.HardinessZoneNotSetException;
 import ch.zhaw.gartenverwaltung.models.GardenSchedule;
 import ch.zhaw.gartenverwaltung.types.Crop;
 import ch.zhaw.gartenverwaltung.types.Plant;
 import ch.zhaw.gartenverwaltung.types.Task;
-import javafx.application.Platform;
 import javafx.beans.property.ListProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.collections.FXCollections;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
@@ -51,15 +51,9 @@ public class MyScheduleController {
     @FXML
     private ListView<Crop> scheduledPlants_listview;
 
-    @FXML
-    private void showAllTasks(ActionEvent actionEvent) throws IOException {
-        gardenSchedule.getTasksUpcomingWeek();
-        scheduledPlants_listview.getSelectionModel().clearSelection();
-    }
-
     @AfterInject
     @SuppressWarnings("unused")
-    public void init() throws IOException {
+    public void init() {
         setCellFactoryCropListView();
         setCellFactoryTaskListView();
         scheduledPlants_listview.itemsProperty().bind(garden.getPlantedCrops());
@@ -67,19 +61,6 @@ public class MyScheduleController {
         week_listView.itemsProperty().bind(taskListProperty);
         lookForSelectedListEntries();
         information_label.setText("");
-
-        gardenSchedule.getTasksUpcomingWeek();
-        TaskList.TaskListObserver taskListObserver = newTaskList -> {
-            Platform.runLater(() -> {
-                try {
-                    gardenSchedule.getTasksUpcomingWeek();
-                    scheduledPlants_listview.getSelectionModel().clearSelection();
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            });
-        };
-        gardenSchedule.setTaskListObserver(taskListObserver);
     }
 
     /**
@@ -100,8 +81,6 @@ public class MyScheduleController {
      * set cellFactory for the crops.
      */
     private void setCellFactoryCropListView() {
-        MultipleSelectionModel<Crop> selectionModel = scheduledPlants_listview.getSelectionModel();
-        selectionModel.setSelectionMode(SelectionMode.MULTIPLE);
         scheduledPlants_listview.setCellFactory(param -> new ListCell<>() {
             @Override
             protected void updateItem(Crop crop, boolean empty) {
@@ -154,6 +133,8 @@ public class MyScheduleController {
         } else {
             gardenSchedule.getTasksUpcomingWeek();
         }
+        //taskListProperty.clear();
+        //taskListProperty.addAll(taskLists);
     }
 
     /**
@@ -219,4 +200,5 @@ public class MyScheduleController {
                 });
     }
 
+
 }

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

@@ -67,7 +67,7 @@ public class JsonTaskList implements TaskList {
      * @see TaskList#getTaskList(LocalDate, LocalDate)
      */
     @Override
-    public synchronized List<Task> getTaskList(LocalDate start, LocalDate end) throws IOException{
+    public List<Task> getTaskList(LocalDate start, LocalDate end) throws IOException{
         if(taskMap.isEmpty()) {
             loadTaskListFromFile();
         }
@@ -80,7 +80,7 @@ public class JsonTaskList implements TaskList {
      * @return List of Tasks for given Crop
      */
     @Override
-    public synchronized List<Task> getTaskForCrop(long cropId) throws IOException {
+    public List<Task> getTaskForCrop(long cropId) throws IOException {
         if(taskMap.isEmpty()) {
             loadTaskListFromFile();
         }
@@ -111,7 +111,7 @@ public class JsonTaskList implements TaskList {
      * @see TaskList#saveTask(Task)
      */
     @Override
-    public synchronized void saveTask(Task task) throws IOException {
+    public void saveTask(Task task) throws IOException {
         if(taskMap.isEmpty()) {
             loadTaskListFromFile();
         }

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

@@ -3,7 +3,6 @@ package ch.zhaw.gartenverwaltung.models;
 import ch.zhaw.gartenverwaltung.Settings;
 import ch.zhaw.gartenverwaltung.io.*;
 import ch.zhaw.gartenverwaltung.types.*;
-import javafx.application.Platform;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
@@ -32,6 +31,10 @@ public class GardenSchedule {
     public GardenSchedule(TaskList taskList, PlantList plantList) throws IOException {
         this.taskList = taskList;
         this.plantList = plantList;
+        TaskList.TaskListObserver taskListObserver = newTaskList -> {
+            getTasksUpcomingWeek();
+        };
+        setTaskListObserver(taskListObserver);
     }
 
     public ListProperty<List<Task>> getWeeklyTaskListProperty() {

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

@@ -104,7 +104,7 @@ public class Task {
      * @return Whether the Task is within the given range
      */
     public boolean isInTimePeriod(LocalDate searchStartDate, LocalDate searchEndDate) {
-        return endDate.isAfter(searchStartDate) && startDate.isBefore(searchEndDate) || (nextExecution != null && nextExecution.isBefore(searchEndDate) && nextExecution.isAfter(searchStartDate));
+        return endDate.isAfter(searchStartDate) && startDate.isBefore(searchEndDate);
     }
 
     /**

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.layout.AnchorPane?>
@@ -20,12 +19,11 @@
             </Label>
             <HBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="541.0" prefWidth="867.0" spacing="10.0" VBox.vgrow="ALWAYS">
                <children>
-                  <VBox prefHeight="497.0" prefWidth="237.0" spacing="10.0" HBox.hgrow="NEVER">
-                     <children>
-                        <ListView fx:id="scheduledPlants_listview" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="522.0" prefWidth="271.0" VBox.vgrow="ALWAYS" />
-                        <Button maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#showAllTasks" styleClass="button-class" text="Show All Tasks" VBox.vgrow="NEVER" />
-                     </children>
-                  </VBox>
+                  <ListView fx:id="scheduledPlants_listview" maxWidth="1.7976931348623157E308" prefHeight="522.0" prefWidth="271.0" HBox.hgrow="NEVER">
+                     <HBox.margin>
+                        <Insets />
+                     </HBox.margin>
+                  </ListView>
                   <VBox maxWidth="1.7976931348623157E308" prefHeight="537.0" prefWidth="650.0" spacing="10.0" HBox.hgrow="ALWAYS">
                      <children>
                         <ListView fx:id="week_listView" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">

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

@@ -130,7 +130,7 @@ public class JsonTaskListTest {
     }
 
     @Test
-    void testSubscription() throws IOException {
+    void testSubscription() {
         TaskList.TaskListObserver mockObs = Mockito.mock(TaskList.TaskListObserver.class);
         testDatabase.subscribe(mockObs);
         try {