06c4c47e44
added screenshot pngs
2022-12-11 09:23:53 +01:00
fb21797040
added screenshots to tutorial
2022-12-10 13:22:40 +01:00
f54b39b1f2
updated style
2022-12-09 06:59:37 +01:00
dd09fad581
Merge branch 'dev' into feature_guiOverhaul_M3
2022-12-05 13:08:47 +01:00
0257dd9bf0
fxml files changes + first style
2022-12-05 01:12:18 +01:00
5e42cae290
#23 bugfix adjust task
2022-11-29 21:55:42 +01:00
f43bfeebd2
#23 bugfix plantdb.json
2022-11-29 11:32:20 +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
84df4c07a1
temp style css
2022-11-28 11:53:02 +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
2ec37114de
quick fix task end date can not be null + test data
2022-11-27 21:56:12 +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
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
e22cb0b24d
init css file and bind with app
2022-11-25 02:29:07 +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
bcb36b89c7
feature: added tutorial window
2022-11-23 21:55:35 +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
dcb97f1c55
add and edit task list
2022-11-21 06:47:27 +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
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
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
15279838b7
refactor: first attempt at dependency injection
...
also some more renaming and improving date-picker dialog
2022-11-14 20:00:01 +01:00
8e23124c6b
display List of Crops, get detail of crop and display taskList
2022-11-10 22:50:49 +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
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
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
2cf7f55215
#53 fixed bug get sow date from harvest date + javadoc Plant and SelectSowDayController
2022-11-05 16:50:18 +01:00
e91773b360
#27 gardenplanmodelTest bugfixed
2022-11-04 15:35:45 +01:00
fb0c50a715
Merge branch 'dev' into feature_json-gardenplan_M2
2022-11-03 14:31:23 +01:00
efc95dbcc6
#46 DatePicker for sow and harvest day
2022-11-02 19:33:27 +01:00
2cb64f3dee
Merge branch 'dev' into feature_gardenplan-model_M2
2022-11-02 13:10:06 +01:00
0987b42086
Merge remote-tracking branch 'origin/feature_taskList_m2' into feature_gardenplan-model_M2
...
# Conflicts:
# src/main/resources/ch/zhaw/gartenverwaltung/io/taskdb.json
2022-10-31 14:32:33 +01:00
d1d9d11b66
added Methods in TaskListModel
...
added Field Crop ID in Task
added method removeTasksforCrop
2022-10-31 14:30:42 +01:00
29ad2fdae2
#17 Bug Mismatchexception fixed
2022-10-31 13:19:14 +01:00
7a060be84a
case insensitive serarch, images
2022-10-31 10:06:17 +01:00
160880d4f5
removed useless quotes, corrected typo
2022-10-31 09:42:39 +01:00
David Guler
giavaphi
Gian-Andrea Hutter
schrom01
Elias Csomor