Skip to content

Commit 27f91ac

Browse files
Missing ttec (#105)
* include instead of extend * tecto lines: new attributes, deleted old one * documenting status of attributes in model
1 parent 9a53ee9 commit 27f91ac

File tree

2 files changed

+32
-6
lines changed

2 files changed

+32
-6
lines changed

datamodel.yaml

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
# 0.6 Tables, like CHARCAT, ADMIXTURE as annex (why no CD?). Ignore some deleted attributes.
1111
# hack to improve translations (cannot modify the XLS file)
1212
# 0.7 Added attribut `alias`
13-
version: "0.6"
13+
# 0.8 Attribut `status` indicating the version an attribute is used (<4.0, >=4.0)
14+
version: "0.8"
1415
date: 2024-09-24
1516

1617
# Model revision should change if attributes are added, deleted or changed
1718
model:
18-
revision: 3.9.11
19-
revision_date: "2024-11-08"
19+
revision: 3.9.12
20+
revision_date: "2024-11-09"
2021

2122
themes:
2223
- name: Rock_Bodies
@@ -122,6 +123,7 @@ themes:
122123
value: GC_LITSTRAT_UNCO_CD
123124
cardinality: "1"
124125
mandatory: true
126+
status: ">=3.0"
125127
- name: litho
126128
description:
127129
de: Lithologische Beschreibung
@@ -334,6 +336,7 @@ themes:
334336
cardinality: "1"
335337
change: removed
336338
mandatory: false
339+
status: "<4.0"
337340
- name: exotic_ele
338341
value: boolean
339342
description:
@@ -919,13 +922,33 @@ themes:
919922
value: GC_LIN_TTEC_HORIZ_MO_CD
920923
cardinality: 0..1
921924
mandatory: false
922-
- name: lim_tect
925+
- name: lim_typ
926+
description:
927+
de: Typ der tektonischen Grenze (Deckengrenze,Schuppengrenze, etc.)
928+
fr: Limite d’unité tectonique (oui / non)?
929+
att_type: CD
930+
value: GC_LIN_TTEC_LIM_TYP
931+
cardinality: "1"
932+
mandatory: false
933+
status: ">=4.0"
934+
- name: lim_tect
923935
description:
924936
de: Typ der tektonischen Grenze (Deckengrenze,Schuppengrenze, etc.)
925937
fr: Limite d’unité tectonique (oui / non)?
926938
att_type: boolean
927939
cardinality: "1"
928940
mandatory: false
941+
change: removed
942+
status: "<4.0"
943+
- name: hiera
944+
description:
945+
de: Typ der tektonischen Grenze (Deckengrenze,Schuppengrenze, etc.)
946+
fr: Limite d’unité tectonique (oui / non)?
947+
att_type: CD
948+
value: GC_LIN_TTEC_HIERA_CD
949+
cardinality: "1"
950+
mandatory: false
951+
status: ">=4.0"
929952
- name: status
930953
description:
931954
de: Zustand der Objektart
@@ -938,10 +961,11 @@ themes:
938961
description:
939962
de: Aktivität der Objektart
940963
fr: Activité du type d'objet
941-
att_type: TODO # TODO: no coded domain
964+
att_type: TODO # removed
942965
change: removed
943966
cardinality: 0..1
944967
mandatory: false
968+
status: "<4.0"
945969
- name: meta_sta
946970
description:
947971
de: Tektonometamorphe Chronologie der Objektart
@@ -1205,6 +1229,8 @@ themes:
12051229
value: gc_system
12061230
cardinality: 0..5
12071231
mandatory: false
1232+
change: removed
1233+
status: "<4.0"
12081234
- name: dat_meth
12091235
description:
12101236
de: Datierungsmethode.

templates/model_markdown.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,6 @@ _{{_("Datatype")}} : {{ attr.att_type }}_
9393
{% endfor %}
9494

9595

96-
{% extends "comparison_reports.j2" %}
96+
{% include "comparison_reports.j2" %}
9797

9898

0 commit comments

Comments
 (0)