  giavaphiandGitHub Enterprise
|
6e98517013
|
Merge pull request #90 from schrom01/dev
Update of Readme and removed old Documents
|
2022-12-11 17:53:11 +01:00 |
|
|
giavaphiandGitHub Enterprise
|
01ddb38ccb
|
Merge pull request #89 from schrom01/dev
Final Version for M3 Beta Release
|
2022-12-11 17:15:50 +01:00 |
|
|
giavaphi
|
3a50c2655d
|
delete of unused todos
|
2022-12-11 17:09:49 +01:00 |
|
|
giavaphiandGitHub Enterprise
|
de01503598
|
Merge pull request #88 from schrom01/feature_weather
Feature weather
|
2022-12-11 17:02:59 +01:00 |
|
|
giavaphi
|
a8a693296e
|
delete unused function
|
2022-12-11 16:45:07 +01:00 |
|
|
giavaphi
|
a519393fc7
|
small change garden plant description
|
2022-12-11 16:23:05 +01:00 |
|
|
giavaphi
|
2dd8cffda2
|
delete unused imports
|
2022-12-11 16:06:16 +01:00 |
|
|
giavaphi
|
3f51adcbd0
|
show screenshots in tutorial
|
2022-12-11 16:04:28 +01:00 |
|
|
giavaphiandGitHub Enterprise
|
4acd328286
|
Merge pull request #87 from schrom01/feature_tutorial-screenshots_M3
added screenshot pngs (whoops)
|
2022-12-11 15:29:36 +01:00 |
|
|
giavaphi
|
dc0830120f
|
small fixes
|
2022-12-11 07:59:34 +01:00 |
|
|
giavaphi
|
39bff805ac
|
small fixes
|
2022-12-11 07:44:03 +01:00 |
|
|
giavaphi
|
3ebbb0e0e3
|
small fixes
|
2022-12-11 07:19:06 +01:00 |
|
|
giavaphiandGitHub Enterprise
|
083d934472
|
Merge pull request #85 from schrom01/feature_weather
#23 bugfix testclass WeatherGradenTaskPlannerTest and bugfix Task and…
|
2022-12-10 13:58:26 +01:00 |
|
|
giavaphi
|
96dc0ad827
|
fix show all tasks
|
2022-12-09 19:38:22 +01:00 |
|
|
giavaphiandGitHub Enterprise
|
59c5d4be5a
|
Merge pull request #80 from schrom01/feature_guiOverhaul_M3
css style update
|
2022-12-09 14:20:02 +01:00 |
|
|
giavaphiandGitHub Enterprise
|
035f5d7fcd
|
Merge pull request #79 from schrom01/feature_updaeTaskListViewOnUpdate_M3
update tasks with subscription from JsonTaskList
|
2022-12-09 14:18:56 +01:00 |
|
|
giavaphi
|
4d2057d0df
|
fix update scheduler
|
2022-12-09 14:16:12 +01:00 |
|
|
giavaphi
|
f54b39b1f2
|
updated style
|
2022-12-09 06:59:37 +01:00 |
|
|
giavaphi
|
45035e565c
|
update tasks with subscription from JsonTaskList
|
2022-12-09 01:27:37 +01:00 |
|
|
giavaphi
|
d725367f4d
|
JavaDoc for controller classes
|
2022-12-05 01:56:15 +01:00 |
|
|
giavaphi
|
0257dd9bf0
|
fxml files changes + first style
|
2022-12-05 01:12:18 +01:00 |
|
|
giavaphiandGitHub Enterprise
|
21643e5d63
|
Merge pull request #70 from schrom01/tests_and_fixes_M3
Tests and fixes m3
|
2022-11-28 13:36:47 +01:00 |
|
|
giavaphiandGitHub Enterprise
|
e9fbbf2f9f
|
Merge pull request #73 from schrom01/feature_guiOverhaul_M3
fix nullpointer exception check date garden schedule
|
2022-11-28 13:11:18 +01:00 |
|
|
giavaphiandGitHub Enterprise
|
ce8bdaba7e
|
Merge branch 'dev' into feature_guiOverhaul_M3
|
2022-11-28 13:10:50 +01:00 |
|
|
giavaphi
|
7e5730a19f
|
fix nullpointer exception check date garden schedule
|
2022-11-28 13:09:59 +01:00 |
|
|
giavaphi
|
ec42a6e75a
|
fix nullpointer exception check date garden schedule
|
2022-11-28 12:38:29 +01:00 |
|
|
giavaphi
|
3d36c85941
|
temp style css
|
2022-11-28 11:57:28 +01:00 |
|
|
giavaphi
|
84df4c07a1
|
temp style css
|
2022-11-28 11:53:02 +01:00 |
|
|
giavaphiandGitHub Enterprise
|
4ae9eec9f7
|
Merge pull request #72 from schrom01/refactor_javadoc-and-apploader_M3
refactor: javadoc and dependencies in HashMap
|
2022-11-28 11:43:18 +01:00 |
|
|
giavaphi
|
129a26e1a9
|
ui display task schedule
|
2022-11-28 02:49:55 +01:00 |
|
|
giavaphi
|
e9258fb238
|
fix of zero interval
|
2022-11-28 00:50:41 +01:00 |
|
|
giavaphi
|
6d24687f7b
|
Merge remote-tracking branch 'origin/feature_guiOverhaul_M3' into feature_guiOverhaul_M3
|
2022-11-27 21:56:37 +01:00 |
|
|
giavaphi
|
2ec37114de
|
quick fix task end date can not be null + test data
|
2022-11-27 21:56:12 +01:00 |
|
|
giavaphi
|
aedcfe2be9
|
update json files for crop and task with ui
|
2022-11-27 20:39:37 +01:00 |
|
|
giavaphi
|
b3f839e4a3
|
update json files for crop and task with ui
|
2022-11-27 20:38:38 +01:00 |
|
|
giavaphi
|
e22cb0b24d
|
init css file and bind with app
|
2022-11-25 02:29:07 +01:00 |
|
|
giavaphi
|
1c83fc4694
|
add disable properties to dialog save buttons
|
2022-11-25 02:00:13 +01:00 |
|
|
giavaphi
|
df19edb25a
|
delete tasks
|
2022-11-24 23:55:54 +01:00 |
|
|
giavaphi
|
6b7a6f095d
|
dialog pane for location and area of crop
|
2022-11-24 23:18:14 +01:00 |
|
|
giavaphi
|
b0369e3174
|
fix error edit task list
|
2022-11-21 12:53:28 +01:00 |
|
|
giavaphiandGitHub Enterprise
|
2312149256
|
Merge pull request #64 from schrom01/fix_tasklist-not-updated_M3
fix: Properly saving tasks
|
2022-11-21 09:21:26 +01:00 |
|
|
giavaphi
|
8d3fbc06ad
|
added task list editor date cell factory
|
2022-11-21 07:03:45 +01:00 |
|
|
giavaphi
|
dcb97f1c55
|
add and edit task list
|
2022-11-21 06:47:27 +01:00 |
|
|
giavaphi
|
ee67c83b22
|
update plant information plant fxml file
|
2022-11-21 00:03:19 +01:00 |
|
|
giavaphi
|
2963872237
|
update my garden from VBox to ListView
|
2022-11-20 23:38:24 +01:00 |
|
|
giavaphi
|
7920bdff28
|
new home screen, tutorial fxml file and missing javadoc
|
2022-11-20 21:10:55 +01:00 |
|
|
giavaphi
|
e96280cd0c
|
overhaul gui icons + settings
|
2022-11-20 17:39:18 +01:00 |
|
|
giavaphiandGitHub Enterprise
|
2be9df6094
|
Merge branch 'dev' into feature_cropsAndTaskGUI_M2
|
2022-11-11 12:21:05 +01:00 |
|
|
giavaphi
|
8e23124c6b
|
display List of Crops, get detail of crop and display taskList
|
2022-11-10 22:50:49 +01:00 |
|
|
giavaphi
|
0e40bc6304
|
Merge remote-tracking branch 'origin/feature_cropsAndTaskGUI_M2' into feature_cropsAndTaskGUI_M2
# Conflicts:
# src/main/java/ch/zhaw/gartenverwaltung/CropDetailController.java
# src/main/java/ch/zhaw/gartenverwaltung/MyPlantsController.java
# src/main/java/ch/zhaw/gartenverwaltung/MyScheduleController.java
# src/main/resources/ch/zhaw/gartenverwaltung/CropDetail.fxml
|
2022-11-08 21:08:23 +01:00 |
|
|
giavaphi
|
ced2645bd7
|
connection task list model and garden plan model with controllers
|
2022-11-08 21:03:01 +01:00 |
|
|
giavaphi
|
802f238d69
|
gui details of crop basics
|
2022-11-08 19:26:08 +01:00 |
|
|
giavaphi
|
096abfd148
|
#48 and #47 basics of gui
|
2022-11-08 19:26:08 +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 |
|
|
giavaphiandGitHub Enterprise
|
5e206ace39
|
Merge pull request #51 from schrom01/feature_taskList_m2
TaskListModel
|
2022-11-06 17:50:30 +01:00 |
|
|
giavaphi
|
ea4a1ecc6a
|
gui details of crop basics
|
2022-11-06 17:46:35 +01:00 |
|
|
giavaphi
|
3077e02b32
|
#48 and #47 basics of gui
|
2022-11-05 23:50:45 +01:00 |
|
|
giavaphi
|
96fdc64105
|
#36 update size of imageView
|
2022-11-05 17:55:25 +01:00 |
|
|
giavaphi
|
e92538fbb4
|
#54 update Seasons enum + update method name + javadoc update
|
2022-11-05 17:19:41 +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 |
|
|
giavaphiandGitHub Enterprise
|
a43a23427c
|
Merge pull request #50 from schrom01/feature_json-gardenplan_M2
|
2022-11-04 12:12:43 +01:00 |
|
|
giavaphi
|
efc95dbcc6
|
#46 DatePicker for sow and harvest day
|
2022-11-02 19:33:27 +01:00 |
|
|
giavaphiandGitHub Enterprise
|
7a6a0eb66f
|
Merge pull request #45 from schrom01/feature_controllerPlantList_M2
Plant Controller Filter to hardiness zone and season
|
2022-10-31 13:07:49 +01:00 |
|
|
giavaphi
|
5f35d99839
|
fixed merge conflict PlantsController
|
2022-10-31 12:52:27 +01:00 |
|
|
giavaphi
|
5b039eb762
|
#12 small changes and java doc
|
2022-10-31 09:23:44 +01:00 |
|
|
giavaphi
|
c83b8695ab
|
#12 PlantsController filter list view
|
2022-10-30 23:23:19 +01:00 |
|
|
giavaphi
|
f22ef61d3c
|
#42 bug resize window fix
|
2022-10-30 18:06:18 +01:00 |
|
|
giavaphi
|
7fd18f3830
|
#16 create MainFXML with skeletal structure
|
2022-10-28 15:36:33 +02:00 |
|