Commit Graph

Select branches

Hide Pull Requests

dev

feature_cropsAndTaskGUI_M2

feature_guiOverhaul_M3

feature_plantList_M2

feature_plantlist-gui_M2

feature_taskList_m2

feature_tutorial-screenshots_M3

feature_tutorial_M3

feature_updaeTaskListViewOnUpdate_M3

feature_weather

fix_imageLoad_M3

fix_tasklist_filteringPastTasks

main

refactor_dependency-injection_M3

refactor_gui_M3

refactor_javadoc-and-apploader_M3

tests_and_fixes_M3

tests_extended_M3

#29

#30

#31

#32

#33

#34

#35

#37

#38

#39

#40

#41

#44

#45

#49

#50

#51

#55

#56

#57

#58

#59

#60

#61

#62

#64

#65

#66

#67

#68

#69

#70

#71

#72

#73

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#90

0.0.1-alpha1

1.0.0-beta1

Mono Color

• 9424c8713f Merge branch 'dev' into feature_weather Gian-Andrea Hutter 2022-11-26 11:57:34 +01:00
• 4e720c2ddc finished tests for Plant, added fix for Plant Elias Csomor 2022-11-26 11:54:47 +01:00
• 77541c282c fixed RemoveTasksForCrop Elias Csomor 2022-11-26 11:22:27 +01:00
• c79386ec88 feature: made TaskList observable David Guler 2022-11-25 20:03:32 +01:00
• f36826ef29 Merge pull request #62 from schrom01/feature_taskList_m2 gulerdavandGitHub Enterprise 2022-11-25 13:28:33 +01:00
• c9ba9c1234 created sortByNextExecution Comparator feature_taskList_m2 schrom01 2022-11-25 13:01:38 +01:00
• 2d88c9ea91 implemented multithreading schrom01 2022-11-25 12:58:03 +01:00
• 07569b83e1 fix: syntax errors David Guler 2022-11-25 12:39:10 +01:00
• 04e4ea1dea Merge pull request #69 from schrom01/feature_tutorial_M3 huttegiaandGitHub Enterprise 2022-11-25 12:34:03 +01:00
• 1f049f86ab fix: fixed fxml version warning feature_tutorial_M3 David Guler 2022-11-25 12:31:27 +01:00
• 9b08113ff9 Merge pull request #67 from schrom01/feature_guiOverhaul_M3 gulerdavandGitHub Enterprise 2022-11-25 12:11:07 +01:00
• e48be29d59 Merge branch 'feature_taskList_m2' into feature_notification_m3 schrom01 2022-11-25 11:14:47 +01:00
• f389cfcdfd adapted GardenSchedule and GardenScheduleTest to new Structure of Task schrom01 2022-11-25 11:13:45 +01:00
• e22cb0b24d init css file and bind with app giavaphi 2022-11-25 02:29:07 +01:00
• 1c83fc4694 add disable properties to dialog save buttons giavaphi 2022-11-25 02:00:13 +01:00
• df19edb25a delete tasks giavaphi 2022-11-24 23:55:54 +01:00
• a437236788 created Class Notifier schrom01 2022-11-24 23:45:33 +01:00
• 6b7a6f095d dialog pane for location and area of crop giavaphi 2022-11-24 23:18:14 +01:00
• b2c0886e46 new Structure of taskdb.json schrom01 2022-11-24 22:27:16 +01:00
• 775e35a70b new Structure of Task schrom01 2022-11-24 22:18:08 +01:00
• d7b9095050 Merge branch 'dev' into feature_taskList_m2 schrom01 2022-11-24 21:55:52 +01:00
• bcb36b89c7 feature: added tutorial window David Guler 2022-11-23 21:55:35 +01:00
• d2b8fe4ba2 #23 small adjustments Gian-Andrea Hutter 2022-11-22 14:48:09 +01:00
• 670938ef85 #23 added constructor in Task class, implemented SevereWeather, WeatherService, WeatherGradenTaskPlanner Gian-Andrea Hutter 2022-11-22 14:44:56 +01:00
• f7105f041c Merge pull request #66 from schrom01/feature_guiOverhaul_M3 gulerdavandGitHub Enterprise 2022-11-21 12:56:57 +01:00
• b0369e3174 fix error edit task list giavaphi 2022-11-21 12:53:28 +01:00
• 8c20dcaadb Merge pull request #65 from schrom01/refactor_task-id-semantics_M3 gulerdavandGitHub Enterprise 2022-11-21 12:43:04 +01:00
• 95b0f7e13d refactor: Made Task::id nullable/Optional for semantic reasons David Guler 2022-11-21 09:45:58 +01:00
• 2312149256 Merge pull request #64 from schrom01/fix_tasklist-not-updated_M3 giavaphiandGitHub Enterprise 2022-11-21 09:21:26 +01:00
• ffc7f5174e fix: Properly saving tasks David Guler 2022-11-21 09:15:29 +01:00
• 8d3fbc06ad added task list editor date cell factory giavaphi 2022-11-21 07:03:45 +01:00
• dcb97f1c55 add and edit task list giavaphi 2022-11-21 06:47:27 +01:00
• ee67c83b22 update plant information plant fxml file giavaphi 2022-11-21 00:03:19 +01:00
• 2963872237 update my garden from VBox to ListView giavaphi 2022-11-20 23:38:24 +01:00
• 7920bdff28 new home screen, tutorial fxml file and missing javadoc giavaphi 2022-11-20 21:10:55 +01:00
• e96280cd0c overhaul gui icons + settings giavaphi 2022-11-20 17:39:18 +01:00
• bfe3fcfb79 fix: pre-copying test files David Guler 2022-11-20 08:53:56 +01:00
• 8e3af2ba32 Merge branch 'dev' into feature_taskList_m2 gulerdavandGitHub Enterprise 2022-11-18 12:27:33 +01:00
• b70a758099 Merge pull request #61 from schrom01/refactor_gui_M3 gulerdavandGitHub Enterprise 2022-11-18 12:22:13 +01:00
• 3a69119eb7 refactor: bind croplist in schedule refactor_gui_M3 David Guler 2022-11-18 12:21:50 +01:00
• 165dc6d901 implemented Method getGrowphaseGroupForDate schrom01 2022-11-18 12:21:21 +01:00
• 384dc2d853 completed Tests for GardenScheduleTest schrom01 2022-11-18 11:34:53 +01:00
• 2f69c48800 refactor: dedicated loadPaneToDialog function replacing the previous workaround David Guler 2022-11-16 20:37:07 +01:00
• 86a9eeaf2e Merge pull request #60 from schrom01/refactor_dependency-injection_M3 gulerdavandGitHub Enterprise 2022-11-16 15:30:43 +01:00
• 9ba252b828 refactor: fixed and simplified dayCellFactory even more David Guler 2022-11-15 22:45:01 +01:00
• 90d2de65de refactor: simplified dayCellFactory for date selector David Guler 2022-11-15 15:25:51 +01:00
• 05e7bcc2e8 fix: Made GardenPlanModelTest independent from json content. refactor_dependency-injection_M3 David Guler 2022-11-15 11:28:48 +01:00
• 09e582b8a2 refactor: converted SelectSowDay popup to proper JFX Dialog David Guler 2022-11-15 11:03:36 +01:00
• 2b7cec7e6a refactor: removed MainFXMLController from dependencies David Guler 2022-11-15 08:40:42 +01:00
• 5ef3f6c587 refactor: annotation-based dependency-injection David Guler 2022-11-14 21:15:27 +01:00
• 15279838b7 refactor: first attempt at dependency injection David Guler 2022-11-14 20:00:01 +01:00
• 4f80a0a3e0 refactor: renamed everything David Guler 2022-11-14 13:47:22 +01:00
• a5e1acc7c3 Merge pull request #59 from schrom01/test_complete_M2 Roman SchenkandGitHub Enterprise 2022-11-14 12:13:15 +01:00
• a8efa8fc2b Merge branch 'dev' into test_complete_M2 Roman SchenkandGitHub Enterprise 2022-11-14 12:09:37 +01:00
• 6737e67cda Task Test Copied over from dev Elias Csomor 2022-11-13 16:30:53 +01:00
• a7fa58344c Continued testing for TaskDatabase Elias Csomor 2022-11-12 16:45:18 +01:00
• 6523e1d791 added jacoco Elias Csomor 2022-11-12 16:13:02 +01:00
• c653005652 Merge pull request #58 from schrom01/dev 0.0.1-alpha1 gulerdavandGitHub Enterprise 2022-11-11 12:40:03 +01:00
• bee517317a Merge pull request #57 from schrom01/feature_cropsAndTaskGUI_M2 Roman SchenkandGitHub Enterprise 2022-11-11 12:28:17 +01:00
• 2be9df6094 Merge branch 'dev' into feature_cropsAndTaskGUI_M2 feature_cropsAndTaskGUI_M2 giavaphiandGitHub Enterprise 2022-11-11 12:21:05 +01:00
• 5faf61089a Merge pull request #56 from schrom01/feature_logger_M2 Roman SchenkandGitHub Enterprise 2022-11-11 12:19:04 +01:00
• 8e23124c6b display List of Crops, get detail of crop and display taskList giavaphi 2022-11-10 22:50:49 +01:00
• 78a27499a8 #27 gardenplanmodelTest bugfixed Gian-Andrea Hutter 2022-11-08 23:11:38 +01:00
• 0e40bc6304 Merge remote-tracking branch 'origin/feature_cropsAndTaskGUI_M2' into feature_cropsAndTaskGUI_M2 giavaphi 2022-11-08 21:08:23 +01:00
• ced2645bd7 connection task list model and garden plan model with controllers giavaphi 2022-11-08 21:03:01 +01:00
• 802f238d69 gui details of crop basics giavaphi 2022-11-06 17:46:35 +01:00
• 096abfd148 #48 and #47 basics of gui giavaphi 2022-11-05 23:50:45 +01:00
• 590049b9cf feat: Added logging and refactored code to accommodate David Guler 2022-11-08 07:36:31 +01:00
• ad05e9e95a refactor: remove exception-based control-flow David Guler 2022-11-08 07:31:04 +01:00
• 60c6dcd0d9 Merge pull request #49 from schrom01/feature_gardenplan-model_M2 giavaphiandGitHub Enterprise 2022-11-07 11:57:40 +01:00
• 52ae2b02bc Merge pull request #55 from schrom01/feature_savePlantToCropGUI_M2 giavaphiandGitHub Enterprise 2022-11-07 11:56:59 +01:00
• 00db602904 Merge branch 'dev' into feature_gardenplan-model_M2 Roman SchenkandGitHub Enterprise 2022-11-06 18:22:33 +01:00
• 5e206ace39 Merge pull request #51 from schrom01/feature_taskList_m2 giavaphiandGitHub Enterprise 2022-11-06 17:50:30 +01:00
• ea4a1ecc6a gui details of crop basics giavaphi 2022-11-06 17:46:35 +01:00
• b7d08944a6 added new Methods to filter List by Crop ID schrom01 2022-11-06 17:29:21 +01:00
• 3077e02b32 #48 and #47 basics of gui giavaphi 2022-11-05 23:50:45 +01:00
• 96fdc64105 #36 update size of imageView giavaphi 2022-11-05 17:55:25 +01:00
• e92538fbb4 #54 update Seasons enum + update method name + javadoc update giavaphi 2022-11-05 17:19:41 +01:00
• 2cf7f55215 #53 fixed bug get sow date from harvest date + javadoc Plant and SelectSowDayController giavaphi 2022-11-05 16:50:18 +01:00
• f6ec411b7a doc: design class diagram "dcd" David Guler 2022-11-05 09:50:35 +01:00
• 8408af175d #27 gardenplanmodelTest bugfixed Gian-Andrea Hutter 2022-11-04 15:46:11 +01:00
• e91773b360 #27 gardenplanmodelTest bugfixed Gian-Andrea Hutter 2022-11-04 15:35:45 +01:00
• 2361afd537 #27 gardenplanmodel bugfixed cropid Gian-Andrea Hutter 2022-11-04 15:32:15 +01:00
• 38288f8561 finished Tests for TaskListModel schrom01 2022-11-04 14:20:58 +01:00
• a43a23427c Merge pull request #50 from schrom01/feature_json-gardenplan_M2 giavaphiandGitHub Enterprise 2022-11-04 12:12:43 +01:00
• d45b8e116e Merge remote-tracking branch 'origin/feature_taskList_m2' into feature_gardenplan-model_M2 Gian-Andrea Hutter 2022-11-04 07:39:57 +01:00
• fb0c50a715 Merge branch 'dev' into feature_json-gardenplan_M2 gulerdavandGitHub Enterprise 2022-11-03 14:31:23 +01:00
• 83bc011870 #26 added fixed test files, made Crop class testable David Guler 2022-11-03 14:28:26 +01:00
• ce93531ab8 Made tests pass for plants not in zone David Guler 2022-11-03 14:25:25 +01:00
• efc95dbcc6 #46 DatePicker for sow and harvest day giavaphi 2022-11-02 19:33:27 +01:00
• 2cb64f3dee Merge branch 'dev' into feature_gardenplan-model_M2 Gian-Andrea Hutter 2022-11-02 13:10:06 +01:00
• b1e4e51d68 #27 gardenplanmodelTest first version implemented Gian-Andrea Hutter 2022-11-02 13:08:23 +01:00
• 9e14920fbb #27 gardenplanmodel fully implemented Gian-Andrea Hutter 2022-11-01 10:33:07 +01:00
• eea530931e created Some TaskListModelTests schrom01 2022-10-31 21:01:25 +01:00
• 541217c281 prepaired Tests for new Methods in JsonTaskDatabase schrom01 2022-10-31 16:36:24 +01:00
• bf5c5c8439 javadocs in TaskListModel schrom01 2022-10-31 16:31:59 +01:00
• 5bfebdc92c implemented Methods removeTasksForCrop and getTaskForCrop in JsonTaskDatabase schrom01 2022-10-31 16:23:49 +01:00
• 0e4e207581 completed Methods created Config Class schrom01 2022-10-31 15:57:19 +01:00
• 0987b42086 Merge remote-tracking branch 'origin/feature_taskList_m2' into feature_gardenplan-model_M2 Gian-Andrea Hutter 2022-10-31 14:32:33 +01:00
• d1d9d11b66 added Methods in TaskListModel added Field Crop ID in Task added method removeTasksforCrop schrom01 2022-10-31 14:30:42 +01:00