From: Roland Häder Date: Sat, 19 Aug 2017 17:56:35 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=00b4177289478a1ded0fa7ab78a33c769d95db79;p=jfinancials-war.git Please cherry-pick: - expanded business "contact"-s basic_data with all missing fields from entity - added some fields, like contact person and company founder to backing bean - added converter for company employees Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/jfinancials/beans/businessdata/FinancialsAdminBusinessDataWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/businessdata/FinancialsAdminBusinessDataWebRequestBean.java index 3572dfe5..e3887226 100644 --- a/src/java/org/mxchange/jfinancials/beans/businessdata/FinancialsAdminBusinessDataWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/businessdata/FinancialsAdminBusinessDataWebRequestBean.java @@ -24,6 +24,7 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcontactsbusiness.basicdata.BusinessDataAdminSessionBeanRemote; +import org.mxchange.jcontactsbusiness.employee.Employee; import org.mxchange.jcountry.data.Country; import org.mxchange.jfinancials.beans.BaseFinancialsController; @@ -91,6 +92,11 @@ public class FinancialsAdminBusinessDataWebRequestBean extends BaseFinancialsCon */ private Long landLineNumber; + /** + * An employee as contact person with this company + */ + private Employee companyContactEmployee; + /** * Constructor */ @@ -117,6 +123,24 @@ public class FinancialsAdminBusinessDataWebRequestBean extends BaseFinancialsCon this.companyComments = companyComments; } + /** + * Getter for employee as contact person + *

+ * @return Employee as contact person + */ + public Employee getCompanyContactEmployee () { + return this.companyContactEmployee; + } + + /** + * Setter for employee as contact person + *

+ * @param companyContactEmployee Employee as contact person + */ + public void setCompanyContactEmployee (final Employee companyContactEmployee) { + this.companyContactEmployee = companyContactEmployee; + } + /** * Getter for company's (main) email address *

diff --git a/src/java/org/mxchange/jfinancials/converter/businesscontact/FinancialsBusinessContactConverter.java b/src/java/org/mxchange/jfinancials/converter/businesscontact/FinancialsBusinessContactConverter.java index c8df4eea..f22fe9cd 100644 --- a/src/java/org/mxchange/jfinancials/converter/businesscontact/FinancialsBusinessContactConverter.java +++ b/src/java/org/mxchange/jfinancials/converter/businesscontact/FinancialsBusinessContactConverter.java @@ -28,7 +28,7 @@ import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote; -import org.mxchange.jcontactsbusiness.exceptions.BusinessDataNotFoundException; +import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataNotFoundException; /** * Converter for contact id <-> valid business contact instance diff --git a/src/java/org/mxchange/jfinancials/converter/company_employee/FinancialsCompanyEmployeeConverter.java b/src/java/org/mxchange/jfinancials/converter/company_employee/FinancialsCompanyEmployeeConverter.java new file mode 100644 index 00000000..645fc220 --- /dev/null +++ b/src/java/org/mxchange/jfinancials/converter/company_employee/FinancialsCompanyEmployeeConverter.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.jfinancials.converter.company_employee; + +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.employee.CompanyEmployeeSessionBeanRemote; +import org.mxchange.jcontactsbusiness.employee.Employee; +import org.mxchange.jcontactsbusiness.exceptions.employee.CompanyEmployeeNotFoundException; + +/** + * Converter for converting company employee to and from id number + *

+ * @author Roland Häder + */ +@FacesConverter (value = "CompanyEmployeeConverter") +public class FinancialsCompanyEmployeeConverter implements Converter { + + /** + * CompanyEmployee EJB + */ + private static CompanyEmployeeSessionBeanRemote COMPANY_EMPLOYEE_BEAN; + + /** + * Default constructor + */ + public FinancialsCompanyEmployeeConverter () { + } + + @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 == FinancialsCompanyEmployeeConverter.COMPANY_EMPLOYEE_BEAN) { + // Try to get it + try { + // Get initial context + Context initialContext = new InitialContext(); + + // ... and user controller + FinancialsCompanyEmployeeConverter.COMPANY_EMPLOYEE_BEAN = (CompanyEmployeeSessionBeanRemote) initialContext.lookup("java:global/jfinancials-ejb/companyEmployee!org.mxchange.jcontactsbusiness.company_employee.CompanyEmployeeSessionBeanRemote"); //NOI18N + } catch (final NamingException ex) { + // Continue to throw it + throw new ConverterException(MessageFormat.format("initialContext.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N + } + } + + // Init instance + Employee companyEmployee = null; + + try { + // Try to parse the value as long + Long employeeId = Long.valueOf(submittedValue); + + // Try to get user instance from it + companyEmployee = FinancialsCompanyEmployeeConverter.COMPANY_EMPLOYEE_BEAN.findCompanyEmployeeById(employeeId); + } catch (final NumberFormatException ex) { + // Throw again + throw new ConverterException(ex); + } catch (final CompanyEmployeeNotFoundException 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 companyEmployee; + } + + @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 Employee)) { + // Not same interface + throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement Employee.", value.getClass().getSimpleName())); //NOI18N + } + + // Return id number + return String.valueOf(((Employee) value).getEmployeeId()); + } + +} diff --git a/web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl b/web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl index e5938a0e..ab49e92d 100644 --- a/web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl +++ b/web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl @@ -48,16 +48,132 @@

- +
- + + + + + +
+ +
+ + + + + + + +
+ +
+ +
+ + + + + +
+ +
+ + + + + + + +
+ +
+ +
+ +
+ +
+ + + + + + + +
+ +
+ +
+
+ + + + + +
+ +
+ +
+ +
+ +
+ + + + + + + +
+ +
+ +
+ + + + + +
+ +
+ + + + + + + +
+ +
+ +
+ + + + + +
+ +
+ + + + + +
@@ -105,6 +221,18 @@
+ + +
+ +
+ +
+ +
+ +
+