11a1a63345
Create mini commit for rebase
2022-11-21 09:50:44 +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
3a69119eb7
refactor: bind croplist in schedule
2022-11-18 12:21:50 +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
2cf7f55215
#53 fixed bug get sow date from harvest date + javadoc Plant and SelectSowDayController
2022-11-05 16:50:18 +01:00
8408af175d
#27 gardenplanmodelTest bugfixed
2022-11-04 15:46:11 +01:00
e91773b360
#27 gardenplanmodelTest bugfixed
2022-11-04 15:35:45 +01:00
2361afd537
#27 gardenplanmodel bugfixed cropid
2022-11-04 15:32:15 +01:00
38288f8561
finished Tests for TaskListModel
2022-11-04 14:20:58 +01:00
d45b8e116e
Merge remote-tracking branch 'origin/feature_taskList_m2' into feature_gardenplan-model_M2
...
# Conflicts:
# src/test/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabaseTest.java
2022-11-04 07:39:57 +01:00
fb0c50a715
Merge branch 'dev' into feature_json-gardenplan_M2
2022-11-03 14:31:23 +01:00
83bc011870
#26 added fixed test files, made Crop class testable
2022-11-03 14:28:26 +01:00
ce93531ab8
Made tests pass for plants not in zone
2022-11-03 14:25:25 +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
b1e4e51d68
#27 gardenplanmodelTest first version implemented
2022-11-02 13:08:23 +01:00
9e14920fbb
#27 gardenplanmodel fully implemented
2022-11-01 10:33:07 +01:00
eea530931e
created Some TaskListModelTests
2022-10-31 21:01:25 +01:00
541217c281
prepaired Tests for new Methods in JsonTaskDatabase
2022-10-31 16:36:24 +01:00
bf5c5c8439
javadocs in TaskListModel
2022-10-31 16:31:59 +01:00
5bfebdc92c
implemented Methods
...
removeTasksForCrop and getTaskForCrop
in JsonTaskDatabase
2022-10-31 16:23:49 +01:00
0e4e207581
completed Methods
...
created Config Class
2022-10-31 15:57:19 +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
521f3ae025
Merge remote-tracking branch 'origin/feature_taskList_m2' into feature_gardenplan-model_M2
2022-10-31 14:28:06 +01:00
Elias Csomor
David Guler
giavaphi
Roman Schenk
Gian-Andrea Hutter