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 |
|
Gian-Andrea Hutter
|
0987b42086
|
Merge remote-tracking branch 'origin/feature_taskList_m2' into feature_gardenplan-model_M2
# Conflicts:
# src/main/resources/ch/zhaw/gartenverwaltung/io/taskdb.json
|
2022-10-31 14:32:33 +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 |
|
Gian-Andrea Hutter
|
521f3ae025
|
Merge remote-tracking branch 'origin/feature_taskList_m2' into feature_gardenplan-model_M2
|
2022-10-31 14:28:06 +01:00 |
|
Gian-Andrea Hutter
|
52b4b1c01d
|
Merge remote-tracking branch 'origin/feature_taskList_m2' into feature_gardenplan-model_M2
|
2022-10-31 13:47:38 +01:00 |
|
schrom01
|
007fc81b22
|
added Method planTasksForCrop
|
2022-10-31 13:47:17 +01:00 |
|
Gian-Andrea Hutter
|
bc3ba43b7e
|
Merge branch 'feature_json-task-db_M2' into feature_gardenplan-model_M2
# Conflicts:
# src/main/java/ch/zhaw/gartenverwaltung/gardenplan/Gardenplanmodel.java
# src/main/java/ch/zhaw/gartenverwaltung/io/JsonTaskDatabase.java
|
2022-10-31 13:23:02 +01:00 |
|
Gian-Andrea Hutter
|
2e12c3f868
|
Merge remote-tracking branch 'origin/feature_json-task-db_M2' into feature_json-task-db_M2
|
2022-10-31 13:19:31 +01:00 |
|
Gian-Andrea Hutter
|
29ad2fdae2
|
#17 Bug Mismatchexception fixed
|
2022-10-31 13:19:14 +01:00 |
|
giavaphi
|
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 |
|
gulerdav
|
3afeb8a22d
|
Merge branch 'dev' into feature_controllerPlantList_M2
|
2022-10-31 13:05:49 +01:00 |
|
gulerdav
|
88f9bf7990
|
Merge pull request #44 from schrom01/feature_plantlist-gui_M2
Display images in gui and fix image deserialise with spaces
|
2022-10-31 12:59:06 +01:00 |
Elias Csomor
|
5c6528a038
|
Update JsonTaskDatabaseTest.java
|
2022-10-31 12:54:52 +01:00 |
|
giavaphi
|
5f35d99839
|
fixed merge conflict PlantsController
|
2022-10-31 12:52:27 +01:00 |
|
Gian-Andrea Hutter
|
afac3ba855
|
#17 Serialization implemented
|
2022-10-31 12:45:24 +01:00 |
|
Gian-Andrea Hutter
|
a87f3da9d2
|
Merge branch 'feature_plantlist-gui_M2' into feature_json-task-db_M2
|
2022-10-31 12:43:43 +01:00 |
|
schrom01
|
d0cef1fe82
|
fixed problems with file Path
#43
|
2022-10-31 12:43:13 +01:00 |
|
Gian-Andrea Hutter
|
6273b0e59a
|
#27 implementation of task template with task generation
|
2022-10-31 12:24:54 +01:00 |
|
Elias Csomor
|
2510608117
|
Extended taskDb tests
|
2022-10-31 11:55:20 +01:00 |
|
Elias Csomor
|
82eab6d5cd
|
continue GardenPlan tests
|
2022-10-31 11:21:45 +01:00 |
|
Elias Csomor
|
5411ac69ae
|
initial GardenPlan tests
|
2022-10-31 11:15:27 +01:00 |