Roman_Schenk/PM3-HS22-IT21b_WIN-Team1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
192 Commits 18 Branches 2 Tags
4e720c2ddc620ed89d114d52fd41890ee300e22c
Commit Graph
48 Commits
Author SHA1 Message Date
Elias Csomor 77541c282c fixed RemoveTasksForCrop 2022-11-26 11:22:27 +01:00
David Guler c79386ec88 feature: made TaskList observable 2022-11-25 20:03:32 +01:00
David Guler 95b0f7e13d refactor: Made Task::id nullable/Optional for semantic reasons 
better use of builder semantics in task and crop creation
 2022-11-21 09:45:58 +01:00
David Guler ffc7f5174e fix: Properly saving tasks 
Tasks were not properly saved by the JsonTaskList, resulting in the newly created tasks being discarded immediately. Fixed by putting them into the taskMap in saveTask()
 2022-11-21 09:15:29 +01:00
David Guler 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
David Guler 4f80a0a3e0 refactor: renamed everything 2022-11-14 13:47:22 +01:00
David Guler 590049b9cf feat: Added logging and refactored code to accommodate 2022-11-08 07:36:31 +01:00
Roman SchenkandGitHub Enterprise 00db602904 Merge branch 'dev' into feature_gardenplan-model_M2 2022-11-06 18:22:33 +01:00
giavaphiandGitHub Enterprise 5e206ace39 Merge pull request #51 from schrom01/feature_taskList_m2 
TaskListModel
 2022-11-06 17:50:30 +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
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
Gian-Andrea Hutter b1e4e51d68 #27 gardenplanmodelTest first version implemented 2022-11-02 13:08:23 +01:00
schrom01 5bfebdc92c implemented Methods 
removeTasksForCrop and getTaskForCrop
in JsonTaskDatabase
 2022-10-31 16:23:49 +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 29ad2fdae2 #17 Bug Mismatchexception fixed 2022-10-31 13:19:14 +01:00
Gian-Andrea Hutter afac3ba855 #17 Serialization implemented 2022-10-31 12:45:24 +01:00
Elias Csomor 146c43d5d9 extended tests for Zones 2022-10-31 10:07:06 +01:00
Roman SchenkandGitHub Enterprise 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 bfbda8d753 #36 Added images to Plant database 2022-10-29 09:44:02 +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
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
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 23d87f7a85 #17 taskdb.json changed to the right variable types, ad isIntimePeriode to , JasonTaskDatabase 2022-10-25 10:10:40 +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 e5b5e1b88a adapted class PlantListModel to PlantDatabase 
#12
 2022-10-24 19:00:06 +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
Gian-Andrea Hutter 904041afc0 #17 implementation JsonTaskDatabase.java, gradle import for jackson 2022-10-24 12:43:50 +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 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
Gian-Andrea Hutter 96b5dba36c #17 first version of tasks 2022-10-20 21:59:18 +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
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
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