From 9337b32c520dd28547a64c0ebafe237b5b6342c0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 26 Aug 2017 12:41:21 +0200 Subject: [PATCH] Please cherry-pick: - added converter for headquarters data (please rename + fix JNDI) - added validator for URLs (please rename) - renamed allowEmptyEmail to allowEmptyValue and used it more as this is generic - fixed mixture of headquarters and company founder (my mistake) - added form elements to set company-contact and owning user instance - added navigation rules for links from business-contact list to sub pages (still some missing) - added missing i18n strings 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 | 16 +- .../localization/bundle_en_US.properties | 12 +- .../PizzaAdminBusinessDataWebRequestBean.java | 187 +++++++++++++++--- .../PizzaBusinessDataWebSessionBean.java | 6 +- .../PizzaCompanyEmployeeWebRequestBean.java | 2 +- .../PizzaBusinessContactConverter.java | 6 +- .../PizzaCompanyHeadquartersConverter.java | 114 +++++++++++ .../PizzaEmailAddressValidator.java | 28 ++- .../validator/url/PizzaUrlValidator.java | 111 +++++++++++ web/WEB-INF/faces-config.xml | 19 ++ .../admin_form_business_basic_data.tpl | 73 +++++-- .../admin/contact/admin_form_contact_data.tpl | 2 +- .../user/user_enter_current_password.tpl | 2 +- web/WEB-INF/web.xml | 5 + .../admin_business_contacts_list.xhtml | 46 +++-- 15 files changed, 548 insertions(+), 81 deletions(-) create mode 100644 src/java/org/mxchange/pizzaapplication/converter/business/headquarters/PizzaCompanyHeadquartersConverter.java create mode 100644 src/java/org/mxchange/pizzaapplication/validator/url/PizzaUrlValidator.java diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index dfa9900a..6e5514da 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -814,7 +814,7 @@ ADMIN_BUSINESS_BASIC_DATA_ID=Id-Nummer: ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE=Details des geschaeftlichen Kontaktes anzeigen. ADMIN_BUSINESS_BASIC_DATA_OWNER_ID=Zugew. Benutzer: ADMIN_LINK_SHOW_BUSINESS_BASIC_DATA_OWNER_USER_TITLE=Benutzerprofil des zugewiesenen Benutzers anzeigen. -ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_OWNER_USER=Zuweisen +ADMIN_LINK_ASSIGN=Zuweisen #@TODO Please fix German umlauts! ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_OWNER_USER_TITLE=Geschaeftlichen Kontakt einen Benutzeraccount zuweisen. ADMIN_BUSINESS_BASIC_DATA_COMPANY_NAME=Firmenname: @@ -856,3 +856,17 @@ ADMIN_BUSINESS_DATA_COMPANY_WEBSITE_URL=Webseiten-URL: ADMIN_SELECT_BUSINESS_DATA_COMPANY_USER_OWNER=Unternehmen einem Benutzer zuweisen: #@TODO Please fix German umlauts! ADMIN_SELECT_BUSINESS_DATA_COMPANY_LOGO=Firmenlogo auswaehlen: +#@TODO Please fix German umlauts! +URL_NOT_MATCHING_REGULAR_EXPRESSION=Die eingegebene URL entspricht nicht der ueblichen Form. +#@TODO Please fix German umlauts! +ADMIN_SELECT_BUSINESS_DATA_COMPANY_CONTACT_EMPLOYEE=Mitarbeiter als Kontaktperson auswaehlen: +#@TODO Please fix German umlauts! +ADMIN_SELECT_BUSINESS_DATA_COMPANY_HEADQUARTERS=Daten des Hauptsitzesz auswaehlen: +LINK_COMPANY_WEBSITE_URL_TITLE=Zur Unternehmenswebseite (neues Fenster) surfen +#@TODO Please fix German umlauts! +ADMIN_BUSINESS_BASIC_DATA_COMPANY_FOUNDER=Gruender +#@TODO Please fix German umlauts! +ADMIN_LINK_SHOW_BUSINESS_BASIC_DATA_COMPANY_FOUNDER_TITLE=Daten des Unternehmensgruenders anzeigen. +#@TODO Please fix German umlauts! +ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_COMPANY_FOUNDER_TITLE=Weisst diesem Firmeneintrag einen Unternehmensgruender zu. +ADMIN_BUSINESS_BASIC_DATA_CREATED=Eintrag erstellt diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 4a3a9a7e..b3ab49c3 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -784,7 +784,7 @@ GUEST_REGISTRATION_USER_PASSWORDS_EMPTY_NOT_ALLOWED=You have to enter an own pas GUEST_REGISTRATION_PASSWORD_NOT_ENTERED=Please enter a password. This must match with security rules. GUEST_REGISTRATION_PASSWORD_REPEAT_NOT_ENTERED=Please repeat the entered password. This done to confirm the password. PAGE_TITLE_ADMIN_AREA=Administration -ADMIN_MENU_BUSINESS_BASIC_DATA_TITLE=Business Contacts +ADMIN_MENU_BUSINESS_BASIC_DATA_TITLE=Business contacts LINK_ADMIN_LIST_BUSINESS_BASIC_DATA=List business contacts LINK_ADMIN_LIST_BUSINESS_BASIC_DATA_TITLE=Lists business contacts LINK_ADMIN_EXPORT_BUSINESS_BASIC_DATA=Export business contacts @@ -797,7 +797,7 @@ ADMIN_BUSINESS_BASIC_DATA_ID=Id Number: ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE=Show details of this business contact. ADMIN_BUSINESS_BASIC_DATA_OWNER_ID=Assigned user: ADMIN_LINK_SHOW_BUSINESS_BASIC_DATA_OWNER_USER_TITLE=Shows assigned user profile. -ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_OWNER_USER=Assign +ADMIN_LINK_ASSIGN=Assign ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_OWNER_USER_TITLE=Assigns this business contact to a user account. ADMIN_BUSINESS_BASIC_DATA_COMPANY_NAME=Company name: ADMIN_BUSINESS_BASIC_DATA_CONTACT_PERSON=Contact person: @@ -830,3 +830,11 @@ ADMIN_BUSINESS_DATA_COMPANY_TAX_NUMBER=Tax number: ADMIN_BUSINESS_DATA_COMPANY_WEBSITE_URL=Website URL: ADMIN_SELECT_BUSINESS_DATA_COMPANY_USER_OWNER=Select user to assign with company: ADMIN_SELECT_BUSINESS_DATA_COMPANY_LOGO=Choose company logo: +URL_NOT_MATCHING_REGULAR_EXPRESSION=The entered URL does not match the common form. +ADMIN_SELECT_BUSINESS_DATA_COMPANY_CONTACT_EMPLOYEE=Choose employee as contact person: +ADMIN_SELECT_BUSINESS_DATA_COMPANY_HEADQUARTERS=Choose headquarters: +LINK_COMPANY_WEBSITE_URL_TITLE=Surf to company's web site (new window) +ADMIN_BUSINESS_BASIC_DATA_COMPANY_FOUNDER=Founder +ADMIN_LINK_SHOW_BUSINESS_BASIC_DATA_COMPANY_FOUNDER_TITLE=Show data of company founder. +ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_COMPANY_FOUNDER_TITLE=Assigns a company founder to this company entry. +ADMIN_BUSINESS_BASIC_DATA_CREATED=Entry created diff --git a/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaAdminBusinessDataWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaAdminBusinessDataWebRequestBean.java index 83db9404..d5b1c671 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaAdminBusinessDataWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaAdminBusinessDataWebRequestBean.java @@ -18,15 +18,28 @@ package org.mxchange.pizzaapplication.beans.business.basicdata; import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; +import javax.enterprise.event.Event; +import javax.enterprise.inject.Any; +import javax.faces.FacesException; import javax.faces.view.facelets.FaceletException; +import javax.inject.Inject; import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote; +import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; +import org.mxchange.jcontactsbusiness.basicdata.CompanyBasicData; import org.mxchange.jcontactsbusiness.employee.Employee; -import org.mxchange.jcontactsbusiness.headquarters.HeadQuartersData; +import org.mxchange.jcontactsbusiness.events.basicdata.added.BusinessBasicDataAddedEvent; +import org.mxchange.jcontactsbusiness.events.basicdata.added.ObservableBusinessBasicDataAddedEvent; +import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataAlreadyAddedException; +import org.mxchange.jcontactsbusiness.headquarters.HeadquartersData; import org.mxchange.jcountry.data.Country; +import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.phonenumbers.fax.FaxNumber; +import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.phonenumbers.landline.LandLineNumber; import org.mxchange.jusercore.model.user.User; import org.mxchange.pizzaapplication.beans.BasePizzaController; @@ -35,7 +48,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; *

* @author Roland Häder */ -@Named ("adminBusinessDataController") +@Named ("adminCompanyDataController") @RequestScoped public class PizzaAdminBusinessDataWebRequestBean extends BasePizzaController implements PizzaAdminBusinessDataWebRequestController { @@ -49,6 +62,13 @@ public class PizzaAdminBusinessDataWebRequestBean extends BasePizzaController im */ private AdminBusinessDataSessionBeanRemote adminBusinessDataBean; + /** + * An event being fired when basic business data has been added + */ + @Inject + @Any + private Event businessDataAddedEvent; + /** * Comments for this company */ @@ -64,10 +84,15 @@ public class PizzaAdminBusinessDataWebRequestBean extends BasePizzaController im */ private String companyEmailAddress; + /** + * Company founder + */ + private Employee companyFounder; + /** * Head quarter data for this company */ - private HeadQuartersData companyHeadQuarters; + private HeadquartersData companyHeadQuarters; /** * Company name @@ -80,14 +105,14 @@ public class PizzaAdminBusinessDataWebRequestBean extends BasePizzaController im private String companyTaxNumber; /** - * Web site URL + * Owning user instance (which this company is assigned to) */ - private String companyWebsiteUrl; + private User companyUserOwner; /** - * Owning user instance (which this company is assigned to) + * Web site URL */ - private User contactCompanyUserOwner; + private String companyWebsiteUrl; /** * Area code for fax number @@ -120,13 +145,105 @@ public class PizzaAdminBusinessDataWebRequestBean extends BasePizzaController im private Long landLineNumber; /** - * Constructor + * Default constructor */ public PizzaAdminBusinessDataWebRequestBean () { // Call super constructor super(); } + /** + * Adds a basic business data entry, if not yet found. + *

+ * @return Redirect outcome + */ + public String addBusinessBasicData () { + // First, validate all parameter + if (this.getCompanyName() == null) { + // Is null + throw new NullPointerException("this.companyName is null"); //NOI18N + } else if (this.getCompanyName().isEmpty()) { + // Is null + throw new IllegalArgumentException("this.companyName is empty"); //NOI18N + } + + // Prepare entity + BusinessBasicData basicData = new CompanyBasicData(this.getCompanyName()); + + // Set all opther remaining data + basicData.setCompanyComments(this.getCompanyComments()); + basicData.setCompanyContactEmployee(this.getCompanyContactEmployee()); + basicData.setCompanyEmailAddress(this.getCompanyEmailAddress()); + basicData.setCompanyFounder(this.getCompanyFounder()); + basicData.setCompanyHeadQuartersData(this.getCompanyHeadQuarters()); + basicData.setCompanyTaxNumber(this.getCompanyTaxNumber()); + basicData.setCompanyUserOwner(this.getCompanyUserOwner()); + basicData.setCompanyWebsiteUrl(this.getCompanyWebsiteUrl()); + + // Set logo instance + // @TODO basicData.setCompanyLogo(); + // Generate phone number + DialableLandLineNumber landLine = new LandLineNumber(this.getLandLineCountry(), this.getLandLineAreaCode(), this.getLandLineNumber()); + DialableFaxNumber fax = new FaxNumber(this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber()); + + // Don't set null or wrong references + if ((landLine instanceof DialableLandLineNumber) && (landLine.getPhoneCountry() instanceof Country) && (this.getLandLineAreaCode() != null) && (this.getLandLineNumber() != null) && (this.getLandLineAreaCode() > 0) && (this.getLandLineNumber() > 0)) { + // Now the number must be given + if (landLine.getPhoneAreaCode() == null) { + // Is null + throw new NullPointerException("phone.phoneAreaCode is null"); //NOI18N + } else if (landLine.getPhoneAreaCode() < 1) { + // Abort here + throw new IllegalArgumentException("phone.phoneAreaCode is zero or below."); //NOI18N + } else if (landLine.getPhoneNumber() == null) { + // Is null + throw new NullPointerException("phone.phoneNumber is null"); //NOI18N + } else if (landLine.getPhoneNumber() < 1) { + // Abort here + throw new IllegalArgumentException("phone.phoneNumber is zero or below."); //NOI18N + } + + // Set phone number + basicData.setCompanyLandLineNumber(landLine); + } + + // Don't set null or wrong references + if ((fax instanceof DialableFaxNumber) && (fax.getPhoneCountry() instanceof Country) && (this.getFaxAreaCode() != null) && (this.getFaxNumber() != null) && (this.getFaxAreaCode() > 0) && (this.getFaxNumber() > 0)) { + // Now the number must be given + if (fax.getPhoneAreaCode() == null) { + // Is null + throw new NullPointerException("fax.phoneAreaCode is null"); //NOI18N + } else if (fax.getPhoneAreaCode() < 1) { + // Abort here + throw new IllegalArgumentException("fax.phoneAreaCode is zero or below."); //NOI18N + } else if (fax.getPhoneNumber() == null) { + // Is null + throw new NullPointerException("fax.phoneNumber is null"); //NOI18N + } else if (fax.getPhoneNumber() < 1) { + // Abort here + throw new IllegalArgumentException("fax.phoneNumber is zero or below."); //NOI18N + } + + // Set fax number + basicData.setCompanyFaxNumber(fax); + } + + // Now try to send to EJB and get an updated version back + try { + // Try it + BusinessBasicData updatedBasicData = this.adminBusinessDataBean.addCompanyBasicData(basicData); + + // Fire event + this.businessDataAddedEvent.fire(new BusinessBasicDataAddedEvent(updatedBasicData)); + } catch (final BusinessDataAlreadyAddedException e) { + // Does already exist + throw new FacesException(e); + } + + // Continue to list again + return "admin_list_business_contacts"; //NOI18N + } + /** * Getter for comments *

@@ -181,12 +298,30 @@ public class PizzaAdminBusinessDataWebRequestBean extends BasePizzaController im this.companyEmailAddress = companyEmailAddress; } + /** + * Getter for company founder + *

+ * @return Company founder + */ + public Employee getCompanyFounder () { + return this.companyFounder; + } + + /** + * Setter for company founder + *

+ * @param companyFounder Company founder + */ + public void setCompanyFounder (final Employee companyFounder) { + this.companyFounder = companyFounder; + } + /** * Getter for headquarters data *

* @return Headquarters data */ - public HeadQuartersData getCompanyHeadQuarters () { + public HeadquartersData getCompanyHeadQuarters () { return this.companyHeadQuarters; } @@ -195,7 +330,7 @@ public class PizzaAdminBusinessDataWebRequestBean extends BasePizzaController im *

* @param companyHeadQuarters Headquarters data */ - public void setCompanyHeadQuarters (final HeadQuartersData companyHeadQuarters) { + public void setCompanyHeadQuarters (final HeadquartersData companyHeadQuarters) { this.companyHeadQuarters = companyHeadQuarters; } @@ -236,39 +371,39 @@ public class PizzaAdminBusinessDataWebRequestBean extends BasePizzaController im } /** - * Getter for company web site URL + * Getter for owning user instance *

- * @return Company web site URL + * @return Owning user instance */ - public String getCompanyWebsiteUrl () { - return this.companyWebsiteUrl; + public User getCompanyUserOwner () { + return this.companyUserOwner; } /** - * Getter for company web site URL + * Setter for owning user instance *

- * @param companyWebsiteUrl Company web site URL + * @param companyUserOwner Owning user instance */ - public void setCompanyWebsiteUrl (final String companyWebsiteUrl) { - this.companyWebsiteUrl = companyWebsiteUrl; + public void setCompanyUserOwner (final User companyUserOwner) { + this.companyUserOwner = companyUserOwner; } /** - * Getter for owning user instance + * Getter for company web site URL *

- * @return Owning user instance + * @return Company web site URL */ - public User getContactCompanyUserOwner () { - return this.contactCompanyUserOwner; + public String getCompanyWebsiteUrl () { + return this.companyWebsiteUrl; } /** - * Setter for owning user instance + * Getter for company web site URL *

- * @param contactCompanyUserOwner Owning user instance + * @param companyWebsiteUrl Company web site URL */ - public void setContactCompanyUserOwner (final User contactCompanyUserOwner) { - this.contactCompanyUserOwner = contactCompanyUserOwner; + public void setCompanyWebsiteUrl (final String companyWebsiteUrl) { + this.companyWebsiteUrl = companyWebsiteUrl; } /** diff --git a/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaBusinessDataWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaBusinessDataWebSessionBean.java index 1d9bf1e0..c7dc6332 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaBusinessDataWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaBusinessDataWebSessionBean.java @@ -37,7 +37,7 @@ import org.mxchange.pizzaapplication.beans.user.login.PizzaUserLoginWebSessionCo *

* @author Roland Häder */ -@Named ("businessDataController") +@Named ("companyDataController") @SessionScoped public class PizzaBusinessDataWebSessionBean extends BasePizzaController implements PizzaBusinessDataWebSessionController { @@ -127,7 +127,7 @@ public class PizzaBusinessDataWebSessionBean extends BasePizzaController impleme * @return A list of all business contacts */ @SuppressWarnings ("ReturnOfCollectionOrArrayField") - public List allBusinessContacts () { + public List allCompanyBasicData () { return this.businessContacts; } @@ -314,7 +314,7 @@ public class PizzaBusinessDataWebSessionBean extends BasePizzaController impleme } // Init user's contact list - this.businessContacts = this.adminBusinessDataBean.allBusinessContacts(); + this.businessContacts = this.adminBusinessDataBean.allCompanyBasicData(); } } diff --git a/src/java/org/mxchange/pizzaapplication/beans/business/employee/PizzaCompanyEmployeeWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/business/employee/PizzaCompanyEmployeeWebRequestBean.java index e6ec7229..bf17316d 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/business/employee/PizzaCompanyEmployeeWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/business/employee/PizzaCompanyEmployeeWebRequestBean.java @@ -85,7 +85,7 @@ public class PizzaCompanyEmployeeWebRequestBean extends BasePizzaController impl Context context = new InitialContext(); // Try to lookup - this.companyEmployeeBean = (CompanyEmployeeSessionBeanRemote) context.lookup("java:global/pizzaservice-ejb/adminCompanyEmployee!org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote"); //NOI18N + this.companyEmployeeBean = (CompanyEmployeeSessionBeanRemote) context.lookup("java:global/pizzaservice-ejb/companyEmployee!org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); diff --git a/src/java/org/mxchange/pizzaapplication/converter/business/basicdata/PizzaBusinessContactConverter.java b/src/java/org/mxchange/pizzaapplication/converter/business/basicdata/PizzaBusinessContactConverter.java index e3d15d55..fafd402a 100644 --- a/src/java/org/mxchange/pizzaapplication/converter/business/basicdata/PizzaBusinessContactConverter.java +++ b/src/java/org/mxchange/pizzaapplication/converter/business/basicdata/PizzaBusinessContactConverter.java @@ -81,10 +81,10 @@ public class PizzaBusinessContactConverter implements Converter { try { // Try to parse the value as long - Long contactId = Long.valueOf(submittedValue); + Long basicDataId = Long.valueOf(submittedValue); // Try to get user instance from it - businessContact = PizzaBusinessContactConverter.BUSINESS_CONTACT_BEAN.findBusinessDataById(contactId); + businessContact = PizzaBusinessContactConverter.BUSINESS_CONTACT_BEAN.findBusinessDataById(basicDataId); } catch (final NumberFormatException ex) { // Throw again throw new ConverterException(ex); @@ -109,7 +109,7 @@ public class PizzaBusinessContactConverter implements Converter { } // Return id number - return String.valueOf(((BusinessBasicData) value).getBusinessDataId()); + return String.valueOf(((BusinessBasicData) value).getCompanyDataId()); } } diff --git a/src/java/org/mxchange/pizzaapplication/converter/business/headquarters/PizzaCompanyHeadquartersConverter.java b/src/java/org/mxchange/pizzaapplication/converter/business/headquarters/PizzaCompanyHeadquartersConverter.java new file mode 100644 index 00000000..4f7de1af --- /dev/null +++ b/src/java/org/mxchange/pizzaapplication/converter/business/headquarters/PizzaCompanyHeadquartersConverter.java @@ -0,0 +1,114 @@ +/* + * Copyright (C) 2016, 2017 Roland Häder + * + * 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.converter.business.headquarters; + +import java.text.MessageFormat; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.convert.Converter; +import javax.faces.convert.ConverterException; +import javax.faces.convert.FacesConverter; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import org.mxchange.jcontactsbusiness.exceptions.headquarters.CompanyHeadquartersNotFoundException; +import org.mxchange.jcontactsbusiness.headquarters.CompanyHeadquartersSessionBeanRemote; +import org.mxchange.jcontactsbusiness.headquarters.HeadquartersData; + +/** + * Converter for converting company headquarters to and from id number + *

+ * @author Roland Häder + */ +@FacesConverter (value = "CompanyHeadquartersConverter") +public class PizzaCompanyHeadquartersConverter implements Converter { + + /** + * CompanyEmployee EJB + */ + private static CompanyHeadquartersSessionBeanRemote COMPANY_HEADQUARTERS_BEAN; + + /** + * Default constructor + */ + public PizzaCompanyHeadquartersConverter () { + } + + @Override + public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) { + // Is the value null or empty? + if ((null == submittedValue) || (submittedValue.trim().isEmpty())) { + // Warning message + // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logWarning(MessageFormat.format("{0}.getAsObject(): submittedValue is null or empty - EXIT!", this.getClass().getSimpleName())); //NOI18N + + // Return null + return null; + } + + // Is the bean there? + // @TODO Requires this synchronization or is it (sync) confusing the container? + if (null == PizzaCompanyHeadquartersConverter.COMPANY_HEADQUARTERS_BEAN) { + // Try to get it + try { + // Get initial context + Context initialContext = new InitialContext(); + + // ... and user controller + PizzaCompanyHeadquartersConverter.COMPANY_HEADQUARTERS_BEAN = (CompanyHeadquartersSessionBeanRemote) initialContext.lookup("java:global/jjobs-ejb/companyEmployee!org.mxchange.jcontactsbusiness.headquarters.CompanyHeadquartersSessionBeanRemote"); //NOI18N + } catch (final NamingException ex) { + // Continue to throw it + throw new ConverterException(MessageFormat.format("initialContext.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N + } + } + + // Init instance + HeadquartersData companyHeadquarters = null; + + try { + // Try to parse the value as long + Long headquartersId = Long.valueOf(submittedValue); + + // Try to get user instance from it + companyHeadquarters = PizzaCompanyHeadquartersConverter.COMPANY_HEADQUARTERS_BEAN.findCompanyHeadquartersById(headquartersId); + } catch (final NumberFormatException ex) { + // Throw again + throw new ConverterException(ex); + } catch (final CompanyHeadquartersNotFoundException ex) { + // Debug message + // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logDebug(MessageFormat.format("{0}.getAsObject(): Exception: {1} - Returning null ...", this.getClass().getSimpleName(), ex)); //NOI18N + } + + // Return it + return companyHeadquarters; + } + + @Override + public String getAsString (final FacesContext context, final UIComponent component, final Object value) { + // Is the object null? + if ((null == value) || (String.valueOf(value).isEmpty())) { + // Is null + return ""; //NOI18N + } else if (!(value instanceof HeadquartersData)) { + // Not same interface + throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement HeadquartersData.", value.getClass().getSimpleName())); //NOI18N + } + + // Return id number + return String.valueOf(((HeadquartersData) value).getHeadquartersId()); + } + +} diff --git a/src/java/org/mxchange/pizzaapplication/validator/emailaddress/PizzaEmailAddressValidator.java b/src/java/org/mxchange/pizzaapplication/validator/emailaddress/PizzaEmailAddressValidator.java index 57bacdb2..143f0575 100644 --- a/src/java/org/mxchange/pizzaapplication/validator/emailaddress/PizzaEmailAddressValidator.java +++ b/src/java/org/mxchange/pizzaapplication/validator/emailaddress/PizzaEmailAddressValidator.java @@ -44,14 +44,14 @@ public class PizzaEmailAddressValidator extends BaseStringValidator implements V private static ContactSessionBeanRemote CONTACT_BEAN; /** - * Pattern matcher + * Email pattern */ - private static final Pattern EMAIL_PATTERN = Pattern.compile(PizzaEmailAddressValidator.EMAIL_REGEX); + private static final String EMAIL_REGEX = "^([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$"; //NOI18N /** - * Email pattern + * Pattern matcher */ - private static final String EMAIL_REGEX = "^([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$"; //NOI18N + private static final Pattern PATTERN_MATCHER = Pattern.compile(PizzaEmailAddressValidator.EMAIL_REGEX); /** * Serial number @@ -66,34 +66,32 @@ public class PizzaEmailAddressValidator extends BaseStringValidator implements V @Override public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { - System.out.println("validate: value=" + value); //NOI18N // The required field String[] requiredFields = {"emailAddress", "emailAddressRepeat", "resendEmailAddress"}; //NOI18N // Default is to reject empty email address fields - Boolean allowEmptyEmail = Boolean.FALSE; + Boolean allowEmptyValue = Boolean.FALSE; - // Is attribute "allowEmptyEmail" set? - if (component.getAttributes().containsKey("allowEmptyEmail")) { //NOI18N + // Is attribute "allowEmptyValue" set? + if (component.getAttributes().containsKey("allowEmptyValue")) { //NOI18N // Get attribute - Object attribute = component.getAttributes().get("allowEmptyEmail"); //NOI18N - System.out.println("attribute=" + attribute); //NOI18N + Object attribute = component.getAttributes().get("allowEmptyValue"); //NOI18N // Make sure, it is Boolean as no String is accepted anymore if (!(attribute instanceof String)) { // Not valid attribute, please use "true" or "false" (default) - throw new IllegalArgumentException("allowEmptyEmail must be of type String. Please use \"true\" or \"false\" for f:attribute value."); //NOI18N + throw new IllegalArgumentException("allowEmptyValue must be of type String. Please use \"true\" or \"false\" for f:attribute value."); //NOI18N } // Securely cast it - allowEmptyEmail = Boolean.parseBoolean((String) attribute); + allowEmptyValue = Boolean.parseBoolean((String) attribute); } // Pre-validation (example: not null, not a string, empty string ...) - super.preValidate(context, component, value, requiredFields, allowEmptyEmail); + super.preValidate(context, component, value, requiredFields, allowEmptyValue); // Is the email address empty and allowed? - if (null == value && allowEmptyEmail) { + if (null == value && allowEmptyValue) { // Then accept this here return; } else if (null == value) { @@ -107,7 +105,7 @@ public class PizzaEmailAddressValidator extends BaseStringValidator implements V // Checks if the email address matches a regex ("low-level" check) // @TODO Should also be done by ) - boolean matches = EMAIL_PATTERN.matcher(emailAddress).matches(); //NOI18N + boolean matches = PATTERN_MATCHER.matcher(emailAddress).matches(); //NOI18N // Is the email address valid? if (!matches) { diff --git a/src/java/org/mxchange/pizzaapplication/validator/url/PizzaUrlValidator.java b/src/java/org/mxchange/pizzaapplication/validator/url/PizzaUrlValidator.java new file mode 100644 index 00000000..64de4bc1 --- /dev/null +++ b/src/java/org/mxchange/pizzaapplication/validator/url/PizzaUrlValidator.java @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2016, 2017 Roland Häder + * + * 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.validator.url; + +import java.text.MessageFormat; +import java.util.regex.Pattern; +import javax.faces.application.FacesMessage; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.validator.FacesValidator; +import javax.faces.validator.Validator; +import javax.faces.validator.ValidatorException; +import org.mxchange.jcoreee.validator.string.BaseStringValidator; + +/** + * A validator for URL vallidation (only regex, but allow empty value if + * allowed). + *

+ * @author Roland Häder + */ +@FacesValidator ("UrlValidator") +public class PizzaUrlValidator extends BaseStringValidator implements Validator { + + /** + * Pattern matcher + */ + private static final Pattern PATTERN_MATCHER = Pattern.compile(PizzaUrlValidator.URL_REGEX); + + /** + * Email pattern + */ + private static final String URL_REGEX = "(http|https):\\/\\/[\\w\\-_]+(\\.[\\w\\-_]+)+([\\w\\-\\.,@?^=%&:/~\\+#]*[\\w\\-\\@?^=%&/~\\+#])?"; //NOI18N + + /** + * Serial number + */ + private static final long serialVersionUID = 187_536_745_607_193L; + + /** + * Default constructor + */ + public PizzaUrlValidator () { + } + + @Override + public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { + // The required field + String[] requiredFields = {"companyWebsiteUrl"}; //NOI18N + + // Default is to reject empty email address fields + Boolean allowEmptyValue = Boolean.FALSE; + + // Is attribute "allowEmptyValue" set? + if (component.getAttributes().containsKey("allowEmptyValue")) { //NOI18N + // Get attribute + Object attribute = component.getAttributes().get("allowEmptyValue"); //NOI18N + + // Make sure, it is Boolean as no String is accepted anymore + if (!(attribute instanceof String)) { + // Not valid attribute, please use "true" or "false" (default) + throw new IllegalArgumentException("allowEmptyValue must be of type String. Please use \"true\" or \"false\" for f:attribute value."); //NOI18N + } + + // Securely cast it + allowEmptyValue = Boolean.parseBoolean((String) attribute); + } + + // Pre-validation (example: not null, not a string, empty string ...) + super.preValidate(context, component, value, requiredFields, allowEmptyValue); + + // Is the email address empty and allowed? + if (null == value && allowEmptyValue) { + // Then accept this here + return; + } else if (null == value) { + // Abort here + throw new ValidatorException(new FacesMessage("No empty URL allowed.")); //NOI18N + } + + // Get string from object ... ;-) + String url = String.valueOf(value).trim(); + + // Checks if the email address matches a regex ("low-level" check) + // @TODO Should also be done by ) + boolean matches = PATTERN_MATCHER.matcher(url).matches(); //NOI18N + + // Is the email address valid? + if (!matches) { + // Generate message + String message = MessageFormat.format("URL {0} does not match regular expression.", url); //NOI18N + + // Not matching + throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, message, message)); + } + } + +} diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 075a9377..a6a7f3f5 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -714,6 +714,25 @@ /admin/user/admin_user_show.xhtml + + /admin/business_contacts/admin_business_contacts_list.xhtml + + admin_show_business_basic_data + /admin/business_contacts/admin_business_contacts_assign.xhtml + + + admin_assign_business_basic_data_contact + /admin/business_contacts/admin_business_contacts_assign_contact.xhtml + + + admin_assign_business_basic_data_founder + /admin/business_contacts/admin_business_contacts_assign_founder.xhtml + + + admin_assign_business_basic_data_owner + /admin/business_contacts/admin_business_contacts_assign_owner.xhtml + + + diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index c35a35b6..c17fd916 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -2,6 +2,11 @@ A pizza shop application, created and open-sourced while I was at my JavaEE training. Pizza-Service Application v1.0 + + Development mode for WELD, keep disabled unless really needed. Currently it messes up the website. + org.jboss.weld.development + false + Generic custom JSF tags library javax.faces.FACELETS_LIBRARIES diff --git a/web/admin/business_contacts/admin_business_contacts_list.xhtml b/web/admin/business_contacts/admin_business_contacts_list.xhtml index e63fc10d..51f5e9c8 100644 --- a/web/admin/business_contacts/admin_business_contacts_list.xhtml +++ b/web/admin/business_contacts/admin_business_contacts_list.xhtml @@ -15,16 +15,16 @@ - + - + - - + + @@ -33,9 +33,13 @@ - + + + - + + + @@ -43,7 +47,9 @@ - + + + @@ -51,9 +57,27 @@ - + + + - + + + + + + + + + + + + + + + + + @@ -61,7 +85,7 @@ - + @@ -81,7 +105,7 @@

- +
-- 2.39.5