6d24687f7b
Merge remote-tracking branch 'origin/feature_guiOverhaul_M3' into feature_guiOverhaul_M3
2022-11-27 21:56:37 +01:00
2ec37114de
quick fix task end date can not be null + test data
2022-11-27 21:56:12 +01:00
aedcfe2be9
update json files for crop and task with ui
2022-11-27 20:39:37 +01:00
b3f839e4a3
update json files for crop and task with ui
2022-11-27 20:38:38 +01:00
4072308ae6
#23 Implementation of Gardenschedule for wateringtask adjustment
2022-11-27 10:13:11 +01:00
1dc2ad1774
Extended testcoverage for classes
2022-11-26 14:30:16 +01:00
e75ececedb
Refactored AllSEASONS to ALLSEASONS and added tests
2022-11-26 14:29:49 +01:00
560cea2ff9
Extended coverage for tests
2022-11-26 12:49:42 +01:00
65b15b6a4c
Merge remote-tracking branch 'origin/feature_weather' into feature_weather
2022-11-26 11:59:06 +01:00
9424c8713f
Merge branch 'dev' into feature_weather
2022-11-26 11:57:34 +01:00
4e720c2ddc
finished tests for Plant, added fix for Plant
2022-11-26 11:54:47 +01:00
77541c282c
fixed RemoveTasksForCrop
2022-11-26 11:22:27 +01:00
c79386ec88
feature: made TaskList observable
2022-11-25 20:03:32 +01:00
f36826ef29
Merge pull request #62 from schrom01/feature_taskList_m2
...
completed Tests for GardenScheduleTest and new Structure of Task
2022-11-25 13:28:33 +01:00
c9ba9c1234
created sortByNextExecution Comparator
2022-11-25 13:01:38 +01:00
2d88c9ea91
implemented multithreading
2022-11-25 12:58:03 +01:00
07569b83e1
fix: syntax errors
2022-11-25 12:39:10 +01:00
04e4ea1dea
Merge pull request #69 from schrom01/feature_tutorial_M3
...
feature: added tutorial window
2022-11-25 12:34:03 +01:00
1f049f86ab
fix: fixed fxml version warning
2022-11-25 12:31:27 +01:00
9b08113ff9
Merge pull request #67 from schrom01/feature_guiOverhaul_M3
...
Feature gui overhaul m3
2022-11-25 12:11:07 +01:00
e48be29d59
Merge branch 'feature_taskList_m2' into feature_notification_m3
2022-11-25 11:14:47 +01:00
f389cfcdfd
adapted GardenSchedule and GardenScheduleTest to new Structure of Task
2022-11-25 11:13:45 +01:00
e22cb0b24d
init css file and bind with app
2022-11-25 02:29:07 +01:00
1c83fc4694
add disable properties to dialog save buttons
2022-11-25 02:00:13 +01:00
df19edb25a
delete tasks
2022-11-24 23:55:54 +01:00
a437236788
created Class Notifier
2022-11-24 23:45:33 +01:00
6b7a6f095d
dialog pane for location and area of crop
2022-11-24 23:18:14 +01:00
b2c0886e46
new Structure of taskdb.json
2022-11-24 22:27:16 +01:00
775e35a70b
new Structure of Task
2022-11-24 22:18:08 +01:00
d7b9095050
Merge branch 'dev' into feature_taskList_m2
2022-11-24 21:55:52 +01:00
bcb36b89c7
feature: added tutorial window
2022-11-23 21:55:35 +01:00
d2b8fe4ba2
#23 small adjustments
2022-11-22 14:48:09 +01:00
670938ef85
#23 added constructor in Task class, implemented SevereWeather, WeatherService, WeatherGradenTaskPlanner
2022-11-22 14:44:56 +01:00
f7105f041c
Merge pull request #66 from schrom01/feature_guiOverhaul_M3
...
Feature gui overhaul m3
2022-11-21 12:56:57 +01:00
b0369e3174
fix error edit task list
2022-11-21 12:53:28 +01:00
8c20dcaadb
Merge pull request #65 from schrom01/refactor_task-id-semantics_M3
...
refactor: Made Task::id nullable/Optional for semantic reasons
2022-11-21 12:43:04 +01:00
95b0f7e13d
refactor: Made Task::id nullable/Optional for semantic reasons
...
better use of builder semantics in task and crop creation
2022-11-21 09:45:58 +01:00
2312149256
Merge pull request #64 from schrom01/fix_tasklist-not-updated_M3
...
fix: Properly saving tasks
2022-11-21 09:21:26 +01:00
ffc7f5174e
fix: Properly saving tasks
...
Tasks were not properly saved by the JsonTaskList, resulting in the newly created tasks being discarded immediately. Fixed by putting them into the taskMap in saveTask()
2022-11-21 09:15:29 +01:00
8d3fbc06ad
added task list editor date cell factory
2022-11-21 07:03:45 +01:00
dcb97f1c55
add and edit task list
2022-11-21 06:47:27 +01:00
ee67c83b22
update plant information plant fxml file
2022-11-21 00:03:19 +01:00
2963872237
update my garden from VBox to ListView
2022-11-20 23:38:24 +01:00
7920bdff28
new home screen, tutorial fxml file and missing javadoc
2022-11-20 21:10:55 +01:00
e96280cd0c
overhaul gui icons + settings
2022-11-20 17:39:18 +01:00
bfe3fcfb79
fix: pre-copying test files
...
By some accursed class loading magic, files in the test-resources with the same name as one in the main resources were read/written in the main resources, causing some problems.
Renamed all of the test files to fix this.
2022-11-20 08:53:56 +01:00
8e3af2ba32
Merge branch 'dev' into feature_taskList_m2
2022-11-18 12:27:33 +01:00
b70a758099
Merge pull request #61 from schrom01/refactor_gui_M3
...
Refactor gui m3
2022-11-18 12:22:13 +01:00
3a69119eb7
refactor: bind croplist in schedule
2022-11-18 12:21:50 +01:00
165dc6d901
implemented Method getGrowphaseGroupForDate
2022-11-18 12:21:21 +01:00
giavaphi
Gian-Andrea Hutter
Elias Csomor
David Guler
schrom01