added title (e.g. Dr., Prof. etc)

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

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index ebbbba2239400f7f7385405a296168675281238b..2d89abb6aecfb0ac69f7dc82218b7b73c3cc57b3 100644 (file)
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,81 +2,81 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/customer/admin_customer_delete.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="customer/checkout2.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="2650" y="150" zoom="true"/>
-        <Node id="privacy.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="guest/user/show_addressbook.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="1650" y="900" zoom="true"/>
-        <Node id="admin/index.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="user/login_own_addressbooks.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="user/login_user_data_saved.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="customer/register.xhtml" x="400" y="1500" zoom="true"/>
-        <Node id="item_added.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="admin/category/admin_category_list.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="user/login_data_saved.xhtml" x="2650" y="300" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="customer/lost_passwd.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="guest/user/user_list.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="index.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="user/login_edit_user_data.xhtml" x="650" y="1200" zoom="true"/>
-        <Node id="customer/checkout_done.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="*" x="900" y="1200" zoom="true"/>
-        <Node id="customer/login.xhtml" x="1900" y="750" zoom="true"/>
-        <Node id="admin/customer/admin_customer_unlock.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="user/login_index.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="400" y="1350" zoom="true"/>
-        <Node id="admin/product/admin_product_edit.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="guest/user/lost_passwd.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="guest/user/register_done.xhtml" x="2150" y="450" zoom="true"/>
-        <Node id="guest/user/show_addressbook_entries.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="user/login.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="admin/customer/admin_customer_delete.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="customer/checkout2.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="privacy.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="guest/user/show_addressbook.xhtml" x="400" y="1350" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="1650" y="750" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="admin/index.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="user/login_own_addressbooks.xhtml" x="2650" y="300" zoom="true"/>
+        <Node id="customer/register.xhtml" x="900" y="1200" zoom="true"/>
+        <Node id="user/login_user_data_saved.xhtml" x="1900" y="750" zoom="true"/>
+        <Node id="item_added.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="admin/category/admin_category_list.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="user/login_data_saved.xhtml" x="2150" y="300" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="customer/lost_passwd.xhtml" x="1900" y="600" zoom="true"/>
+        <Node id="index.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="guest/user/user_list.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="user/login_edit_user_data.xhtml" x="1650" y="900" zoom="true"/>
+        <Node id="customer/checkout_done.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="customer/login.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="*" x="400" y="300" zoom="true"/>
+        <Node id="admin/customer/admin_customer_unlock.xhtml" x="1150" y="1050" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="user/login_index.xhtml" x="150" y="1650" zoom="true"/>
+        <Node id="admin/product/admin_product_edit.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="guest/user/lost_passwd.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="guest/user/register_done.xhtml" x="1400" y="900" zoom="true"/>
+        <Node id="guest/user/show_addressbook_entries.xhtml" x="900" y="1050" zoom="true"/>
+        <Node id="user/login.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="650" y="300" zoom="true"/>
         <Node id="login/login_edit_user_data.xhtml" x="2400" y="450" zoom="true"/>
-        <Node id="admin/customer/admin_customer_edit.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="user/login_change_password.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="1150" y="1200" zoom="true"/>
+        <Node id="admin/customer/admin_customer_edit.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="user/login_change_password.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="2900" y="150" zoom="true"/>
         <Node id="admin/contact/admin_contact_export.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="customer/checkout.xhtml" x="1400" y="1050" zoom="true"/>
-        <Node id="guest/user/user_profile.xhtml" x="1400" y="900" zoom="true"/>
-        <Node id="admin/product/admin_product_delete.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="guest/user/confirm_account.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="basket.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="exception.xhtml" x="2150" y="600" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="150" y="1500" zoom="true"/>
-        <Node id="admin/category/admin_category_delete.xhtml" x="900" y="1350" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="guest/user/register_page2.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="terms.xhtml" x="650" y="1350" zoom="true"/>
-        <Node id="admin/contact/admin_contact_list.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="admin/contact/admin_contact_edit.xhtml" x="1900" y="600" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="user/login_change_personal_data.xhtml" x="2400" y="300" zoom="true"/>
-        <Node id="admin/category/admin_category_edit.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="logout.xhtml" x="1650" y="750" zoom="true"/>
-        <Node id="user/login_add_addressbook.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="user/login_contact_data_saved.xhtml" x="1150" y="1200" zoom="true"/>
-        <Node id="admin/contact/admin_contact_delete.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="imprint.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="150" y="1650" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="guest/user/login.xhtml" x="2900" y="150" zoom="true"/>
-        <Node id="admin/customer/admin_customer_list.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="guest/user/register.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="user/login_change_email_address.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="admin/product/admin_product_list.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="admin/customer/admin_customer_show.xhtml" x="1150" y="1050" zoom="true"/>
-        <Node id="customer/empty_basket.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="customer/checkout.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="guest/user/user_profile.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="admin/product/admin_product_delete.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="guest/user/confirm_account.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="basket.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="exception.xhtml" x="150" y="1500" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="2150" y="600" zoom="true"/>
+        <Node id="login/login_index.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="admin/category/admin_category_delete.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="guest/user/register_page2.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="650" y="1350" zoom="true"/>
+        <Node id="terms.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="user/login_change_personal_data.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="admin/category/admin_category_edit.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="logout.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="user/login_add_addressbook.xhtml" x="1400" y="1050" zoom="true"/>
+        <Node id="user/login_contact_data_saved.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="user/user_profile.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="admin/contact/admin_contact_delete.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="imprint.xhtml" x="2650" y="150" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="650" y="1200" zoom="true"/>
+        <Node id="guest/user/login.xhtml" x="2150" y="450" zoom="true"/>
+        <Node id="admin/customer/admin_customer_list.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="guest/user/register.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="user/login_change_email_address.xhtml" x="400" y="1500" zoom="true"/>
+        <Node id="admin/product/admin_product_list.xhtml" x="2400" y="300" zoom="true"/>
+        <Node id="admin/customer/admin_customer_show.xhtml" x="900" y="1350" zoom="true"/>
+        <Node id="customer/empty_basket.xhtml" x="1400" y="150" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 9318cc33ac31f94c65d0e3ffe1829717ad27cee4..6333bb73035d14a34cc26c2eee71ba51857162d3 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -551,3 +551,4 @@ GUEST_CONTACT_DATA_ZIP_CODE_REQUIRED=Bitte geben Sie Ihre Postleitzahl ein.
 GUEST_CONTACT_DATA_CITY_REQUIRED=Bitte geben Sie Ihren Wohnort ein.
 GUEST_CONTACT_DATA_BIRTHDAY_REQUIRED=Bitte geben Sie Ihr Geburtsdatum ein.
 FIELD_GENDER_REQUIRED=Bitte w\u00e4hlen Sie eine Anrede aus.
+ADMIN_PERSONAL_DATA_TITLE=Titel:

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 803037cb5ed14bccc8ffb69df7381eaa5847ccdb..f73ab467f73b5128f5c9a30200918401c2695810 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -535,3 +535,4 @@ GUEST_CONTACT_DATA_ZIP_CODE_REQUIRED=Please enter your ZIP code.
 GUEST_CONTACT_DATA_CITY_REQUIRED=Please enter your city.
 GUEST_CONTACT_DATA_BIRTHDAY_REQUIRED=Please enter your birthday.
 FIELD_GENDER_REQUIRED=Please select a salutation.
+ADMIN_PERSONAL_DATA_TITLE=Title:

diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java
index 6b3ef417dfa8afecb145669cd9e07eada13f64a8..94487af0287326b34d95c2a6d7e2f0dac975638c 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java
@@ -214,6 +214,11 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
         */
        private String street;
 
+       /**
+        * Title
+        */
+       private String title;
+
        /**
         * An event fired when the administrator has updated contact data
         */
@@ -295,6 +300,7 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
 
                // Set all fields: contact
                this.setContactId(contact.getContactId());
+               this.setTitle(contact.getContactTitle());
                this.setBirthday(contact.getContactBirthday());
                this.setCity(contact.getContactCity());
                this.setComment(contact.getContactComment());
@@ -735,6 +741,16 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
                this.street = street;
        }
 
+       @Override
+       public String getTitle () {
+               return this.title;
+       }
+
+       @Override
+       public void setTitle (final String title) {
+               this.title = title;
+       }
+
        @Override
        public Integer getZipCode () {
                return this.zipCode;
@@ -759,6 +775,7 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
                // Clear all data
                // - personal data
                this.setGender(Gender.UNKNOWN);
+               this.setTitle(null);
                this.setFirstName(null);
                this.setFamilyName(null);
                this.setStreet(null);
@@ -834,6 +851,7 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
 
                // Update all fields
                contact.setContactGender(this.getGender());
+               contact.setContactTitle(this.getTitle());
                contact.setContactFirstName(this.getFirstName());
                contact.setContactFamilyName(this.getFamilyName());
                contact.setContactStreet(this.getStreet());

diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java
index d86125839d536588cdbdf1b6ec25d59d5b4c1b4e..c1fa9668aae459bed321a5c51319edec5603004e 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java
@@ -369,6 +369,20 @@ public interface PizzaAdminContactWebRequestController extends Serializable {
         */
        void setStreet (final String street);
 
+       /**
+        * Getter for title
+        * <p>
+        * @return title
+        */
+       String getTitle ();
+
+       /**
+        * Setter for title
+        * <p>
+        * @param title Title
+        */
+       void setTitle (final String title);
+
        /**
         * ZIP code
         * <p>

diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
index 0282508c252fc37b6e2ed9eed0e345010f86b013..f7f3228b75f1506d1ce75419d0126dd5d750351f 100644 (file)
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -41,6 +41,20 @@
 
                        <h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
 
+                       <div class="table_row">
+                               <div class="table_left_medium">
+                                       <h:outputLabel for="title" value="#{msg.ADMIN_PERSONAL_DATA_TITLE}" />
+                               </div>
+
+                               <div class="table_right_medium">
+                                       <h:inputText styleClass="input" id="title" size="5" maxlength="255" value="#{adminContactController.title}" />
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <h:message for="title" errorClass="errors" fatalClass="errors" warnClass="errors" />
+
                        <div class="table_row">
                                <div class="table_left_medium">
                                        <h:outputLabel for="familyName" value="#{msg.ADMIN_PERSONAL_DATA_FAMILY_NAME}" />