From bf5f4b2cad3b996620c467f51836e661c7a32236 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 31 May 2016 15:27:46 +0200 Subject: [PATCH] added title (e.g. Dr., Prof. etc) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- nbproject/build-impl.xml | 34 +---- nbproject/faces-config.NavData | 128 +++++++++--------- nbproject/genfiles.properties | 4 +- ...AddressbookAdminContactWebRequestBean.java | 18 +++ ...sbookAdminContactWebRequestController.java | 14 ++ .../localization/bundle_de_DE.properties | 1 + .../localization/bundle_en_US.properties | 1 + .../admin/contact/admin_form_contact_data.tpl | 14 ++ 8 files changed, 116 insertions(+), 98 deletions(-) diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index b7394665..79d77ef2 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -1042,41 +1042,10 @@ exists or setup the property manually. For example like this: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1490,6 +1459,7 @@ exists or setup the property manually. For example like this: --> + diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index 3cecb2ea..b03ed569 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -2,70 +2,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 4f7fd810..f75ed0ad 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=be5f34f7 build.xml.stylesheet.CRC32=651128d4@1.68.1.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=71b488fe -nbproject/build-impl.xml.script.CRC32=8618eafc +nbproject/build-impl.xml.data.CRC32=c38bccef +nbproject/build-impl.xml.script.CRC32=2b4884f7 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1 diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java index a07dc3fd..1151723f 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java @@ -214,6 +214,11 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro */ private String street; + /** + * Title + */ + private String title; + /** * An event fired when the administrator has updated contact data */ @@ -310,6 +315,7 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro // Set all fields: contact this.setContactId(contact.getContactId()); + this.setTitle(contact.getContactTitle()); this.setBirthday(contact.getContactBirthday()); this.setCity(contact.getContactCity()); this.setComment(contact.getContactComment()); @@ -679,6 +685,16 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro 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; @@ -703,6 +719,7 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro // Clear all data // - personal data this.setGender(Gender.UNKNOWN); + this.setTitle(null); this.setFirstName(null); this.setFamilyName(null); this.setStreet(null); @@ -778,6 +795,7 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro // 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/addressbook/beans/contact/AddressbookAdminContactWebRequestController.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestController.java index 4e4a7d89..8d5d0a19 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestController.java +++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestController.java @@ -369,6 +369,20 @@ public interface AddressbookAdminContactWebRequestController extends Serializabl */ void setStreet (final String street); + /** + * Getter for title + *

+ * @return title + */ + String getTitle (); + + /** + * Setter for title + *

+ * @param title Title + */ + void setTitle (final String title); + /** * ZIP code *

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 4babaa02..0412bb3f 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -579,3 +579,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 7c7c04a7..dc922c60 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -577,3 +577,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/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl index 0282508c..f7f3228b 100644 --- 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 @@ +

+
+ +
+ +
+ +
+ +
+
+ + +
-- 2.39.5