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=c5081875aa28935bb1a02e5c4713ed6209eee1f4;p=jjobs-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/jjobs/beans/contact/JobsAdminContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java index ea6ad966..420ae887 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java @@ -174,6 +174,11 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement */ private Short houseNumber; + /** + * House number extension + */ + private String houseNumberExtension; + /** * Whether a cellphone entry has been unlinked */ @@ -636,6 +641,16 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement 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; @@ -802,6 +817,7 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement 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/jjobs/beans/contact/JobsAdminContactWebRequestController.java b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java index 8df27e4d..af2c64b7 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java @@ -313,6 +313,21 @@ public interface JobsAdminContactWebRequestController 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/jjobs/beans/contact/JobsContactWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java index 92c9c236..f40bb6f3 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java @@ -162,6 +162,11 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job */ private Short houseNumber; + /** + * House number extension + */ + private String houseNumberExtension; + /** * Whether a cellphone entry has been unlinked */ @@ -439,6 +444,7 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job 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()); @@ -542,6 +548,7 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job 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()); @@ -725,6 +732,16 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job 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; @@ -958,6 +975,7 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job this.setFamilyName(null); this.setStreet(null); this.setHouseNumber(null); + this.setHouseNumberExtension(null); this.setZipCode(null); this.setCity(null); this.setCountry(null); @@ -1004,6 +1022,7 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job 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/jjobs/beans/contact/JobsContactWebSessionController.java b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionController.java index ad0a0e42..cb8a6c29 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionController.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionController.java @@ -345,6 +345,21 @@ public interface JobsContactWebSessionController 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/jjobs/beans/country/JobsAdminCountryWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java index 51eb57e0..9b6117fe 100644 --- a/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java @@ -124,7 +124,7 @@ public class JobsAdminCountryWebRequestBean extends BaseJobsController implement country.setCountryAbroadDialPrefix(this.getCountryAbroadDialPrefix()); country.setCountryCode(this.getCountryCode()); country.setCountryExternalDialPrefix(this.getCountryExternalDialPrefix()); - country.setCountryI18nkey(this.getCountryI18nKey()); + country.setCountryI18nKey(this.getCountryI18nKey()); country.setCountryIsLocalPrefixRequired(this.getCountryIsLocalPrefixRequired()); country.setCountryPhoneCode(this.getCountryPhoneCode()); @@ -247,7 +247,7 @@ public class JobsAdminCountryWebRequestBean extends BaseJobsController implement Country next = iterator.next(); // Is country code or i18n the same? - if ((Objects.equals(country.getCountryCode(), next.getCountryCode())) || (Objects.equals(country.getCountryI18nkey(), next.getCountryI18nkey()))) { + if ((Objects.equals(country.getCountryCode(), next.getCountryCode())) || (Objects.equals(country.getCountryI18nKey(), next.getCountryI18nKey()))) { // Yes, then abort search isAdded = true; break; diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java index 3cf2f558..5c3d16fb 100644 --- a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java +++ b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java @@ -22,6 +22,7 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jjobs.beans.contact.JobsAdminContactWebRequestController; +import org.mxchange.jjobs.beans.phone.JobsAdminContactPhoneWebRequestController; import org.mxchange.jjobs.beans.user.JobsUserWebSessionController; import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminContactPhoneWebRequestBean.java new file mode 100644 index 00000000..917025ff --- /dev/null +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminContactPhoneWebRequestBean.java @@ -0,0 +1,170 @@ +/* + * Copyright (C) 2016 Roland Haeder + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package org.mxchange.jjobs.beans.phone; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.enterprise.context.RequestScoped; +import javax.faces.view.facelets.FaceletException; +import javax.inject.Named; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote; +import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; +import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; + +/** + * Administrative bean (controller) for phone numbers + *

+ * @author Roland Haeder + */ +@Named ("adminPhoneController") +@RequestScoped +public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController implements JobsAdminContactPhoneWebRequestController { + + /** + * Serial number + */ + private static final long serialVersionUID = 184_598_175_371_269_016L; + + /** + * Remote EJB for phone number (administrative) + */ + private AdminContactsPhoneSessionBeanRemote adminRemoteBean; + + /** + * Cell phone number + */ + private DialableCellphoneNumber cellPhone; + + /** + * Instance of linked contact account + *

+ * @deprecated This is a generic phone controller, not just for contact data + */ + @Deprecated + private Contact contact; + + /** + * "Cache" for contact lists, mostly only one is assigned. So this cache + * shouldn't grow beyond control. + *

+ * @deprecated This is a generic phone controller, not just for contact data + */ + @Deprecated + private final Map> contacts; + + /** + * Fax number + */ + private DialableFaxNumber fax; + + /** + * Land-line number + */ + private DialableLandLineNumber landLine; + + /** + * Default constructor + */ + public JobsAdminContactPhoneWebRequestBean () { + // Try it + try { + // Get initial context + Context context = new InitialContext(); + + // Try to lookup the beans + this.adminRemoteBean = (AdminContactsPhoneSessionBeanRemote) context.lookup("java:global/jjobs-ejb/admincontactphone!org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote"); //NOI18N + } catch (final NamingException e) { + // Throw it again + throw new FaceletException(e); + } + + // Init map + this.contacts = new HashMap<>(10); + } + + @Override + @Deprecated + public List allCellphoneContacts () { + // Get id + Long phoneId = this.getCellPhone().getPhoneId(); + + // Is cache there? + if (this.contacts.containsKey(phoneId)) { + // Return cached version + return this.contacts.get(phoneId); + } else { + // Ask bean + List list = this.adminRemoteBean.allContacts(this.getCellPhone()); + + // Store result in cache + this.contacts.put(phoneId, list); + + // Return now-cached list + return list; + } + } + + @Override + public DialableCellphoneNumber getCellPhone () { + return this.cellPhone; + } + + @Override + public void setCellPhone (final DialableCellphoneNumber cellPhone) { + this.cellPhone = cellPhone; + } + + @Override + @Deprecated + public Contact getContact () { + return this.contact; + } + + @Override + @Deprecated + public void setContact (final Contact contact) { + this.contact = contact; + } + + @Override + public DialableFaxNumber getFax () { + return this.fax; + } + + @Override + public void setFax (final DialableFaxNumber fax) { + this.fax = fax; + } + + @Override + public DialableLandLineNumber getLandLine () { + return this.landLine; + } + + @Override + public void setLandLine (final DialableLandLineNumber landLine) { + this.landLine = landLine; + } + +} diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminContactPhoneWebRequestController.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminContactPhoneWebRequestController.java new file mode 100644 index 00000000..5094b321 --- /dev/null +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminContactPhoneWebRequestController.java @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2016 Roland Haeder + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package org.mxchange.jjobs.beans.phone; + +import java.io.Serializable; +import java.util.List; +import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; +import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; + +/** + * An interface for a request web controller (bean) for administrative phone + * number purposes. + *

+ * @author Roland Haeder + */ +public interface JobsAdminContactPhoneWebRequestController extends Serializable { + + /** + * Getter for all contacts having current cellphone instance linked + *

+ * @return List of all linked contacts + */ + @Deprecated + List allCellphoneContacts (); + + /** + * Getter for dialable cellphone number instance + *

+ * @return Dialable cellphone number instance + */ + DialableCellphoneNumber getCellPhone (); + + /** + * Setter for dialable land-line number instance + *

+ * @param landLine Dialable land-line number instance + */ + void setLandLine (final DialableLandLineNumber landLine); + + /** + * Getter for dialable land-line number instance + *

+ * @return Dialable land-line number instance + */ + DialableLandLineNumber getLandLine (); + + /** + * Setter for dialable fax number instance + *

+ * @param fax Dialable fax number instance + */ + void setFax (final DialableFaxNumber fax); + + /** + * Getter for dialable fax number instance + *

+ * @return Dialable fax number instance + */ + DialableFaxNumber getFax (); + + /** + * Setter for dialable cellphone number instance + *

+ * @param cellPhone Dialable cellphone number instance + */ + void setCellPhone (final DialableCellphoneNumber cellPhone); + + /** + * Getter for linked contact account + *

+ * @return Linked contact account + */ + @Deprecated + Contact getContact (); + + /** + * Setter for linked contact account + *

+ * @param contact Linked contact account + */ + @Deprecated + void setContact (final Contact contact); + +} diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminContactPhoneWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminContactPhoneWebSessionBean.java deleted file mode 100644 index 80a42699..00000000 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminContactPhoneWebSessionBean.java +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Copyright (C) 2016 Roland Haeder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.mxchange.jjobs.beans.phone; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.enterprise.context.RequestScoped; -import javax.faces.view.facelets.FaceletException; -import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote; -import org.mxchange.jjobs.beans.BaseJobsController; -import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; - -/** - * Administrative bean (controller) for phone numbers - *

- * @author Roland Haeder - */ -@Named ("adminPhoneController") -@RequestScoped -public class JobsAdminContactPhoneWebSessionBean extends BaseJobsController implements JobsAdminContactPhoneWebSessionController { - - /** - * Serial number - */ - private static final long serialVersionUID = 184_598_175_371_269_016L; - - /** - * Remote EJB for phone number (administrative) - */ - private AdminContactsPhoneSessionBeanRemote adminRemoteBean; - - /** - * Cell phone number - */ - private DialableCellphoneNumber cellPhone; - - /** - * Instance of linked contact account - *

- * @deprecated This is a generic phone controller, not just for contact data - */ - @Deprecated - private Contact contact; - - /** - * "Cache" for contact lists, mostly only one is assigned. So this cache - * shouldn't grow beyond control. - *

- * @deprecated This is a generic phone controller, not just for contact data - */ - @Deprecated - private final Map> contacts; - - /** - * Fax number - */ - private DialableFaxNumber fax; - - /** - * Land-line number - */ - private DialableLandLineNumber landLine; - - /** - * Default constructor - */ - public JobsAdminContactPhoneWebSessionBean () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup the beans - this.adminRemoteBean = (AdminContactsPhoneSessionBeanRemote) context.lookup("java:global/jjobs-ejb/admincontactphone!org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw it again - throw new FaceletException(e); - } - - // Init map - this.contacts = new HashMap<>(10); - } - - @Override - @Deprecated - public List allCellphoneContacts () { - // Get id - Long phoneId = this.getCellPhone().getPhoneId(); - - // Is cache there? - if (this.contacts.containsKey(phoneId)) { - // Return cached version - return this.contacts.get(phoneId); - } else { - // Ask bean - List list = this.adminRemoteBean.allContacts(this.getCellPhone()); - - // Store result in cache - this.contacts.put(phoneId, list); - - // Return now-cached list - return list; - } - } - - @Override - public DialableCellphoneNumber getCellPhone () { - return this.cellPhone; - } - - @Override - public void setCellPhone (final DialableCellphoneNumber cellPhone) { - this.cellPhone = cellPhone; - } - - @Override - @Deprecated - public Contact getContact () { - return this.contact; - } - - @Override - @Deprecated - public void setContact (final Contact contact) { - this.contact = contact; - } - - @Override - public DialableFaxNumber getFax () { - return this.fax; - } - - @Override - public void setFax (final DialableFaxNumber fax) { - this.fax = fax; - } - - @Override - public DialableLandLineNumber getLandLine () { - return this.landLine; - } - - @Override - public void setLandLine (final DialableLandLineNumber landLine) { - this.landLine = landLine; - } - -} diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminContactPhoneWebSessionController.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminContactPhoneWebSessionController.java deleted file mode 100644 index 989f9894..00000000 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminContactPhoneWebSessionController.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (C) 2016 Roland Haeder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.mxchange.jjobs.beans.phone; - -import java.io.Serializable; -import java.util.List; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; - -/** - * An interface for a request web controller (bean) for administrative phone - * number purposes. - *

- * @author Roland Haeder - */ -public interface JobsAdminContactPhoneWebSessionController extends Serializable { - - /** - * Getter for all contacts having current cellphone instance linked - *

- * @return List of all linked contacts - */ - @Deprecated - List allCellphoneContacts (); - - /** - * Getter for dialable cellphone number instance - *

- * @return Dialable cellphone number instance - */ - DialableCellphoneNumber getCellPhone (); - - /** - * Setter for dialable land-line number instance - *

- * @param landLine Dialable land-line number instance - */ - void setLandLine (final DialableLandLineNumber landLine); - - /** - * Getter for dialable land-line number instance - *

- * @return Dialable land-line number instance - */ - DialableLandLineNumber getLandLine (); - - /** - * Setter for dialable fax number instance - *

- * @param fax Dialable fax number instance - */ - void setFax (final DialableFaxNumber fax); - - /** - * Getter for dialable fax number instance - *

- * @return Dialable fax number instance - */ - DialableFaxNumber getFax (); - - /** - * Setter for dialable cellphone number instance - *

- * @param cellPhone Dialable cellphone number instance - */ - void setCellPhone (final DialableCellphoneNumber cellPhone); - - /** - * Getter for linked contact account - *

- * @return Linked contact account - */ - @Deprecated - Contact getContact (); - - /** - * Setter for linked contact account - *

- * @param contact Linked contact account - */ - @Deprecated - void setContact (final Contact contact); - -} diff --git a/src/java/org/mxchange/pizzaapplication/beans/features/PizzaFeaturesWebApplicationController.java b/src/java/org/mxchange/pizzaapplication/beans/features/PizzaFeaturesWebApplicationController.java deleted file mode 100644 index 05892d05..00000000 --- a/src/java/org/mxchange/pizzaapplication/beans/features/PizzaFeaturesWebApplicationController.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2016 Cho-Time GmbH - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.mxchange.pizzaapplication.beans.features; - -import java.io.Serializable; -import javax.ejb.Local; - -/** - * An interface for country beans - *

- * @author Roland Haeder - */ -@Local -public interface PizzaFeaturesWebApplicationController extends Serializable { - - /** - * Checks if given feature is enabled. - *

- * @param feature Feature to be checked - *

- * @return Whether given feature is enabled - */ - boolean isFeatureEnabled (final String feature); - -} 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 8de92120..23f196aa 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 51455c98..dc990a7b 100644 --- a/web/WEB-INF/templates/contact/form_contact_data.tpl +++ b/web/WEB-INF/templates/contact/form_contact_data.tpl @@ -114,6 +114,20 @@
+
+
+ +
+ +
+ +
+ +
+
+ + +