From 7714a51f0d78aab6037a97af4482cffd7dddb537 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 11 Jul 2016 18:03:32 +0200 Subject: [PATCH] Closed internal TODO: (please cherry-pick this) - house numbers may have extensions like 'a', so the full number can be e.g. '123a' which should be better splitted into number and extension - expanded templates for above stuff - expanded controllers for this - added missing i18n strings MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder Signed-off-by: Roland Häder --- ...AddressbookAdminContactWebRequestBean.java | 18 +- ...sbookAdminContactWebRequestController.java | 15 ++ .../AddressbookContactWebSessionBean.java | 19 ++ ...ddressbookContactWebSessionController.java | 15 ++ .../localization/bundle_de_DE.properties | 14 ++ .../localization/bundle_en_US.properties | 14 ++ .../admin/contact/admin_contact_data.tpl | 220 +++++++++--------- .../admin/contact/admin_form_contact_data.tpl | 14 ++ .../templates/contact/form_contact_data.tpl | 14 ++ 9 files changed, 235 insertions(+), 108 deletions(-) diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java index 6ff9817f..e360eeea 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java @@ -175,6 +175,11 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro */ private Short houseNumber; + /** + * House number extension + */ + private String houseNumberExtension; + /** * Whether a cellphone entry has been unlinked */ @@ -636,6 +641,16 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro this.houseNumber = houseNumber; } + @Override + public String getHouseNumberExtension () { + return this.houseNumberExtension; + } + + @Override + public void setHouseNumberExtension (final String houseNumberExtension) { + this.houseNumberExtension = houseNumberExtension; + } + @Override public Long getLandLineId () { return this.landLineId; @@ -731,7 +746,7 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro private void clear () { // Clear all data // - personal data - this.setGender(Gender.UNKNOWN); + this.setGender(null); this.setTitle(null); this.setFirstName(null); this.setFamilyName(null); @@ -813,6 +828,7 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro contact.setContactFamilyName(this.getFamilyName()); contact.setContactStreet(this.getStreet()); contact.setContactHouseNumber(this.getHouseNumber()); + contact.setContactHouseNumberExtension(this.getHouseNumberExtension()); contact.setContactZipCode(this.getZipCode()); contact.setContactCity(this.getCity()); contact.setContactCountry(this.getCountry()); diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestController.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestController.java index e32ca68b..80e1a0c7 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestController.java +++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestController.java @@ -313,6 +313,21 @@ public interface AddressbookAdminContactWebRequestController extends Serializabl */ void setHouseNumber (final Short houseNumber); + /** + * Getter for house number extension, example: 123a 'a' is then the + * extension and 123 is the house number. + *

+ * @return House number extension + */ + String getHouseNumberExtension (); + + /** + * Setter for house number extension + *

+ * @param houseNumberExtension House number extension + */ + void setHouseNumberExtension (final String houseNumberExtension); + /** * Getter for phone number's area code *

diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java index 0d7267b8..49b39b5f 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java @@ -162,6 +162,11 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController */ private Short houseNumber; + /** + * House number extension + */ + private String houseNumberExtension; + /** * Whether a cellphone entry has been unlinked */ @@ -474,6 +479,7 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController Contact contact = new UserContact(this.getGender(), this.getFirstName(), this.getFamilyName()); contact.setContactStreet(this.getStreet()); contact.setContactHouseNumber(this.getHouseNumber()); + contact.setContactHouseNumberExtension(this.getHouseNumberExtension()); contact.setContactZipCode(this.getZipCode()); contact.setContactCity(this.getCity()); contact.setContactCountry(this.getCountry()); @@ -577,6 +583,7 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController contact.setContactFamilyName(this.getFamilyName()); contact.setContactStreet(this.getStreet()); contact.setContactHouseNumber(this.getHouseNumber()); + contact.setContactHouseNumberExtension(this.getHouseNumberExtension()); contact.setContactZipCode(this.getZipCode()); contact.setContactCity(this.getCity()); contact.setContactCountry(this.getCountry()); @@ -749,6 +756,16 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController this.houseNumber = houseNumber; } + @Override + public String getHouseNumberExtension () { + return this.houseNumberExtension; + } + + @Override + public void setHouseNumberExtension (final String houseNumberExtension) { + this.houseNumberExtension = houseNumberExtension; + } + @Override public Integer getPhoneAreaCode () { return this.phoneAreaCode; @@ -982,6 +999,7 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController this.setFamilyName(null); this.setStreet(null); this.setHouseNumber(null); + this.setHouseNumberExtension(null); this.setZipCode(null); this.setCity(null); this.setCountry(null); @@ -1028,6 +1046,7 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController this.setFamilyName(contact.getContactFamilyName()); this.setStreet(contact.getContactStreet()); this.setHouseNumber(contact.getContactHouseNumber()); + this.setHouseNumberExtension(contact.getContactHouseNumberExtension()); this.setZipCode(contact.getContactZipCode()); this.setCity(contact.getContactCity()); this.setCountry(contact.getContactCountry()); diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java index 38675b3a..7ba90cbc 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java +++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java @@ -345,6 +345,21 @@ public interface AddressbookContactWebSessionController extends Serializable { */ void setHouseNumber (final Short houseNumber); + /** + * Getter for house number extension, example: 123a 'a' is then the + * extension and 123 is the house number. + *

+ * @return House number extension + */ + String getHouseNumberExtension (); + + /** + * Setter for house number extension + *

+ * @param houseNumberExtension House number extension + */ + void setHouseNumberExtension (final String houseNumberExtension); + /** * Getter for phone number's area code *

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index a64f670b..38bf4f57 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -595,3 +595,17 @@ GUEST_USER_RESEND_LINK_COMPLETED=Es ist ein neuer Best\u00e4tigungslink an Ihre GUEST_USER_NO_ACCOUNT_YET_QUESTION=Noch kein Benutzerkonto? LINK_GUEST_USER_NO_ACCOUNT_YET_TITLE=Als Benutzer anmelden LINK_GUEST_USER_NO_ACCOUNT_YET=Einfach hier anmelden. +ERROR_GUEST_REGISTRATION_DISABLED=Fehler: Die Anmeldung ist administrativ deaktiviert worden. +ERROR_LOGIN_USER_EDIT_DATA_DISABLED=Fehler: Editieren von Benutzerdaten wurde administrativ deaktiviert. +LINK_USER_LOGOUT=Ausloggen +LINK_USER_LOGOUT_TITLE=Aus dem Mitgliedsbereich ausloggen. +ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED=Fehler: Erneutes Aussenden des Best\u00e4tigungslink wurde administrativ deaktiviert. +PAGE_TITLE_LOGIN_USER_LOGOUT=Ausloggen aus dem Benutzerbereich +CONTENT_TITLE_LOGIN_USER_LOGOUT=Aus dem Benutzerbereich ausloggen: +LOGIN_USER_LOGOUT_TITLE=Aus Benutzerbereich ausloggen? +LOGIN_USER_LOGOUT_NOTICE=M\u00f6chten Sie sich aus dem Benutzerbereich ausloggen? Dies sollten Sie immer an einem Rechner tun, den auch andere nutzen (z.B. Internetcafe). +BUTTON_USER_LOGOUT=Ausloggen +ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION=Hausnummererweiterung: +ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION=Hausnummererweiterung: +PERSONAL_DATA_HOUSE_NUMBER_EXTENSION=Anhang: +ERROR_PARAMETER_FILE_TYPE_NOT_SET=Fehler: Parameter 'fileType' nicht gesetzt. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 7eae338d..9721d859 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -593,3 +593,17 @@ GUEST_USER_RESEND_LINK_COMPLETED=A new confirmation link has been sent out to yo GUEST_USER_NO_ACCOUNT_YET_QUESTION=Not yet registered as user? LINK_GUEST_USER_NO_ACCOUNT_YET_TITLE=Register as a user LINK_GUEST_USER_NO_ACCOUNT_YET=Signup here quickly. +ERROR_GUEST_REGISTRATION_DISABLED=Error: Registration has been administratively deactivated. +ERROR_LOGIN_USER_EDIT_DATA_DISABLED=Error: Editing of user data has been disabled by administrators. +LINK_USER_LOGOUT=Logout +LINK_USER_LOGOUT_TITLE=Logout from user area. +ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED=Error: Sending out confirmation link has been deactivated. +PAGE_TITLE_LOGIN_USER_LOGOUT=Logout from user area +CONTENT_TITLE_LOGIN_USER_LOGOUT=Logout from user area: +LOGIN_USER_LOGOUT_TITLE=Logout from user area? +LOGIN_USER_LOGOUT_NOTICE=Do you want to logout from user area? You should always do this when you share the same computer with others (e.g. Internet cafe). +BUTTON_USER_LOGOUT=Logout +ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION=House number extension: +ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION=House number extension: +PERSONAL_DATA_HOUSE_NUMBER_EXTENSION=Extension: +ERROR_PARAMETER_FILE_TYPE_NOT_SET=Error: Parameter 'fileType' is not set. diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl index 5e29f6f6..0cf4cfd1 100644 --- a/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl +++ b/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl @@ -1,107 +1,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 8dd50a6c..6b1be220 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 @@ -127,6 +127,20 @@ +

+
+ +
+ +
+ +
+ +
+
+ + +
diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl index 04152180..7184ad53 100644 --- a/web/WEB-INF/templates/contact/form_contact_data.tpl +++ b/web/WEB-INF/templates/contact/form_contact_data.tpl @@ -122,6 +122,20 @@
+
+
+ +
+ +
+ +
+ +
+
+ + +
-- 2.39.5