2f5440696f
Cleanup of Class BackgroundTasks, added Logger
2022-12-01 23:45:53 +01:00
5e42cae290
#23 bugfix adjust task
2022-11-29 21:55:42 +01:00
028bc0240d
Merged Notification Branch with Weather Branch
2022-11-29 12:25:54 +01:00
8ecc14db91
Merged Notification Branch with Weather Branch
2022-11-29 12:19:45 +01:00
c16f99aabc
Merge remote-tracking branch 'origin/feature_weather' into feature_weather
2022-11-29 12:13:01 +01:00
6ec0ccaeaa
#23 bugfix GardenScheduleTest and PlantTest
2022-11-29 12:12:18 +01:00
55f92f92bd
Merged Notification Branch with Weather Branch
2022-11-29 12:12:16 +01:00
fd28ca7cc2
Merged Notification Branch with Weather Branch
2022-11-29 11:55:49 +01:00
1faf1c10de
Merge branch 'feature_notification_m3' into feature_weather
...
# Conflicts:
# src/main/java/ch/zhaw/gartenverwaltung/bootstrap/AppLoader.java
2022-11-29 11:41:28 +01:00
f43bfeebd2
#23 bugfix plantdb.json
2022-11-29 11:32:20 +01:00
220d138185
fixed saving Task after editing
2022-11-28 19:31:08 +01:00
aa87a23f7d
Merge branch 'dev' into feature_weather
...
# Conflicts:
# src/test/java/ch/zhaw/gartenverwaltung/models/GardenScheduleTest.java
2022-11-28 13:54:47 +01:00
eccb519bfb
#23 watering task refactor
2022-11-28 13:53:47 +01:00
21643e5d63
Merge pull request #70 from schrom01/tests_and_fixes_M3
...
Tests and fixes m3
2022-11-28 13:36:47 +01:00
ce8bdaba7e
Merge branch 'dev' into feature_guiOverhaul_M3
2022-11-28 13:10:50 +01:00
7e5730a19f
fix nullpointer exception check date garden schedule
2022-11-28 13:09:59 +01:00
ec42a6e75a
fix nullpointer exception check date garden schedule
2022-11-28 12:38:29 +01:00
2452e42b72
Merge pull request #71 from schrom01/feature_guiOverhaul_M3
...
Feature_OverhaulGUI_Scheduler_M3
2022-11-28 11:58:26 +01:00
3d36c85941
temp style css
2022-11-28 11:57:28 +01:00
84df4c07a1
temp style css
2022-11-28 11:53:02 +01:00
d0959f535b
refactor: javadoc and dependencies in HashMap
2022-11-28 11:35:17 +01:00
cae6f950ad
#23 comments added
2022-11-28 10:20:00 +01:00
fd184e1248
implemented Exception handling in EMailSender
2022-11-28 09:11:37 +01:00
fbf1700c34
implemented EMailSender
2022-11-28 08:00:31 +01:00
129a26e1a9
ui display task schedule
2022-11-28 02:49:55 +01:00
e9258fb238
fix of zero interval
2022-11-28 00:50:41 +01:00
233ce6b088
#23 add Task generation watertask
2022-11-27 23:42:29 +01:00
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
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
b0369e3174
fix error edit task list
2022-11-21 12:53:28 +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
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
384dc2d853
completed Tests for GardenScheduleTest
2022-11-18 11:34:53 +01:00
2f69c48800
refactor: dedicated loadPaneToDialog function replacing the previous workaround
2022-11-16 20:37:07 +01:00
9ba252b828
refactor: fixed and simplified dayCellFactory even more
...
Added method to check if a date is within a GrowthPhaseType to plant, thus removing the need for the ugly getMinDate methods and moving knowledge of the phase-internals to the Plant class.
Also removed the need to specify the lifecycle-group to the sowDateFromHarvest method
2022-11-15 22:45:01 +01:00
90d2de65de
refactor: simplified dayCellFactory for date selector
...
Instead of generating a list of dates for every single visible date and checking if it is contained in that list, we now use a (admittedly scary-looking) predicate to compare the date to the start and enddates
2022-11-15 15:25:51 +01:00
05e7bcc2e8
fix: Made GardenPlanModelTest independent from json content.
...
isolated GardenPlanModelTests by pre-copying files. Tests pass now.
2022-11-15 11:28:48 +01:00
09e582b8a2
refactor: converted SelectSowDay popup to proper JFX Dialog
2022-11-15 11:03:36 +01:00
2b7cec7e6a
refactor: removed MainFXMLController from dependencies
...
Replaced MainFXMLController-based scene-changing with event-based scene-changing to remove cyclic dependency
2022-11-15 08:40:42 +01:00
5ef3f6c587
refactor: annotation-based dependency-injection
2022-11-14 21:15:27 +01:00
15279838b7
refactor: first attempt at dependency injection
...
also some more renaming and improving date-picker dialog
2022-11-14 20:00:01 +01:00
4f80a0a3e0
refactor: renamed everything
2022-11-14 13:47:22 +01:00
6737e67cda
Task Test Copied over from dev
2022-11-13 16:30:53 +01:00
2be9df6094
Merge branch 'dev' into feature_cropsAndTaskGUI_M2
2022-11-11 12:21:05 +01:00
5faf61089a
Merge pull request #56 from schrom01/feature_logger_M2
...
Include Logger
2022-11-11 12:19:04 +01:00
8e23124c6b
display List of Crops, get detail of crop and display taskList
2022-11-10 22:50:49 +01:00
78a27499a8
#27 gardenplanmodelTest bugfixed
2022-11-08 23:11:38 +01:00
ced2645bd7
connection task list model and garden plan model with controllers
2022-11-08 21:03:01 +01:00
802f238d69
gui details of crop basics
2022-11-08 19:26:08 +01:00
096abfd148
#48 and #47 basics of gui
2022-11-08 19:26:08 +01:00
590049b9cf
feat: Added logging and refactored code to accommodate
2022-11-08 07:36:31 +01:00
ad05e9e95a
refactor: remove exception-based control-flow
2022-11-08 07:31:04 +01:00
60c6dcd0d9
Merge pull request #49 from schrom01/feature_gardenplan-model_M2
...
Feature gardenplan model m2
2022-11-07 11:57:40 +01:00
52ae2b02bc
Merge pull request #55 from schrom01/feature_savePlantToCropGUI_M2
...
savePlantToCropGUI m2
2022-11-07 11:56:59 +01:00
00db602904
Merge branch 'dev' into feature_gardenplan-model_M2
2022-11-06 18:22:33 +01:00
5e206ace39
Merge pull request #51 from schrom01/feature_taskList_m2
...
TaskListModel
2022-11-06 17:50:30 +01:00
b7d08944a6
added new Methods to filter List by Crop ID
2022-11-06 17:29:21 +01:00
96fdc64105
#36 update size of imageView
2022-11-05 17:55:25 +01:00
e92538fbb4
#54 update Seasons enum + update method name + javadoc update
2022-11-05 17:19:41 +01:00
schrom01
Gian-Andrea Hutter
giavaphi
gulerdav
Elias Csomor