From 2dce4fdfa596b193378ef88b885136565eb47b09 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 10 Jun 2017 21:08:21 +0200 Subject: [PATCH] Please cherry-pick: - using gender for Mr./Mrs. is plain wrong, now "personal title" and "academic title" are being used. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../localization/bundle_de_DE.properties | 21 ++-- .../localization/bundle_en_US.properties | 25 ++-- .../PizzaAdminContactWebRequestBean.java | 69 +++++------ ...PizzaAdminContactWebRequestController.java | 32 ++--- .../contact/PizzaContactWebSessionBean.java | 74 ++++++------ .../PizzaContactWebSessionController.java | 26 ++-- .../PizzaAdminCustomerWebRequestBean.java | 4 +- .../gender/PizzaGenderWebApplicationBean.java | 14 +-- .../PizzaGenderWebApplicationController.java | 8 +- ...zaProfileModeWebApplicationController.java | 4 +- .../user/PizzaAdminUserWebRequestBean.java | 2 +- .../admin/contact/admin_contact_data.tpl | 113 ------------------ .../contact/admin_contact_data_columns.tpl | 6 +- .../admin_contact_data_columns_mini.tpl | 6 +- .../admin/contact/admin_contact_data_mini.tpl | 4 +- .../admin/contact/admin_form_contact_data.tpl | 8 +- .../templates/contact/form_contact_data.tpl | 6 +- ...x.tpl => personal_title_selection_box.tpl} | 4 +- web/WEB-INF/web.xml | 8 +- web/admin/contact/admin_contact_delete.xhtml | 2 +- web/admin/contact/admin_contact_edit.xhtml | 2 +- web/admin/contact/admin_contact_export.xhtml | 6 +- web/admin/contact/admin_contact_list.xhtml | 6 +- web/admin/fax/admin_fax_show.xhtml | 6 +- web/admin/landline/admin_landline_show.xhtml | 6 +- web/admin/mobile/admin_mobile_show.xhtml | 6 +- web/admin/user/admin_user_activity_log.xhtml | 2 +- web/admin/user/admin_user_export.xhtml | 6 +- web/admin/user/admin_user_list.xhtml | 6 +- web/admin/user/admin_user_lock.xhtml | 5 +- web/admin/user/admin_user_unlock.xhtml | 4 +- web/guest/user/user_confirm_account.xhtml | 2 +- 32 files changed, 189 insertions(+), 304 deletions(-) delete mode 100644 web/WEB-INF/templates/admin/contact/admin_contact_data.tpl rename web/WEB-INF/templates/generic/{gender_selection_box.tpl => personal_title_selection_box.tpl} (63%) diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 220e7d6a..7ab039c0 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -13,9 +13,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -# Unknown gender -GENDER_MALE=Herr -GENDER_FEMALE=Frau +PERSONAL_TITLE_MALE=Herr +PERSONAL_TITLE_FEMALE=Frau CHOICE_YES=Ja CHOICE_NO=Nein PAGE_TITLE_INDEX_WELCOME=Willkommen! @@ -59,7 +58,7 @@ PRIVACY_TERMS_LEGEND=Rechtliches: PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE=Bitte den Datenschutzbestimmungen zustimmen. TERMS_NOT_ACCEPTED_MESSAGE=Bitte den AGBs zustimmen. PERSONAL_DATA_MINIMUM_NOTICE=Bitte geben Sie mindestens Name, Anschrift und Telefonnummer an. -PERSONAL_DATA_GENDER=Anrede: +PERSONAL_DATA_PERSONAL_TITLE=Anrede: PERSONAL_DATA_FIRST_NAME=Vorname: PERSONAL_DATA_FAMILY_NAME=Nachname: PERSONAL_DATA_STREET=Stra\u00dfe: @@ -244,7 +243,7 @@ ADMIN_ADD_USER_TITLE=Neues Benutzeraccount anlegen ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE=Bitte geben Sie mindestens Anrede, Vor- und Nachnamen, sowie Benutzernamen und Email-Adresse ein. ADMIN_CONTACT_PERSONAL_DATA_LEGEND=Pers\u00f6nliche Daten des Benutzers: ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE=Geben Sie hier die pers\u00f6nlichen Daten des neuen Benutzers ein. -ADMIN_PERSONAL_DATA_GENDER=Anrede ausw\u00e4hlen: +ADMIN_PERSONAL_DATA_PERSONAL_TITLE=Anrede ausw\u00e4hlen: ADMIN_PERSONAL_DATA_FIRST_NAME=Vorname: ADMIN_PERSONAL_DATA_FAMILY_NAME=Familienname: ADMIN_PERSONAL_DATA_STREET=Strassenname: @@ -323,7 +322,7 @@ ADMIN_USER_DATA_ENTER_PASSWORD=Passwort eingeben: ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT=Passwort wiederholen: ADMIN_LIST_USER_ID=Benutzer-Id: ADMIN_LIST_USER_NAME=Benutzername: -ADMIN_LIST_USER_GENDER=Anrede: +ADMIN_LIST_USER_PERSONAL_TITLE=Anrede: ADMIN_LIST_USER_FIRST_NAME=Vorname: ADMIN_LIST_USER_FAMILY_NAME=Nachname: ADMIN_LIST_USER_ACCOUNT_STATUS=Account-Status: @@ -353,8 +352,8 @@ ADMIN_USER_LAST_LOCKED_REASON=Letzter Sperrgrund: ADMIN_USER_CONTACT_CREATED=Wann Kontaktdaten erstellt: ADMIN_USER_CONTACT_UPDATED=Wann Kontaktdaten ge\u00e4ndert: ADMIN_CONTACT_IS_OWN_CONTACT=Eigenes Account: -ADMIN_CONTACT_GENDER=Anrede: -ADMIN_CONTACT_TITLE=Titel: +ADMIN_CONTACT_PERSONAL_TITLE=Anrede: +ADMIN_CONTACT_ACADEMIC_TITLE=Titel: ADMIN_CONTACT_FIRST_NAME=Vorname: ADMIN_CONTACT_FAMILY_NAME=Nachname: ADMIN_CONTACT_STREET=Strasse: @@ -504,8 +503,8 @@ PERSONAL_DATA_BIRTHDAY=Geburtsdatum (tt.mm.jjjj): BIRTHDAY_PATTERN=dd.MM.yyyy INVALID_BIRTHDAY=Ung\u00fcltiges Geburtsdatum eingegeben. ADMIN_EXPORT_CONTACT_ID=Kontaktdaten-Id -ADMIN_EXPORT_CONTACT_GENDER=Anrede -ADMIN_EXPORT_CONTACT_TITLE=Titel +ADMIN_EXPORT_CONTACT_PERSONAL_TITLE=Anrede +ADMIN_EXPORT_CONTACT_ACADEMIC_TITLE=Titel ADMIN_EXPORT_CONTACT_FIRST_NAME=Vorname ADMIN_EXPORT_CONTACT_FAMILY_NAME=Nachname ADMIN_EXPORT_CONTACT_STREET=Stra\u00dfe @@ -526,7 +525,7 @@ GUEST_CONTACT_DATA_HOUSE_NUMBER_REQUIRED=Bitte geben Sie die Hausnummer ohne Zus 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. +FIELD_PERSONAL_TITLE_REQUIRED=Bitte w\u00e4hlen Sie eine Anrede aus. ADMIN_PERSONAL_DATA_TITLE=Titel: LINK_ADMIN_EXPORT_USER=Benutzerdaten exportieren LINK_ADMIN_EXPORT_USER_TITLE=Exportiert alle Benutzerdaten (und Kontaktdaten). diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 00c20b21..c5c5872e 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -13,9 +13,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -# Unknown gender -GENDER_MALE=Mr. -GENDER_FEMALE=Mrs. +PERSONAL_TITLE_MALE=Mr. +PERSONAL_TITLE_FEMALE=Mrs. CHOICE_YES=Yes CHOICE_NO=No PAGE_TITLE_INDEX_WELCOME=Welcome! @@ -59,7 +58,7 @@ PRIVACY_TERMS_LEGEND=Terms & privacy policy: PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE=Please accept our privacy policy. TERMS_NOT_ACCEPTED_MESSAGE=Please accept Terms&Conditions. PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least your name, address and phone number. -PERSONAL_DATA_GENDER=Salutation: +PERSONAL_DATA_PERSONAL_TITLE=Salutation: PERSONAL_DATA_FIRST_NAME=First name: PERSONAL_DATA_FAMILY_NAME=Family name: PERSONAL_DATA_STREET=Street: @@ -224,10 +223,10 @@ PAGE_TITLE_ADMIN_ADD_USER=Add new user account CONTENT_TITLE_ADMIN_ADD_USER=Add new user account: TABLE_SUMMARY_ADMIN_LIST_USERS=Administration, list all users ADMIN_ADD_USER_TITLE=Create a new user account -ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least gender, first name, family name, user name and email address. +ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least title, first name, family name, user name and email address. ADMIN_CONTACT_PERSONAL_DATA_LEGEND=Personal data of the user: ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE=Here you can enter the personal data of the new user. -ADMIN_PERSONAL_DATA_GENDER=Select gender: +ADMIN_PERSONAL_DATA_PERSONAL_TITLE=Select title: ADMIN_PERSONAL_DATA_FIRST_NAME=First name: ADMIN_PERSONAL_DATA_FAMILY_NAME=Family name: ADMIN_PERSONAL_DATA_STREET=Name of street: @@ -306,7 +305,7 @@ ADMIN_USER_DATA_ENTER_PASSWORD=Enter password: ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT=Repeat password: ADMIN_LIST_USER_ID=User id: ADMIN_LIST_USER_NAME=User name: -ADMIN_LIST_USER_GENDER=Gender: +ADMIN_LIST_USER_PERSONAL_TITLE=Gender: ADMIN_LIST_USER_FIRST_NAME=First name: ADMIN_LIST_USER_FAMILY_NAME=Family name: ADMIN_LIST_USER_ACCOUNT_STATUS=Account status: @@ -333,8 +332,8 @@ ADMIN_USER_LAST_LOCKED_REASON=Last lock reason: ADMIN_USER_CONTACT_CREATED=When contact data created: ADMIN_USER_CONTACT_UPDATED=When contact data updated: ADMIN_CONTACT_IS_OWN_CONTACT=Own account: -ADMIN_CONTACT_GENDER=Gender: -ADMIN_CONTACT_TITLE=Title: +ADMIN_CONTACT_PERSONAL_TITLE=Gender: +ADMIN_CONTACT_ACADEMIC_TITLE=Title: ADMIN_CONTACT_FIRST_NAME=First name: ADMIN_CONTACT_FAMILY_NAME=Family name: ADMIN_CONTACT_STREET=Street: @@ -423,7 +422,7 @@ CONTENT_TITLE_ADMIN_DELETE_CONTACT=Delete contact data: ADMIN_DELETE_CONTACT_TITLE=Delete contact data unreverseable BUTTON_ADMIN_DELETE_CONTACT=Delete contact data ADMIN_DELETE_CONTACT_NOTICE=You want to delete contact data. This data could be still linked with other data which could lead to errors. Please delete only, if you are sure that no foreign data links to this record. -ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least gender, first name and family name. +ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least title, first name and family name. LINK_ADMIN_LIST_CONTACT=List contact data LINK_ADMIN_LIST_CONTACT_TITLE=Lists all contact data regardless where they was created. CONTACT_IS_USER=Is a user @@ -499,8 +498,8 @@ PERSONAL_DATA_BIRTHDAY=Birthday (mm-dd-yyyy): BIRTHDAY_PATTERN=MM-dd-yyyy INVALID_BIRTHDAY=Wrong birthday entered. ADMIN_EXPORT_CONTACT_ID=Contact data id -ADMIN_EXPORT_CONTACT_GENDER=Gender -ADMIN_EXPORT_CONTACT_TITLE=Title +ADMIN_EXPORT_CONTACT_PERSONAL_TITLE=Gender +ADMIN_EXPORT_CONTACT_ACADEMIC_TITLE=Title ADMIN_EXPORT_CONTACT_FIRST_NAME=First name ADMIN_EXPORT_CONTACT_FAMILY_NAME=Family name ADMIN_EXPORT_CONTACT_STREET=Street @@ -521,7 +520,7 @@ GUEST_CONTACT_DATA_HOUSE_NUMBER_REQUIRED=Please enter your house number without 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. +FIELD_PERSONAL_TITLE_REQUIRED=Please select a salutation. ADMIN_PERSONAL_DATA_TITLE=Title: LINK_ADMIN_EXPORT_USER=Export user data LINK_ADMIN_EXPORT_USER_TITLE=Exports all user and contact data. diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java index 982cf38d..6af68fdf 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java @@ -34,7 +34,7 @@ import org.mxchange.jcontacts.contact.AdminContactSessionBeanRemote; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.ContactSessionBeanRemote; import org.mxchange.jcontacts.contact.UserContact; -import org.mxchange.jcontacts.contact.gender.Gender; +import org.mxchange.jcontacts.contact.title.PersonalTitle; import org.mxchange.jcontacts.contact.utils.ContactUtils; import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent; import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent; @@ -156,11 +156,6 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme */ private String firstName; - /** - * Gender instance - */ - private Gender gender; - /** * House number */ @@ -221,15 +216,20 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme */ private MobileProvider mobileProvider; + /** + * PersonalTitle instance + */ + private PersonalTitle personalTitle; + /** * Street */ private String street; /** - * Title + * Academic academicTitle */ - private String title; + private String academicTitle; /** * An event fired when the administrator has updated contact data @@ -254,9 +254,9 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme @Override public String addContact () { // Are all minimum fields set? - if (this.getGender() == null) { + if (this.getPersonalTitle() == null) { // Throw NPE - throw new NullPointerException("gender is null"); //NOI18N + throw new NullPointerException("personalTitle is null"); //NOI18N } else if (this.getFirstName() == null) { // Throw NPE throw new NullPointerException("firstName is null"); //NOI18N @@ -321,7 +321,7 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme // Set all fields: contact this.setContactId(contact.getContactId()); - this.setTitle(contact.getContactTitle()); + this.setAcademicTitle(contact.getContactTitle()); this.setBirthday(contact.getContactBirthday()); this.setCity(contact.getContactCity()); this.setComment(contact.getContactComment()); @@ -329,7 +329,7 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme this.setEmailAddress(contact.getContactEmailAddress()); this.setFamilyName(contact.getContactFamilyName()); this.setFirstName(contact.getContactFirstName()); - this.setGender(contact.getContactGender()); + this.setPersonalTitle(contact.getContactPersonalTitle()); this.setHouseNumber(contact.getContactHouseNumber()); this.setHouseNumberExtension(contact.getContactHouseNumberExtension()); this.setStreet(contact.getContactStreet()); @@ -368,9 +368,9 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme @Override public Contact createContactInstance () { // Are all minimum fields set? - if (this.getGender() == null) { + if (this.getPersonalTitle() == null) { // Throw NPE - throw new NullPointerException("gender is null"); //NOI18N + throw new NullPointerException("personalTitle is null"); //NOI18N } else if (this.getFirstName() == null) { // Throw NPE throw new NullPointerException("firstName is null"); //NOI18N @@ -391,9 +391,10 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme DialableFaxNumber fax = new FaxNumber(this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber()); // Create new instance - Contact contact = new UserContact(this.getGender(), this.getFirstName(), this.getFamilyName()); + Contact contact = new UserContact(this.getPersonalTitle(), this.getFirstName(), this.getFamilyName()); // Add all others + contact.setContactTitle(this.getAcademicTitle()); contact.setContactBirthday(this.getBirthday()); contact.setContactStreet(this.getStreet()); contact.setContactHouseNumber(this.getHouseNumber()); @@ -674,16 +675,6 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme this.firstName = firstName; } - @Override - public Gender getGender () { - return this.gender; - } - - @Override - public void setGender (final Gender gender) { - this.gender = gender; - } - @Override public Short getHouseNumber () { return this.houseNumber; @@ -774,6 +765,16 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme this.mobileProvider = mobileProvider; } + @Override + public PersonalTitle getPersonalTitle () { + return this.personalTitle; + } + + @Override + public void setPersonalTitle (final PersonalTitle personalTitle) { + this.personalTitle = personalTitle; + } + @Override public String getStreet () { return this.street; @@ -785,13 +786,13 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme } @Override - public String getTitle () { - return this.title; + public String getAcademicTitle () { + return this.academicTitle; } @Override - public void setTitle (final String title) { - this.title = title; + public void setAcademicTitle (final String academicTitle) { + this.academicTitle = academicTitle; } @Override @@ -826,9 +827,9 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme } @Override - public boolean isGenderRequired () { + public boolean isPersonalTitleRequired () { // Get context parameter - String contextParameter = FacesContext.getCurrentInstance().getExternalContext().getInitParameter("is_admin_gender_enabled"); //NOI18N + String contextParameter = FacesContext.getCurrentInstance().getExternalContext().getInitParameter("is_admin_personal_title_enabled"); //NOI18N // Is it set? boolean isRequired = ((contextParameter instanceof String) && (contextParameter.toLowerCase().equals("true"))); //NOI18N @@ -843,7 +844,7 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme private void clear () { // Clear all data // - personal data - this.setTitle(null); + this.setAcademicTitle(null); this.setFirstName(null); this.setFamilyName(null); this.setStreet(null); @@ -919,8 +920,8 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme } // Update all fields - contact.setContactGender(this.getGender()); - contact.setContactTitle(this.getTitle()); + contact.setContactPersonalTitle(this.getPersonalTitle()); + contact.setContactTitle(this.getAcademicTitle()); 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 f96b62b3..d89fb563 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java @@ -20,7 +20,7 @@ import java.io.Serializable; import java.util.Date; import javax.ejb.Local; import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jcontacts.contact.gender.Gender; +import org.mxchange.jcontacts.contact.title.PersonalTitle; import org.mxchange.jcountry.data.Country; import org.mxchange.jphone.phonenumbers.DialableNumber; import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; @@ -288,18 +288,18 @@ public interface PizzaAdminContactWebRequestController extends Serializable { void setFirstName (final String firstName); /** - * Gender of the contact + * Getter for personal title *

- * @return the gender + * @return Personal title */ - Gender getGender (); + PersonalTitle getPersonalTitle (); /** - * Gender of the contact + * Setter for personal title *

- * @param gender the gender to set + * @param personalTitle Personal title */ - void setGender (final Gender gender); + void setPersonalTitle (final PersonalTitle personalTitle); /** * House number @@ -387,18 +387,18 @@ public interface PizzaAdminContactWebRequestController extends Serializable { void setStreet (final String street); /** - * Getter for title + * Getter for academic title *

- * @return title + * @return Academic title */ - String getTitle (); + String getAcademicTitle (); /** - * Setter for title + * Setter for academic title *

- * @param title Title + * @param academicTitle Academic title */ - void setTitle (final String title); + void setAcademicTitle (final String academicTitle); /** * ZIP code @@ -451,11 +451,11 @@ public interface PizzaAdminContactWebRequestController extends Serializable { String generateMobileNumber (final DialableMobileNumber mobileNumber); /** - * Checks/returns whether the gender/salutation is required for this + * Checks/returns whether the personal title (Mr./Mrs.) is required for this * controller. *

- * @return Whether gender is required + * @return Whether personal title is required */ - boolean isGenderRequired (); + boolean isPersonalTitleRequired (); } diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java index 30a9b480..cdc991da 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java @@ -35,7 +35,7 @@ import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.ContactSessionBeanRemote; import org.mxchange.jcontacts.contact.UserContact; -import org.mxchange.jcontacts.contact.gender.Gender; +import org.mxchange.jcontacts.contact.title.PersonalTitle; import org.mxchange.jcontacts.contact.utils.ContactUtils; import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent; import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent; @@ -73,6 +73,11 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P */ private static final long serialVersionUID = 542_145_347_916L; + /** + * Academic academicTitle + */ + private String academicTitle; + /** * Birth day */ @@ -143,11 +148,6 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P */ private String firstName; - /** - * Gender instance - */ - private Gender gender; - /** * House number */ @@ -198,6 +198,11 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P */ private MobileProvider mobileProvider; + /** + * Personal academicTitle + */ + private PersonalTitle personalTitle; + /** * A list of all selectable contacts */ @@ -208,11 +213,6 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P */ private String street; - /** - * Title - */ - private String title; - /** * Regular user controller */ @@ -470,7 +470,7 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P DialableFaxNumber fax = new FaxNumber(this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber()); // Create new contact - Contact contact = new UserContact(this.getGender(), this.getFirstName(), this.getFamilyName()); + Contact contact = new UserContact(this.getPersonalTitle(), this.getFirstName(), this.getFamilyName()); contact.setContactStreet(this.getStreet()); contact.setContactHouseNumber(this.getHouseNumber()); contact.setContactHouseNumberExtension(this.getHouseNumberExtension()); @@ -566,7 +566,7 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P assert (contact.getContactId() > 0) : MessageFormat.format("Instance userLoginController.userContact.contactId={0} is invalid", contact.getContactId()); //NOI18N // Update all fields - contact.setContactGender(this.getGender()); + contact.setContactPersonalTitle(this.getPersonalTitle()); contact.setContactFirstName(this.getFirstName()); contact.setContactFamilyName(this.getFamilyName()); contact.setContactStreet(this.getStreet()); @@ -592,6 +592,16 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P return "contact_data_saved"; //NOI18N } + @Override + public String getAcademicTitle () { + return this.academicTitle; + } + + @Override + public void setAcademicTitle (final String academicTitle) { + this.academicTitle = academicTitle; + } + @Override @SuppressWarnings ("ReturnOfDateField") public Date getBirthday () { @@ -715,16 +725,6 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P this.firstName = firstName; } - @Override - public Gender getGender () { - return this.gender; - } - - @Override - public void setGender (final Gender gender) { - this.gender = gender; - } - @Override public Short getHouseNumber () { return this.houseNumber; @@ -796,23 +796,23 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P } @Override - public String getStreet () { - return this.street; + public PersonalTitle getPersonalTitle () { + return this.personalTitle; } @Override - public void setStreet (final String street) { - this.street = street; + public void setPersonalTitle (final PersonalTitle personalTitle) { + this.personalTitle = personalTitle; } @Override - public String getTitle () { - return this.title; + public String getStreet () { + return this.street; } @Override - public void setTitle (final String title) { - this.title = title; + public void setStreet (final String street) { + this.street = street; } @Override @@ -903,7 +903,7 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P @Override public boolean isRequiredChangePersonalDataSet () { - return ((this.getGender() != null) && + return ((this.getPersonalTitle() != null) && (this.getFirstName() != null) && (this.getFamilyName() != null) && (this.getStreet() != null) && @@ -914,7 +914,7 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P @Override public boolean isRequiredPersonalDataSet () { - return ((this.getGender() != null) && + return ((this.getPersonalTitle() != null) && (this.getFirstName() != null) && (this.getFamilyName() != null) && (this.getStreet() != null) && @@ -1009,8 +1009,8 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P private void clear () { // Clear all data // - personal data - this.setGender(null); - this.setTitle(null); + this.setPersonalTitle(null); + this.setAcademicTitle(null); this.setFirstName(null); this.setFamilyName(null); this.setStreet(null); @@ -1057,8 +1057,8 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P // Copy all fields: // - base data - this.setGender(contact.getContactGender()); - this.setTitle(contact.getContactTitle()); + this.setPersonalTitle(contact.getContactPersonalTitle()); + this.setAcademicTitle(contact.getContactTitle()); this.setFirstName(contact.getContactFirstName()); this.setFamilyName(contact.getContactFamilyName()); this.setStreet(contact.getContactStreet()); diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java index f8b8c84c..c3918cdc 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java @@ -21,7 +21,7 @@ import java.util.Date; import java.util.List; import javax.ejb.Local; import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jcontacts.contact.gender.Gender; +import org.mxchange.jcontacts.contact.title.PersonalTitle; import org.mxchange.jcontacts.exceptions.ContactNotFoundException; import org.mxchange.jcountry.data.Country; import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; @@ -255,18 +255,18 @@ public interface PizzaContactWebSessionController extends Serializable { void setFirstName (final String firstName); /** - * Gender of the contact + * Getter for personal title *

- * @return the gender + * @return Personal title */ - Gender getGender (); + PersonalTitle getPersonalTitle (); /** - * Gender of the contact + * Setter for personal title *

- * @param gender the gender to set + * @param personalTitle Personal title */ - void setGender (final Gender gender); + void setPersonalTitle (final PersonalTitle personalTitle); /** * House number @@ -354,18 +354,18 @@ public interface PizzaContactWebSessionController extends Serializable { void setStreet (final String street); /** - * Title + * Getter for academic title *

- * @return the title + * @return Academic title */ - String getTitle (); + String getAcademicTitle (); /** - * Title + * Setter for academic title *

- * @param title the title to set + * @param academicTitle Academic title */ - void setTitle (final String title); + void setAcademicTitle (final String academicTitle); /** * ZIP code diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java index 9e0b8f74..819d6a3c 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java @@ -28,7 +28,7 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jcontacts.contact.gender.Gender; +import org.mxchange.jcontacts.contact.gender.PersonalTitle; import org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException; import org.mxchange.jcustomercore.events.customer.added.AdminAddedCustomerEvent; import org.mxchange.jcustomercore.exceptions.CustomerAlreadyRegisteredException; @@ -195,7 +195,7 @@ public class PizzaAdminCustomerWebRequestBean extends BasePizzaController implem */ private boolean isCustomerDataSet () { // Check all - return ((this.adminContactController.getGender() instanceof Gender) && + return ((this.adminContactController.getGender() instanceof PersonalTitle) && (this.adminContactController.getFirstName() != null) && (!this.adminContactController.getFirstName().isEmpty()) && (this.adminContactController.getFamilyName() != null) && diff --git a/src/java/org/mxchange/pizzaapplication/beans/gender/PizzaGenderWebApplicationBean.java b/src/java/org/mxchange/pizzaapplication/beans/gender/PizzaGenderWebApplicationBean.java index 6b4f9283..4a9dcce5 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/gender/PizzaGenderWebApplicationBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/gender/PizzaGenderWebApplicationBean.java @@ -20,12 +20,12 @@ import java.util.List; import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; -import org.mxchange.jcontacts.contact.gender.Gender; -import org.mxchange.jcontacts.contact.gender.GenderUtils; +import org.mxchange.jcontacts.contact.title.PersonalTitle; +import org.mxchange.jcontacts.contact.title.TitleUtils; import org.mxchange.pizzaapplication.beans.BasePizzaController; /** - * A gender bean (controller) + * A gender and title bean *

* @author Roland Häder */ @@ -47,15 +47,15 @@ public class PizzaGenderWebApplicationBean extends BasePizzaController implement } @Override - public Gender[] getAllGenders () { + public PersonalTitle[] getAllGenders () { // Return it - return Gender.values(); + return PersonalTitle.values(); } @Override - public List getSelectableGenders () { + public List getSelectableGenders () { // Init array - List genders = GenderUtils.selectableGenders(); + List genders = TitleUtils.allPersonalTitlesAsList(); // Return it return genders; diff --git a/src/java/org/mxchange/pizzaapplication/beans/gender/PizzaGenderWebApplicationController.java b/src/java/org/mxchange/pizzaapplication/beans/gender/PizzaGenderWebApplicationController.java index ac5ea71f..c5eb3ff7 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/gender/PizzaGenderWebApplicationController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/gender/PizzaGenderWebApplicationController.java @@ -18,10 +18,10 @@ package org.mxchange.pizzaapplication.beans.gender; import java.io.Serializable; import java.util.List; -import org.mxchange.jcontacts.contact.gender.Gender; +import org.mxchange.jcontacts.contact.title.PersonalTitle; /** - * An interface for data beans + * An interface for gender and title (static data) beans *

* @author Roland Häder */ @@ -32,13 +32,13 @@ public interface PizzaGenderWebApplicationController extends Serializable { *

* @return All genders as array */ - Gender[] getAllGenders (); + PersonalTitle[] getAllGenders (); /** * Getter for only selectable genders as array, UNKNOWN is not selectable *

* @return All genders as array */ - List getSelectableGenders (); + List getSelectableGenders (); } diff --git a/src/java/org/mxchange/pizzaapplication/beans/profilemode/PizzaProfileModeWebApplicationController.java b/src/java/org/mxchange/pizzaapplication/beans/profilemode/PizzaProfileModeWebApplicationController.java index d6ae8f5b..437d9ad2 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/profilemode/PizzaProfileModeWebApplicationController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/profilemode/PizzaProfileModeWebApplicationController.java @@ -27,9 +27,9 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; public interface PizzaProfileModeWebApplicationController extends Serializable { /** - * Getter for all genders as array + * Getter for all profile modes as array *

- * @return All genders as array + * @return All profile modes as array */ ProfileMode[] getAllProfileModes (); diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java index 0e64b054..b053ea30 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java @@ -212,7 +212,7 @@ public class PizzaAdminUserWebRequestBean extends BasePizzaController implements throw new IllegalArgumentException("userName is null"); //NOI18N } else if (this.beanHelper.getContact() == null) { // No contact instance set, so test required fields: gender, first name and family name - if (this.contactController.getGender() == null) { + if (this.contactController.getPersonalTitle() == null) { // Throw NPE again throw new NullPointerException("contactController.gender is null"); //NOI18N } else if (this.contactController.getFirstName() == null) { diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl deleted file mode 100644 index 0cf4cfd1..00000000 --- a/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl index 76203216..1bfcb98a 100644 --- a/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl +++ b/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl @@ -35,13 +35,13 @@ - + - + - + diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data_columns_mini.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data_columns_mini.tpl index 1d996043..61e914a9 100644 --- a/web/WEB-INF/templates/admin/contact/admin_contact_data_columns_mini.tpl +++ b/web/WEB-INF/templates/admin/contact/admin_contact_data_columns_mini.tpl @@ -8,13 +8,13 @@ - + - + - + diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl index 2ac7b2c5..e4d35cb9 100644 --- a/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl +++ b/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl @@ -13,9 +13,9 @@ - + - + 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 77695f02..b8d0765a 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 @@ -13,11 +13,11 @@

- +
- +
@@ -26,7 +26,7 @@
- +
@@ -51,7 +51,7 @@
- +
diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl index 2d9fc075..e49330f5 100644 --- a/web/WEB-INF/templates/contact/form_contact_data.tpl +++ b/web/WEB-INF/templates/contact/form_contact_data.tpl @@ -18,11 +18,11 @@
- +
- +
@@ -30,7 +30,7 @@
- +
diff --git a/web/WEB-INF/templates/generic/gender_selection_box.tpl b/web/WEB-INF/templates/generic/personal_title_selection_box.tpl similarity index 63% rename from web/WEB-INF/templates/generic/gender_selection_box.tpl rename to web/WEB-INF/templates/generic/personal_title_selection_box.tpl index 7c91da71..dd353c96 100644 --- a/web/WEB-INF/templates/generic/gender_selection_box.tpl +++ b/web/WEB-INF/templates/generic/personal_title_selection_box.tpl @@ -6,9 +6,9 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + - + diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index 2b1a53ec..44167044 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -43,13 +43,13 @@ false - Wether the gender is required for using the general contact controller. - is_feature_general_gender_enabled + Wether the personal title is required for using the general contact controller. + is_feature_general_personal_title_enabled true - Whether gender is required for administrative contact controller. - is_feature_admin_gender_enabled + Whether personal title is required for administrative contact controller. + is_feature_admin_personal_title_enabled false diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml index d9debf2f..f7528344 100644 --- a/web/admin/contact/admin_contact_delete.xhtml +++ b/web/admin/contact/admin_contact_delete.xhtml @@ -35,7 +35,7 @@
- +
diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml index 0f9c851b..ed56e153 100644 --- a/web/admin/contact/admin_contact_edit.xhtml +++ b/web/admin/contact/admin_contact_edit.xhtml @@ -35,7 +35,7 @@
- +
diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml index 7754d3d8..db0b8832 100644 --- a/web/admin/contact/admin_contact_export.xhtml +++ b/web/admin/contact/admin_contact_export.xhtml @@ -39,15 +39,15 @@ - + - + - + diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml index e5084007..3521fde8 100644 --- a/web/admin/contact/admin_contact_list.xhtml +++ b/web/admin/contact/admin_contact_list.xhtml @@ -38,10 +38,10 @@ - + - + @@ -82,7 +82,7 @@
- +
diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml index 1c2773d3..2c5f755f 100644 --- a/web/admin/fax/admin_fax_show.xhtml +++ b/web/admin/fax/admin_fax_show.xhtml @@ -44,13 +44,13 @@ - + - + - + diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml index e14c2bc7..b36826bd 100644 --- a/web/admin/landline/admin_landline_show.xhtml +++ b/web/admin/landline/admin_landline_show.xhtml @@ -44,13 +44,13 @@ - + - + - + diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml index 8332a7c1..841bd93b 100644 --- a/web/admin/mobile/admin_mobile_show.xhtml +++ b/web/admin/mobile/admin_mobile_show.xhtml @@ -44,13 +44,13 @@ - + - + - + diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml index 84858cab..862dcc1d 100644 --- a/web/admin/user/admin_user_activity_log.xhtml +++ b/web/admin/user/admin_user_activity_log.xhtml @@ -62,7 +62,7 @@ - + diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml index 49638be8..407caada 100644 --- a/web/admin/user/admin_user_export.xhtml +++ b/web/admin/user/admin_user_export.xhtml @@ -56,15 +56,15 @@ - + - + - + diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index 511a03ae..f22a1a56 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -48,10 +48,10 @@ - + - + @@ -118,7 +118,7 @@
- +
diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml index 74860144..b39945f4 100644 --- a/web/admin/user/admin_user_lock.xhtml +++ b/web/admin/user/admin_user_lock.xhtml @@ -1,4 +1,3 @@ -
- +
- +
diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml index d0cde138..b7c91b4a 100644 --- a/web/admin/user/admin_user_unlock.xhtml +++ b/web/admin/user/admin_user_unlock.xhtml @@ -55,11 +55,11 @@
- +
- +
diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml index f394d378..40adbfdf 100644 --- a/web/guest/user/user_confirm_account.xhtml +++ b/web/guest/user/user_confirm_account.xhtml @@ -32,7 +32,7 @@
- + -- 2.39.5