David Guler
|
2b7cec7e6a
|
refactor: removed MainFXMLController from dependencies
Replaced MainFXMLController-based scene-changing with event-based scene-changing to remove cyclic dependency
|
2022-11-15 08:40:42 +01:00 |
|
David Guler
|
5ef3f6c587
|
refactor: annotation-based dependency-injection
|
2022-11-14 21:15:27 +01:00 |
|
David Guler
|
15279838b7
|
refactor: first attempt at dependency injection
also some more renaming and improving date-picker dialog
|
2022-11-14 20:00:01 +01:00 |
|
David Guler
|
4f80a0a3e0
|
refactor: renamed everything
|
2022-11-14 13:47:22 +01:00 |
Roman Schenk
|
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 Schenk
|
a8efa8fc2b
|
Merge branch 'dev' into test_complete_M2
|
2022-11-14 12:09:37 +01:00 |
Elias Csomor
|
6737e67cda
|
Task Test Copied over from dev
|
2022-11-13 16:30:53 +01:00 |
|
Elias Csomor
|
a7fa58344c
|
Continued testing for TaskDatabase
Moved from branch and extended
|
2022-11-12 16:45:18 +01:00 |
|
Elias Csomor
|
6523e1d791
|
added jacoco
|
2022-11-12 16:13:02 +01:00 |
|
gulerdav
|
c653005652
|
Merge pull request #58 from schrom01/dev
Merge for Hand-in M2
|
2022-11-11 12:40:03 +01:00 |
|
Roman Schenk
|
bee517317a
|
Merge pull request #57 from schrom01/feature_cropsAndTaskGUI_M2
Feature crops and task gui m2
|
2022-11-11 12:28:17 +01:00 |
giavaphi
|
2be9df6094
|
Merge branch 'dev' into feature_cropsAndTaskGUI_M2
|
2022-11-11 12:21:05 +01:00 |
|
Roman Schenk
|
5faf61089a
|
Merge pull request #56 from schrom01/feature_logger_M2
Include Logger
|
2022-11-11 12:19:04 +01:00 |
|
giavaphi
|
8e23124c6b
|
display List of Crops, get detail of crop and display taskList
|
2022-11-10 22:50:49 +01:00 |
Gian-Andrea Hutter
|
78a27499a8
|
#27 gardenplanmodelTest bugfixed
|
2022-11-08 23:11:38 +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 |
|
David Guler
|
590049b9cf
|
feat: Added logging and refactored code to accommodate
|
2022-11-08 07:36:31 +01:00 |
|
David Guler
|
ad05e9e95a
|
refactor: remove exception-based control-flow
|
2022-11-08 07:31:04 +01:00 |
|
giavaphi
|
60c6dcd0d9
|
Merge pull request #49 from schrom01/feature_gardenplan-model_M2
Feature gardenplan model m2
|
2022-11-07 11:57:40 +01:00 |
|
giavaphi
|
52ae2b02bc
|
Merge pull request #55 from schrom01/feature_savePlantToCropGUI_M2
savePlantToCropGUI m2
|
2022-11-07 11:56:59 +01:00 |
|
Roman Schenk
|
00db602904
|
Merge branch 'dev' into feature_gardenplan-model_M2
|
2022-11-06 18:22:33 +01:00 |
|
giavaphi
|
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 |
|
schrom01
|
b7d08944a6
|
added new Methods to filter List by Crop ID
|
2022-11-06 17:29:21 +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 |
|
David Guler
|
f6ec411b7a
|
doc: design class diagram "dcd"
|
2022-11-05 09:50:35 +01:00 |
|
Gian-Andrea Hutter
|
8408af175d
|
#27 gardenplanmodelTest bugfixed
|
2022-11-04 15:46:11 +01:00 |
|
Gian-Andrea Hutter
|
e91773b360
|
#27 gardenplanmodelTest bugfixed
|
2022-11-04 15:35:45 +01:00 |
|
Gian-Andrea Hutter
|
2361afd537
|
#27 gardenplanmodel bugfixed cropid
|
2022-11-04 15:32:15 +01:00 |
|
schrom01
|
38288f8561
|
finished Tests for TaskListModel
|
2022-11-04 14:20:58 +01:00 |
|
giavaphi
|
a43a23427c
|
Merge pull request #50 from schrom01/feature_json-gardenplan_M2
|
2022-11-04 12:12:43 +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 |
|
gulerdav
|
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 |
|
giavaphi
|
efc95dbcc6
|
#46 DatePicker for sow and harvest day
|
2022-11-02 19:33:27 +01:00 |
|
Gian-Andrea Hutter
|
2cb64f3dee
|
Merge branch 'dev' into feature_gardenplan-model_M2
|
2022-11-02 13:10:06 +01:00 |
|
Gian-Andrea Hutter
|
b1e4e51d68
|
#27 gardenplanmodelTest first version implemented
|
2022-11-02 13:08:23 +01:00 |
|
Gian-Andrea Hutter
|
9e14920fbb
|
#27 gardenplanmodel fully implemented
|
2022-11-01 10:33:07 +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 |