From 289f7559aa53350194deaf178efc04c923d883df Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 22 Sep 2017 22:09:02 +0200 Subject: [PATCH] Please cherry-pick: - renamed BaseController to BaseBean as 'Controller' is for interfaces and 'Bean' for classes (the actual backing bean) - added bean for static data (application-scoped) - added converter for PaymentType enumeration - added branchNumber which can be aside from the primary key a number e.g. from organigrams MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- ...eJobsController.java => BaseJobsBean.java} | 6 +- .../JobsAdminBusinessDataWebRequestBean.java | 4 +- ...AdminBusinessDataWebRequestController.java | 2 +- .../JobsBusinessDataWebRequestBean.java | 4 +- .../JobsBusinessDataWebRequestController.java | 2 +- .../JobsAdminBranchOfficeWebRequestBean.java | 28 +++++++++- .../JobsBranchOfficeWebRequestBean.java | 4 +- ...obsAdminCompanyEmployeeWebRequestBean.java | 4 +- .../JobsCompanyEmployeeWebRequestBean.java | 4 +- .../JobsAdminContactWebRequestBean.java | 4 +- .../contact/JobsContactWebRequestBean.java | 4 +- .../JobsAdminContactPhoneWebRequestBean.java | 4 +- .../phone/JobsContactPhoneWebRequestBean.java | 4 +- .../JobsAdminCountryWebRequestBean.java | 7 +-- .../country/JobsCountryWebRequestBean.java | 5 +- .../data/JobsDataWebApplicationBean.java | 55 +++++++++++++++++++ .../JobsFeatureWebApplicationBean.java | 4 +- .../gender/JobsGenderWebApplicationBean.java | 4 +- .../helper/JobsWebRequestHelperBean.java | 4 +- .../JobsLocalizationSessionBean.java | 4 +- ...JobsAdminMobileProviderWebRequestBean.java | 4 +- .../JobsMobileProviderWebRequestBean.java | 4 +- .../phone/JobsAdminPhoneWebRequestBean.java | 4 +- .../beans/phone/JobsPhoneWebRequestBean.java | 4 +- .../JobsUserProfileWebRequestBean.java | 4 +- .../JobsProfileModeWebApplicationBean.java | 4 +- .../user/JobsAdminUserWebRequestBean.java | 5 +- .../beans/user/JobsUserWebRequestBean.java | 4 +- .../JobsUserActivityWebRequestBean.java | 4 +- .../JobsConfirmationLinkWebRequestBean.java | 4 +- .../JobsEmailChangeWebRequestBean.java | 4 +- .../login/JobsUserLoginWebSessionBean.java | 4 +- .../JobsUserPasswordWebRequestBean.java | 4 +- .../JobsUserRegisterWebRequestBean.java | 4 +- .../JobsResendLinkWebRequestBean.java | 4 +- .../JobsBranchOfficeConverter.java | 2 +- .../localization/bundle_de_DE.properties | 1 + .../localization/bundle_en_US.properties | 1 + .../admin_form_branch_offices_data.tpl | 10 ++++ 39 files changed, 160 insertions(+), 72 deletions(-) rename src/java/org/mxchange/jjobs/beans/{BaseJobsController.java => BaseJobsBean.java} (89%) create mode 100644 src/java/org/mxchange/jjobs/beans/data/JobsDataWebApplicationBean.java diff --git a/src/java/org/mxchange/jjobs/beans/BaseJobsController.java b/src/java/org/mxchange/jjobs/beans/BaseJobsBean.java similarity index 89% rename from src/java/org/mxchange/jjobs/beans/BaseJobsController.java rename to src/java/org/mxchange/jjobs/beans/BaseJobsBean.java index 44c98e2b..84a6187e 100644 --- a/src/java/org/mxchange/jjobs/beans/BaseJobsController.java +++ b/src/java/org/mxchange/jjobs/beans/BaseJobsBean.java @@ -25,7 +25,7 @@ import org.mxchange.jcoreee.bean.faces.BaseFacesBean; *

* @author Roland Häder */ -public class BaseJobsController extends BaseFacesBean { +public abstract class BaseJobsBean extends BaseFacesBean { /** * Serial number @@ -35,14 +35,14 @@ public class BaseJobsController extends BaseFacesBean { /** * Protected constructor */ - protected BaseJobsController () { + protected BaseJobsBean () { // Call super constructor super(); } @Override protected ResourceBundle loadResourceBundle (final Locale locale) { - // Load resource bundle + // Load resource bundle, so it will be loaded from this JAR ResourceBundle bundle = ResourceBundle.getBundle("org.mxchange.localization.bundle", locale); // Return it diff --git a/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsAdminBusinessDataWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsAdminBusinessDataWebRequestBean.java index 5c4cd160..9f3e6427 100644 --- a/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsAdminBusinessDataWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsAdminBusinessDataWebRequestBean.java @@ -32,7 +32,7 @@ import org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData; import org.mxchange.jcontactsbusiness.model.employee.Employee; import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; import org.mxchange.jcountry.model.data.Country; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber; import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; @@ -46,7 +46,7 @@ import org.mxchange.jusercore.model.user.User; */ @Named ("adminCompanyDataController") @RequestScoped -public class JobsAdminBusinessDataWebRequestBean extends BaseJobsController implements JobsAdminBusinessDataWebRequestController { +public class JobsAdminBusinessDataWebRequestBean extends BaseJobsBean implements JobsAdminBusinessDataWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsAdminBusinessDataWebRequestController.java b/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsAdminBusinessDataWebRequestController.java index afef8aff..3154e41b 100644 --- a/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsAdminBusinessDataWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsAdminBusinessDataWebRequestController.java @@ -19,7 +19,7 @@ package org.mxchange.jjobs.beans.business.basicdata; import java.io.Serializable; /** - * An interface for session-scoped financial controller + * An interface for session-scoped basic data controller *

* @author Roland Häder */ diff --git a/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestBean.java index 5616468a..63723585 100644 --- a/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestBean.java @@ -33,7 +33,7 @@ import org.mxchange.jcontactsbusiness.model.basicdata.AdminBasicCompanyDataSessi import org.mxchange.jcontactsbusiness.model.basicdata.BasicCompanyDataSessionBeanRemote; import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; import org.mxchange.jcountry.model.data.Country; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.user.login.JobsUserLoginWebSessionController; /** @@ -43,7 +43,7 @@ import org.mxchange.jjobs.beans.user.login.JobsUserLoginWebSessionController; */ @Named ("basicDataController") @RequestScoped -public class JobsBusinessDataWebRequestBean extends BaseJobsController implements JobsBusinessDataWebRequestController { +public class JobsBusinessDataWebRequestBean extends BaseJobsBean implements JobsBusinessDataWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestController.java b/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestController.java index 8e88d333..f60e6d4d 100644 --- a/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestController.java @@ -19,7 +19,7 @@ package org.mxchange.jjobs.beans.business.basicdata; import java.io.Serializable; /** - * An interface for session-scoped financial controller + * An interface for session-scoped basic data controller *

* @author Roland Häder */ diff --git a/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsAdminBranchOfficeWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsAdminBranchOfficeWebRequestBean.java index c2ae6292..4d08fbc4 100644 --- a/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsAdminBranchOfficeWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsAdminBranchOfficeWebRequestBean.java @@ -33,7 +33,7 @@ import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffices; import org.mxchange.jcontactsbusiness.model.branchoffice.CompanyBranchOffice; import org.mxchange.jcontactsbusiness.model.employee.Employee; import org.mxchange.jcountry.model.data.Country; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber; import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; @@ -47,7 +47,7 @@ import org.mxchange.jusercore.model.user.User; */ @Named ("adminBranchOfficeController") @RequestScoped -public class JobsAdminBranchOfficeWebRequestBean extends BaseJobsController implements JobsAdminBranchOfficeWebRequestController { +public class JobsAdminBranchOfficeWebRequestBean extends BaseJobsBean implements JobsAdminBranchOfficeWebRequestController { /** * Serial number @@ -90,6 +90,11 @@ public class JobsAdminBranchOfficeWebRequestBean extends BaseJobsController impl */ private Short branchHouseNumber; + /** + * Number of branch office + */ + private Long branchNumber; + /** * An event being fired when a branch office has been successfully added */ @@ -311,6 +316,24 @@ public class JobsAdminBranchOfficeWebRequestBean extends BaseJobsController impl this.branchHouseNumber = branchHouseNumber; } + /** + * Getter for branch office number + *

+ * @return Branch office number + */ + public Long getBranchNumber () { + return this.branchNumber; + } + + /** + * Setter for branch office number + *

+ * @param branchNumber Branch office number + */ + public void setBranchNumber (final Long branchNumber) { + this.branchNumber = branchNumber; + } + /** * Getter for store *

@@ -523,6 +546,7 @@ public class JobsAdminBranchOfficeWebRequestBean extends BaseJobsController impl // Add all other fields, too branchOffice.setBranchContactEmployee(this.getBranchContactEmployee()); branchOffice.setBranchEmailAddress(this.getBranchEmailAddress()); + branchOffice.setBranchNumber(this.getBranchNumber()); branchOffice.setBranchStore(this.getBranchStore()); branchOffice.setBranchSuiteNumber(this.getBranchSuiteNumber()); branchOffice.setBranchUserOwner(this.getBranchUserOwner()); diff --git a/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsBranchOfficeWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsBranchOfficeWebRequestBean.java index a6bd1be6..7f365473 100644 --- a/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsBranchOfficeWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsBranchOfficeWebRequestBean.java @@ -32,7 +32,7 @@ import javax.inject.Named; import org.mxchange.jcontactsbusiness.events.branchoffice.added.ObservableBranchOfficeAddedEvent; import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBeanRemote; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; /** * A general bean for branch offices @@ -41,7 +41,7 @@ import org.mxchange.jjobs.beans.BaseJobsController; */ @Named ("branchOfficeController") @RequestScoped -public class JobsBranchOfficeWebRequestBean extends BaseJobsController implements JobsBranchOfficeWebRequestController { +public class JobsBranchOfficeWebRequestBean extends BaseJobsBean implements JobsBranchOfficeWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/business/employee/JobsAdminCompanyEmployeeWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/employee/JobsAdminCompanyEmployeeWebRequestBean.java index 7c19776c..447a4d06 100644 --- a/src/java/org/mxchange/jjobs/beans/business/employee/JobsAdminCompanyEmployeeWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/employee/JobsAdminCompanyEmployeeWebRequestBean.java @@ -20,7 +20,7 @@ import javax.ejb.EJB; import javax.enterprise.context.RequestScoped; import javax.inject.Named; import org.mxchange.jcontactsbusiness.model.employee.AdminCompanyEmployeeSessionBeanRemote; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; /** * A request-scoped bean for administrative purposes for company employees. @@ -29,7 +29,7 @@ import org.mxchange.jjobs.beans.BaseJobsController; */ @Named ("adminCompanyEmployeeController") @RequestScoped -public class JobsAdminCompanyEmployeeWebRequestBean extends BaseJobsController implements JobsAdminCompanyEmployeeWebRequestController { +public class JobsAdminCompanyEmployeeWebRequestBean extends BaseJobsBean implements JobsAdminCompanyEmployeeWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/business/employee/JobsCompanyEmployeeWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/employee/JobsCompanyEmployeeWebRequestBean.java index cfcd1acf..e6ffccc0 100644 --- a/src/java/org/mxchange/jjobs/beans/business/employee/JobsCompanyEmployeeWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/employee/JobsCompanyEmployeeWebRequestBean.java @@ -28,7 +28,7 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontactsbusiness.model.employee.CompanyEmployeeSessionBeanRemote; import org.mxchange.jcontactsbusiness.model.employee.Employee; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; /** * A request-scoped bean for general purposes for company employees. @@ -37,7 +37,7 @@ import org.mxchange.jjobs.beans.BaseJobsController; */ @Named ("companyEmployeeController") @RequestScoped -public class JobsCompanyEmployeeWebRequestBean extends BaseJobsController implements JobsCompanyEmployeeWebSessionController { +public class JobsCompanyEmployeeWebRequestBean extends BaseJobsBean implements JobsCompanyEmployeeWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java index 3897d86a..4b28be06 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java @@ -40,7 +40,7 @@ import org.mxchange.jcontacts.model.contact.ContactUtils; import org.mxchange.jcontacts.model.contact.UserContact; import org.mxchange.jcontacts.model.contact.title.PersonalTitle; import org.mxchange.jcountry.model.data.Country; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jphone.model.phonenumbers.DialableNumber; import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber; @@ -57,7 +57,7 @@ import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; */ @Named ("adminContactController") @RequestScoped -public class JobsAdminContactWebRequestBean extends BaseJobsController implements JobsAdminContactWebRequestController { +public class JobsAdminContactWebRequestBean extends BaseJobsBean implements JobsAdminContactWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java index e19996da..67dc7a06 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java @@ -39,7 +39,7 @@ import org.mxchange.jcontacts.model.contact.ContactUtils; import org.mxchange.jcontacts.model.contact.UserContact; import org.mxchange.jcontacts.model.contact.title.PersonalTitle; import org.mxchange.jcountry.model.data.Country; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.user.JobsUserWebRequestController; import org.mxchange.jjobs.beans.user.login.JobsUserLoginWebSessionController; import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; @@ -64,7 +64,7 @@ import org.mxchange.juserlogincore.exceptions.UserPasswordMismatchException; */ @Named ("contactController") @RequestScoped -public class JobsContactWebRequestBean extends BaseJobsController implements JobsContactWebRequestController { +public class JobsContactWebRequestBean extends BaseJobsBean implements JobsContactWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java index 17b3857e..202210d2 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java @@ -43,7 +43,7 @@ import org.mxchange.jcontacts.events.mobile.unlinked.ObservableAdminUnlinkedMobi import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcontacts.model.phone.AdminContactsPhoneSessionBeanRemote; import org.mxchange.jcountry.model.data.Country; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.phone.JobsAdminPhoneWebRequestController; import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent; import org.mxchange.jphone.events.landline.created.ObservableCreatedLandLineNumberEvent; @@ -66,7 +66,7 @@ import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; */ @Named ("adminContactPhoneController") @RequestScoped -public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController implements JobsAdminContactPhoneWebRequestController { +public class JobsAdminContactPhoneWebRequestBean extends BaseJobsBean implements JobsAdminContactPhoneWebRequestController { /** * Call-stack instance (5 may show BeanELResolver.getValue as caller) diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebRequestBean.java index a2d0d9b1..14647f8d 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebRequestBean.java @@ -32,7 +32,7 @@ import org.mxchange.jcontacts.events.fax.unlinked.ObservableAdminUnlinkedFaxNumb import org.mxchange.jcontacts.events.landline.unlinked.ObservableAdminUnlinkedLandLineNumberEvent; import org.mxchange.jcontacts.events.mobile.unlinked.ObservableAdminUnlinkedMobileNumberEvent; import org.mxchange.jcontacts.model.contact.Contact; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.contact.JobsContactWebRequestController; import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent; import org.mxchange.jphone.events.landline.created.ObservableCreatedLandLineNumberEvent; @@ -50,7 +50,7 @@ import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; */ @Named ("contactPhoneController") @RequestScoped -public class JobsContactPhoneWebRequestBean extends BaseJobsController implements JobsContactPhoneWebRequestController { +public class JobsContactPhoneWebRequestBean extends BaseJobsBean implements JobsContactPhoneWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java index d9cded89..9a0817e9 100644 --- a/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java @@ -29,10 +29,7 @@ import javax.inject.Named; import org.mxchange.jcountry.events.AdminAddedCountryEvent; import org.mxchange.jcountry.events.ObservableAdminAddedCountryEvent; import org.mxchange.jcountry.exceptions.CountryAlreadyAddedException; -import org.mxchange.jcountry.model.data.Country; -import org.mxchange.jcountry.model.data.CountryData; -import org.mxchange.jcountry.model.data.CountrySingletonBeanRemote; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; /** * An administrative country bean @@ -41,7 +38,7 @@ import org.mxchange.jjobs.beans.BaseJobsController; */ @Named ("adminCountryController") @RequestScoped -public class JobsAdminCountryWebRequestBean extends BaseJobsController implements JobsAdminCountryWebRequestController { +public class JobsAdminCountryWebRequestBean extends BaseJobsBean implements JobsAdminCountryWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebRequestBean.java index 964b26be..e028d395 100644 --- a/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebRequestBean.java @@ -31,7 +31,8 @@ import javax.inject.Named; import org.mxchange.jcountry.events.ObservableAdminAddedCountryEvent; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jcountry.model.data.CountrySingletonBeanRemote; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jcountry.events.ObservableAdminAddedCountryEvent; +import org.mxchange.jjobs.beans.BaseJobsBean; /** * A country bean @@ -40,7 +41,7 @@ import org.mxchange.jjobs.beans.BaseJobsController; */ @Named ("countryController") @RequestScoped -public class JobsCountryWebRequestBean extends BaseJobsController implements JobsCountryWebRequestController { +public class JobsCountryWebRequestBean extends BaseJobsBean implements JobsCountryWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/data/JobsDataWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/data/JobsDataWebApplicationBean.java new file mode 100644 index 00000000..4324ba7d --- /dev/null +++ b/src/java/org/mxchange/jjobs/beans/data/JobsDataWebApplicationBean.java @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2017 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.data; + +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Named; +import org.mxchange.jjobs.beans.BaseJobsBean; +import org.mxchange.jproduct.model.payment.PaymentType; + +/** + * An application-scoped data bean for any kind of static data + *

+ * @author Roland Haeder + */ +@Named ("dataController") +@ApplicationScoped +public class JobsDataWebApplicationBean extends BaseJobsBean { + + /** + * Serial number + */ + private static final long serialVersionUID = 34_869_872_672_641L; + + /** + * Default constructor + */ + public JobsDataWebApplicationBean () { + // Call super constructor + super(); + } + + /** + * Returns a list of all payment types + *

+ * @return A list of all payment types + */ + public PaymentType[] getPaymentTypes () { + return PaymentType.values(); + } + +} diff --git a/src/java/org/mxchange/jjobs/beans/features/JobsFeatureWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/features/JobsFeatureWebApplicationBean.java index ca348f61..2e63d013 100644 --- a/src/java/org/mxchange/jjobs/beans/features/JobsFeatureWebApplicationBean.java +++ b/src/java/org/mxchange/jjobs/beans/features/JobsFeatureWebApplicationBean.java @@ -19,7 +19,7 @@ package org.mxchange.jjobs.beans.features; import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; /** * A feature bean @@ -28,7 +28,7 @@ import org.mxchange.jjobs.beans.BaseJobsController; */ @Named ("featureController") @ApplicationScoped -public class JobsFeatureWebApplicationBean extends BaseJobsController implements JobsFeaturesWebApplicationController { +public class JobsFeatureWebApplicationBean extends BaseJobsBean implements JobsFeaturesWebApplicationController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/gender/JobsGenderWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/gender/JobsGenderWebApplicationBean.java index 264873e8..4d028c3b 100644 --- a/src/java/org/mxchange/jjobs/beans/gender/JobsGenderWebApplicationBean.java +++ b/src/java/org/mxchange/jjobs/beans/gender/JobsGenderWebApplicationBean.java @@ -21,7 +21,7 @@ import java.util.List; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; import org.mxchange.jcontacts.model.contact.title.PersonalTitle; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; /** * A gender and title bean @@ -30,7 +30,7 @@ import org.mxchange.jjobs.beans.BaseJobsController; */ @Named ("genderController") @ApplicationScoped -public class JobsGenderWebApplicationBean extends BaseJobsController implements JobsGenderWebApplicationController { +public class JobsGenderWebApplicationBean extends BaseJobsBean implements JobsGenderWebApplicationController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelperBean.java b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelperBean.java index 6b2307d3..335e5247 100644 --- a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelperBean.java +++ b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelperBean.java @@ -25,7 +25,7 @@ import javax.inject.Named; import org.mxchange.jcontacts.events.contact.created.CreatedContactEvent; import org.mxchange.jcontacts.events.contact.created.ObservableCreatedContactEvent; import org.mxchange.jcontacts.model.contact.Contact; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.contact.JobsAdminContactWebRequestController; import org.mxchange.jjobs.beans.phone.JobsAdminPhoneWebRequestController; import org.mxchange.jjobs.beans.user.JobsAdminUserWebRequestController; @@ -50,7 +50,7 @@ import org.mxchange.jusercore.model.user.User; */ @Named ("beanHelper") @RequestScoped -public class JobsWebRequestHelperBean extends BaseJobsController implements JobsWebRequestHelperController { +public class JobsWebRequestHelperBean extends BaseJobsBean implements JobsWebRequestHelperController { /** * Call-stack instance (5 may show BeanELResolver.getValue as caller) diff --git a/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionBean.java b/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionBean.java index ebbf724b..0d9c2d83 100644 --- a/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionBean.java @@ -32,7 +32,7 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcoreee.events.locale.LocaleChangeEvent; import org.mxchange.jcoreee.events.locale.ObservableLocaleChangeEvent; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.juserlogincore.events.login.ObservableUserLoggedInEvent; import org.mxchange.juserlogincore.events.logout.ObservableUserLogoutEvent; @@ -46,7 +46,7 @@ import org.mxchange.juserlogincore.events.logout.ObservableUserLogoutEvent; */ @Named ("localizationController") @SessionScoped -public class JobsLocalizationSessionBean extends BaseJobsController implements JobsLocalizationSessionController { +public class JobsLocalizationSessionBean extends BaseJobsBean implements JobsLocalizationSessionController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java index 9645dff3..654d32ed 100644 --- a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java @@ -27,7 +27,7 @@ import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcountry.model.data.Country; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jphone.events.mobileprovider.added.AdminAddedMobileProviderEvent; import org.mxchange.jphone.events.mobileprovider.added.AdminMobileProviderAddedEvent; import org.mxchange.jphone.exceptions.MobileProviderAlreadyAddedException; @@ -42,7 +42,7 @@ import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; */ @Named ("adminMobileProviderController") @RequestScoped -public class JobsAdminMobileProviderWebRequestBean extends BaseJobsController implements JobsAdminMobileProviderWebRequestController { +public class JobsAdminMobileProviderWebRequestBean extends BaseJobsBean implements JobsAdminMobileProviderWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsMobileProviderWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsMobileProviderWebRequestBean.java index 32fd055e..76ce49c9 100644 --- a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsMobileProviderWebRequestBean.java @@ -29,7 +29,7 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Observes; import javax.inject.Inject; import javax.inject.Named; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jphone.events.mobileprovider.added.AdminAddedMobileProviderEvent; import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote; @@ -41,7 +41,7 @@ import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingl */ @Named ("mobileProviderController") @RequestScoped -public class JobsMobileProviderWebRequestBean extends BaseJobsController implements JobsMobileProviderWebRequestController { +public class JobsMobileProviderWebRequestBean extends BaseJobsBean implements JobsMobileProviderWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java index 3d0adcaf..101c7942 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java @@ -28,7 +28,7 @@ import javax.enterprise.inject.Any; import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcountry.model.data.Country; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent; import org.mxchange.jphone.events.fax.deleted.AdminDeletedFaxNumberEvent; import org.mxchange.jphone.events.fax.deleted.AdminFaxNumberDeletedEvent; @@ -66,7 +66,7 @@ import org.mxchange.jphone.model.phonenumbers.phone.AdminPhoneSessionBeanRemote; */ @Named ("adminPhoneController") @RequestScoped -public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements JobsAdminPhoneWebRequestController { +public class JobsAdminPhoneWebRequestBean extends BaseJobsBean implements JobsAdminPhoneWebRequestController { /** * Call-stack position diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebRequestBean.java index 1793e1ef..ec318840 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebRequestBean.java @@ -35,7 +35,7 @@ import org.mxchange.jcontacts.events.fax.linked.ObservableAdminLinkedFaxNumberEv import org.mxchange.jcontacts.events.landline.linked.ObservableAdminLinkedLandLineNumberEvent; import org.mxchange.jcontacts.events.mobile.linked.ObservableAdminLinkedMobileNumberEvent; import org.mxchange.jcontacts.model.contact.Contact; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jphone.events.fax.deleted.AdminDeletedFaxNumberEvent; import org.mxchange.jphone.events.fax.updated.AdminUpdatedFaxNumberEvent; import org.mxchange.jphone.events.landline.deleted.AdminDeletedLandLineNumberEvent; @@ -55,7 +55,7 @@ import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; */ @Named ("phoneController") @RequestScoped -public class JobsPhoneWebRequestBean extends BaseJobsController implements JobsPhoneWebRequestController { +public class JobsPhoneWebRequestBean extends BaseJobsBean implements JobsPhoneWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/profile/JobsUserProfileWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/profile/JobsUserProfileWebRequestBean.java index 07f3bd7b..9c2fcfb7 100644 --- a/src/java/org/mxchange/jjobs/beans/profile/JobsUserProfileWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/profile/JobsUserProfileWebRequestBean.java @@ -21,7 +21,7 @@ import javax.enterprise.context.RequestScoped; import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.user.JobsUserWebRequestController; import org.mxchange.jjobs.beans.user.login.JobsUserLoginWebSessionController; import org.mxchange.jusercore.exceptions.UserNotFoundException; @@ -35,7 +35,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; */ @Named (value = "profileController") @RequestScoped -public class JobsUserProfileWebRequestBean extends BaseJobsController implements JobsUserProfileWebRequestController { +public class JobsUserProfileWebRequestBean extends BaseJobsBean implements JobsUserProfileWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/profilemode/JobsProfileModeWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/profilemode/JobsProfileModeWebApplicationBean.java index 88f82973..95358d51 100644 --- a/src/java/org/mxchange/jjobs/beans/profilemode/JobsProfileModeWebApplicationBean.java +++ b/src/java/org/mxchange/jjobs/beans/profilemode/JobsProfileModeWebApplicationBean.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; /** @@ -31,7 +31,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; */ @Named ("profileModeController") @ApplicationScoped -public class JobsProfileModeWebApplicationBean extends BaseJobsController implements JobsProfileModeWebApplicationController { +public class JobsProfileModeWebApplicationBean extends BaseJobsBean implements JobsProfileModeWebApplicationController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java index 28bd6df5..39db1e8d 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java @@ -31,10 +31,9 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcoreee.utils.FacesUtils; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.contact.JobsAdminContactWebRequestController; import org.mxchange.jjobs.beans.contact.JobsContactWebRequestController; -import org.mxchange.jjobs.beans.localization.JobsLocalizationSessionController; import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; import org.mxchange.jusercore.events.user.created.ObservableCreatedUserEvent; @@ -72,7 +71,7 @@ import org.mxchange.juserlogincore.login.UserLoginUtils; */ @Named ("adminUserController") @RequestScoped -public class JobsAdminUserWebRequestBean extends BaseJobsController implements JobsAdminUserWebRequestController { +public class JobsAdminUserWebRequestBean extends BaseJobsBean implements JobsAdminUserWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebRequestBean.java index ec07697c..dd1deb9b 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsUserWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebRequestBean.java @@ -36,7 +36,7 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcoreee.events.locale.ObservableLocaleChangeEvent; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.contact.JobsContactWebRequestController; import org.mxchange.jjobs.beans.features.JobsFeaturesWebApplicationController; import org.mxchange.jjobs.beans.localization.JobsLocalizationSessionController; @@ -72,7 +72,7 @@ import org.mxchange.juserlogincore.login.UserLoginUtils; */ @Named ("userController") @RequestScoped -public class JobsUserWebRequestBean extends BaseJobsController implements JobsUserWebRequestController { +public class JobsUserWebRequestBean extends BaseJobsBean implements JobsUserWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebRequestBean.java index 4555ad7b..7b7056ff 100644 --- a/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebRequestBean.java @@ -29,7 +29,7 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Observes; import javax.inject.Inject; import javax.inject.Named; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; import org.mxchange.jusercore.events.user.created.ObservableCreatedUserEvent; import org.mxchange.jusercore.events.user.delete.ObservableAdminDeletedUserEvent; @@ -57,7 +57,7 @@ import org.mxchange.juserlogincore.events.user.password_change.ObservableUpdated */ @Named ("userActivityController") @RequestScoped -public class JobsUserActivityWebRequestBean extends BaseJobsController implements JobsUserActivityWebRequestController { +public class JobsUserActivityWebRequestBean extends BaseJobsBean implements JobsUserActivityWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/user/confirmlink/JobsConfirmationLinkWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/confirmlink/JobsConfirmationLinkWebRequestBean.java index 18b25016..cb9943de 100644 --- a/src/java/org/mxchange/jjobs/beans/user/confirmlink/JobsConfirmationLinkWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/confirmlink/JobsConfirmationLinkWebRequestBean.java @@ -30,7 +30,7 @@ import javax.inject.Named; import org.mxchange.jcoreee.events.helper.clear.HelperCleanupEvent; import org.mxchange.jcoreee.events.helper.clear.ObservableHelperCleanupEvent; import org.mxchange.jcoreee.utils.FacesUtils; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.user.JobsUserWebRequestController; import org.mxchange.jusercore.events.user.created.CreatedUserEvent; import org.mxchange.jusercore.events.user.created.ObservableCreatedUserEvent; @@ -49,7 +49,7 @@ import org.mxchange.juserlogincore.events.confirmation.UserConfirmedAccountEvent */ @Named ("userConfirmationLinkController") @RequestScoped -public class JobsConfirmationLinkWebRequestBean extends BaseJobsController implements JobsConfirmationLinkWebRequestController { +public class JobsConfirmationLinkWebRequestBean extends BaseJobsBean implements JobsConfirmationLinkWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/user/email_address/JobsEmailChangeWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/email_address/JobsEmailChangeWebRequestBean.java index e5e3e6c8..3ccd4153 100644 --- a/src/java/org/mxchange/jjobs/beans/user/email_address/JobsEmailChangeWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/email_address/JobsEmailChangeWebRequestBean.java @@ -30,7 +30,7 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcoreee.utils.FacesUtils; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.features.JobsFeaturesWebApplicationController; import org.mxchange.jjobs.beans.user.login.JobsUserLoginWebSessionController; import org.mxchange.jusercore.model.email_address.ChangeableEmailAddress; @@ -46,7 +46,7 @@ import org.mxchange.juserlogincore.exceptions.UserPasswordMismatchException; */ @Named ("userEmailChangeController") @RequestScoped -public class JobsEmailChangeWebRequestBean extends BaseJobsController implements JobsEmailChangeWebRequestController { +public class JobsEmailChangeWebRequestBean extends BaseJobsBean implements JobsEmailChangeWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/user/login/JobsUserLoginWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/user/login/JobsUserLoginWebSessionBean.java index e330ebce..4255d4f8 100644 --- a/src/java/org/mxchange/jjobs/beans/user/login/JobsUserLoginWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/login/JobsUserLoginWebSessionBean.java @@ -28,7 +28,7 @@ import javax.enterprise.inject.Any; import javax.faces.context.FacesContext; import javax.inject.Inject; import javax.inject.Named; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.user.JobsUserWebRequestController; import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.exceptions.UserStatusLockedException; @@ -56,7 +56,7 @@ import org.mxchange.juserlogincore.model.user.login.UserLoginSessionBeanRemote; */ @Named ("userLoginController") @SessionScoped -public class JobsUserLoginWebSessionBean extends BaseJobsController implements JobsUserLoginWebSessionController { +public class JobsUserLoginWebSessionBean extends BaseJobsBean implements JobsUserLoginWebSessionController { /** * Path name for guest base template diff --git a/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java index ecbd97bf..72c5ffb4 100644 --- a/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java @@ -25,7 +25,7 @@ import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcoreee.utils.FacesUtils; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.features.JobsFeaturesWebApplicationController; import org.mxchange.jjobs.beans.user.login.JobsUserLoginWebSessionController; import org.mxchange.jusercore.exceptions.UserNotFoundException; @@ -46,7 +46,7 @@ import org.mxchange.juserlogincore.login.UserLoginUtils; */ @Named ("userPasswordController") @RequestScoped -public class JobsUserPasswordWebRequestBean extends BaseJobsController implements JobsUserPasswordWebRequestController { +public class JobsUserPasswordWebRequestBean extends BaseJobsBean implements JobsUserPasswordWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/user/register/JobsUserRegisterWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/register/JobsUserRegisterWebRequestBean.java index 9df92a79..74bae16e 100644 --- a/src/java/org/mxchange/jjobs/beans/user/register/JobsUserRegisterWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/register/JobsUserRegisterWebRequestBean.java @@ -26,7 +26,7 @@ import javax.inject.Named; import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcontacts.model.contact.UserContact; import org.mxchange.jcoreee.utils.FacesUtils; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.contact.JobsContactWebRequestController; import org.mxchange.jjobs.beans.features.JobsFeaturesWebApplicationController; import org.mxchange.jjobs.beans.user.JobsAdminUserWebRequestController; @@ -56,7 +56,7 @@ import org.mxchange.juserlogincore.model.user.register.UserRegistrationSessionBe */ @Named ("userRegistrationController") @RequestScoped -public class JobsUserRegisterWebRequestBean extends BaseJobsController implements JobsUserRegisterWebRequestController { +public class JobsUserRegisterWebRequestBean extends BaseJobsBean implements JobsUserRegisterWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/user/resendlink/JobsResendLinkWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/resendlink/JobsResendLinkWebRequestBean.java index 32e02faf..c58a92e6 100644 --- a/src/java/org/mxchange/jjobs/beans/user/resendlink/JobsResendLinkWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/resendlink/JobsResendLinkWebRequestBean.java @@ -26,7 +26,7 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcoreee.events.locale.ObservableLocaleChangeEvent; import org.mxchange.jcoreee.utils.FacesUtils; -import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.localization.JobsLocalizationSessionController; import org.mxchange.jjobs.beans.user.JobsUserWebRequestController; import org.mxchange.jusercore.exceptions.UserEmailAddressNotFoundException; @@ -46,7 +46,7 @@ import org.mxchange.juserlogincore.model.user.resendlink.ResendLinkSessionBeanRe */ @Named ("userResendConfirmationController") @RequestScoped -public class JobsResendLinkWebRequestBean extends BaseJobsController implements JobsResendLinkWebRequestController { +public class JobsResendLinkWebRequestBean extends BaseJobsBean implements JobsResendLinkWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/converter/business/branchoffice/JobsBranchOfficeConverter.java b/src/java/org/mxchange/jjobs/converter/business/branchoffice/JobsBranchOfficeConverter.java index e22277c4..83ec69e6 100644 --- a/src/java/org/mxchange/jjobs/converter/business/branchoffice/JobsBranchOfficeConverter.java +++ b/src/java/org/mxchange/jjobs/converter/business/branchoffice/JobsBranchOfficeConverter.java @@ -36,7 +36,7 @@ import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBean * @author Roland Häder */ @FacesConverter ("BranchOfficeConverter") -public class FinancialsBranchOfficeConverter implements Converter { +public class JobsBranchOfficeConverter implements Converter { /** * Branch office EJB diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index cfe7e8f5..ced63609 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -971,3 +971,4 @@ LABEL_COMPANIES=Firmen FILTER_BY_MULTIPLE_COMPANIES_TITLE=Liste durch Auswahl von ein oder mehr Unternehmen durchsuchen. LABEL_COMPANY_EMPLOYEES=Mitarbeiter FILTER_BY_MULTIPLE_COMPANY_EMPLOYEES_TITLE=Liste durch Auswahl von ein oder mehr Mitarbeiter durchsuchen. +ADMIN_ENTER_BRANCH_OFFICE_NUMBER=Filialnummer eingeben: diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 7e54d2a5..665d2f73 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -920,3 +920,4 @@ LABEL_COMPANIES=Companies FILTER_BY_MULTIPLE_COMPANIES_TITLE=Filter list by selecting one or more companies. LABEL_COMPANY_EMPLOYEES=Employees FILTER_BY_MULTIPLE_COMPANY_EMPLOYEES_TITLE=Filter list by selecting one or more employees. +ADMIN_ENTER_BRANCH_OFFICE_NUMBER=Enter branch office number: diff --git a/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl b/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl index 48f7352e..e798ed35 100644 --- a/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl +++ b/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl @@ -160,6 +160,16 @@ + + +

+ +
+ +
+ +
+
-- 2.39.5