Roman_Schenk/PM3-HS22-IT21b_WIN-Team1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
151 Commits 18 Branches 2 Tags
2b7cec7e6a59f6daf28899f3097a72d5b6090ab8
Commit Graph
40 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David Guler 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
David Guler 5ef3f6c587 refactor: annotation-based dependency-injection 2022-11-14 21:15:27 +01:00
David Guler 15279838b7 refactor: first attempt at dependency injection 
also some more renaming and improving date-picker dialog
 2022-11-14 20:00:01 +01:00
David Guler 4f80a0a3e0 refactor: renamed everything 2022-11-14 13:47:22 +01:00
gulerdavandGitHub Enterprise c653005652 Merge pull request #58 from schrom01/dev 
Merge for Hand-in M2
 2022-11-11 12:40:03 +01:00
David Guler 590049b9cf feat: Added logging and refactored code to accommodate 2022-11-08 07:36:31 +01:00
David Guler ad05e9e95a refactor: remove exception-based control-flow 2022-11-08 07:31:04 +01:00
David Guler f6ec411b7a doc: design class diagram "dcd" 2022-11-05 09:50:35 +01:00
gulerdavandGitHub Enterprise fb0c50a715 Merge branch 'dev' into feature_json-gardenplan_M2 2022-11-03 14:31:23 +01:00
David Guler 83bc011870 #26 added fixed test files, made Crop class testable 2022-11-03 14:28:26 +01:00
David Guler ce93531ab8 Made tests pass for plants not in zone 2022-11-03 14:25:25 +01:00
gulerdavandGitHub Enterprise 3afeb8a22d Merge branch 'dev' into feature_controllerPlantList_M2 2022-10-31 13:05:49 +01:00
gulerdavandGitHub Enterprise 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
David Guler 7a060be84a case insensitive serarch, images 2022-10-31 10:06:17 +01:00
gulerdavandGitHub Enterprise 6c00b7f182 Merge pull request #41 from schrom01/feature_plantList_M2 
fixed Method getFilteredPlantListByString
 2022-10-31 08:01:43 +01:00
gulerdavandGitHub Enterprise f452b73233 Merge pull request #40 from schrom01/feature_plantList_M2 
Feature plant list m2
 2022-10-30 10:36:07 +01: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
gulerdavandGitHub Enterprise 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
gulerdavandGitHub Enterprise 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
gulerdavandGitHub Enterprise 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
gulerdavandGitHub Enterprise b851c11f7d Merge pull request #33 from schrom01/feature_plantList_M2 
Feature plant list model m2
 2022-10-24 21:40:30 +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
David Guler a29f8c7db7 Added IdProvider 2022-10-24 13:42:31 +02:00
gulerdavandGitHub Enterprise 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
gulerdavandGitHub Enterprise 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
David Guler 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
gulerdavandGitHub Enterprise 56fac84e12 Merge pull request #29 from dev 
Documents from teams and project setup
 2022-10-18 15:24:11 +02:00
David Guler 5f53bb86c6 #11 Very basic implementation with dummy data 2022-10-17 17:01:50 +02:00
David Guler 9a29499c39 feat: GardenPlan types and interfaces 
Created the type and interface relating to the GardenPlan
 2022-10-14 21:15:42 +02:00
David Guler 6d1fdd05ab feat: TaskDB types and interfaces 
Created the types and interfaces relating to the TaskDatabase
 2022-10-14 21:15:42 +02:00
gulerdavandGitHub Enterprise 9ad62d72cc Update README.md 2022-10-14 15:27:49 +02:00
David Guler bd53d0644a feat: PlantDB types and interfaces 
Created the types and interfaces relating to the PlantDatabase
 2022-10-14 15:16:27 +02:00