From: Roland Häder Date: Mon, 11 Jul 2016 16:03:32 +0000 (+0200) Subject: Closed internal TODO: (please cherry-pick this) X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=eef948e358e8aa1996b2eede0f146c7ca10a1f20;p=pizzaservice-war.git 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 Signed-off-by: Roland Häder Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 10b0da52..84e8f1f9 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -567,3 +567,18 @@ 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. +PAGE_TITLE_USER_LOGIN_REPORTS=Berichte +SUB_TITLE_USER_LOGIN_REPORTS=Berichte: +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: diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 6f8c2422..ad51b94f 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -551,3 +551,16 @@ 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: diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java index 94487af0..8d1552c4 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java @@ -174,6 +174,11 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme */ private Short houseNumber; + /** + * House number extension + */ + private String houseNumberExtension; + /** * Whether a cellphone entry has been unlinked */ @@ -691,6 +696,16 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme 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; @@ -774,7 +789,6 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme private void clear () { // Clear all data // - personal data - this.setGender(Gender.UNKNOWN); this.setTitle(null); this.setFirstName(null); this.setFamilyName(null); @@ -856,6 +870,7 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme 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/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java index c1fa9668..d05e34cd 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java @@ -313,6 +313,21 @@ public interface PizzaAdminContactWebRequestController 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 *

@@ -397,6 +412,23 @@ public interface PizzaAdminContactWebRequestController extends Serializable { */ void setZipCode (final Integer zipCode); + /** + * Getter for controller type + *

+ * @return controller type + */ + String getControllerType (); + + /** + * Setter for controller type + *

+ * @param controllerType Controller type + *

+ * @deprecated Don't use this method + */ + @Deprecated + void setControllerType (final String controllerType); + /** * Returns a text respresentation of given phone number or null if not set. *

diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java index 07400a0c..5d6be6d9 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java @@ -160,6 +160,11 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P */ private Short houseNumber; + /** + * House number extension + */ + private String houseNumberExtension; + /** * Whether a cellphone entry has been unlinked */ @@ -482,6 +487,7 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P 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()); @@ -583,6 +589,7 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P 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()); @@ -755,6 +762,16 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P 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; @@ -943,11 +960,11 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P private void clear () { // Clear all data // - personal data - this.setGender(Gender.UNKNOWN); this.setFirstName(null); this.setFamilyName(null); this.setStreet(null); this.setHouseNumber(null); + this.setHouseNumberExtension(null); this.setZipCode(null); this.setCity(null); this.setCountry(null); @@ -995,6 +1012,7 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P 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/pizzaapplication/beans/contact/PizzaContactWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java index 6b4f000b..ddb6a55f 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java @@ -345,6 +345,21 @@ public interface PizzaContactWebSessionController 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/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 f7f3228b..d40c1299 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 @@ -99,6 +99,20 @@ +

+
+ +
+ +
+ +
+ +
+
+ + +
diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl index 91ad63d8..85af850c 100644 --- a/web/WEB-INF/templates/contact/form_contact_data.tpl +++ b/web/WEB-INF/templates/contact/form_contact_data.tpl @@ -96,6 +96,20 @@ +
+
+ +
+ +
+ +
+ +
+
+ + +