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
52b4b1c01d
Merge remote-tracking branch 'origin/feature_taskList_m2' into feature_gardenplan-model_M2
2022-10-31 13:47:38 +01:00
007fc81b22
added Method planTasksForCrop
2022-10-31 13:47:17 +01:00
bc3ba43b7e
Merge branch 'feature_json-task-db_M2' into feature_gardenplan-model_M2
...
# Conflicts:
# src/main/java/ch/zhaw/gartenverwaltung/gardenplan/Gardenplanmodel.java
# src/main/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabase.java
2022-10-31 13:23:02 +01:00
2e12c3f868
Merge remote-tracking branch 'origin/feature_json-task-db_M2' into feature_json-task-db_M2
2022-10-31 13:19:31 +01:00
29ad2fdae2
#17 Bug Mismatchexception fixed
2022-10-31 13:19:14 +01:00
3afeb8a22d
Merge branch 'dev' into feature_controllerPlantList_M2
2022-10-31 13:05:49 +01:00
5c6528a038
Update JsonTaskDatabaseTest.java
2022-10-31 12:54:52 +01:00
5f35d99839
fixed merge conflict PlantsController
2022-10-31 12:52:27 +01:00
afac3ba855
#17 Serialization implemented
2022-10-31 12:45:24 +01:00
a87f3da9d2
Merge branch 'feature_plantlist-gui_M2' into feature_json-task-db_M2
2022-10-31 12:43:43 +01:00
d0cef1fe82
fixed problems with file Path
...
#43
2022-10-31 12:43:13 +01:00
6273b0e59a
#27 implementation of task template with task generation
2022-10-31 12:24:54 +01:00
2510608117
Extended taskDb tests
2022-10-31 11:55:20 +01:00
82eab6d5cd
continue GardenPlan tests
2022-10-31 11:21:45 +01:00
5411ac69ae
initial GardenPlan tests
2022-10-31 11:15:27 +01:00
146c43d5d9
extended tests for Zones
2022-10-31 10:07:06 +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
5b039eb762
#12 small changes and java doc
2022-10-31 09:23:44 +01:00
b79387abc2
Merge branch 'dev' into feature_json-task-db_M2
2022-10-31 08:40:52 +01:00
25057d34f0
created Class TaskListModel
2022-10-31 08:06:35 +01:00
6c00b7f182
Merge pull request #41 from schrom01/feature_plantList_M2
...
fixed Method getFilteredPlantListByString
2022-10-31 08:01:43 +01:00
63d7eddff4
#27 first implemention of the Gardenplanmodel
2022-10-30 23:34:42 +01:00
c83b8695ab
#12 PlantsController filter list view
2022-10-30 23:23:19 +01:00
f22ef61d3c
#42 bug resize window fix
2022-10-30 18:06:18 +01:00
98ff259d95
fixed Method getFilteredPlantListByString for case if SearchString is empty.
2022-10-30 10:38:46 +01:00
f452b73233
Merge pull request #40 from schrom01/feature_plantList_M2
...
Feature plant list m2
2022-10-30 10:36:07 +01:00
4e794a8a93
implemented Methods and tests:
...
getFilteredPlantListByHarvestSaison
getFilteredPlantListByPlantingSaison
#12
2022-10-30 10:31:09 +01:00
da7a31f512
java doc and readme update
2022-10-30 09:37:27 +01:00
3e586093ba
implemented Method getFilteredPlantListByString in PlantListModel
2022-10-30 09:32:55 +01:00
691d2a6345
Merge pull request #38 from schrom01/feature_skeletonGUI_M2
...
#16 create MainFXML with skeletal structure
2022-10-30 09:23:21 +01:00
246fed7826
Merge pull request #39 from schrom01/feature_json-plant-db_M2
...
#36 Added images to Plant database
2022-10-29 11:36:14 +02:00
b6b5138e9f
fix: adjust fxml-api version to remove warnings
2022-10-29 09:54:55 +02:00
bfbda8d753
#36 Added images to Plant database
2022-10-29 09:44:02 +02:00
7fd18f3830
#16 create MainFXML with skeletal structure
2022-10-28 15:36:33 +02:00
51e8f27a20
#17 implementation objectmapper writeFile
2022-10-28 12:24:55 +02:00
bd2aa60128
Merge remote-tracking branch 'origin/feature_json-gardenplan_M2' into feature_json-task-db_M2
...
# Conflicts:
# build.gradle
2022-10-28 11:52:49 +02:00
1e14a07ef8
Merge branch 'dev' into feature_json-gardenplan_M2
2022-10-28 11:43:45 +02:00
629e64143b
Fixed serialisation of cropId and startDate
2022-10-26 20:32:01 +02:00
63f0501397
Merge branch 'dev' into feature_json-task-db_M2
2022-10-25 18:15:26 +02:00
6c75fcd0ec
#17 taskdb.json changed to the right variable types, JsonTaskDatabase.java fully implemented and documented
2022-10-25 18:11:29 +02:00
8fd57d91f2
Merge remote-tracking branch 'origin/feature_json-task-db_M2' into feature_json-task-db_M2
2022-10-25 10:11:02 +02:00
23d87f7a85
#17 taskdb.json changed to the right variable types, ad isIntimePeriode to , JasonTaskDatabase
2022-10-25 10:10:40 +02:00
4e15a706fb
code cleanup
2022-10-24 21:34:19 +02:00
d686469336
Created Tests for PlantListModel
...
#15
2022-10-24 21:30:20 +02:00
72b0d029d5
#25 Initial implementation of the JsonGardenPlan
...
Updated and renamed the Crop type to accommodate storage
2022-10-24 19:20:08 +02:00
fb237e47c0
added new HardinessZone for testing
2022-10-24 19:08:24 +02:00
e5b5e1b88a
adapted class PlantListModel to PlantDatabase
...
#12
2022-10-24 19:00:06 +02:00
aceb6aa1e6
first tests and a typo corrected
2022-10-24 14:54:49 +02:00
af0e73c007
Prepare for tests
2022-10-24 14:20:59 +02:00
e550f5549a
Merge remote-tracking branch 'origin/feature_json-gardenplan_M2' into feature_json-task-db_M2
2022-10-24 13:54:43 +02:00
694da97cd6
#17 implementation JsonTaskDatabase.java, writeTasklistToFile
2022-10-24 13:54:28 +02:00
a29f8c7db7
Added IdProvider
2022-10-24 13:42:31 +02:00
0ca381f8cc
Merge branch 'dev' into feature_json-task-db_M2
...
# Conflicts:
# src/main/java/module-info.java
2022-10-24 12:53:09 +02:00
f9149c48fd
Merge branch 'dev' into feature_plantList_M2
2022-10-24 12:51:52 +02:00
e51da071bc
updated method getFilteredPlantList
2022-10-24 12:44:11 +02:00
904041afc0
#17 implementation JsonTaskDatabase.java, gradle import for jackson
2022-10-24 12:43:50 +02:00
0d24bcc2ad
Moved null-check to loading method
2022-10-24 12:32:28 +02:00
2c61cd3393
Implemented simple caching for JsonPlantDatabase
...
Also added Javadoc for the PlantDatabase interface
2022-10-23 11:11:52 +02:00
7355ce563f
Added WateringCycle and Pest types
2022-10-23 09:54:56 +02:00
429ac16d98
filtering lifecycle based on hardiness-zone
...
- Added 2 more plants to test db
- Db filters plant lifecycles based on hardiness-zones
- getPlantById implemented
- Added methods to Plant for calculating sowDates and accounting for multiple lifecycles
2022-10-23 09:49:22 +02:00
e228b9019d
#17 implementation JsonTaskDatabase.java, gradle import for jackson
2022-10-22 11:52:06 +02:00
a2008450e6
#17 implementation of an example task database
2022-10-21 21:18:29 +02:00
bf4d56e759
removed test code
2022-10-21 12:16:15 +02:00
96b5dba36c
#17 first version of tasks
2022-10-20 21:59:18 +02:00
6d13bede7a
Minimum viable deserialization
...
Added TaskTemplate type
Added dummy data with (probably) usable format
Used the java.time classes instead of the legacy util.Date
2022-10-20 21:46:00 +02:00
5b0e472ec7
implemented Methods to sort and filter PlantList
2022-10-20 21:33:42 +02:00
7dd157b9d5
implemented Methods to sort and filter PlantList
2022-10-20 21:26:30 +02:00
5f53bb86c6
#11 Very basic implementation with dummy data
2022-10-17 17:01:50 +02:00
9a29499c39
feat: GardenPlan types and interfaces
...
Created the type and interface relating to the GardenPlan
2022-10-14 21:15:42 +02:00
6d1fdd05ab
feat: TaskDB types and interfaces
...
Created the types and interfaces relating to the TaskDatabase
2022-10-14 21:15:42 +02:00
bd53d0644a
feat: PlantDB types and interfaces
...
Created the types and interfaces relating to the PlantDatabase
2022-10-14 15:16:27 +02:00
870bd18c0f
Gradle Setup
2022-10-14 14:50:54 +02:00
giavaphi
Roman Schenk
Gian-Andrea Hutter
gulerdav
Elias Csomor
DavidRavine