From dfb90c5596a7b2e2558f0856143b227e5f233091 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 19 Aug 2017 20:53:28 +0200 Subject: [PATCH] Please cherry-pick: - added administrative and general backing bean for company employees + added JNDI lookup, still at wrong place - Employees have an instance back to business basic data which makes it impossible for creation (no fancy AJAX stuff now) of business basic data with founder and/or contact person - separated package of businessdata to business/basicdata so above business/company_employee package is nicely possible MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- ...ookAdminCompanyEmployeeWebRequestBean.java | 74 ++++++++++ ...inCompanyEmployeeWebRequestController.java | 28 ++++ ...ressbookCompanyEmployeeWebRequestBean.java | 101 +++++++++++++ ...okCompanyEmployeeWebSessionController.java | 28 ++++ ...ssbookAdminBusinessDataWebRequestBean.java | 134 +++++++++++++++--- ...AddressbookBusinessDataWebSessionBean.java | 56 ++++---- .../AddressbookCompanyEmployeeConverter.java} | 12 +- .../admin_form_business_basic_data.tpl | 44 +----- 8 files changed, 389 insertions(+), 88 deletions(-) create mode 100644 src/java/org/mxchange/addressbook/beans/business/employee/AddressbookAdminCompanyEmployeeWebRequestBean.java create mode 100644 src/java/org/mxchange/addressbook/beans/business/employee/AddressbookAdminCompanyEmployeeWebRequestController.java create mode 100644 src/java/org/mxchange/addressbook/beans/business/employee/AddressbookCompanyEmployeeWebRequestBean.java create mode 100644 src/java/org/mxchange/addressbook/beans/business/employee/AddressbookCompanyEmployeeWebSessionController.java rename src/java/org/mxchange/{jfinancials/converter/company_employee/FinancialsCompanyEmployeeConverter.java => addressbook/converter/company_employee/AddressbookCompanyEmployeeConverter.java} (85%) diff --git a/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookAdminCompanyEmployeeWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookAdminCompanyEmployeeWebRequestBean.java new file mode 100644 index 00000000..87f52726 --- /dev/null +++ b/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookAdminCompanyEmployeeWebRequestBean.java @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2017 RRoland 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.addressbook.beans.business.employee; + +import javax.annotation.PostConstruct; +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.addressbook.beans.BaseAddressbookController; +import org.mxchange.jcontactsbusiness.employee.AdminCompanyEmployeeSessionBeanRemote; + +/** + * A request-scoped bean for administrative purposes for company employees. + *

+ * @author Roland Häder + */ +@Named ("adminCompanyEmployeeController") +@RequestScoped +public class AddressbookAdminCompanyEmployeeWebRequestBean extends BaseAddressbookController implements AddressbookAdminCompanyEmployeeWebRequestController { + + /** + * Serial number + */ + private static final long serialVersionUID = 12_886_968_547_360L; + + /** + * EJB for administrative company employee purposes + */ + private AdminCompanyEmployeeSessionBeanRemote adminCompanyEmployeeBean; + + /** + * Default constructor + */ + public AddressbookAdminCompanyEmployeeWebRequestBean () { + // Call super constructor + super(); + } + + /** + * Initialization method + */ + @PostConstruct + public void init () { + // Try it + try { + // Get initial context + Context context = new InitialContext(); + + // Try to lookup + this.adminCompanyEmployeeBean = (AdminCompanyEmployeeSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/adminCompanyEmployee!org.mxchange.jcontactsbusiness.employee.AdminCompanyEmployeeSessionBeanRemote"); //NOI18N + } catch (final NamingException e) { + // Throw again + throw new FaceletException(e); + } + } + +} diff --git a/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookAdminCompanyEmployeeWebRequestController.java b/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookAdminCompanyEmployeeWebRequestController.java new file mode 100644 index 00000000..86b47c6e --- /dev/null +++ b/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookAdminCompanyEmployeeWebRequestController.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 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.addressbook.beans.business.employee; + +import java.io.Serializable; + +/** + * An interface for request-scoped administrative company employee beans + *

+ * @author Roland Häder + */ +public interface AddressbookAdminCompanyEmployeeWebRequestController extends Serializable { + +} diff --git a/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookCompanyEmployeeWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookCompanyEmployeeWebRequestBean.java new file mode 100644 index 00000000..24ae8e8d --- /dev/null +++ b/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookCompanyEmployeeWebRequestBean.java @@ -0,0 +1,101 @@ +/* + * Copyright (C) 2017 RRoland 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.addressbook.beans.business.employee; + +import java.util.LinkedList; +import java.util.List; +import javax.annotation.PostConstruct; +import javax.enterprise.context.SessionScoped; +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.addressbook.beans.BaseAddressbookController; +import org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote; +import org.mxchange.jcontactsbusiness.employee.Employee; + +/** + * A request-scoped bean for general purposes for company employees. + *

+ * @author Roland Häder + */ +@Named ("companyEmployeeController") +@SessionScoped +public class AddressbookCompanyEmployeeWebRequestBean extends BaseAddressbookController implements AddressbookCompanyEmployeeWebSessionController { + + /** + * Serial number + */ + private static final long serialVersionUID = 12_886_968_547_361L; + + /** + * EJB for general company employee purposes + */ + private CompanyEmployeeSessionBeanRemote companyEmployeeBean; + + /** + * List of all company employees + */ + private final List companyEmployees; + + /** + * Default constructor + */ + public AddressbookCompanyEmployeeWebRequestBean () { + // Call super constructor + super(); + + // Init list instance + this.companyEmployees = new LinkedList<>(); + } + + /** + * Returns a list of all company employees + *

+ * @return List of all company employees + */ + @SuppressWarnings ("ReturnOfCollectionOrArrayField") + public List allCompanyEmployees () { + return this.companyEmployees; + } + + /** + * Initialization method + */ + @PostConstruct + public void init () { + // Try it + try { + // Get initial context + Context context = new InitialContext(); + + // Try to lookup + this.companyEmployeeBean = (CompanyEmployeeSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/adminCompanyEmployee!org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote"); //NOI18N + } catch (final NamingException e) { + // Throw again + throw new FaceletException(e); + } + + // Get all entries from remote bean + List employees = this.companyEmployeeBean.allCompanyEmployees(); + + // Copy it to main list + this.companyEmployees.addAll(employees); + } + +} diff --git a/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookCompanyEmployeeWebSessionController.java b/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookCompanyEmployeeWebSessionController.java new file mode 100644 index 00000000..25606668 --- /dev/null +++ b/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookCompanyEmployeeWebSessionController.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 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.addressbook.beans.business.employee; + +import java.io.Serializable; + +/** + * An interface for request-scoped general company employee beans + *

+ * @author Roland Häder + */ +public interface AddressbookCompanyEmployeeWebSessionController extends Serializable { + +} diff --git a/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookAdminBusinessDataWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookAdminBusinessDataWebRequestBean.java index 2b6d543d..b82851d9 100644 --- a/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookAdminBusinessDataWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookAdminBusinessDataWebRequestBean.java @@ -16,7 +16,6 @@ */ package org.mxchange.addressbook.beans.businessdata; -import java.util.List; import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; import javax.faces.view.facelets.FaceletException; @@ -25,9 +24,11 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.addressbook.beans.BaseAddressbookController; -import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; -import org.mxchange.jcountry.data.Country; import org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote; +import org.mxchange.jcontactsbusiness.employee.Employee; +import org.mxchange.jcontactsbusiness.headquarters.HeadQuartersData; +import org.mxchange.jcountry.data.Country; +import org.mxchange.jusercore.model.user.User; /** * An administrative business contact bean (controller) @@ -49,25 +50,45 @@ public class AddressbookAdminBusinessDataWebRequestBean extends BaseAddressbookC private AdminBusinessDataSessionBeanRemote adminBusinessDataBean; /** - * A list of all registered companies (globally) + * Comments for this company */ - private List businessContacts; + private String companyComments; /** - * Comments for this company + * An employee as contact person with this company */ - private String companyComments; + private Employee companyContactEmployee; /** * Companies (main) email address (example: info@company.example) */ private String companyEmailAddress; + /** + * Head quarter data for this company + */ + private HeadQuartersData companyHeadQuarters; + /** * Company name */ private String companyName; + /** + * Tax number + */ + private String companyTaxNumber; + + /** + * Web site URL + */ + private String companyWebsiteUrl; + + /** + * Owning user instance (which this company is assigned to) + */ + private User contactCompanyUserOwner; + /** * Area code for fax number */ @@ -106,12 +127,6 @@ public class AddressbookAdminBusinessDataWebRequestBean extends BaseAddressbookC super(); } - @Override - @SuppressWarnings ("ReturnOfCollectionOrArrayField") - public List allBusinessContacts () { - return this.businessContacts; - } - /** * Getter for comments *

@@ -130,6 +145,24 @@ public class AddressbookAdminBusinessDataWebRequestBean extends BaseAddressbookC 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 *

@@ -148,6 +181,24 @@ public class AddressbookAdminBusinessDataWebRequestBean extends BaseAddressbookC this.companyEmailAddress = companyEmailAddress; } + /** + * Getter for headquarters data + *

+ * @return Headquarters data + */ + public HeadQuartersData getCompanyHeadQuarters () { + return this.companyHeadQuarters; + } + + /** + * Setter for headquarters data + *

+ * @param companyHeadQuarters Headquarters data + */ + public void setCompanyHeadQuarters (final HeadQuartersData companyHeadQuarters) { + this.companyHeadQuarters = companyHeadQuarters; + } + /** * Getter for company name *

@@ -166,6 +217,60 @@ public class AddressbookAdminBusinessDataWebRequestBean extends BaseAddressbookC this.companyName = companyName; } + /** + * Getter for company tax number + *

+ * @return Company tax number + */ + public String getCompanyTaxNumber () { + return this.companyTaxNumber; + } + + /** + * Setter for company tax number + *

+ * @param companyTaxNumber Company tax number + */ + public void setCompanyTaxNumber (final String companyTaxNumber) { + this.companyTaxNumber = companyTaxNumber; + } + + /** + * Getter for company web site URL + *

+ * @return Company web site URL + */ + public String getCompanyWebsiteUrl () { + return this.companyWebsiteUrl; + } + + /** + * Getter for company web site URL + *

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

+ * @return Owning user instance + */ + public User getContactCompanyUserOwner () { + return this.contactCompanyUserOwner; + } + + /** + * Setter for owning user instance + *

+ * @param contactCompanyUserOwner Owning user instance + */ + public void setContactCompanyUserOwner (final User contactCompanyUserOwner) { + this.contactCompanyUserOwner = contactCompanyUserOwner; + } + /** * Getter for fax number's area code *

@@ -290,9 +395,6 @@ public class AddressbookAdminBusinessDataWebRequestBean extends BaseAddressbookC // Throw again throw new FaceletException(e); } - - // Init user's contact list - this.businessContacts = this.adminBusinessDataBean.allBusinessContacts(); } } diff --git a/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookBusinessDataWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookBusinessDataWebSessionBean.java index 6b315ea0..82b98e2f 100644 --- a/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookBusinessDataWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookBusinessDataWebSessionBean.java @@ -16,16 +16,19 @@ */ package org.mxchange.addressbook.beans.businessdata; +import java.util.List; import javax.annotation.PostConstruct; import javax.enterprise.context.SessionScoped; 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.addressbook.beans.BaseAddressbookController; +import org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote; +import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote; -import org.mxchange.jcontactsbusiness.employee.Employee; import org.mxchange.jcountry.data.Country; /** @@ -45,17 +48,22 @@ public class AddressbookBusinessDataWebSessionBean extends BaseAddressbookContro /** * Remote contact bean */ - private BusinessDataSessionBeanRemote businessDataBean; + private AdminBusinessDataSessionBeanRemote adminBusinessDataBean; /** - * Comments for this company + * A list of all registered companies (globally) */ - private String companyComments; + private List businessContacts; + + /** + * Remote contact bean + */ + private BusinessDataSessionBeanRemote businessDataBean; /** - * An employee as contact person with this company + * Comments for this company */ - private Employee companyContactEmployee; + private String companyComments; /** * Companies (main) email address (example: info@company.example) @@ -97,6 +105,12 @@ public class AddressbookBusinessDataWebSessionBean extends BaseAddressbookContro */ private Long landLineNumber; + /** + * User instance + */ + @Inject + private AddressbookUserLoginWebSessionController userLoginController; + /** * Constructor */ @@ -105,6 +119,12 @@ public class AddressbookBusinessDataWebSessionBean extends BaseAddressbookContro super(); } + @Override + @SuppressWarnings ("ReturnOfCollectionOrArrayField") + public List allBusinessContacts () { + return this.businessContacts; + } + /** * Getter for comments *

@@ -123,24 +143,6 @@ public class AddressbookBusinessDataWebSessionBean extends BaseAddressbookContro 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 *

@@ -297,10 +299,16 @@ public class AddressbookBusinessDataWebSessionBean extends BaseAddressbookContro // Try to lookup this.businessDataBean = (BusinessDataSessionBeanRemote) context.lookup("java:global/addressbook-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote"); //NOI18N + + // Try to lookup + this.adminBusinessDataBean = (AdminBusinessDataSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/adminBusinessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataAdminSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); } + + // Init user's contact list + this.businessContacts = this.adminBusinessDataBean.allBusinessContacts(); } } diff --git a/src/java/org/mxchange/jfinancials/converter/company_employee/FinancialsCompanyEmployeeConverter.java b/src/java/org/mxchange/addressbook/converter/company_employee/AddressbookCompanyEmployeeConverter.java similarity index 85% rename from src/java/org/mxchange/jfinancials/converter/company_employee/FinancialsCompanyEmployeeConverter.java rename to src/java/org/mxchange/addressbook/converter/company_employee/AddressbookCompanyEmployeeConverter.java index 645fc220..72132301 100644 --- a/src/java/org/mxchange/jfinancials/converter/company_employee/FinancialsCompanyEmployeeConverter.java +++ b/src/java/org/mxchange/addressbook/converter/company_employee/AddressbookCompanyEmployeeConverter.java @@ -14,7 +14,7 @@ * 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; +package org.mxchange.addressbook.converter.company_employee; import java.text.MessageFormat; import javax.faces.component.UIComponent; @@ -35,7 +35,7 @@ import org.mxchange.jcontactsbusiness.exceptions.employee.CompanyEmployeeNotFoun * @author Roland Häder */ @FacesConverter (value = "CompanyEmployeeConverter") -public class FinancialsCompanyEmployeeConverter implements Converter { +public class AddressbookCompanyEmployeeConverter implements Converter { /** * CompanyEmployee EJB @@ -45,7 +45,7 @@ public class FinancialsCompanyEmployeeConverter implements Converter { /** * Default constructor */ - public FinancialsCompanyEmployeeConverter () { + public AddressbookCompanyEmployeeConverter () { } @Override @@ -61,14 +61,14 @@ public class FinancialsCompanyEmployeeConverter implements Converter { // Is the bean there? // @TODO Requires this synchronization or is it (sync) confusing the container? - if (null == FinancialsCompanyEmployeeConverter.COMPANY_EMPLOYEE_BEAN) { + if (null == AddressbookCompanyEmployeeConverter.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 + AddressbookCompanyEmployeeConverter.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 @@ -83,7 +83,7 @@ public class FinancialsCompanyEmployeeConverter implements Converter { Long employeeId = Long.valueOf(submittedValue); // Try to get user instance from it - companyEmployee = FinancialsCompanyEmployeeConverter.COMPANY_EMPLOYEE_BEAN.findCompanyEmployeeById(employeeId); + companyEmployee = AddressbookCompanyEmployeeConverter.COMPANY_EMPLOYEE_BEAN.findCompanyEmployeeById(employeeId); } catch (final NumberFormatException ex) { // Throw again throw new ConverterException(ex); 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 0daf0e55..23ea3bbd 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 @@ -46,46 +46,6 @@ - -

- -
- -
- - - - - -
- -
- - - - - - - -
- -
- -
- - - - - -
- -
- - - - - -
@@ -143,7 +103,7 @@ - +
@@ -163,7 +123,7 @@ - + -- 2.39.5