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

Merge remote-tracking branch 'origin/feature_weather' into feature_weather

This commit is contained in:
schrom01 2022-12-01 23:46:08 +01:00
parent 2f5440696f 5e42cae290
commit 564cecd4ff
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,7 +86,7 @@ public class WeatherGradenTaskPlanner {
// vom startdatum abhängig, // vom startdatum abhängig,
private void adjustNextExecutionOfWateringTask(List<Task> cropTaskList){ private void adjustNextExecutionOfWateringTask(List<Task> cropTaskList){
for(Task task : cropTaskList){ for(Task task : cropTaskList){
if(task.getName().equals("watering task")){ if(task.getName().equals("water plant")){
task.setNextExecution(task.getNextExecution().plusDays(task.getInterval().orElse(1))); task.setNextExecution(task.getNextExecution().plusDays(task.getInterval().orElse(1)));
} }
} }

6
src/main/resources/ch/zhaw/gartenverwaltung/io/taskdb.json
View File

@ -14,10 +14,10 @@
"id": 2, "id": 2,
"name": "water plant", "name": "water plant",
"description": "water the plant, so that the soil is wet around the plant.", "description": "water the plant, so that the soil is wet around the plant.",
"startDate": "2022-05-01", "startDate": "2022-10-29",
"nextExecution": "2022-05-01", "nextExecution": "2022-11-30",
"nextNotification": "2022-05-01", "nextNotification": "2022-05-01",
"endDate": "2022-09-01", "endDate": "2022-12-31",
"interval": 2, "interval": 2,
"cropId": 0 "cropId": 0
}, },