Skip to content

Commit

Permalink
Merge pull request #19 from BROprogramma/OnvolledigeDatum
Browse files Browse the repository at this point in the history 
Onvolledige datum toegevoegd
  • Loading branch information
@RHuismn
RHuismn authored Aug 15, 2023
2 parents ad9f175 + 62eeb7b commit 05c7c0c
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 24 deletions.
5 changes: 5 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
################################################################################
# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
################################################################################

/.vs
2 changes: 1 addition & 1 deletion Versie 0.9/SAD Uitwisselberichten/XSD en voorbeeld XML/dssad-messages.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Explanation: De registratiegeschiedenis van een milieuhygiënisch bodemonderzoek
<xs:complexContent>
<xs:extension base="sadcom:AbstractCharacteristicsV2Type">
<xs:sequence>
<xs:element name="reportDate" type="xs:date" minOccurs="0" maxOccurs="1">
<xs:element name="reportDate" type="sadcom:PartialDateType" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation source="http://www.imvertor.org/model-info/technical-documentation">Definition: De datum waarop de uitvoerder van het bodemonderzoek alle gegevens van het bodemonderzoek aan de bronhouder heeft overgedragen.
Explanation: Het gegeven is alleen aanwezig wanneer het bodemonderzoek (inclusief eventuele monitoring) is gerapporteerd en het onderzoek is afgesloten. Hier wordt overigens niet de datum van het onderzoeksrapport bedoeld. De datum van het onderzoeksrapport wordt vastgelegd bij de gegevensgroep Rapport als rapportdatum. Voor bestaande gegevens die onder IMBRO/A worden aangeleverd is deze datum veelal onbekend en niet relevant.</xs:documentation>
Expand Down
12 changes: 6 additions & 6 deletions ...XML/Voorbeeldberichten innameservice/01_registrationRequest_SAD_CompleteReport IMBROA.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@
<!-- Optional -->
<report>
<sadcom:reportNumber>123123</sadcom:reportNumber>
<sadcom:reportDate>2013-07-07</sadcom:reportDate>
<sadcom:reportDate><brocom:date>2013-07-07</brocom:date></sadcom:reportDate>
<sadcom:reportAuthor>Subliem Voorbeeld Advies B.V.</sadcom:reportAuthor>
<sadcom:documentLink>https://www.document.nl/voorbeeldrapport</sadcom:documentLink>
</report>
<borehole>
<sadcom:Borehole gml:id="_d8401c1a-ec0c-446f-8e45-22d9514f8400">
<sadcom:identification>d8401c1a-ec0c-446f-8e45-22d9514f8400</sadcom:identification>
<sadcom:boringName>PB01</sadcom:boringName>
<sadcom:boringDate>2018-03-08</sadcom:boringDate>
<sadcom:boringDate><brocom:date>2018-03-08</brocom:date></sadcom:boringDate>
<sadcom:finalDepthBoring uom="m">2</sadcom:finalDepthBoring>
<sadcom:deliveredLocation>
<gml:Point gml:id="_d38ee87f-9552-464a-8125-e8409b01c5c1" srsName="urn:ogc:def:crs:EPSG::4258">
Expand Down Expand Up @@ -174,7 +174,7 @@
<sadcom:GroundwaterSampling gml:id="_ba54949b-99a5-4aca-bb8a-5fe9df74efe3">
<sadcom:identification>ba54949b-99a5-4aca-bb8a-5fe9df74efe3</sadcom:identification>
<sadcom:name>PB01-Filter1-1</sadcom:name>
<sadcom:sampleTime>2018-03-08</sadcom:sampleTime>
<sadcom:sampleTime><brocom:date>2018-03-08</brocom:date></sadcom:sampleTime>
<sadcom:groundwatersampleAnalysis>
<sadcom:GroundwaterAnalysis gml:id="_b1adf8f7-e0cd-4810-a93e-60284f34b3fa">
<sadcom:identification>b1adf8f7-e0cd-4810-a93e-60284f34b3fa</sadcom:identification>
Expand Down Expand Up @@ -233,7 +233,7 @@
<sadcom:sampleName>POT1</sadcom:sampleName>
<sadcom:beginDepth uom="m">0.0</sadcom:beginDepth>
<sadcom:endDepth uom="m">0.5</sadcom:endDepth>
<sadcom:sampleTime>2018-03-08</sadcom:sampleTime>
<sadcom:sampleTime><brocom:date>2018-03-08</brocom:date></sadcom:sampleTime>
</sadcom:SoilSampling>
</sadcom:soilSampling>
<sadcom:soilSampling>
Expand All @@ -242,7 +242,7 @@
<sadcom:sampleName>POT2</sadcom:sampleName>
<sadcom:beginDepth uom="m">0.5</sadcom:beginDepth>
<sadcom:endDepth uom="m">1.2</sadcom:endDepth>
<sadcom:sampleTime>2018-03-08</sadcom:sampleTime>
<sadcom:sampleTime><brocom:date>2018-03-08</brocom:date></sadcom:sampleTime>
</sadcom:SoilSampling>
</sadcom:soilSampling>
<sadcom:soilSampling>
Expand All @@ -251,7 +251,7 @@
<sadcom:sampleName>POT3</sadcom:sampleName>
<sadcom:beginDepth uom="m">1.2</sadcom:beginDepth>
<sadcom:endDepth uom="m">2.0</sadcom:endDepth>
<sadcom:sampleTime>2018-03-08</sadcom:sampleTime>
<sadcom:sampleTime><brocom:date>2018-03-08</brocom:date></sadcom:sampleTime>
</sadcom:SoilSampling>
</sadcom:soilSampling>
</sadcom:Borehole>
Expand Down
26 changes: 19 additions & 7 deletions ...d XML/Voorbeeldberichten innameservice/02_correctionRequest_SAD_CompleteReport IMBROA.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<brocom:qualityRegime>IMBRO/A</brocom:qualityRegime>
<brocom:underPrivilege>nee</brocom:underPrivilege>
<correctionReason codeSpace="urn:bro:sad:CorrectionReason">eigenCorrectie</correctionReason>
<sourceDocument>
<sourceDocument>
<SAD_CompleteReport gml:id="_daa6c99f-4eee-44c6-b78e-6b1826057114">
<objectIdAccountableParty>objectID_from_BIS</objectIdAccountableParty>
<deliveryContext codeSpace="urn:bro:sad:InvestigationReason">archiefoverdracht</deliveryContext>
Expand Down Expand Up @@ -59,15 +59,19 @@
<!-- Optional -->
<report>
<sadcom:reportNumber>123123</sadcom:reportNumber>
<sadcom:reportDate>2013-07-07</sadcom:reportDate>
<sadcom:reportDate>
<brocom:date>2013-07-07</brocom:date>
</sadcom:reportDate>
<sadcom:reportAuthor>Subliem Voorbeeld Advies B.V.</sadcom:reportAuthor>
<sadcom:documentLink>https://www.document.nl/voorbeeldrapport</sadcom:documentLink>
</report>
<borehole>
<sadcom:Borehole gml:id="_d8401c1a-ec0c-446f-8e45-22d9514f8400">
<sadcom:identification>d8401c1a-ec0c-446f-8e45-22d9514f8400</sadcom:identification>
<sadcom:boringName>PB01</sadcom:boringName>
<sadcom:boringDate>2018-03-08</sadcom:boringDate>
<sadcom:boringDate>
<brocom:date>2018-03-08</brocom:date>
</sadcom:boringDate>
<sadcom:finalDepthBoring uom="m">2</sadcom:finalDepthBoring>
<sadcom:deliveredLocation>
<gml:Point gml:id="_d38ee87f-9552-464a-8125-e8409b01c5c1" srsName="urn:ogc:def:crs:EPSG::4258">
Expand Down Expand Up @@ -177,7 +181,9 @@
<sadcom:GroundwaterSampling gml:id="_ba54949b-99a5-4aca-bb8a-5fe9df74efe3">
<sadcom:identification>ba54949b-99a5-4aca-bb8a-5fe9df74efe3</sadcom:identification>
<sadcom:name>PB01-Filter1-1</sadcom:name>
<sadcom:sampleTime>2018-03-08</sadcom:sampleTime>
<sadcom:sampleTime>
<brocom:date>2018-03-08</brocom:date>
</sadcom:sampleTime>
<sadcom:groundwatersampleAnalysis>
<sadcom:GroundwaterAnalysis gml:id="_b1adf8f7-e0cd-4810-a93e-60284f34b3fa">
<sadcom:identification>b1adf8f7-e0cd-4810-a93e-60284f34b3fa</sadcom:identification>
Expand Down Expand Up @@ -236,7 +242,9 @@
<sadcom:sampleName>POT1</sadcom:sampleName>
<sadcom:beginDepth uom="m">0.0</sadcom:beginDepth>
<sadcom:endDepth uom="m">0.5</sadcom:endDepth>
<sadcom:sampleTime>2018-03-08</sadcom:sampleTime>
<sadcom:sampleTime>
<brocom:date>2018-03-08</brocom:date>
</sadcom:sampleTime>
</sadcom:SoilSampling>
</sadcom:soilSampling>
<sadcom:soilSampling>
Expand All @@ -245,7 +253,9 @@
<sadcom:sampleName>POT2</sadcom:sampleName>
<sadcom:beginDepth uom="m">0.5</sadcom:beginDepth>
<sadcom:endDepth uom="m">1.2</sadcom:endDepth>
<sadcom:sampleTime>2018-03-08</sadcom:sampleTime>
<sadcom:sampleTime>
<brocom:date>2018-03-08</brocom:date>
</sadcom:sampleTime>
</sadcom:SoilSampling>
</sadcom:soilSampling>
<sadcom:soilSampling>
Expand All @@ -254,7 +264,9 @@
<sadcom:sampleName>POT3</sadcom:sampleName>
<sadcom:beginDepth uom="m">1.2</sadcom:beginDepth>
<sadcom:endDepth uom="m">2.0</sadcom:endDepth>
<sadcom:sampleTime>2018-03-08</sadcom:sampleTime>
<sadcom:sampleTime>
<brocom:date>2013-07-08</brocom:date>
</sadcom:sampleTime>
</sadcom:SoilSampling>
</sadcom:soilSampling>
</sadcom:Borehole>
Expand Down
12 changes: 6 additions & 6 deletions ...n/XSD en voorbeeld XML/Voorbeeldberichten uitgifteservice/DO_Response_SAD_O_DP IMBROA.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@
<!-- Optional -->
<report>
<sadcom:reportNumber>123123</sadcom:reportNumber>
<sadcom:reportDate>2013-07-07</sadcom:reportDate>
<sadcom:reportDate><brocom:date>2013-07-07</brocom:date></sadcom:reportDate>
<sadcom:reportAuthor>Subliem Voorbeeld Advies B.V.</sadcom:reportAuthor>
<sadcom:documentLink>https://www.document.nl/voorbeeldrapport</sadcom:documentLink>
</report>
<borehole>
<sadcom:Borehole gml:id="_d8401c1a-ec0c-446f-8e45-22d9514f8400">
<sadcom:identification>d8401c1a-ec0c-446f-8e45-22d9514f8400</sadcom:identification>
<sadcom:boringName>PB01</sadcom:boringName>
<sadcom:boringDate>2018-03-08</sadcom:boringDate>
<sadcom:boringDate><brocom:date>2018-03-08</brocom:date></sadcom:boringDate>
<sadcom:finalDepthBoring uom="m">2</sadcom:finalDepthBoring>
<sadcom:deliveredLocation>
<gml:Point gml:id="_d38ee87f-9552-464a-8125-e8409b01c5c1">
Expand Down Expand Up @@ -228,7 +228,7 @@
<sadcom:GroundwaterSampling gml:id="_ba54949b-99a5-4aca-bb8a-5fe9df74efe3">
<sadcom:identification>ba54949b-99a5-4aca-bb8a-5fe9df74efe3</sadcom:identification>
<sadcom:name>PB01-Filter1-1</sadcom:name>
<sadcom:sampleTime>2018-03-08</sadcom:sampleTime>
<sadcom:sampleTime><brocom:date>2018-03-08</brocom:date></sadcom:sampleTime>
<sadcom:groundwatersampleAnalysis>
<sadcom:GroundwaterAnalysis gml:id="_b1adf8f7-e0cd-4810-a93e-60284f34b3fa">
<sadcom:identification>b1adf8f7-e0cd-4810-a93e-60284f34b3fa</sadcom:identification>
Expand Down Expand Up @@ -287,7 +287,7 @@
<sadcom:sampleName>POT1</sadcom:sampleName>
<sadcom:beginDepth uom="m">0.0</sadcom:beginDepth>
<sadcom:endDepth uom="m">0.5</sadcom:endDepth>
<sadcom:sampleTime>2018-03-08</sadcom:sampleTime>
<sadcom:sampleTime><brocom:date>2018-03-08</brocom:date></sadcom:sampleTime>
</sadcom:SoilSampling>
</sadcom:soilSampling>
<sadcom:soilSampling>
Expand All @@ -296,7 +296,7 @@
<sadcom:sampleName>POT2</sadcom:sampleName>
<sadcom:beginDepth uom="m">0.5</sadcom:beginDepth>
<sadcom:endDepth uom="m">1.2</sadcom:endDepth>
<sadcom:sampleTime>2018-03-08</sadcom:sampleTime>
<sadcom:sampleTime><brocom:date>2018-03-08</brocom:date></sadcom:sampleTime>
</sadcom:SoilSampling>
</sadcom:soilSampling>
<sadcom:soilSampling>
Expand All @@ -305,7 +305,7 @@
<sadcom:sampleName>POT3</sadcom:sampleName>
<sadcom:beginDepth uom="m">1.2</sadcom:beginDepth>
<sadcom:endDepth uom="m">2.0</sadcom:endDepth>
<sadcom:sampleTime>2018-03-08</sadcom:sampleTime>
<sadcom:sampleTime><brocom:date>2013-07-08</brocom:date></sadcom:sampleTime>
</sadcom:SoilSampling>
</sadcom:soilSampling>
</sadcom:Borehole>
Expand Down
8 changes: 4 additions & 4 deletions Versie 0.9/SAD_Intern Uitwisselberichten/XSD en voorbeeld XML/sadcommon-internal.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Explanation: Deze identificatie is de SIKB0101 invulling van het NEN3610-ID en h
</xs:simpleType>
</xs:element>
<xs:element name="boringDate"
type="xs:date"
type="brocom:PartialDateType"
minOccurs="1"
maxOccurs="1">
<xs:annotation>
Expand Down Expand Up @@ -389,7 +389,7 @@ Explanation: De einddiepte wordt weergegeven ten opzichte van het lokaal vertica
</xs:complexType>
</xs:element>
<xs:element name="sampleTime"
type="xs:date"
type="brocom:PartialDateType"
minOccurs="1"
maxOccurs="1">
<xs:annotation>
Expand Down Expand Up @@ -658,7 +658,7 @@ Explanation: Deze identificatie is de SIKB0101 invulling van het NEN3610-ID en h
</xs:simpleType>
</xs:element>
<xs:element name="sampleTime"
type="xs:date"
type="brocom:PartialDateType"
minOccurs="1"
maxOccurs="1">
<xs:annotation>
Expand Down Expand Up @@ -1011,7 +1011,7 @@ Explanation: Deze identificatie is de SIKB0101 invulling van het NEN3610-ID en h
</xs:simpleType>
</xs:element>
<xs:element name="reportDate"
type="xs:date"
type="brocom:PartialDateType"
minOccurs="0"
maxOccurs="1">
<xs:annotation>
Expand Down

0 comments on commit 05c7c0c

Please sign in to comment.