Roman_Schenk
/
PM3-HS22-IT21b_WIN-Team1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small fixes

This commit is contained in:
giavaphi 2022-12-11 07:44:03 +01:00
parent 3ebbb0e0e3
commit 39bff805ac
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/ch/zhaw/gartenverwaltung/CropDetailController.java
View File

@ -12,6 +12,7 @@ import ch.zhaw.gartenverwaltung.types.Crop;
import ch.zhaw.gartenverwaltung.types.Pest; import ch.zhaw.gartenverwaltung.types.Pest;
import ch.zhaw.gartenverwaltung.types.Plant; import ch.zhaw.gartenverwaltung.types.Plant;
import ch.zhaw.gartenverwaltung.types.Task; import ch.zhaw.gartenverwaltung.types.Task;
import javafx.application.Platform;
import javafx.beans.property.ListProperty; import javafx.beans.property.ListProperty;
import javafx.beans.property.SimpleListProperty; import javafx.beans.property.SimpleListProperty;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
@ -133,8 +134,14 @@ public class CropDetailController {
initializeTaskListProperty(crop); initializeTaskListProperty(crop);
TaskList.TaskListObserver taskListObserver = newTaskList -> { TaskList.TaskListObserver taskListObserver = newTaskList -> {
taskListProperty.clear(); Platform.runLater(() -> {
taskListProperty.addAll(gardenSchedule.getTaskListForCrop(crop.getCropId().get())); taskListProperty.clear();
try {
taskListProperty.addAll(gardenSchedule.getTaskListForCrop(crop.getCropId().get()));
} catch (IOException e) {
e.printStackTrace();
}
});
}; };
gardenSchedule.setTaskListObserver(taskListObserver); gardenSchedule.setTaskListObserver(taskListObserver);

2
src/main/java/ch/zhaw/gartenverwaltung/Main.java
View File

@ -28,7 +28,7 @@ public class Main extends Application {
stage.setTitle("Gartenverwaltung"); stage.setTitle("Gartenverwaltung");
stage.show(); stage.show();
backGroundTaskTimer.scheduleAtFixedRate(backgroundTasks, 0, 60000); backGroundTaskTimer.scheduleAtFixedRate(backgroundTasks, 0, 10000);
} }

2
src/main/java/ch/zhaw/gartenverwaltung/backgroundtasks/BackgroundTasks.java
View File

@ -24,7 +24,7 @@ public class BackgroundTasks extends TimerTask {
private final WeatherGradenTaskPlanner weatherGardenTaskPlaner; private final WeatherGradenTaskPlanner weatherGardenTaskPlaner;
private void movePastTasks() throws IOException { private void movePastTasks() throws IOException {
List<Task> taskList = this.taskList.getTaskList(LocalDate.MIN, LocalDate.now().minusDays(1)); List<Task> taskList = this.taskList.getTaskList(LocalDate.MIN.plusDays(1), LocalDate.now().minusDays(1));
for (Task task : taskList) { for (Task task : taskList) {
if (!task.isDone()) { if (!task.isDone()) {
task.setNextExecution(LocalDate.now()); task.setNextExecution(LocalDate.now());