Roman_Schenk/PM3-HS22-IT21b_WIN-Team1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
233 Commits 18 Branches 2 Tags
c16f99aabc240cce47273e89ead7ce0be8f588d6
Commit Graph
55 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
schrom01 55f92f92bd Merged Notification Branch with Weather Branch 2022-11-29 12:12:16 +01:00
schrom01 fd28ca7cc2 Merged Notification Branch with Weather Branch 2022-11-29 11:55:49 +01:00
schrom01 1faf1c10de Merge branch 'feature_notification_m3' into feature_weather 
# Conflicts:
#	src/main/java/ch/zhaw/gartenverwaltung/bootstrap/AppLoader.java
 2022-11-29 11:41:28 +01:00
schrom01 220d138185 fixed saving Task after editing 2022-11-28 19:31:08 +01:00
schrom01 fd184e1248 implemented Exception handling in EMailSender 2022-11-28 09:11:37 +01:00
schrom01 fbf1700c34 implemented EMailSender 2022-11-28 08:00:31 +01:00
schrom01 c9ba9c1234 created sortByNextExecution Comparator 2022-11-25 13:01:38 +01:00
schrom01 2d88c9ea91 implemented multithreading 2022-11-25 12:58:03 +01:00
schrom01 e48be29d59 Merge branch 'feature_taskList_m2' into feature_notification_m3 2022-11-25 11:14:47 +01:00
schrom01 f389cfcdfd adapted GardenSchedule and GardenScheduleTest to new Structure of Task 2022-11-25 11:13:45 +01:00
schrom01 a437236788 created Class Notifier 2022-11-24 23:45:33 +01:00
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
schrom01 d7b9095050 Merge branch 'dev' into feature_taskList_m2 2022-11-24 21:55:52 +01:00
schrom01 165dc6d901 implemented Method getGrowphaseGroupForDate 2022-11-18 12:21:21 +01:00
schrom01 384dc2d853 completed Tests for GardenScheduleTest 2022-11-18 11:34:53 +01:00
Roman SchenkandGitHub Enterprise a5e1acc7c3 Merge pull request #59 from schrom01/test_complete_M2 
Task Test Copied over from dev
 2022-11-14 12:13:15 +01:00
Roman SchenkandGitHub Enterprise a8efa8fc2b Merge branch 'dev' into test_complete_M2 2022-11-14 12:09:37 +01:00
Roman SchenkandGitHub Enterprise bee517317a Merge pull request #57 from schrom01/feature_cropsAndTaskGUI_M2 
Feature crops and task gui m2
 2022-11-11 12:28:17 +01:00
Roman SchenkandGitHub Enterprise 5faf61089a Merge pull request #56 from schrom01/feature_logger_M2 
Include Logger
 2022-11-11 12:19:04 +01:00
Roman SchenkandGitHub Enterprise 00db602904 Merge branch 'dev' into feature_gardenplan-model_M2 2022-11-06 18:22:33 +01:00
schrom01 b7d08944a6 added new Methods to filter List by Crop ID 2022-11-06 17:29:21 +01:00
schrom01 38288f8561 finished Tests for TaskListModel 2022-11-04 14:20:58 +01:00
schrom01 eea530931e created Some TaskListModelTests 2022-10-31 21:01:25 +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
schrom01 d1d9d11b66 added Methods in TaskListModel 
added Field Crop ID in Task
added method removeTasksforCrop
 2022-10-31 14:30:42 +01:00
schrom01 007fc81b22 added Method planTasksForCrop 2022-10-31 13:47:17 +01:00
schrom01 d0cef1fe82 fixed problems with file Path 
#43
 2022-10-31 12:43:13 +01:00
schrom01 25057d34f0 created Class TaskListModel 2022-10-31 08:06:35 +01:00
schrom01 98ff259d95 fixed Method getFilteredPlantListByString for case if SearchString is empty. 2022-10-30 10:38:46 +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 SchenkandGitHub Enterprise 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 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
Roman SchenkandGitHub Enterprise f5fcfa78f6 Merge pull request #35 from schrom01/feature_json-gardenplan_M2 
Feature json gardenplan m2
 2022-10-28 11:52: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
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
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
schrom01 5b0e472ec7 implemented Methods to sort and filter PlantList 2022-10-20 21:33:42 +02:00
schrom01 7dd157b9d5 implemented Methods to sort and filter PlantList 2022-10-20 21:26:30 +02:00
Roman SchenkandGitHub Enterprise ceb448c1ff Update issue templates 2022-10-20 20:05:31 +02:00
Roman SchenkandGitHub Enterprise 8c651aec2b Update issue templates 2022-10-20 20:02:18 +02:00
Roman SchenkandGitHub Enterprise 8b3a0c1570 Update issue templates 2022-10-18 11:19:24 +02:00
Roman SchenkandGitHub Enterprise 516a185546 Update issue templates 2022-10-18 11:18:36 +02:00
schrom01 758b1bb07c created ClassDiagramDraft 2022-10-07 13:27:59 +02:00
Roman SchenkandGitHub Enterprise 8d47ee80ee Initial commit 2022-10-07 12:45:13 +02:00