Roman_Schenk
/
PM3-HS22-IT21b_WIN-Team1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
103 Commits 18 Branches 2 Tags 8.5 MiB
Commit Graph

103 Commits

Author SHA1 Message Date
Gian-Andrea Hutter 8408af175d #27 gardenplanmodelTest bugfixed 2022-11-04 15:46:11 +01:00
Gian-Andrea Hutter e91773b360 #27 gardenplanmodelTest bugfixed 2022-11-04 15:35:45 +01:00
Gian-Andrea Hutter 2361afd537 #27 gardenplanmodel bugfixed cropid 2022-11-04 15:32:15 +01:00
Gian-Andrea Hutter 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
Gian-Andrea Hutter 2cb64f3dee Merge branch 'dev' into feature_gardenplan-model_M2 2022-11-02 13:10:06 +01:00
Gian-Andrea Hutter b1e4e51d68 #27 gardenplanmodelTest first version implemented 2022-11-02 13:08:23 +01:00
Gian-Andrea Hutter 9e14920fbb #27 gardenplanmodel fully implemented 2022-11-01 10:33:07 +01:00
schrom01 541217c281 prepaired Tests for new Methods in JsonTaskDatabase 2022-10-31 16:36:24 +01:00
schrom01 bf5c5c8439 javadocs in TaskListModel 2022-10-31 16:31:59 +01:00
schrom01 5bfebdc92c implemented Methods 
removeTasksForCrop and getTaskForCrop
in JsonTaskDatabase
 2022-10-31 16:23:49 +01:00
schrom01 0e4e207581 completed Methods 
created Config Class
 2022-10-31 15:57:19 +01:00
Gian-Andrea Hutter 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
schrom01 d1d9d11b66 added Methods in TaskListModel 
added Field Crop ID in Task
added method removeTasksforCrop
 2022-10-31 14:30:42 +01:00
Gian-Andrea Hutter 521f3ae025 Merge remote-tracking branch 'origin/feature_taskList_m2' into feature_gardenplan-model_M2 2022-10-31 14:28:06 +01:00
Gian-Andrea Hutter 52b4b1c01d Merge remote-tracking branch 'origin/feature_taskList_m2' into feature_gardenplan-model_M2 2022-10-31 13:47:38 +01:00
schrom01 007fc81b22 added Method planTasksForCrop 2022-10-31 13:47:17 +01:00
Gian-Andrea Hutter 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
Gian-Andrea Hutter 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
Gian-Andrea Hutter 29ad2fdae2 #17 Bug Mismatchexception fixed 2022-10-31 13:19:14 +01:00
giavaphi 7a6a0eb66f Merge pull request #45 from schrom01/feature_controllerPlantList_M2 
Plant Controller Filter to hardiness zone and season
 2022-10-31 13:07:49 +01:00
gulerdav 3afeb8a22d Merge branch 'dev' into feature_controllerPlantList_M2 2022-10-31 13:05:49 +01:00
gulerdav 88f9bf7990 Merge pull request #44 from schrom01/feature_plantlist-gui_M2 
Display images in gui and fix image deserialise with spaces
 2022-10-31 12:59:06 +01:00
Elias Csomor 5c6528a038 Update JsonTaskDatabaseTest.java 2022-10-31 12:54:52 +01:00
giavaphi 5f35d99839 fixed merge conflict PlantsController 2022-10-31 12:52:27 +01:00
Gian-Andrea Hutter afac3ba855 #17 Serialization implemented 2022-10-31 12:45:24 +01:00
Gian-Andrea Hutter a87f3da9d2 Merge branch 'feature_plantlist-gui_M2' into feature_json-task-db_M2 2022-10-31 12:43:43 +01:00
schrom01 d0cef1fe82 fixed problems with file Path 
#43
 2022-10-31 12:43:13 +01:00
Gian-Andrea Hutter 6273b0e59a #27 implementation of task template with task generation 2022-10-31 12:24:54 +01:00
Elias Csomor 2510608117 Extended taskDb tests 2022-10-31 11:55:20 +01:00
David Guler 7a060be84a case insensitive serarch, images 2022-10-31 10:06:17 +01:00
giavaphi 5b039eb762 #12 small changes and java doc 2022-10-31 09:23:44 +01:00
Gian-Andrea Hutter b79387abc2 Merge branch 'dev' into feature_json-task-db_M2 2022-10-31 08:40:52 +01:00
schrom01 25057d34f0 created Class TaskListModel 2022-10-31 08:06:35 +01:00
gulerdav 6c00b7f182 Merge pull request #41 from schrom01/feature_plantList_M2 
fixed Method getFilteredPlantListByString
 2022-10-31 08:01:43 +01:00
Gian-Andrea Hutter 63d7eddff4 #27 first implemention of the Gardenplanmodel 2022-10-30 23:34:42 +01:00
giavaphi c83b8695ab #12 PlantsController filter list view 2022-10-30 23:23:19 +01:00
giavaphi f22ef61d3c #42 bug resize window fix 2022-10-30 18:06:18 +01:00
schrom01 98ff259d95 fixed Method getFilteredPlantListByString for case if SearchString is empty. 2022-10-30 10:38:46 +01:00
gulerdav f452b73233 Merge pull request #40 from schrom01/feature_plantList_M2 
Feature plant list m2
 2022-10-30 10:36:07 +01:00
schrom01 4e794a8a93 implemented Methods and tests: 
getFilteredPlantListByHarvestSaison
getFilteredPlantListByPlantingSaison
#12
 2022-10-30 10:31:09 +01:00
schrom01 da7a31f512 java doc and readme update 2022-10-30 09:37:27 +01:00
schrom01 3e586093ba implemented Method getFilteredPlantListByString in PlantListModel 2022-10-30 09:32:55 +01:00
Roman Schenk 691d2a6345 Merge pull request #38 from schrom01/feature_skeletonGUI_M2 
#16 create MainFXML with skeletal structure
 2022-10-30 09:23:21 +01:00
Roman Schenk 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
David Guler 5b860e0ff4 #10 doc: layer-diagram 2022-10-29 10:17:51 +02:00
David Guler b6b5138e9f fix: adjust fxml-api version to remove warnings 2022-10-29 09:54:55 +02:00
gulerdav 554c560832 Merge pull request #37 from schrom01/feature_json-task-db_M2 
Feature json task db m2
 2022-10-29 09:47:17 +02:00
gulerdav 8120071348 Merge branch 'dev' into feature_json-task-db_M2 2022-10-29 09:46:50 +02:00
David Guler bfbda8d753 #36 Added images to Plant database 2022-10-29 09:44:02 +02:00
giavaphi 7fd18f3830 #16 create MainFXML with skeletal structure 2022-10-28 15:36:33 +02:00