diff --git a/templates/xml/calibration_laboratory.xml b/templates/xml/calibration_laboratory.xml index 6c1d5fb118e60424848772aa2e72bfdc7483ec0c..8186a559ebb71fbb8b63153da3c5656b7c4535e4 100644 --- a/templates/xml/calibration_laboratory.xml +++ b/templates/xml/calibration_laboratory.xml @@ -7,8 +7,10 @@ <![CDATA[{%- for j in i.content %}{{j|safe}}{% endfor -%}]]> </dcc:content> {% endfor -%} - </dcc:name> + </dcc:name> + {%- if x['eMail'] is defined %} <dcc:eMail>{{x.eMail}}</dcc:eMail> + {% endif -%} <dcc:location> <dcc:further> {%- for i in x.location.further %} @@ -17,13 +19,21 @@ </dcc:content> {% endfor -%} </dcc:further> + {%- if x.location.street is defined %} <dcc:street>{{x.location.street}}</dcc:street> - {%- if x.location.streetNo %} + {% endif -%} + {%- if x.location.streetNo is defined %} <dcc:streetNo>{{x.location.streetNo}}</dcc:streetNo> {% endif -%} + {%- if x.location.postCode is defined %} <dcc:postCode>{{x.location.postCode}}</dcc:postCode> + {% endif -%} + {%- if x.location.city is defined %} <dcc:city>{{x.location.city}}</dcc:city> + {% endif -%} + {%- if x.location.countryCode is defined %} <dcc:countryCode>{{x.location.countryCode}}</dcc:countryCode> + {% endif -%} </dcc:location> </dcc:contact> </dcc:calibrationLaboratory> diff --git a/templates/xml/core_data.xml b/templates/xml/core_data.xml index 1789c05e9bffb9f28e86bc40c30b9226aa8fb2e5..2e7bf2634df13f67505256cc76f27e5a808680aa 100644 --- a/templates/xml/core_data.xml +++ b/templates/xml/core_data.xml @@ -27,7 +27,7 @@ </dcc:identification> {% endfor -%} </dcc:identifications> - {%- if x.receiptDate %} + {%- if x['receiptDate'] is defined %} <dcc:receiptDate> {{x.receiptDate}} </dcc:receiptDate> diff --git a/templates/xml/influence_conditions.xml b/templates/xml/influence_conditions.xml index b279c4a7e4694dc88a316ffd56056b437216475f..91672067b07938836d947393e57cba68d78e0010 100644 --- a/templates/xml/influence_conditions.xml +++ b/templates/xml/influence_conditions.xml @@ -27,7 +27,7 @@ <si:real> <si:value>{{v.real.value}}</si:value> <si:unit>{{v.real.unit}}</si:unit> - {%- if v.real.expandedUnc %} + {%- if v.real['expandedUnc'] is defined %} <si:expandedUnc> <si:uncertainty> {{v.real.expandedUnc.uncertainty}} diff --git a/templates/xml/responsible_persons.xml b/templates/xml/responsible_persons.xml index f62e8fc30d8269ed0a7d18a9ebcddd568e397c52..f806ec011d32dbed88a1a5e4d78fbc1bd5c1984b 100644 --- a/templates/xml/responsible_persons.xml +++ b/templates/xml/responsible_persons.xml @@ -8,10 +8,12 @@ <![CDATA[{%- for k in j.content %}{{k|safe}}{% endfor -%}]]> </dcc:content> {% endfor -%} - </dcc:name> + </dcc:name> + {%- if i.person['eMail'] is defined %} <dcc:eMail>{{i.person.eMail}}</dcc:eMail> + {% endif -%} </dcc:person> - {%- if i.mainSigner %} + {%- if i['mainSigner'] is defined %} <dcc:mainSigner>{{i.mainSigner|lower}}</dcc:mainSigner> {% endif -%} </dcc:respPerson> diff --git a/templates/xml/results.xml b/templates/xml/results.xml index 105bbcce0adeefba939c74e7b47d461b82837f9a..a2d905c3b2ad552c091037e5a2a0fd57c04667c4 100644 --- a/templates/xml/results.xml +++ b/templates/xml/results.xml @@ -23,7 +23,7 @@ <si:real> <si:value>{{k.real.value}}</si:value> <si:unit>{{k.real.unit}}</si:unit> - {%- if k.real.expandedUnc %} + {%- if k.real['expandedUnc'] is defined %} <si:expandedUnc> {# TODO: Alle Komponenten immer vorhanden? #} <si:uncertainty> diff --git a/templates/xml/statements.xml b/templates/xml/statements.xml index 27caefd2dfeb19944837a8ac115d6679698ea3e4..9475804cfa5e9d148646efbc6f2b3584b80e7950 100644 --- a/templates/xml/statements.xml +++ b/templates/xml/statements.xml @@ -32,7 +32,7 @@ <dcc:date>{{i.date}}</dcc:date> {% endif -%} {% if i['respAuthority'] is defined %} - <dcc:respAuthority> {# TODO: auch bei customer übernehmen. #} + <dcc:respAuthority> {% set x1 = i['respAuthority'] %} {%- if x1['name'] is defined %} <dcc:name> diff --git a/templates/xml/used_software.xml b/templates/xml/used_software.xml index 89733e6cfdcd3f73744a31f42006c92870815b17..111daeffdd68567c8bab61484ed851ab9a03e4e8 100644 --- a/templates/xml/used_software.xml +++ b/templates/xml/used_software.xml @@ -8,7 +8,9 @@ </dcc:content> {% endfor -%} </dcc:name> + {%- if i['release'] is defined %} <dcc:release>{{i.release}}</dcc:release> + {% endif -%} </dcc:software> {% endfor -%} </dcc:dccSoftware>