Elias Csomor
77541c282c
fixed RemoveTasksForCrop
2022-11-26 11:22:27 +01:00
David Guler
c79386ec88
feature: made TaskList observable
2022-11-25 20:03:32 +01:00
gulerdav
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
schrom01
c9ba9c1234
created sortByNextExecution Comparator
2022-11-25 13:01:38 +01:00
schrom01
2d88c9ea91
implemented multithreading
2022-11-25 12:58:03 +01:00
David Guler
07569b83e1
fix: syntax errors
2022-11-25 12:39:10 +01:00
huttegia
04e4ea1dea
Merge pull request #69 from schrom01/feature_tutorial_M3
...
feature: added tutorial window
2022-11-25 12:34:03 +01:00
David Guler
1f049f86ab
fix: fixed fxml version warning
2022-11-25 12:31:27 +01:00
gulerdav
9b08113ff9
Merge pull request #67 from schrom01/feature_guiOverhaul_M3
...
Feature gui overhaul m3
2022-11-25 12:11:07 +01:00
schrom01
e48be29d59
Merge branch 'feature_taskList_m2' into feature_notification_m3
2022-11-25 11:14:47 +01:00
schrom01
f389cfcdfd
adapted GardenSchedule and GardenScheduleTest to new Structure of Task
2022-11-25 11:13:45 +01:00
giavaphi
e22cb0b24d
init css file and bind with app
2022-11-25 02:29:07 +01:00
giavaphi
1c83fc4694
add disable properties to dialog save buttons
2022-11-25 02:00:13 +01:00
giavaphi
df19edb25a
delete tasks
2022-11-24 23:55:54 +01:00
schrom01
a437236788
created Class Notifier
2022-11-24 23:45:33 +01:00
giavaphi
6b7a6f095d
dialog pane for location and area of crop
2022-11-24 23:18:14 +01:00
schrom01
b2c0886e46
new Structure of taskdb.json
2022-11-24 22:27:16 +01:00
schrom01
775e35a70b
new Structure of Task
2022-11-24 22:18:08 +01:00
schrom01
d7b9095050
Merge branch 'dev' into feature_taskList_m2
2022-11-24 21:55:52 +01:00
David Guler
bcb36b89c7
feature: added tutorial window
2022-11-23 21:55:35 +01:00
Gian-Andrea Hutter
d2b8fe4ba2
#23 small adjustments
2022-11-22 14:48:09 +01:00
Gian-Andrea Hutter
670938ef85
#23 added constructor in Task class, implemented SevereWeather, WeatherService, WeatherGradenTaskPlanner
2022-11-22 14:44:56 +01:00
gulerdav
f7105f041c
Merge pull request #66 from schrom01/feature_guiOverhaul_M3
...
Feature gui overhaul m3
2022-11-21 12:56:57 +01:00
giavaphi
b0369e3174
fix error edit task list
2022-11-21 12:53:28 +01:00
gulerdav
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
David Guler
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
giavaphi
2312149256
Merge pull request #64 from schrom01/fix_tasklist-not-updated_M3
...
fix: Properly saving tasks
2022-11-21 09:21:26 +01:00
David Guler
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
giavaphi
8d3fbc06ad
added task list editor date cell factory
2022-11-21 07:03:45 +01:00
giavaphi
dcb97f1c55
add and edit task list
2022-11-21 06:47:27 +01:00
giavaphi
ee67c83b22
update plant information plant fxml file
2022-11-21 00:03:19 +01:00
giavaphi
2963872237
update my garden from VBox to ListView
2022-11-20 23:38:24 +01:00
giavaphi
7920bdff28
new home screen, tutorial fxml file and missing javadoc
2022-11-20 21:10:55 +01:00
giavaphi
e96280cd0c
overhaul gui icons + settings
2022-11-20 17:39:18 +01:00
David Guler
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
gulerdav
8e3af2ba32
Merge branch 'dev' into feature_taskList_m2
2022-11-18 12:27:33 +01:00
gulerdav
b70a758099
Merge pull request #61 from schrom01/refactor_gui_M3
...
Refactor gui m3
2022-11-18 12:22:13 +01:00
David Guler
3a69119eb7
refactor: bind croplist in schedule
2022-11-18 12:21:50 +01:00
schrom01
165dc6d901
implemented Method getGrowphaseGroupForDate
2022-11-18 12:21:21 +01:00
schrom01
384dc2d853
completed Tests for GardenScheduleTest
2022-11-18 11:34:53 +01:00
David Guler
2f69c48800
refactor: dedicated loadPaneToDialog function replacing the previous workaround
2022-11-16 20:37:07 +01:00
gulerdav
86a9eeaf2e
Merge pull request #60 from schrom01/refactor_dependency-injection_M3
...
Refactor: dependency injection M3
2022-11-16 15:30:43 +01:00
David Guler
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
David Guler
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
David Guler
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
David Guler
09e582b8a2
refactor: converted SelectSowDay popup to proper JFX Dialog
2022-11-15 11:03:36 +01:00
David Guler
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
David Guler
5ef3f6c587
refactor: annotation-based dependency-injection
2022-11-14 21:15:27 +01:00
David Guler
15279838b7
refactor: first attempt at dependency injection
...
also some more renaming and improving date-picker dialog
2022-11-14 20:00:01 +01:00
David Guler
4f80a0a3e0
refactor: renamed everything
2022-11-14 13:47:22 +01:00