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

67 Commits

Author SHA1 Message Date
gulerdav 6c00b7f182 Merge pull request #41 from schrom01/feature_plantList_M2 
fixed Method getFilteredPlantListByString
 2022-10-31 08:01:43 +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
Gian-Andrea Hutter 51e8f27a20 #17 implementation objectmapper writeFile 2022-10-28 12:24:55 +02:00
Gian-Andrea Hutter 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
Roman Schenk f5fcfa78f6 Merge pull request #35 from schrom01/feature_json-gardenplan_M2 
Feature json gardenplan m2
 2022-10-28 11:52:30 +02:00
gulerdav 1e14a07ef8 Merge branch 'dev' into feature_json-gardenplan_M2 2022-10-28 11:43:45 +02:00
David Guler 629e64143b Fixed serialisation of cropId and startDate 2022-10-26 20:32:01 +02:00
Gian-Andrea Hutter 63f0501397 Merge branch 'dev' into feature_json-task-db_M2 2022-10-25 18:15:26 +02:00
Gian-Andrea Hutter 6c75fcd0ec #17 taskdb.json changed to the right variable types, JsonTaskDatabase.java fully implemented and documented 2022-10-25 18:11:29 +02:00
Gian-Andrea Hutter 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
Gian-Andrea Hutter 23d87f7a85 #17 taskdb.json changed to the right variable types, ad isIntimePeriode to , JasonTaskDatabase 2022-10-25 10:10:40 +02:00
gulerdav b851c11f7d Merge pull request #33 from schrom01/feature_plantList_M2 
Feature plant list model m2
 2022-10-24 21:40:30 +02:00
schrom01 4e15a706fb code cleanup 2022-10-24 21:34:19 +02:00
schrom01 d686469336 Created Tests for PlantListModel 
#15
 2022-10-24 21:30:20 +02:00
David Guler 72b0d029d5 #25 Initial implementation of the JsonGardenPlan 
Updated and renamed the Crop type to accommodate storage
 2022-10-24 19:20:08 +02:00
schrom01 fb237e47c0 added new HardinessZone for testing 2022-10-24 19:08:24 +02:00
schrom01 9fa4762b9c Merge remote-tracking branch 'origin/feature_plantList_M2' into feature_plantList_M2 2022-10-24 19:01:19 +02:00
schrom01 e5b5e1b88a adapted class PlantListModel to PlantDatabase 
#12
 2022-10-24 19:00:06 +02:00
schrom01 d1c5c58468 adapted class PlantListModel to PlantDatabase 2022-10-24 18:55:26 +02:00
Elias Csomor aceb6aa1e6 first tests and a typo corrected 2022-10-24 14:54:49 +02:00
Elias Csomor af0e73c007 Prepare for tests 2022-10-24 14:20:59 +02:00
Gian-Andrea Hutter e550f5549a Merge remote-tracking branch 'origin/feature_json-gardenplan_M2' into feature_json-task-db_M2 2022-10-24 13:54:43 +02:00
Gian-Andrea Hutter 694da97cd6 #17 implementation JsonTaskDatabase.java, writeTasklistToFile 2022-10-24 13:54:28 +02:00
David Guler a29f8c7db7 Added IdProvider 2022-10-24 13:42:31 +02:00
Gian-Andrea Hutter 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
schrom01 f9149c48fd Merge branch 'dev' into feature_plantList_M2 2022-10-24 12:51:52 +02:00
schrom01 e51da071bc updated method getFilteredPlantList 2022-10-24 12:44:11 +02:00
Gian-Andrea Hutter 904041afc0 #17 implementation JsonTaskDatabase.java, gradle import for jackson 2022-10-24 12:43:50 +02:00
gulerdav 0d99ee219d #11 Merge pull request #32 from schrom01/feature_json-plant-db_M2 
#4 Feature json plant db m2
 2022-10-24 12:41:18 +02:00
David Guler 0d24bcc2ad Moved null-check to loading method 2022-10-24 12:32:28 +02:00
David Guler 2c61cd3393 Implemented simple caching for JsonPlantDatabase 
Also added Javadoc for the PlantDatabase interface
 2022-10-23 11:11:52 +02:00
David Guler 7355ce563f Added WateringCycle and Pest types 2022-10-23 09:54:56 +02:00
David Guler 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
Gian-Andrea Hutter e228b9019d #17 implementation JsonTaskDatabase.java, gradle import for jackson 2022-10-22 11:52:06 +02:00
Gian-Andrea Hutter a2008450e6 #17 implementation of an example task database 2022-10-21 21:18:29 +02:00
gulerdav 99e8f305e1 Merge pull request #31 from schrom01/feature_json-plant-db_M2 
Feature json plant db m2
 2022-10-21 12:20:06 +02:00
David Guler bf4d56e759 removed test code 2022-10-21 12:16:15 +02:00
Gian-Andrea Hutter 96b5dba36c #17 first version of tasks 2022-10-20 21:59:18 +02:00