more defined tests

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>

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>

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}}

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>            

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>

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>   

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>