From 854cb26e599c574ecfa762dfd425c5108bb2ffd5 Mon Sep 17 00:00:00 2001 From: Florian Knappers <73856313+JJFlorian@users.noreply.github.com> Date: Wed, 20 Mar 2024 14:00:55 +0100 Subject: [PATCH 1/4] setup GMW registration template (GMW_Construction done so far) --- .../templates/registration_GMW.html | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 api/bro_upload/templates/registration_GMW.html diff --git a/api/bro_upload/templates/registration_GMW.html b/api/bro_upload/templates/registration_GMW.html new file mode 100644 index 0000000..34bdf53 --- /dev/null +++ b/api/bro_upload/templates/registration_GMW.html @@ -0,0 +1,79 @@ + + {{ metadata.requestReference }} + {{ metadata.deliveryAccountableParty }} + {{ metadata.qualityRegime }} + + + {{ sourcedocs_data.objectIdAccountableParty }} + {{ sourcedocs_data.deliveryContext }} + {{ sourcedocs_data.constructionStandard }} + {{ sourcedocs_data.initialFunction }} + {{ sourcedocs_data.numberOfMonitoringTubes }} + {{ sourcedocs_data.groundLevelStable }} + {{ sourcedocs_data.owner }} + {{ sourcedocs_data.maintenanceResponsibleParty }} + {{ sourcedocs_data.wellHeadProtector }} + + {{ sourcedocs_data.wellConstructionDate }} + + + + {{ sourcedocs_data.deliveredLocation }} + + {{ sourcedocs_data.horizontalPositioningMethod }} + + + {{ sourcedocs_data.localVerticalReferencePoint }} + {{ sourcedocs_data.offset }} + {{ sourcedocs_data.verticalDatum }} + {{ sourcedocs_data.groundLevelPosition }} + {{ sourcedocs_data.groundLevelPositioningMethod }} + +{% for monitoringtube in sourcedocs_data.monitoringtube %} + + {{ monitoringtube.tubeNumber }} + {{ monitoringtube.tubeType }} + {{ monitoringtube.artesianWellCapPresent }} + {{ monitoringtube.sedimentSumpPresent }} + {{ monitoringtube.numberOfGeoOhmCables }} + {{ monitoringtube.tubeTopDiameter }} + {{ monitoringtube.variableDiameter }} + {{ monitoringtube.tubeStatus }} + {{ monitoringtube.tubeTopPosition }} + {{ monitoringtube.tubeTopPositioningMethod }} + + {{ monitoringtube.tubePackingMaterial }} + {{ monitoringtube.tubeMaterial }} + {{ monitoringtube.glue }} + + + {{ monitoringtube.screenLength }} + {{ monitoringtube.sockMaterial }} + + + {{ monitoringtube.plainTubePartLength }} + + + {{ monitoringtube.sedimentSumpLength }} + +{% for geoogmcable in monitoringtube.geoogmcables %} + + {{ geoogmcable.cableNumber }} +{% for electrode in geoogmcable.electrodes %} + + {{ geoogmcable.electrodeNumber }} + {{ geoogmcable.electrodePackingMaterial }} + {{ geoogmcable.electrodeStatus }} + {{ geoogmcable.electrodePosition }} + +{% endfor %} + +{% endfor %} + +{% endfor %} + + + \ No newline at end of file From f21aa34088d94835361932481652b3aa944b690d Mon Sep 17 00:00:00 2001 From: Florian Knappers <73856313+JJFlorian@users.noreply.github.com> Date: Wed, 20 Mar 2024 15:09:36 +0100 Subject: [PATCH 2/4] start GAR Template --- .../templates/registration_GAR.html | 124 ++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 api/bro_upload/templates/registration_GAR.html diff --git a/api/bro_upload/templates/registration_GAR.html b/api/bro_upload/templates/registration_GAR.html new file mode 100644 index 0000000..cd64e99 --- /dev/null +++ b/api/bro_upload/templates/registration_GAR.html @@ -0,0 +1,124 @@ + + TestCase1 + IMBRO/A + + + Pietje_20181023_QR2 + handboekProvinciesRIVMv2017 + + + ? + + + + + GMW000000058869 + 1 + + + + 2018-10-23T16:59:32+01:00 + + ? + NEN5744v2011-A1v2013 + + onderwaterpomp + + + wit + grijs + licht + ja + nee + nee + ja + nee + nee + ja + nee + nee + + + + 1496 + 5.123 + goedgekeurd + + + 6024 + 3 + afgekeurd + + + 3548 + 15.123 + onbekend + + + + + + + ? + + + + 2018-10-25 + + AAS + CIW + + + 1270 + 5 + ? + 2 + goedgekeurd + + + 441 + 0.1 + LT + 0.1 + afgekeurd + + + + + onbekend + + IR + AQUOKIT + + + 1522 + 12.2 + onbeslist + + + + + + 27376655 + + + + 2018-10 + + AA + DESK + + 4445 + 0.7 + 0.1 + goedgekeurd + + + + + + \ No newline at end of file From 6c05f146ccf5263ecece024a8f16900d48ad050d Mon Sep 17 00:00:00 2001 From: Florian Knappers <73856313+JJFlorian@users.noreply.github.com> Date: Thu, 21 Mar 2024 16:49:59 +0100 Subject: [PATCH 3/4] GWM tested: add to templates --- api/bro_upload/templates/registration_GAR.html | 4 ++-- api/bro_upload/templates/registration_GMW.html | 2 +- api/choices.py | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/api/bro_upload/templates/registration_GAR.html b/api/bro_upload/templates/registration_GAR.html index cd64e99..0401fa9 100644 --- a/api/bro_upload/templates/registration_GAR.html +++ b/api/bro_upload/templates/registration_GAR.html @@ -3,8 +3,8 @@ xmlns:brocom="http://www.broservices.nl/xsd/brocommon/3.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.broservices.nl/xsd/isgar/1.0 https://schema.broservices.nl/xsd/isgar/1.0/isgar-messages.xsd"> - TestCase1 - IMBRO/A + {{ metadata.requestReference }} + {{ metadata.qualityRegime }} Pietje_20181023_QR2 diff --git a/api/bro_upload/templates/registration_GMW.html b/api/bro_upload/templates/registration_GMW.html index 34bdf53..91dafab 100644 --- a/api/bro_upload/templates/registration_GMW.html +++ b/api/bro_upload/templates/registration_GMW.html @@ -32,7 +32,7 @@ {{ sourcedocs_data.groundLevelPosition }} {{ sourcedocs_data.groundLevelPositioningMethod }} -{% for monitoringtube in sourcedocs_data.monitoringtube %} +{% for monitoringtube in sourcedocs_data.monitoringTubes %} {{ monitoringtube.tubeNumber }} {{ monitoringtube.tubeType }} diff --git a/api/choices.py b/api/choices.py index 6036a33..6cda03e 100644 --- a/api/choices.py +++ b/api/choices.py @@ -18,6 +18,7 @@ ("GMN_MeasuringPointEndDate", "GMN_MeasuringPointEndDate"), ("GMN_TubeReference", "GMN_TubeReference"), ("GMN_Closure", "GMN_Closure"), + ("GMW", "GWM"), ] REQUEST_TYPE_OPTIONS = [ From 55ba2d2e1ff7d51ac378c64c529600bf55f7b974 Mon Sep 17 00:00:00 2001 From: Florian Knappers <73856313+JJFlorian@users.noreply.github.com> Date: Thu, 21 Mar 2024 16:50:36 +0100 Subject: [PATCH 4/4] precommit --- api/bro_upload/templates/registration_GAR.html | 2 +- api/bro_upload/templates/registration_GMW.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/bro_upload/templates/registration_GAR.html b/api/bro_upload/templates/registration_GAR.html index 0401fa9..8f31fc3 100644 --- a/api/bro_upload/templates/registration_GAR.html +++ b/api/bro_upload/templates/registration_GAR.html @@ -121,4 +121,4 @@ - \ No newline at end of file + diff --git a/api/bro_upload/templates/registration_GMW.html b/api/bro_upload/templates/registration_GMW.html index 91dafab..dada770 100644 --- a/api/bro_upload/templates/registration_GMW.html +++ b/api/bro_upload/templates/registration_GMW.html @@ -76,4 +76,4 @@ {% endfor %} - \ No newline at end of file +