 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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Gian-Andrea Hutter
|
6273b0e59a
|
#27 implementation of task template with task generation
|
2022-10-31 12:24:54 +01:00 |
|
|
Gian-Andrea Hutter
|
b79387abc2
|
Merge branch 'dev' into feature_json-task-db_M2
|
2022-10-31 08:40:52 +01:00 |
|
|
Gian-Andrea Hutter
|
63d7eddff4
|
#27 first implemention of the Gardenplanmodel
|
2022-10-30 23:34:42 +01:00 |
|
|
Gian-Andrea Hutter
|
51e8f27a20
|
#17 implementation objectmapper writeFile
|
2022-10-28 12:24:55 +02:00 |
|
|
Gian-Andrea Hutter
|
bd2aa60128
|
Merge remote-tracking branch 'origin/feature_json-gardenplan_M2' into feature_json-task-db_M2
# Conflicts:
# build.gradle
|
2022-10-28 11:52:49 +02:00 |
|
|
Gian-Andrea Hutter
|
63f0501397
|
Merge branch 'dev' into feature_json-task-db_M2
|
2022-10-25 18:15:26 +02:00 |
|
|
Gian-Andrea Hutter
|
6c75fcd0ec
|
#17 taskdb.json changed to the right variable types, JsonTaskDatabase.java fully implemented and documented
|
2022-10-25 18:11:29 +02:00 |
|
|
Gian-Andrea Hutter
|
8fd57d91f2
|
Merge remote-tracking branch 'origin/feature_json-task-db_M2' into feature_json-task-db_M2
|
2022-10-25 10:11:02 +02:00 |
|
|
Gian-Andrea Hutter
|
23d87f7a85
|
#17 taskdb.json changed to the right variable types, ad isIntimePeriode to , JasonTaskDatabase
|
2022-10-25 10:10:40 +02:00 |
|
|
Gian-Andrea Hutter
|
e550f5549a
|
Merge remote-tracking branch 'origin/feature_json-gardenplan_M2' into feature_json-task-db_M2
|
2022-10-24 13:54:43 +02:00 |
|
|
Gian-Andrea Hutter
|
694da97cd6
|
#17 implementation JsonTaskDatabase.java, writeTasklistToFile
|
2022-10-24 13:54:28 +02:00 |
|
|
Gian-Andrea Hutter
|
0ca381f8cc
|
Merge branch 'dev' into feature_json-task-db_M2
# Conflicts:
# src/main/java/module-info.java
|
2022-10-24 12:53:09 +02:00 |
|
|
Gian-Andrea Hutter
|
904041afc0
|
#17 implementation JsonTaskDatabase.java, gradle import for jackson
|
2022-10-24 12:43:50 +02:00 |
|
|
Gian-Andrea Hutter
|
e228b9019d
|
#17 implementation JsonTaskDatabase.java, gradle import for jackson
|
2022-10-22 11:52:06 +02:00 |
|
|
Gian-Andrea Hutter
|
a2008450e6
|
#17 implementation of an example task database
|
2022-10-21 21:18:29 +02:00 |
|
|
Gian-Andrea Hutter
|
96b5dba36c
|
#17 first version of tasks
|
2022-10-20 21:59:18 +02:00 |
|
|
Gian-Andrea Hutter
|
1e4dd07879
|
#4 upload documents from teams, as discussed
|
2022-10-17 17:14:50 +02:00 |
|
 huttegiaandGitHub Enterprise
|
b947fce825
|
Update README.md
|
2022-10-13 17:18:37 +02:00 |
|
|
Gian-Andrea Hutter
|
f566234873
|
directory structure
|
2022-10-13 17:02:14 +02:00 |
|
|
Gian-Andrea Hutter
|
0aba4d3f8e
|
directory structure
|
2022-10-13 17:01:04 +02:00 |
|