Merge pull request #142 from nens/StevenHosper/issue141

[BROSTAR]: groundLevelPosition should not be required (templates fixes)
nens · Nov 7, 2024 · e3be0d1 · e3be0d1
2 parents 48f3e53 + ee39735
commit e3be0d1
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -3,7 +3,7 @@
 ## 0.58 (unreleased)
 
 
-- Nothing changed yet.
+- Improve templates
 
 
 ## 0.57 (2024-11-07)

diff --git a/api/bro_upload/templates/registration_GMW_Construction.html b/api/bro_upload/templates/registration_GMW_Construction.html
@@ -16,7 +16,7 @@
             <ns:initialFunction codeSpace="urn:bro:gmw:InitialFunction">{{ sourcedocs_data.initialFunction }}</ns:initialFunction>
             <ns:numberOfMonitoringTubes>{{ sourcedocs_data.numberOfMonitoringTubes }}</ns:numberOfMonitoringTubes>
             <ns:groundLevelStable>{{ sourcedocs_data.groundLevelStable }}</ns:groundLevelStable>
-{%          if sourcedocs_data.wellStability %}
+{%          if sourcedocs_data.groundLevelStable == "nee" %}
             <ns:wellStability codeSpace="urn:bro:gmw:WellStability">{{ sourcedocs_data.wellStability }}</ns:wellStability>
 {%          endif %}
             <ns:owner>{{ sourcedocs_data.owner }}</ns:owner>

diff --git a/api/bro_upload/templates/registration_GMW_GroundLevel.html b/api/bro_upload/templates/registration_GMW_GroundLevel.html
@@ -14,8 +14,10 @@
             <ns:eventDate>
                 <ns1:date>{{ sourcedocs_data.eventDate }}</ns1:date>
             </ns:eventDate>
-            <ns:wellStability codeSpace="urn:bro:gmw:WellStability">{{ sourcedocs_data.wellStability }}</ns:wellStability>
             <ns:groundLevelStable>{{ sourcedocs_data.groundLevelStable }}</ns:groundLevelStable>
+{%          if sourcedocs_data.groundLevelStable == "nee" %}
+            <ns:wellStability codeSpace="urn:bro:gmw:WellStability">{{ sourcedocs_data.wellStability }}</ns:wellStability>
+{%          endif %}
             <ns:groundLevelPosition uom="m">{{ sourcedocs_data.groundLevelPosition }}</ns:groundLevelPosition>
             <ns:groundLevelPositioningMethod codeSpace="urn:bro:gmw:GroundLevelPositioningMethod">{{ sourcedocs_data.groundLevelPositioningMethod }}</ns:groundLevelPositioningMethod>
         </ns:GMW_GroundLevel>

diff --git a/api/bro_upload/templates/registration_GMW_Lengthening.html b/api/bro_upload/templates/registration_GMW_Lengthening.html
@@ -22,6 +22,9 @@
             <ns:monitoringTube>
                 <ns:tubeNumber>{{ monitoringtube.tubeNumber }}</ns:tubeNumber>
                 <ns:variableDiameter>{{ monitoringtube.variableDiameter }}</ns:variableDiameter>
+{%              if monitoringtube.tubeTopDiameter %}
+                <ns:tubeTopDiameter uom="mm">{{ monitoringtube.tubeTopDiameter }}</ns:tubeTopDiameter>
+{%              endif %}
                 <ns:tubeTopPosition uom="m">{{ monitoringtube.tubeTopPosition }}</ns:tubeTopPosition>
                 <ns:tubeTopPositioningMethod codeSpace="urn:bro:gmw:TubeTopPositioningMethod">{{ monitoringtube.tubeTopPositioningMethod }}</ns:tubeTopPositioningMethod>
                 <ns:tubeMaterial codeSpace="urn:bro:gmw:TubeMaterial">{{ monitoringtube.tubeMaterial }}</ns:tubeMaterial>

diff --git a/api/bro_upload/templates/replace_GMW_Construction.html b/api/bro_upload/templates/replace_GMW_Construction.html
@@ -18,7 +18,7 @@
             <ns:initialFunction codeSpace="urn:bro:gmw:InitialFunction">{{ sourcedocs_data.initialFunction }}</ns:initialFunction>
             <ns:numberOfMonitoringTubes>{{ sourcedocs_data.numberOfMonitoringTubes }}</ns:numberOfMonitoringTubes>
             <ns:groundLevelStable>{{ sourcedocs_data.groundLevelStable }}</ns:groundLevelStable>
-{%          if sourcedocs_data.wellStability %}
+{%          if sourcedocs_data.groundLevelStable == "nee" %}
             <ns:wellStability codeSpace="urn:bro:gmw:WellStability">{{ sourcedocs_data.wellStability }}</ns:wellStability>
 {%          endif %}
             <ns:owner>{{ sourcedocs_data.owner }}</ns:owner>

diff --git a/api/bro_upload/templates/replace_GMW_GroundLevel.html b/api/bro_upload/templates/replace_GMW_GroundLevel.html
@@ -16,7 +16,7 @@
                 <ns1:date>{{ sourcedocs_data.eventDate }}</ns1:date>
             </ns:eventDate>
             <ns:groundLevelStable>{{ sourcedocs_data.groundLevelStable }}</ns:groundLevelStable>
-{%          if sourcedocs_data.wellStability %}
+{%          if sourcedocs_data.groundLevelStable == "nee" %}
             <ns:wellStability codeSpace="urn:bro:gmw:WellStability">{{ sourcedocs_data.wellStability }}</ns:wellStability>
 {%          endif %}
             <ns:groundLevelPosition uom="m">{{ sourcedocs_data.groundLevelPosition }}</ns:groundLevelPosition>

diff --git a/api/bro_upload/templates/replace_GMW_Lengthening.html b/api/bro_upload/templates/replace_GMW_Lengthening.html
@@ -23,6 +23,9 @@
             <ns:monitoringTube>
                 <ns:tubeNumber>{{ monitoringtube.tubeNumber }}</ns:tubeNumber>
                 <ns:variableDiameter>{{ monitoringtube.variableDiameter }}</ns:variableDiameter>
+{%              if monitoringtube.tubeTopDiameter %}
+                <ns:tubeTopDiameter uom="mm">{{ monitoringtube.tubeTopDiameter }}</ns:tubeTopDiameter>
+{%              endif %}
                 <ns:tubeTopPosition uom="m">{{ monitoringtube.tubeTopPosition }}</ns:tubeTopPosition>
                 <ns:tubeTopPositioningMethod codeSpace="urn:bro:gmw:TubeTopPositioningMethod">{{ monitoringtube.tubeTopPositioningMethod }}</ns:tubeTopPositioningMethod>
                 <ns:tubeMaterial codeSpace="urn:bro:gmw:TubeMaterial">{{ monitoringtube.tubeMaterial }}</ns:tubeMaterial>

diff --git a/api/tests/xml_strings/GMW_Lenghtening_XML.py b/api/tests/xml_strings/GMW_Lenghtening_XML.py
@@ -20,6 +20,7 @@
             <ns:monitoringTube>
                 <ns:tubeNumber>2</ns:tubeNumber>
                 <ns:variableDiameter>nee</ns:variableDiameter>
+
                 <ns:tubeTopPosition uom="m">1.700</ns:tubeTopPosition>
                 <ns:tubeTopPositioningMethod codeSpace="urn:bro:gmw:TubeTopPositioningMethod">onbekend</ns:tubeTopPositioningMethod>
                 <ns:tubeMaterial codeSpace="urn:bro:gmw:TubeMaterial">pvc</ns:tubeMaterial>