Roman_Schenk/PM3-HS22-IT21b_WIN-Team1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
190 Commits 18 Branches 2 Tags
c79386ec88bbbb328dfcd7dbed4bebf8db7a5d62
Commit Graph
27 Commits
Author SHA1 Message Date
schrom01 b2c0886e46 new Structure of taskdb.json 2022-11-24 22:27:16 +01:00
schrom01 775e35a70b new Structure of Task 2022-11-24 22:18:08 +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
giavaphiandGitHub Enterprise 60c6dcd0d9 Merge pull request #49 from schrom01/feature_gardenplan-model_M2 
Feature gardenplan model m2
 2022-11-07 11:57:40 +01:00
giavaphiandGitHub Enterprise 52ae2b02bc Merge pull request #55 from schrom01/feature_savePlantToCropGUI_M2 
savePlantToCropGUI m2
 2022-11-07 11:56:59 +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
giavaphi 2cf7f55215 #53 fixed bug get sow date from harvest date + javadoc Plant and SelectSowDayController 2022-11-05 16:50:18 +01:00
Gian-Andrea Hutter e91773b360 #27 gardenplanmodelTest bugfixed 2022-11-04 15:35:45 +01:00
gulerdavandGitHub Enterprise fb0c50a715 Merge branch 'dev' into feature_json-gardenplan_M2 2022-11-03 14:31:23 +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
Elias Csomor 160880d4f5 removed useless quotes, corrected typo 2022-10-31 09:42:39 +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 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
schrom01 e5b5e1b88a adapted class PlantListModel to PlantDatabase 
#12
 2022-10-24 19:00:06 +02:00
Elias Csomor aceb6aa1e6 first tests and a typo corrected 2022-10-24 14:54:49 +02:00
Gian-Andrea Hutter 694da97cd6 #17 implementation JsonTaskDatabase.java, writeTasklistToFile 2022-10-24 13:54:28 +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
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