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 --- basicConfig/templates/residency.html | 80 ++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 basicConfig/templates/residency.html (limited to 'basicConfig/templates/residency.html') diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html new file mode 100644 index 00000000..96fa13f8 --- /dev/null +++ b/basicConfig/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 --- basicConfig/templates/residency.html | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'basicConfig/templates/residency.html') diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html index 96fa13f8..3c3c05d7 100644 --- a/basicConfig/templates/residency.html +++ b/basicConfig/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 --- basicConfig/templates/residency.html | 122 ++++++++++++++++++++++++++++++----- 1 file changed, 105 insertions(+), 17 deletions(-) (limited to 'basicConfig/templates/residency.html') diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html index 3c3c05d7..9dc1153d 100644 --- a/basicConfig/templates/residency.html +++ b/basicConfig/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 --- basicConfig/templates/residency.html | 312 ++++++++++++++++++----------------- 1 file changed, 162 insertions(+), 150 deletions(-) (limited to 'basicConfig/templates/residency.html') diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html index 9dc1153d..b434b9f9 100644 --- a/basicConfig/templates/residency.html +++ b/basicConfig/templates/residency.html @@ -5,168 +5,180 @@ th:with="lang=${#locale.language}" th:lang="${lang}"> - - - - - Österreichischer Wohnsitz - + Österreichischer Wohnsitz + - + function clearInput() { + $("#inputForm #inputMunicipality").val(""); + $("#inputForm #inputVillage").val(""); + $("#inputForm #inputStreet").val(""); + $("#inputForm #inputNumber").val(""); + $("#textResult").hide(); + $("#tableResult").hide(); + } + +
-
- LanguageSelectionBlock -
+
+ LanguageSelectionBlock +
-

Search your Austrian Residency

+

Search your Austrian Residency

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

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

+
+ + + + + + + + + + + + + + +
PostleitzahlMunicipalityVillageStreetNumberApply
+
-
- - - -
+
+ + + +
-- 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 --- basicConfig/templates/residency.html | 39 ++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) (limited to 'basicConfig/templates/residency.html') diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html index b434b9f9..8192a068 100644 --- a/basicConfig/templates/residency.html +++ b/basicConfig/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 --- basicConfig/templates/residency.html | 119 +++++++++++++++++++++++------------ 1 file changed, 79 insertions(+), 40 deletions(-) (limited to 'basicConfig/templates/residency.html') diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html index 8192a068..7a832aea 100644 --- a/basicConfig/templates/residency.html +++ b/basicConfig/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 @@
-
- -
-
- -
-
- -
-
- +
+
+ + + +
+ +
+ +
+
-

+

- +
- + - - + @@ -196,13 +242,6 @@
-
- - - -
-
© BUNDESMINISTERIUM FÜR INNERES
-- cgit v1.2.3 From a017ebff96d2cc12943801c933e5733b4e827b3b Mon Sep 17 00:00:00 2001 From: Christian Kollmann Date: Tue, 7 Dec 2021 09:00:22 +0100 Subject: Use relative paths in templates to enable preview in browser If Thymeleaf is active (i.e. the template is rendered by the Webapp), the path gets replaced anyway. --- basicConfig/templates/residency.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'basicConfig/templates/residency.html') diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html index 7a832aea..4600a26f 100644 --- a/basicConfig/templates/residency.html +++ b/basicConfig/templates/residency.html @@ -218,7 +218,7 @@
-
-- cgit v1.2.3 From 01a4c718c21573b0d149ca182a02d9355eb61170 Mon Sep 17 00:00:00 2001 From: Thomas <> Date: Tue, 8 Feb 2022 18:03:07 +0100 Subject: feature(matching): add 'Back to previous step' button into 'search-by-residence' GUI --- basicConfig/templates/residency.html | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'basicConfig/templates/residency.html') diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html index 4600a26f..df3c10b7 100644 --- a/basicConfig/templates/residency.html +++ b/basicConfig/templates/residency.html @@ -211,6 +211,12 @@
+
+ + + +
+
-- cgit v1.2.3 From 7405ddcd0bd5326c1a0e2e187086a90caad8ebea Mon Sep 17 00:00:00 2001 From: Thomas <> Date: Thu, 10 Mar 2022 14:54:04 +0100 Subject: chore(matching): set REST endpoint for search-address wizerd by GUI model parameter --- basicConfig/templates/residency.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'basicConfig/templates/residency.html') diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html index df3c10b7..d89b909c 100644 --- a/basicConfig/templates/residency.html +++ b/basicConfig/templates/residency.html @@ -43,7 +43,7 @@ } $.ajax({ type: "POST", - url: "http://localhost:8080/ms_connector/residency/search", + url: "$contextPath$wizardEndpoint", data: $("#inputForm").serialize() }).done(function (data, textStatus, jqXHR) { if (data["resultCount"] === 1) { -- cgit v1.2.3 From 51984cd48762b50cf64fc8f6aa54be1a8e7bf31a Mon Sep 17 00:00:00 2001 From: Thomas <> Date: Thu, 10 Mar 2022 15:32:01 +0100 Subject: chore(matching): inject REST endpoint for address wizard by GUI model --- basicConfig/templates/residency.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'basicConfig/templates/residency.html') diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html index d89b909c..c94721c0 100644 --- a/basicConfig/templates/residency.html +++ b/basicConfig/templates/residency.html @@ -43,7 +43,7 @@ } $.ajax({ type: "POST", - url: "$contextPath$wizardEndpoint", + url: [(${wizardEndpoint})], data: $("#inputForm").serialize() }).done(function (data, textStatus, jqXHR) { if (data["resultCount"] === 1) { -- cgit v1.2.3 From eb301932e03e01ff61990ba578fd55996052eab4 Mon Sep 17 00:00:00 2001 From: Thomas <> Date: Fri, 11 Mar 2022 09:00:53 +0100 Subject: chore(UX): a few small GUI improvements --- basicConfig/templates/residency.html | 37 ++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) (limited to 'basicConfig/templates/residency.html') diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html index c94721c0..f8516945 100644 --- a/basicConfig/templates/residency.html +++ b/basicConfig/templates/residency.html @@ -43,7 +43,7 @@ } $.ajax({ type: "POST", - url: [(${wizardEndpoint})], + url: "[(${wizardEndpoint})]", data: $("#inputForm").serialize() }).done(function (data, textStatus, jqXHR) { if (data["resultCount"] === 1) { @@ -88,6 +88,7 @@ } function clearInput() { + $("#inputForm #inputPostleitzahl").val(""); $("#inputForm #inputMunicipality").val(""); $("#inputForm #inputVillage").val(""); $("#inputForm #inputStreet").val(""); @@ -116,11 +117,12 @@ button { padding: 0.5em; margin: 0.5em; - width: 8em; + width: 12em; } .block { - width: 100%; + width: 80%; + justify-content: left; } #tableResult td, #tableResult th { @@ -205,23 +207,30 @@ - + + + + +
-
- - - -
+
+
+ + + +
+ +
+ + + +
-
- - - -
+
Date: Mon, 2 May 2022 17:16:15 +0200 Subject: chore(matching): re-oreder process steps in GUI releated matching --- basicConfig/templates/residency.html | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'basicConfig/templates/residency.html') diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html index f8516945..26812ec0 100644 --- a/basicConfig/templates/residency.html +++ b/basicConfig/templates/residency.html @@ -173,7 +173,22 @@

Betrieben durch das Bundesministerium für Inneres

-

Search your Austrian Residency

+
+

Search your Austrian Residency

+ +

Info text for matching by address

+

HowTo search by address

+
+ +
+

Detailed +

+

Generell +

+
+
- + +

Alternativ infos and back

+
+ -
+
-- cgit v1.2.3