From 401cd39689d73f1cc865bb3c7cfca40a3f5ac625 Mon Sep 17 00:00:00 2001 From: Christian Kollmann Date: Wed, 1 Dec 2021 14:46:18 +0100 Subject: Add simple page to search for an Austrian Address --- .../src/main/resources/templates/residency.html | 80 ++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 connector/src/main/resources/templates/residency.html (limited to 'connector/src/main/resources/templates/residency.html') diff --git a/connector/src/main/resources/templates/residency.html b/connector/src/main/resources/templates/residency.html new file mode 100644 index 00000000..44ae4bd5 --- /dev/null +++ b/connector/src/main/resources/templates/residency.html @@ -0,0 +1,80 @@ + + + + + + + + + Österreichischer Wohnsitz + + + + +
+
+ LanguageSelectionBlock +
+ +

Search your Austrian Residency

+ +
+
+

Infotext

+
+
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+ +
+ +
+
+ +
+ + + +
+ +
+ + -- cgit v1.2.3 From e5934d538aabcfc1f3b92472753de729d6ce1cce Mon Sep 17 00:00:00 2001 From: Christian Kollmann Date: Thu, 2 Dec 2021 09:06:55 +0100 Subject: Search with user provided input in ZMR for addresses --- connector/src/main/resources/templates/residency.html | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'connector/src/main/resources/templates/residency.html') diff --git a/connector/src/main/resources/templates/residency.html b/connector/src/main/resources/templates/residency.html index 44ae4bd5..38f490ca 100644 --- a/connector/src/main/resources/templates/residency.html +++ b/connector/src/main/resources/templates/residency.html @@ -20,7 +20,8 @@ url: "http://localhost:8080/ms_connector/residency/search", data: $("#inputForm").serialize() }).done(function (data, textStatus, jqXHR) { - $("#inputCity").val(data["city"]); + $("#inputMunicipality").val(data["municipality"]); + $("#inputVillage").val(data["village"]); $("#inputStreet").val(data["street"]); $("#inputNumber").val(data["number"]); $("#textInfo").text(updatedText); @@ -43,11 +44,15 @@

Infotext

-
- - + + +
+
+ +
-- cgit v1.2.3 From 6fff1b53525348d531c96b45c920a8ce72288f60 Mon Sep 17 00:00:00 2001 From: Christian Kollmann Date: Thu, 2 Dec 2021 15:03:09 +0100 Subject: Display all results to user after residency search --- .../src/main/resources/templates/residency.html | 122 ++++++++++++++++++--- 1 file changed, 105 insertions(+), 17 deletions(-) (limited to 'connector/src/main/resources/templates/residency.html') diff --git a/connector/src/main/resources/templates/residency.html b/connector/src/main/resources/templates/residency.html index 38f490ca..3f0532dd 100644 --- a/connector/src/main/resources/templates/residency.html +++ b/connector/src/main/resources/templates/residency.html @@ -12,24 +12,86 @@ th:attr="src=@{/static/js/jquery-3.6.0.min.js}"> Österreichischer Wohnsitz + @@ -41,38 +103,64 @@

Search your Austrian Residency

-
-

Infotext

-
+
Please enter a Municipality or Village first
- - + +
- - + +
- - + +
- - + +
+
+ +
+
+ +
+
+
+

+
+ + + + + + + + + + + + + +
MunicipalityVillageStreetNumberApply
+
+
-- cgit v1.2.3 From ac56869c2a981e40d6cf4637fb8fd46c06207c9d Mon Sep 17 00:00:00 2001 From: Christian Kollmann Date: Thu, 2 Dec 2021 16:05:57 +0100 Subject: Add PLZ to search for adresses in ZMR --- .../src/main/resources/templates/residency.html | 26 ++++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'connector/src/main/resources/templates/residency.html') diff --git a/connector/src/main/resources/templates/residency.html b/connector/src/main/resources/templates/residency.html index 3f0532dd..b434b9f9 100644 --- a/connector/src/main/resources/templates/residency.html +++ b/connector/src/main/resources/templates/residency.html @@ -33,7 +33,8 @@ let foundText = /*[[#{gui.residency.found}]]*/ 'Found {0}'; let uniqueText = /*[[#{gui.residency.unique}]]*/ 'Unique'; let invalidInputText = /*[[#{gui.residency.header.inputinvalid}]]*/ 'Invalid'; - if (!$("#inputForm #inputMunicipality").val().trim() && !$("#inputForm #inputVillage").val().trim()) { + if (!$("#inputForm #inputMunicipality").val().trim() && !$("#inputForm #inputPostleitzahl").val().trim() && + !$("#inputForm #inputVillage").val().trim()) { $("#textResult").show().text(invalidInputText); return; } @@ -46,6 +47,7 @@ $("#textResult").show().text(uniqueText); $("#tableResult tbody").empty(); $("#tableResult").hide(); + $("#inputForm #inputPostleitzahl").val(data["results"][0]["postleitzahl"]); $("#inputForm #inputMunicipality").val(data["results"][0]["municipality"]); $("#inputForm #inputVillage").val(data["results"][0]["village"]); $("#inputForm #inputStreet").val(data["results"][0]["street"]); @@ -58,20 +60,25 @@ $.each(data.results, function (i, output) { $("#tableResult tbody") .append($("") + .append($("").text(output["postleitzahl"] !== null ? output["postleitzahl"] : "")) .append($("").text(output["municipality"] !== null ? output["municipality"] : "")) .append($("").text(output["village"] !== null ? output["village"] : "")) .append($("").text(output["street"] !== null ? output["street"] : "")) .append($("").text(output["number"] !== null ? output["number"] : "")) .append($("").text(applyText).attr("href", "#").click(function () { - $("#inputForm #inputMunicipality").val($(this).parent().children("td:nth-child(1)").text()); - $("#inputForm #inputVillage").val($(this).parent().children("td:nth-child(2)").text()); - $("#inputForm #inputStreet").val($(this).parent().children("td:nth-child(3)").text()); - $("#inputForm #inputNumber").val($(this).parent().children("td:nth-child(4)").text()); + $("#inputForm #inputPostleitzahl").val($(this).parent().children("td:nth-child(1)").text()); + $("#inputForm #inputMunicipality").val($(this).parent().children("td:nth-child(2)").text()); + $("#inputForm #inputVillage").val($(this).parent().children("td:nth-child(3)").text()); + $("#inputForm #inputStreet").val($(this).parent().children("td:nth-child(4)").text()); + $("#inputForm #inputNumber").val($(this).parent().children("td:nth-child(5)").text()); $("#textResult").show().text(updatedText); search(); })) ); }) + if (data.results.length == 0) { + $("#tableResult").hide(); + } }).fail(function (jqXHR, textStatus, errorThrown) { $("#textResult").show().text(errorText); }) @@ -106,6 +113,10 @@
Please enter a Municipality or Village first
+
+ + +
@@ -134,8 +145,8 @@
- +
@@ -148,6 +159,7 @@ + -- cgit v1.2.3 From 8d2aa68bc18c04c2b03cbdd01f008a89e4c8c1c6 Mon Sep 17 00:00:00 2001 From: Christian Kollmann Date: Tue, 7 Dec 2021 07:51:10 +0100 Subject: Unify HTML templates across test, main, basicConfig --- .../src/main/resources/templates/residency.html | 39 ++++++++++++++++++---- 1 file changed, 33 insertions(+), 6 deletions(-) (limited to 'connector/src/main/resources/templates/residency.html') diff --git a/connector/src/main/resources/templates/residency.html b/connector/src/main/resources/templates/residency.html index b434b9f9..8192a068 100644 --- a/connector/src/main/resources/templates/residency.html +++ b/connector/src/main/resources/templates/residency.html @@ -3,7 +3,6 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="fragments/base" th:with="lang=${#locale.language}" th:lang="${lang}"> - @@ -102,17 +101,41 @@ -
-
- LanguageSelectionBlock +
+
+ + +
+
+
+
+

Zentraler eIDAS Knoten der Republik Österreich

+

Betrieben durch das Bundesministerium für Inneres

-

Search your Austrian Residency

+

Search your Austrian Residency

-
Please enter a Municipality or Village first
+
Please enter a postcode, municipality or village first
@@ -181,5 +204,9 @@
+
+
© BUNDESMINISTERIUM FÜR INNERES
+
+
-- cgit v1.2.3 From 02c69d2a137663f5aeefcb4cfacd1a163e7af5db Mon Sep 17 00:00:00 2001 From: Christian Kollmann Date: Tue, 7 Dec 2021 08:33:36 +0100 Subject: Rework styling of residency search template --- .../src/main/resources/templates/residency.html | 119 ++++++++++++++------- 1 file changed, 79 insertions(+), 40 deletions(-) (limited to 'connector/src/main/resources/templates/residency.html') diff --git a/connector/src/main/resources/templates/residency.html b/connector/src/main/resources/templates/residency.html index 8192a068..7a832aea 100644 --- a/connector/src/main/resources/templates/residency.html +++ b/connector/src/main/resources/templates/residency.html @@ -6,8 +6,8 @@ - - Österreichischer Wohnsitz @@ -135,7 +176,8 @@
-
Please enter a postcode, municipality or village first
+

Please enter a postcode, municipality or village first

+
@@ -156,38 +198,42 @@
-
- -
-
- -
-
- -
-
- +
+
+ + + + + +
+ +
+
-

+

-
Postleitzahl Municipality Village Street
+
- + - - + @@ -196,13 +242,6 @@
-
- - - -
-