Gian-Andrea Hutter
|
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 |
|
Gian-Andrea Hutter
|
eccb519bfb
|
#23 watering task refactor
|
2022-11-28 13:53:47 +01:00 |
giavaphi
|
21643e5d63
|
Merge pull request #70 from schrom01/tests_and_fixes_M3
Tests and fixes m3
|
2022-11-28 13:36:47 +01:00 |
|
giavaphi
|
e9fbbf2f9f
|
Merge pull request #73 from schrom01/feature_guiOverhaul_M3
fix nullpointer exception check date garden schedule
|
2022-11-28 13:11:18 +01:00 |
|
giavaphi
|
ce8bdaba7e
|
Merge branch 'dev' into feature_guiOverhaul_M3
|
2022-11-28 13:10:50 +01:00 |
|
giavaphi
|
7e5730a19f
|
fix nullpointer exception check date garden schedule
|
2022-11-28 13:09:59 +01:00 |
|
giavaphi
|
ec42a6e75a
|
fix nullpointer exception check date garden schedule
|
2022-11-28 12:38:29 +01:00 |
gulerdav
|
2452e42b72
|
Merge pull request #71 from schrom01/feature_guiOverhaul_M3
Feature_OverhaulGUI_Scheduler_M3
|
2022-11-28 11:58:26 +01:00 |
|
giavaphi
|
3d36c85941
|
temp style css
|
2022-11-28 11:57:28 +01:00 |
|
giavaphi
|
84df4c07a1
|
temp style css
|
2022-11-28 11:53:02 +01:00 |
|
giavaphi
|
4ae9eec9f7
|
Merge pull request #72 from schrom01/refactor_javadoc-and-apploader_M3
refactor: javadoc and dependencies in HashMap
|
2022-11-28 11:43:18 +01:00 |
|
David Guler
|
d0959f535b
|
refactor: javadoc and dependencies in HashMap
|
2022-11-28 11:35:17 +01:00 |
|
Gian-Andrea Hutter
|
cae6f950ad
|
#23 comments added
|
2022-11-28 10:20:00 +01:00 |
|
giavaphi
|
129a26e1a9
|
ui display task schedule
|
2022-11-28 02:49:55 +01:00 |
|
giavaphi
|
e9258fb238
|
fix of zero interval
|
2022-11-28 00:50:41 +01:00 |
|
Gian-Andrea Hutter
|
233ce6b088
|
#23 add Task generation watertask
|
2022-11-27 23:42:29 +01:00 |
|
giavaphi
|
6d24687f7b
|
Merge remote-tracking branch 'origin/feature_guiOverhaul_M3' into feature_guiOverhaul_M3
|
2022-11-27 21:56:37 +01:00 |
|
giavaphi
|
2ec37114de
|
quick fix task end date can not be null + test data
|
2022-11-27 21:56:12 +01:00 |
|
giavaphi
|
aedcfe2be9
|
update json files for crop and task with ui
|
2022-11-27 20:39:37 +01:00 |
|
giavaphi
|
b3f839e4a3
|
update json files for crop and task with ui
|
2022-11-27 20:38:38 +01:00 |
|
Gian-Andrea Hutter
|
4072308ae6
|
#23 Implementation of Gardenschedule for wateringtask adjustment
|
2022-11-27 10:13:11 +01:00 |
Elias Csomor
|
1dc2ad1774
|
Extended testcoverage for classes
|
2022-11-26 14:30:16 +01:00 |
|
Elias Csomor
|
e75ececedb
|
Refactored AllSEASONS to ALLSEASONS and added tests
|
2022-11-26 14:29:49 +01:00 |
|
Elias Csomor
|
560cea2ff9
|
Extended coverage for tests
|
2022-11-26 12:49:42 +01:00 |
|
Gian-Andrea Hutter
|
65b15b6a4c
|
Merge remote-tracking branch 'origin/feature_weather' into feature_weather
|
2022-11-26 11:59:06 +01:00 |
|
Gian-Andrea Hutter
|
9424c8713f
|
Merge branch 'dev' into feature_weather
|
2022-11-26 11:57:34 +01:00 |
|
Elias Csomor
|
4e720c2ddc
|
finished tests for Plant, added fix for Plant
|
2022-11-26 11:54:47 +01:00 |
|
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 |
|
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
|
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 |
|
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 |