Please cherry-pick:

- rewrote to use DATA_ZIP_CODE only, other *_DATA_ZIP_CODE has been deleted
- continued a bit with details p:dialog (modal) box, still need to add all
  fields, including for administrative list

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/localization/generic_de_DE.properties b/src/java/org/mxchange/localization/generic_de_DE.properties
index 1b905f24a2e533b495ddf3377b43a7420b6450e5..dbc4924efbd8680679d7ccfc22cd34a95440da4f 100644 (file)
--- a/src/java/org/mxchange/localization/generic_de_DE.properties
+++ b/src/java/org/mxchange/localization/generic_de_DE.properties
@@ -259,7 +259,6 @@ ADMIN_PERSONAL_DATA_FIRST_NAME=Vorname:
 ADMIN_PERSONAL_DATA_FAMILY_NAME=Familienname:
 ADMIN_DATA_STREET_NAME=Strassenname:
 ADMIN_DATA_HOUSE_NUMBER=Hausnummer:
-ADMIN_DATA_ZIP_CODE=Postleitzahl:
 ADMIN_DATA_CITY=Wohnort:
 ADMIN_SELECT_COUNTRY=Land ausw\u00e4hlen:
 ADMIN_PERSONAL_DATA_PHONE_NUMBER=Telefonnummer:
@@ -365,7 +364,6 @@ ADMIN_CONTACT_FIRST_NAME=Vorname:
 ADMIN_CONTACT_FAMILY_NAME=Nachname:
 ADMIN_CONTACT_STREET=Strasse:
 ADMIN_CONTACT_HOUSE_NUMBER=Hausnummer:
-ADMIN_CONTACT_ZIP_CODE=Postleitzahl:
 ADMIN_CONTACT_CITY=Stadt:
 DATA_EMAIL_ADDRESS=Email-Adresse:
 ADMIN_CONTACT_BIRTHDAY=Geburtstag:
@@ -1194,7 +1192,6 @@ HOUSE_NUMBER_EXTENSION_OF_BRANCH_OFFICE_TITLE=Hausnummerzusatz der Filiale
 STORE_HEADER=Geschoss:
 STORE_OF_BRANCH_OFFICE_TITLE=Geschoss der Filiale
 SUITE_NUMBER_HEADER=Suite-Nummer:
-ZIP_CODE_HEADER=Postleitzahl:
 ZIP_CODE_OF_BRANCH_OFFICE_TITLE=Postleitzahl der Filiale
 CITY_HEADER=Stadt:
 CITY_OF_BRANCH_OFFICE_TITLE=Stadt der Filiale
@@ -1212,3 +1209,4 @@ AVAILABLE_HEADER=Verf\u00fcgbar:
 ADMIN_MANUFACTURER_HEADER=Hersteller:
 ADMIN_ASSIGNED_MANUFACTURER_LABEL=Zugewiesener Hersteller:
 BARCODE=Barcode:
+ADMIN_CONTACT_DETAILS_HEADER=Kontaktdaten zu {0} {1} {2}:

diff --git a/src/java/org/mxchange/localization/generic_en_US.properties b/src/java/org/mxchange/localization/generic_en_US.properties
index 41f760c46ead8f186bf856cb1cb733b84701dbd3..cc5ac8b6192b5d40c535d6825dd4e18ac00e5e91 100644 (file)
--- a/src/java/org/mxchange/localization/generic_en_US.properties
+++ b/src/java/org/mxchange/localization/generic_en_US.properties
@@ -243,7 +243,6 @@ ADMIN_PERSONAL_DATA_FIRST_NAME=First name:
 ADMIN_PERSONAL_DATA_FAMILY_NAME=Family name:
 ADMIN_DATA_STREET_NAME=Name of street:
 ADMIN_DATA_HOUSE_NUMBER=House number:
-ADMIN_DATA_ZIP_CODE=ZIP code:
 ADMIN_DATA_CITY=City:
 ADMIN_SELECT_COUNTRY=Select country:
 ADMIN_PERSONAL_DATA_PHONE_NUMBER=Phone number:
@@ -345,7 +344,6 @@ ADMIN_CONTACT_FIRST_NAME=First name:
 ADMIN_CONTACT_FAMILY_NAME=Family name:
 ADMIN_CONTACT_STREET=Street:
 ADMIN_CONTACT_HOUSE_NUMBER=House number:
-ADMIN_CONTACT_ZIP_CODE=ZIP code:
 ADMIN_CONTACT_CITY=City:
 DATA_EMAIL_ADDRESS=Email address:
 ADMIN_CONTACT_BIRTHDAY=Birthday:
@@ -1106,7 +1104,6 @@ HOUSE_NUMBER_EXTENSION_OF_BRANCH_OFFICE_TITLE=House number extension of branch o
 STORE_HEADER=Store:
 STORE_OF_BRANCH_OFFICE_TITLE=Store of branch office
 SUITE_NUMBER_HEADER=Suite number:
-ZIP_CODE_HEADER=ZIP code:
 ZIP_CODE_OF_BRANCH_OFFICE_TITLE=ZIP code of branch office
 CITY_HEADER=City:
 CITY_OF_BRANCH_OFFICE_TITLE=City of branch office
@@ -1123,3 +1120,4 @@ AVAILABLE_HEADER=Available:
 ADMIN_MANUFACTURER_HEADER=Manufacturer:
 ADMIN_ASSIGNED_MANUFACTURER_LABEL=Assigned manufacturer:
 BARCODE=Barcode:
+ADMIN_CONTACT_DETAILS_HEADER=Contact data of {0} {1} {2}:

diff --git a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl
index ddf044d7be1a3b880c4fe4cea846349795e8383b..94c88cc5d6fd43a01e05267a303d8b5b919adaf0 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl
+++ b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl
@@ -85,7 +85,7 @@
        </p:column>
 
        <p:column>
-               <p:outputLabel for="contactZipCode" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
+               <p:outputLabel for="contactZipCode" styleClass="table-data-label" value="#{msg.DATA_ZIP_CODE}" />
 
                <h:outputText id="contactZipCode" styleClass="table-data-field" value="#{beanHelper.contact.contactZipCode}" />
        </p:column>
@@ -112,7 +112,7 @@
                <p:outputLabel for="contactBirthday" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
 
                <h:outputText id="contactBirthday" styleClass="table-data-field" value="#{beanHelper.contact.contactBirthday}">
-                                               <f:convertDateTime type="date" dateStyle="medium" />
+                       <f:convertDateTime type="date" dateStyle="medium" />
                </h:outputText>
        </p:column>
 

diff --git a/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl
index c395bad6ed377047e73581565151bc5647e94618..5a0557a9b6d7b00f7af7fc39c6abde8828ba08be 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl
@@ -72,7 +72,7 @@
                        <p:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_DATA_HOUSE_NUMBER_EXTENSION}" />
                        <p:inputText id="houseNumberExtension" size="2" maxlength="2" value="#{adminContactController.houseNumberExtension}" />
 
-                       <p:outputLabel for="zipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
+                       <p:outputLabel for="zipCode" value="#{msg.DATA_ZIP_CODE}" />
                        <p:inputText id="zipCode" size="5" maxlength="6" value="#{adminContactController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
                                <f:validateLongRange minimum="1" maximum="99999" />
                        </p:inputText>

diff --git a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
index 6b4e9f96126288aba08c8a8f86c8ce96d3e279c3..dde0a62b64e7179f0cb4fb6f62fb17cf81e1e4fd 100644 (file)
--- a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
+++ b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
@@ -155,7 +155,7 @@
                                <f:validateLongRange minimum="1" maximum="500" />
                        </p:inputText>
 
-                       <p:outputLabel for="branchZipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
+                       <p:outputLabel for="branchZipCode" value="#{msg.DATA_ZIP_CODE}" />
                        <p:inputText id="branchZipCode" size="5" maxlength="6" value="#{adminBranchOfficeController.branchZipCode}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_ZIP_CODE_REQUIRED}">
                                <f:validateLongRange minimum="1" maximum="99999" />
                        </p:inputText>

diff --git a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl
index 6cb52b22ed526de9b2025b9f356e886386857dac..f7feab04df8e167cf8b15e53c54669b0a3a9bdfa 100644 (file)
--- a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl
+++ b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl
@@ -123,7 +123,7 @@
                                <f:validateLongRange minimum="1" maximum="500" />
                        </p:inputText>
 
-                       <p:outputLabel for="headquarterZipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
+                       <p:outputLabel for="headquarterZipCode" value="#{msg.DATA_ZIP_CODE}" />
                        <p:inputText id="headquarterZipCode" size="5" maxlength="6" value="#{adminHeadquarterController.headquarterZipCode}" required="true" requiredMessage="#{msg.ADMIN_HEADQUARTER_ZIP_CODE_REQUIRED}">
                                <f:validateLongRange minimum="1" maximum="99999" />
                        </p:inputText>

diff --git a/web/admin/branch_office/admin_branch_office_list.xhtml b/web/admin/branch_office/admin_branch_office_list.xhtml
index b5267f384027582a3702b590d6157aaae70391d8..f0532eae4bc5ba38df84d1465337c06981029cf5 100644 (file)
--- a/web/admin/branch_office/admin_branch_office_list.xhtml
+++ b/web/admin/branch_office/admin_branch_office_list.xhtml
@@ -402,7 +402,7 @@
                                                                <p:outputLabel value="#{msg.SUITE_NUMBER_HEADER}" title="#{msg.SUITE_NUMBER_OF_BRANCH_OFFICE_TITLE}" />
                                                                <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchSuiteNumber}" />
 
-                                                               <p:outputLabel value="#{msg.ZIP_CODE_HEADER}" title="#{msg.ZIP_CODE_OF_BRANCH_OFFICE_TITLE}" />
+                                                               <p:outputLabel value="#{msg.DATA_ZIP_CODE}" title="#{msg.ZIP_CODE_OF_BRANCH_OFFICE_TITLE}" />
                                                                <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchZipCode}" />
 
                                                                <p:outputLabel value="#{msg.CITY_HEADER}" title="#{msg.CITY_OF_BRANCH_OFFICE_TITLE}" />

diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index 15ce96640b363958847c6216f6466f81f05011c7..86e0a2e48a1f656e4ee65751275f8e0591b35aa7 100644 (file)
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -177,7 +177,9 @@
                                        <p:panelGrid columns="2" rendered="#{not empty contactListController.selectedContact}">
                                                <f:facet name="header">
                                                        <h:outputFormat value="#{msg.ADMIN_CONTACT_DETAILS_HEADER}">
-                                                               <f:param value="#{contactListController.selectedContact.companyName}" />
+                                                               <f:param value="#{msg[contactListController.selectedContact.contactPersonalTitle.messageKey]}" />
+                                                               <f:param value="#{contactListController.selectedContact.contactFirstName}" />
+                                                               <f:param value="#{contactListController.selectedContact.contactFamilyName}" />
                                                                <f:param value="#{contactListController.selectedContact.contactId}" />
                                                        </h:outputFormat>
                                                </f:facet>