]> git.mxchange.org Git - jjobs-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sat, 9 Sep 2017 10:54:16 +0000 (12:54 +0200)
committerRoland Häder <roland@mxchange.org>
Sat, 9 Sep 2017 16:23:02 +0000 (18:23 +0200)
- renamed companyDataId -> basicDataId (already done in underlaying entity)
- implemented addBranchOffice() which will call newly added private methods to
  create a BranchOffice instance and validate if the address is already found
  in an other bean's cache
- for this, allBranchOffices() needs to be published in interface
- implemented afterBranchOfficeAddedEvent() event observer which will add the
  newly added branch office to the backing bean's cache
- now displaying link to company's website correctly or, if not provided, a
  replacement message
- same with email link, maybe one day I move this out to a custom JSF tag?
- added missing i18n strings
- generalized duplicate i18n strings
- added missing navigation cases

Signed-off-by: Roland Häder <roland@mxchange.org>
38 files changed:
src/java/org/mxchange/jjobs/beans/business/basicdata/JobsAdminBusinessDataWebRequestBean.java
src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestBean.java
src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsAdminBranchOfficeWebRequestBean.java
src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsBranchOfficeWebRequestBean.java
src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsBranchOfficeWebRequestController.java
src/java/org/mxchange/jjobs/beans/business/employee/JobsAdminCompanyEmployeeWebRequestBean.java
src/java/org/mxchange/jjobs/beans/business/employee/JobsCompanyEmployeeWebRequestBean.java
src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBusinessContactConverter.java
src/java/org/mxchange/jjobs/converter/business/company_employee/JobsCompanyEmployeeConverter.java
src/java/org/mxchange/jjobs/converter/business/headquarters/JobsCompanyHeadquartersConverter.java
src/java/org/mxchange/jjobs/converter/mobileprovider/JobsMobileProviderConverter.java
src/java/org/mxchange/jjobs/validator/business/basicdata/JobsCompanyNameValidator.java
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/faces-config.xml
web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl
web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl
web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl
web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl
web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl
web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl
web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl
web/admin/basic_company_data/admin_basic_company_data_list.xhtml
web/admin/branch_offices/admin_branch_offices_list.xhtml
web/admin/contact/admin_contact_list.xhtml
web/admin/country/admin_country_list.xhtml
web/admin/fax/admin_fax_list.xhtml
web/admin/fax/admin_fax_show.xhtml
web/admin/landline/admin_landline_list.xhtml
web/admin/landline/admin_landline_show.xhtml
web/admin/mobile/admin_mobile_list.xhtml
web/admin/mobile/admin_mobile_show.xhtml
web/admin/mobile_provider/admin_mobile_provider_list.xhtml
web/admin/user/admin_user_list.xhtml

index cb5c57078bb3dc3694bdd1b409b1541bca567956..77ff94c027f2065c213af5c8c18a20ae8f00d191 100644 (file)
@@ -23,7 +23,7 @@ import javax.enterprise.inject.Any;
 import javax.faces.FacesException;
 import javax.inject.Inject;
 import javax.inject.Named;
-import org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote;
+import org.mxchange.jcontactsbusiness.model.basicdata.AdminBusinessDataSessionBeanRemote;
 import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData;
 import org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData;
 import org.mxchange.jcontactsbusiness.model.employee.Employee;
index bf8c7a3276045d486e59fb55d54a967be39441a5..a7b0c9f00c60e74874e5296fa976cbdf65d38874 100644 (file)
@@ -28,9 +28,9 @@ import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Observes;
 import javax.inject.Inject;
 import javax.inject.Named;
-import org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote;
+import org.mxchange.jcontactsbusiness.model.basicdata.AdminBusinessDataSessionBeanRemote;
 import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData;
-import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote;
+import org.mxchange.jcontactsbusiness.model.basicdata.BusinessDataSessionBeanRemote;
 import org.mxchange.jcontactsbusiness.events.basicdata.added.ObservableAdminAddedBusinessBasicDataEvent;
 import org.mxchange.jcountry.model.data.Country;
 import org.mxchange.jjobs.beans.BaseJobsController;
index 5f3592fe1b012abacdb1142ba1ec29496bd70e3a..d380a4a2470f2dfbc573d933da382df4b1a28b0c 100644 (file)
  */
 package org.mxchange.jjobs.beans.business.branchoffice;
 
+import java.util.List;
 import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
+import javax.enterprise.event.Event;
+import javax.enterprise.inject.Any;
+import javax.inject.Inject;
 import javax.inject.Named;
+import org.mxchange.jcontactsbusiness.events.branchoffice.added.BranchOfficeAddedEvent;
+import org.mxchange.jcontactsbusiness.events.branchoffice.added.ObservableBranchOfficeAddedEvent;
+import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeAlreadyAddedException;
 import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData;
-import org.mxchange.jcontactsbusiness.branchoffice.AdminBranchOfficeSessionBeanRemote;
+import org.mxchange.jcontactsbusiness.model.branchoffice.AdminBranchOfficeSessionBeanRemote;
+import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
+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.jphone.model.phonenumbers.fax.DialableFaxNumber;
+import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber;
+import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber;
+import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber;
 import org.mxchange.jusercore.model.user.User;
 
 /**
@@ -43,7 +57,7 @@ public class JobsAdminBranchOfficeWebRequestBean extends BaseJobsController impl
        /**
         * EJB for administrative purposes
         */
-       @EJB (lookup = "java:global/jfinancials-ejb/adminBranchOffice!org.mxchange.jcontactsbusiness.branchoffice.AdminBranchOfficeSessionBeanRemote")
+       @EJB (lookup = "java:global/jjobs-ejb/adminBranchOffice!org.mxchange.jcontactsbusiness.branchoffice.AdminBranchOfficeSessionBeanRemote")
        private AdminBranchOfficeSessionBeanRemote adminBranchOfficeBean;
 
        /**
@@ -76,6 +90,19 @@ public class JobsAdminBranchOfficeWebRequestBean extends BaseJobsController impl
         */
        private Short branchHouseNumber;
 
+       /**
+        * An event being fired when a branch office has been successfully added
+        */
+       @Inject
+       @Any
+       private Event<ObservableBranchOfficeAddedEvent> branchOfficeAddedEvent;
+
+       /**
+        * A general branch office controller (backing bean)
+        */
+       @Inject
+       private JobsBranchOfficeWebRequestController branchOfficeController;
+
        /**
         * Store
         */
@@ -139,6 +166,43 @@ public class JobsAdminBranchOfficeWebRequestBean extends BaseJobsController impl
                super();
        }
 
+       /**
+        * Adds branch office with all data from this backing bean. First this
+        * action method will validate if the branch office's address is already
+        * registered and if found, it will output a proper faces message.
+        * <p>
+        * @return Redirect outcome
+        */
+       public String addBranchOffice () {
+               // Get instance
+               final BranchOffice branchOffice = this.createBranchOffice();
+
+               // Is the branch office not created yet?
+               if (this.isBranchOfficeCreatedByRequiredData(branchOffice)) {
+                       // Then show proper faces message
+                       this.showFacesMessage("form_admin_add_branch_office:branchStreet", "ADMIN_BRANCH_OFFICE_ALREADY_CREATED"); //NOI18N
+                       return ""; //NOI18N
+               }
+
+               // Delcare updated instance
+               final BranchOffice updatedOffice;
+
+               try {
+                       // Try to call EJB
+                       updatedOffice = this.adminBranchOfficeBean.addBranchOffice(branchOffice);
+               } catch (final BranchOfficeAlreadyAddedException ex) {
+                       // Output message
+                       this.showFacesMessage("form_admin_add_branch_office:branchStreet", "ADMIN_BRANCH_OFFICE_ALREADY_CREATED"); //NOI18N
+                       return ""; //NOI18N
+               }
+
+               // Fire event
+               this.branchOfficeAddedEvent.fire(new BranchOfficeAddedEvent(updatedOffice));
+
+               // Redirect to list
+               return "admin_list_branch_offices"; //NOI18N
+       }
+
        /**
         * Getter for city
         * <p>
@@ -445,4 +509,103 @@ public class JobsAdminBranchOfficeWebRequestBean extends BaseJobsController impl
                this.landLineNumber = landLineNumber;
        }
 
+       /**
+        * Prepares an instance of a BranchOffice object (entity) with all data from
+        * this bean. If a complete fax number or land-line number was provided, it
+        * will be set in the instance as well.
+        * <p>
+        * @return An instance of a BranchOffice class (entity)
+        */
+       private BranchOffice createBranchOffice () {
+               // Create new branch office instance
+               final BranchOffice branchOffice = new CompanyBranchOffice(this.getBranchCity(), this.getBranchCompany(), this.getBranchCountry(), this.getBranchStreet(), this.getBranchZipCode(), this.getBranchHouseNumber());
+
+               // Add all other fields, too
+               branchOffice.setBranchContactEmployee(this.getBranchContactEmployee());
+               branchOffice.setBranchEmailAddress(this.getBranchEmailAddress());
+               branchOffice.setBranchStore(this.getBranchStore());
+               branchOffice.setBranchSuiteNumber(this.getBranchSuiteNumber());
+               branchOffice.setBranchUserOwner(this.getBranchUserOwner());
+
+               // Generate phone number
+               final DialableLandLineNumber landLine = new LandLineNumber(this.getLandLineCountry(), this.getLandLineAreaCode(), this.getLandLineNumber());
+               final 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
+                       branchOffice.setBranchLandLineNumber(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
+                       branchOffice.setBranchFaxNumber(fax);
+               }
+
+               // Return fully prepared instance
+               return branchOffice;
+       }
+
+       /**
+        * Checks whether the given branch office's address is already found in
+        * local cache. Please note that this method fully relies on the cache, so
+        * you must always fire proper events that add/update/delete entries in
+        * cache.
+        * <p>
+        * @param branchOffice Branch office to check it's address
+        * <p>
+        * @return Whether the address has been found
+        */
+       private boolean isBranchOfficeCreatedByRequiredData (final BranchOffice branchOffice) {
+               // Get full list from other bean
+               final List<BranchOffice> branchOffices = this.branchOfficeController.allBranchOffices();
+
+               // Default is not found
+               boolean isFound = false;
+
+               // Now check each entry
+               for (final BranchOffice bo : branchOffices) {
+                       // Is same address?
+                       if (BranchOffices.isSameAddress(bo, branchOffice)) {
+                               // Found one
+                               isFound = true;
+                               break;
+                       }
+               }
+
+               // Return flag
+               return isFound;
+       }
+
 }
index b468cec40f2f8808a2b2107941c3c76fb169b2f0..32d020d30bffd05604e2d6932ce66cb29b4ebfa5 100644 (file)
@@ -17,6 +17,7 @@
 package org.mxchange.jjobs.beans.business.branchoffice;
 
 import fish.payara.cdi.jsr107.impl.NamedCache;
+import java.text.MessageFormat;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -24,10 +25,12 @@ import javax.annotation.PostConstruct;
 import javax.cache.Cache;
 import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
+import javax.enterprise.event.Observes;
 import javax.inject.Inject;
 import javax.inject.Named;
+import org.mxchange.jcontactsbusiness.events.branchoffice.added.ObservableBranchOfficeAddedEvent;
 import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
-import org.mxchange.jcontactsbusiness.branchoffice.BranchOfficeSessionBeanRemote;
+import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBeanRemote;
 import org.mxchange.jjobs.beans.BaseJobsController;
 
 /**
@@ -47,7 +50,7 @@ public class JobsBranchOfficeWebRequestBean extends BaseJobsController implement
        /**
         * EJB for administrative purposes
         */
-       @EJB (lookup = "java:global/jfinancials-ejb/branchOffice!org.mxchange.jcontactsbusiness.branchoffice.BranchOfficeSessionBeanRemote")
+       @EJB (lookup = "java:global/jjobs-ejb/branchOffice!org.mxchange.jcontactsbusiness.branchoffice.BranchOfficeSessionBeanRemote")
        private BranchOfficeSessionBeanRemote branchOfficeBean;
 
        /**
@@ -66,11 +69,34 @@ public class JobsBranchOfficeWebRequestBean extends BaseJobsController implement
        }
 
        /**
-        * Returns a list of all branch offices
+        * Observes events being fired when a branch office has been added.
         * <p>
-        * @return A list of all branch offices
+        * @param event Event being fired
+        * <p>
+        * @throws NullPointerException If the parameter or it's carried instance is null
+        * @throws IllegalArgumentException If the branchId is zero or lower
         */
-       @SuppressWarnings ("ReturnOfCollectionOrArrayField")
+       public void afterBranchOfficeAddedEvent (@Observes final ObservableBranchOfficeAddedEvent event) {
+               // Validate parameter
+               if (null == event) {
+                       // Throw NPE
+                       throw new NullPointerException("event is null"); //NOI18N
+               } else if (event.getBranchOffice() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("event.branchOffice is null"); //NOI18N
+               } else if (event.getBranchOffice().getBranchId() == null) {
+                       // Throw it again
+                       throw new NullPointerException("event.branchOffice.branchId is null"); //NOI18N
+               } else if (event.getBranchOffice().getBranchId() < 1) {
+                       // Throw IAE
+                       throw new IllegalArgumentException(MessageFormat.format("event.branchOffice.branchId={0} is not valid", event.getBranchOffice().getBranchId())); //NOI18N
+               }
+
+               // Add instance to cache
+               this.branchOfficeCache.put(event.getBranchOffice().getBranchId(), event.getBranchOffice());
+       }
+
+       @Override
        public List<BranchOffice> allBranchOffices () {
                // Init list
                final List<BranchOffice> list = new LinkedList<>();
index 890d9e50a4c99b6958223bcd3dc71c58525f7b81..ffddeed2bdf1e2d899864af9599927c84abad612 100644 (file)
@@ -17,6 +17,8 @@
 package org.mxchange.jjobs.beans.business.branchoffice;
 
 import java.io.Serializable;
+import java.util.List;
+import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
 
 /**
  * An interface for general branch office controller
@@ -25,4 +27,11 @@ import java.io.Serializable;
  */
 public interface JobsBranchOfficeWebRequestController extends Serializable {
 
+       /**
+        * Returns a list of all branch offices
+        * <p>
+        * @return A list of all branch offices
+        */
+       List<BranchOffice> allBranchOffices ();
+
 }
index 178b5b5d51e24ea3b7c46abaa321a3f5a306beda..dffb8bedd002988becabec8dc6055ec2184409fa 100644 (file)
@@ -19,7 +19,7 @@ package org.mxchange.jjobs.beans.business.employee;
 import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
-import org.mxchange.jcontactsbusiness.employee.AdminCompanyEmployeeSessionBeanRemote;
+import org.mxchange.jcontactsbusiness.model.employee.AdminCompanyEmployeeSessionBeanRemote;
 import org.mxchange.jjobs.beans.BaseJobsController;
 
 /**
index b642d59c4bea417cc1db44316b3c9023dcab4bdc..6ddc915d33fd50aebeec128ec996c6db52cc0ece 100644 (file)
@@ -26,7 +26,7 @@ import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
-import org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote;
+import org.mxchange.jcontactsbusiness.model.employee.CompanyEmployeeSessionBeanRemote;
 import org.mxchange.jcontactsbusiness.model.employee.Employee;
 import org.mxchange.jjobs.beans.BaseJobsController;
 
index 8f5939816c3a18518dfd6cb961668be71e8149a7..cde35a52e4ffdf7d8ebfae0e00ddce1fa19100f7 100644 (file)
@@ -27,7 +27,7 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData;
-import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote;
+import org.mxchange.jcontactsbusiness.model.basicdata.BusinessDataSessionBeanRemote;
 import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataNotFoundException;
 
 /**
@@ -52,7 +52,7 @@ public class JobsBusinessContactConverter implements Converter<BusinessBasicData
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               BASIC_DATA_BEAN = (BusinessDataSessionBeanRemote) initial.lookup("java:global/jfinancials-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote");
+                               BASIC_DATA_BEAN = (BusinessDataSessionBeanRemote) initial.lookup("java:global/jjobs-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote");
                        } catch (final NamingException ex) {
                                // Throw it again
                                throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup EJB", ex.getMessage()), ex);
index 271b0232dc7f78499ae911a77d06003cee9f7831..c38a799054887afd97b24a2c001e497119c968f9 100644 (file)
@@ -26,7 +26,7 @@ import javax.faces.validator.ValidatorException;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote;
+import org.mxchange.jcontactsbusiness.model.employee.CompanyEmployeeSessionBeanRemote;
 import org.mxchange.jcontactsbusiness.model.employee.Employee;
 import org.mxchange.jcontactsbusiness.exceptions.employee.CompanyEmployeeNotFoundException;
 
index e51ef56e7812e40f4b7c5dee2046445d1d8c99d4..1a4d4ecbacc66adf19458b837fc0ad39351dbf19 100644 (file)
@@ -27,7 +27,7 @@ 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.model.headquarters.CompanyHeadquartersSessionBeanRemote;
 import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData;
 
 /**
index 58336c08b5fba28028af8df40aeb185837bc61f6..f35b0ab76514aa7dfd6df31d18556e0f50af774b 100644 (file)
@@ -52,7 +52,7 @@ public class JobsMobileProviderConverter implements Converter<MobileProvider> {
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               MOBILE_PROVIDER_BEAN = (MobileProviderSingletonBeanRemote) initial.lookup("java:global/jfinancials-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote");
+                               MOBILE_PROVIDER_BEAN = (MobileProviderSingletonBeanRemote) initial.lookup("java:global/jjobs-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote");
                        } catch (final NamingException ex) {
                                // Throw it again
                                throw new ConverterException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup EJB", ex.getMessage()), ex);
index c8182da65a1ca9cc53c7586457cdc884c481efee..ba6297bdf0c2fa55dd505a10920ab42d0c0d5822 100644 (file)
@@ -25,7 +25,7 @@ import javax.faces.validator.ValidatorException;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote;
+import org.mxchange.jcontactsbusiness.model.basicdata.BusinessDataSessionBeanRemote;
 import org.mxchange.jcoreee.validator.string.BaseStringValidator;
 
 /**
index 02843bdcca0f7bde3c63130295d78810b7616798..e285ae8e9f21c1b4f90541d348f98c4a448a870f 100644 (file)
@@ -300,7 +300,7 @@ ADMIN_ENTER_COUNTRY_EXTERNAL_DIAL_PREFIX=Vorwahl f\u00fcr Gespr\u00e4che ausserh
 ADMIN_ENTER_COUNTRY_PHONE_CODE=Vorwahl f\u00fcr das Land:
 ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE=(Beispiel: 49 f\u00fcr Deutschland)
 BUTTON_ADMIN_ADD_COUNTRY=L\u00e4nderdaten hinzuf\u00fcgen
-ADMIN_LIST_COUNTRY_DATA_COUNTRY_ID=Id-Nummer:
+ADMIN_ID_NUMBER=Id-Nummer:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE=L\u00e4ndercode:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX=Vorwahl ausserorts:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME=Land:
@@ -329,11 +329,10 @@ BUTTON_ADMIN_ADD_MOBILE_PROVIDER=Handyanbieter hinzuf\u00fcgen
 ADMIN_ADD_MOBILE_PROVIDER_NOTICES=Hinweise zum Hinzuf\u00fcgen von Handyanbietern:
 ADMIN_ADD_MOBILE_PROVIDER_PATTERN=Das Textmuster darf nur ein %s enthalten und dies muss die komplette Handynummer sein. Z.B. %s@smsmail.anbieter.example
 ADMIN_ENTER_MOBILE_PROVIDER_PATTERN_EXAMPLE=(Beispiel: %s@smsmail.anbieter.example)
-ADMIN_LIST_MOBILE_PROVIDER_ID=Id-Nummer:
 ADMIN_LIST_MOBILE_PROVIDER_NAME=Name:
 ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX=Vorwahl:
 ADMIN_LIST_MOBILE_PROVIDER_COUNTRY=Land:
-ADMIN_LIST_MOBILE_PROVIDER_ENTRY_CREATED=Erstellt:
+ADMIN_LIST_ENTRY_CREATED=Erstellt:
 ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE=Editieren oder l\u00f6schen des Handyanbieters
 ADMIN_USER_DATA_ENTER_PASSWORD=Passwort eingeben:
 ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT=Passwort wiederholen:
@@ -366,8 +365,6 @@ ADMIN_USER_ACCOUNT_STATUS=Account-Status:
 ADMIN_USER_PROFILE_MODE=Profilmodus:
 ADMIN_USER_LAST_LOCKED=Zuletzt gesperrt:
 ADMIN_USER_LAST_LOCKED_REASON=Letzter Sperrgrund:
-ADMIN_USER_CONTACT_CREATED=Wann Kontaktdaten erstellt:
-ADMIN_USER_CONTACT_UPDATED=Wann Kontaktdaten ge\u00e4ndert:
 ADMIN_CONTACT_IS_OWN_CONTACT=Eigenes Account:
 ADMIN_CONTACT_PERSONAL_TITLE=Anrede:
 ADMIN_CONTACT_ACADEMIC_TITLE=Titel:
@@ -377,7 +374,7 @@ ADMIN_CONTACT_STREET=Strasse:
 ADMIN_CONTACT_HOUSE_NUMBER=Hausnummer:
 ADMIN_CONTACT_ZIP_CODE=Postleitzahl:
 ADMIN_CONTACT_CITY=Stadt:
-ADMIN_CONTACT_EMAIL_ADDRESS=Email-Adresse:
+DATA_EMAIL_ADDRESS=Email-Adresse:
 ADMIN_CONTACT_BIRTHDAY=Geburtstag:
 ADMIN_LINKS_HEADER=Administrative Links:
 ADMIN_LINK_EDIT_USER=Benutzerdaten editieren
@@ -389,7 +386,6 @@ ADMIN_LINK_DELETE_USER_TITLE=L\u00f6scht das Benutzeraccount (nach Best\u00e4tig
 CONTENT_TITLE_ADMIN_DELETE_USER=Benutzeraccount l\u00f6schen:
 PAGE_TITLE_ADMIN_DELETE_USER=Benutzeraccount l\u00f6schen
 ADMIN_HEADER_SHOW_MOBILE_NUMBER_DATA=Daten des Mobiltelefons:
-ADMIN_SHOW_PHONE_ID=Id-Nummer:
 ADMIN_SHOW_MOBILE_PROVIDER_NAME=Mobilanbieter:
 ADMIN_SHOW_MOBILE_NUMBER_COMPLETE=Komplette Nummer:
 ADMIN_SHOW_ADMINISTRATIVE_LINKS=Administrative Links:
@@ -467,7 +463,6 @@ GUEST_AGREE_READ_TERMS_CONDITIONS_2=gelesen und verstanden und nehme sie hiermit
 LINK_GUEST_TERMS_CONDITIONS=Allgemeine Gesch\u00e4ftsbestimmungen
 LINK_GUEST_PRIVACY_STATEMENTS=Datenschutzbestimmungen
 ADMIN_ADD_OR_ENTER_CONTACT_DATA=... oder geben Sie die Kontaktdaten des Benutzers ein:
-ADMIN_PERSONAL_DATA_EMAIL_ADDRESS=Email-Adresse:
 ERROR_CONTACT_ID_NOT_FOUND=Fehler: Kontaktdaten nicht gefunden.
 GUEST_REGISTRATION_PAGE1_TITLE=Anmeldeseite 1
 GUEST_REGISTRATION_PAGE2_TITLE=Anmeldeseite 2
@@ -818,22 +813,22 @@ ADMIN_BASIC_COMPANY_DATA_LIST_EMPTY=Es befinden sich keine Stammdaten in der Dat
 TABLE_SUMMARY_ADMIN_LIST_BASIC_COMPANY_DATA=Tabelle listet Stammdaten auf.
 ADMIN_BASIC_COMPANY_DATA_ID=Id-Nummer:
 #@TODO Please fix German umlauts!
-ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE=Details des Stammdatens anzeigen.
-ADMIN_BASIC_COMPANY_DATA_OWNER_ID=Zugew. Benutzer:
+ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE=Stammdaten des Unternehmens anzeigen.
+ADMIN_ASSIGNED_USER_ID=Zugew. Benutzer:
 ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_OWNER_USER_TITLE=Benutzerprofil des zugewiesenen Benutzers anzeigen.
 ADMIN_LINK_ASSIGN=Zuweisen
 #@TODO Please fix German umlauts!
 ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_OWNER_USER_TITLE=Stammdaten einen Benutzeraccount zuweisen.
 ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME=Firmenname:
-ADMIN_BASIC_COMPANY_DATA_CONTACT_PERSON=Ansprechpartner:
+ADMIN_CONTACT_PERSON=Ansprechpartner:
 ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE=Zeigt einen Mitarbeiter an, der als Ansprechpartner eingetragen ist.
 ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON=Zuweisen
 #@TODO Please fix German umlauts!
 ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE=Weisst einen Mitarbeiter als Ansprechpartner des geschaftlichen Kontaktes zu.
 ADMIN_SHOW_FULL_CONTACT_DATA_TITLE=Zeigt das komplette Kontaktprofil an.
-ADMIN_BUSINESS_DATA_COMPANY_COMMENTS=Anmerkungen:
-ADMIN_BUSINESS_DATA_PHONE_NUMBER=Haupttelefonnummer:
-ADMIN_BUSINESS_DATA_FAX_NUMBER=Hauptfaxnummer:
+ADMIN_BASIC_COMPANY_DATA_COMPANY_COMMENTS=Anmerkungen:
+ADMIN_BASIC_COMPANY_DATA_PHONE_NUMBER=Haupttelefonnummer:
+ADMIN_BASIC_COMPANY_DATA_FAX_NUMBER=Hauptfaxnummer:
 #@TODO Please fix German umlauts!
 ADMIN_ADD_BASIC_COMPANY_DATA_TITLE=Neuen geschaeftlichen Kontakt hinzufuegen
 ADMIN_ADD_BASIC_COMPANY_DATA_MINIMUM_DATA=Bitte mindestens Firmennamen inklusive Rechtsform ein.
@@ -843,10 +838,10 @@ ENTERED_EMAIL_ADDRESS_IS_INVALID=Die eingegebene Email-Addresse entspricht nicht
 ADMIN_BASIC_COMPANY_DATA_LEGEND=Basisdaten fuer geschaeftlichen Kontakt:
 #@TODO Please fix German umlauts!
 ADMIN_BASIC_COMPANY_DATA_LEGEND_TITLE=Geben Sie die Basisdaten fuer einen geschaeftlichen Kontakt ein.
-ADMIN_BUSINESS_DATA_COMPANY_NAME=Firmenname:
-ADMIN_BUSINESS_DATA_COMPANY_NAME_REQUIRED=Bitte geben Sie den Firmennamen inklusive Rechtsform ein.
-ADMIN_BUSINESS_DATA_COMPANY_LEGAL_STATUS=Rechtsform (z.B. GmbH):
-ADMIN_BUSINESS_DATA_COMPANY_EMAIL_ADDRESS=Haupt-Email-Adresse:
+ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME=Firmenname:
+ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME_REQUIRED=Bitte geben Sie den Firmennamen inklusive Rechtsform ein.
+ADMIN_BASIC_COMPANY_DATA_COMPANY_LEGAL_STATUS=Rechtsform (z.B. GmbH):
+ADMIN_BASIC_COMPANY_DATA_COMPANY_EMAIL_ADDRESS=Haupt-Email-Adresse:
 #@TODO Please fix German umlauts!
 BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON=Basisdaten hinzufuegen
 ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED=Fehler: Falscher Aufruf der Anmeldeseite, da die Eingangsseite als Anmeldeseite fungiert.
@@ -855,20 +850,20 @@ BUTTON_CHANGE_LOCALE=Aendern
 #@TODO Please fix German umlauts!
 BUTTON_CHANGE_LOCALE_TITLE=Aendern Sie hier in der aktuellen Sitzung die angezeigte Sprache.
 #@TODO Please fix German umlauts!
-ADMIN_SELECT_BUSINESS_DATA_COMPANY_FOUNDER=Firmengruender auswaehlen:
+ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_FOUNDER=Firmengruender auswaehlen:
 ADMIN_FEATURE_UNFINISHED_WARNING=Diese Funktion ist noch nicht fertiggestellt.
-ADMIN_BUSINESS_DATA_COMPANY_TAX_NUMBER=Steuernummer:
-ADMIN_BUSINESS_DATA_COMPANY_WEBSITE_URL=Webseiten-URL:
-ADMIN_SELECT_BUSINESS_DATA_COMPANY_USER_OWNER=Unternehmen einem Benutzer zuweisen:
+ADMIN_BASIC_COMPANY_DATA_COMPANY_TAX_NUMBER=Steuernummer:
+ADMIN_BASIC_COMPANY_DATA_COMPANY_WEBSITE_URL=Webseiten-URL:
+ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_USER_OWNER=Unternehmen einem Benutzer zuweisen:
 #@TODO Please fix German umlauts!
-ADMIN_SELECT_BUSINESS_DATA_COMPANY_LOGO=Firmenlogo auswaehlen:
+ADMIN_SELECT_BASIC_COMPANY_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:
+ADMIN_SELECT_BASIC_COMPANY_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
+ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_HEADQUARTERS=Daten des Hauptsitzesz auswaehlen:
+LINK_COMPANY_WEBSITE_URL_TITLE=Link zur Unternehmenswebseite (neues Fenster)
 #@TODO Please fix German umlauts!
 ADMIN_BASIC_COMPANY_DATA_COMPANY_FOUNDER=Gruender
 #@TODO Please fix German umlauts!
@@ -879,8 +874,8 @@ ADMIN_BASIC_COMPANY_DATA_CREATED=Eintrag erstellt
 ADMIN_USER_NAME_IS_REQUIRED=Bitte vergeben Sie einen Benutzernamen. Dieser muss unique sein.
 NO_WEBSITE_URL_ENTERED=Keine URL eingegeben
 LINK_ADMIN_LIST_BRANCH_OFFICES=Filialen auflisten
-ADMIN_DATA_STORE=Etage:
-ADMIN_DATA_SUITE_NUMBER=Appartmentnummer:
+ADMIN_ENTER_DATA_STORE=Etage eingeben:
+ADMIN_ENTER_DATA_SUITE_NUMBER=Appartmentnummer eingeben:
 ADMIN_SELECT_BRANCH_OFFICE_USER_OWNER=Filiale einem Benutzer zuweisen:
 ADMIN_SELECT_BRANCH_OFFICE_CONTACT_EMPLOYEE=Kontaktperson der Filiale zuweisen:
 ADMIN_BRANCH_OFFICE_LEGEND=Grunddaten der Filiale:
@@ -907,3 +902,15 @@ ENTERED_STORE_INVALID=Die eingegebene Etage ist nicht gueltig.
 ENTERED_SUITE_NUMBER_INVALID=Die eingegebene Appartmentnummer ist ungueltig.
 ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND=Adressdaten der Filiale:
 ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND_TITLE=Geben Sie hier die Adresse der Filiale ein.
+ADMIN_BRANCH_OFFICE_ZIP_CODE_REQUIRED=Bitte geben Sie die Postleitzahl zur Filiale ein.
+ADMIN_BRANCH_OFFICE_CITY_REQUIRED=Bitte geben Sie die Stadt der Filiale ein.
+ADMIN_BRANCH_OFFICE_ALREADY_CREATED=Eine Filiale existiert bereits mit den angegebenen Daten.
+ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE=Zeige Details dieser Filiale an.
+ADMIN_LINK_SHOW_BRANCH_OFFICES_OWNER_USER_TITLE=Zeit das Benutzerprofil des Besitzers des Filialeintrages an.
+ADMIN_LINK_ASSIGN_BRANCH_OFFICES_OWNER_USER_TITLE=Dieser Filiale einen Benutzer als Besitzer zuweisen.
+ADMIN_LINK_SHOW_BRANCH_OFFICES_CONTACT_PERSON_TITLE=Zeit die Daten der Kontaktperson dieser Filiale an.
+ADMIN_LINK_ASSIGN_BRANCH_OFFICES_CONTACT_PERSON_TITLE=Einen Mitarbeiter als Kontaktperson dieser Filiale zuweisen.
+NO_EMAIL_ADDRESS_ENTERED=Keine Email-Adresse eingegeben.
+DATA_ADDRESS=Adresse
+DATA_STORE=Etage:
+DATA_SUITE_NUMBER=Appartmentnummer:
index 8575faef7a8af020a1c18fd085754bdefb8e1bf1..35a15db11a53f5746abe6a56b2d622ac07fa0791 100644 (file)
@@ -287,7 +287,7 @@ ADMIN_ENTER_COUNTRY_EXTERNAL_DIAL_PREFIX=Prefix for calls outside local city: (m
 ADMIN_ENTER_COUNTRY_PHONE_CODE=Dial prefix for this country:
 ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE=(Example: 1 for U.S.A.)
 BUTTON_ADMIN_ADD_COUNTRY=Add country data
-ADMIN_LIST_COUNTRY_DATA_COUNTRY_ID=Id number:
+ADMIN_ID_NUMBER=Id number:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE=Country code:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX=Dial prefix outside:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME=Country:
@@ -316,11 +316,10 @@ BUTTON_ADMIN_ADD_MOBILE_PROVIDER=Add mobile provider
 ADMIN_ADD_MOBILE_PROVIDER_NOTICES=Notices for adding mobile provider:
 ADMIN_ADD_MOBILE_PROVIDER_PATTERN=The pattern should only contain one %s which must be the full mobile number. Example: %s@smsmail.provider.example
 ADMIN_ENTER_MOBILE_PROVIDER_PATTERN_EXAMPLE=(Example: %s@smsmail.provider.example)
-ADMIN_LIST_MOBILE_PROVIDER_ID=Id number:
 ADMIN_LIST_MOBILE_PROVIDER_NAME=Name:
 ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX=Dial prefix:
 ADMIN_LIST_MOBILE_PROVIDER_COUNTRY=Country:
-ADMIN_LIST_MOBILE_PROVIDER_ENTRY_CREATED=Created:
+ADMIN_LIST_ENTRY_CREATED=Created:
 ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE=Edit or delete mobile provider
 ADMIN_USER_DATA_ENTER_PASSWORD=Enter password:
 ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT=Repeat password:
@@ -350,8 +349,6 @@ ADMIN_USER_ACCOUNT_STATUS=Account status:
 ADMIN_USER_PROFILE_MODE=Profile mode:
 ADMIN_USER_LAST_LOCKED=Last locked:
 ADMIN_USER_LAST_LOCKED_REASON=Last lock reason:
-ADMIN_USER_CONTACT_CREATED=When contact data created:
-ADMIN_USER_CONTACT_UPDATED=When contact data updated:
 ADMIN_CONTACT_IS_OWN_CONTACT=Own account:
 ADMIN_CONTACT_PERSONAL_TITLE=Gender:
 ADMIN_CONTACT_ACADEMIC_TITLE=Title:
@@ -361,7 +358,7 @@ ADMIN_CONTACT_STREET=Street:
 ADMIN_CONTACT_HOUSE_NUMBER=House number:
 ADMIN_CONTACT_ZIP_CODE=ZIP code:
 ADMIN_CONTACT_CITY=City:
-ADMIN_CONTACT_EMAIL_ADDRESS=Email address:
+DATA_EMAIL_ADDRESS=Email address:
 ADMIN_CONTACT_BIRTHDAY=Birthday:
 ADMIN_LINKS_HEADER=Administrative links:
 ADMIN_LINK_EDIT_USER=Edit user data
@@ -373,7 +370,6 @@ ADMIN_LINK_DELETE_USER_TITLE=Deletes user account (after confirmation).
 CONTENT_TITLE_ADMIN_DELETE_USER=Delete user account:
 PAGE_TITLE_ADMIN_DELETE_USER=Delete user account
 ADMIN_HEADER_SHOW_MOBILE_NUMBER_DATA=Data of mobile phone:
-ADMIN_SHOW_PHONE_ID=Id number:
 ADMIN_SHOW_MOBILE_PROVIDER_NAME=Mobile provider:
 ADMIN_SHOW_MOBILE_NUMBER_COMPLETE=Complete number:
 ADMIN_SHOW_ADMINISTRATIVE_LINKS=Administrative links:
@@ -450,7 +446,6 @@ GUEST_AGREE_READ_TERMS_CONDITIONS_2=and I accept them with this.
 LINK_GUEST_TERMS_CONDITIONS=Terms & Conditions
 LINK_GUEST_PRIVACY_STATEMENTS=privacy statements
 ADMIN_ADD_OR_ENTER_CONTACT_DATA=... or enter the user's contact data:
-ADMIN_PERSONAL_DATA_EMAIL_ADDRESS=Email address:
 ERROR_CONTACT_ID_NOT_FOUND=Error: contact data not found
 GUEST_REGISTRATION_PAGE1_TITLE=Registration page 1
 GUEST_REGISTRATION_PAGE2_TITLE=Registration page 2
@@ -808,45 +803,45 @@ CONTENT_TITLE_ADMIN_LIST_BASIC_COMPANY_DATA=Lists basic company data
 ADMIN_BASIC_COMPANY_DATA_LIST_EMPTY=There are currently no basic company data in database.
 TABLE_SUMMARY_ADMIN_LIST_BASIC_COMPANY_DATA=This table lists basic company data.
 ADMIN_BASIC_COMPANY_DATA_ID=Id Number:
-ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE=Show details of this business contact.
-ADMIN_BASIC_COMPANY_DATA_OWNER_ID=Assigned user:
+ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE=Show details of this business contact.
+ADMIN_ASSIGNED_USER_ID=Assigned user:
 ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_OWNER_USER_TITLE=Shows assigned user profile.
 ADMIN_LINK_ASSIGN=Assign
 ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_OWNER_USER_TITLE=Assigns this business contact to a user account.
 ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME=Company name:
-ADMIN_BASIC_COMPANY_DATA_CONTACT_PERSON=Contact person:
+ADMIN_CONTACT_PERSON=Contact person:
 ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE=Shows a single employee entry who has been assigned as contact person.
 ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON=Assign
 ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE=Assigns an employee as a contact person for given business contact.
 ADMIN_SHOW_FULL_CONTACT_DATA_TITLE=Shows complete contact profile.
-ADMIN_BUSINESS_DATA_COMPANY_COMMENTS=Comments:
-ADMIN_BUSINESS_DATA_PHONE_NUMBER=Main phone number:
-ADMIN_BUSINESS_DATA_FAX_NUMBER=Main fax number:
+ADMIN_BASIC_COMPANY_DATA_COMPANY_COMMENTS=Comments:
+ADMIN_BASIC_COMPANY_DATA_PHONE_NUMBER=Main phone number:
+ADMIN_BASIC_COMPANY_DATA_FAX_NUMBER=Main fax number:
 ADMIN_ADD_BASIC_COMPANY_DATA_TITLE=Add new business contact
 ADMIN_ADD_BASIC_COMPANY_DATA_MINIMUM_DATA=Please enter at least company name including legal status.
 ENTERED_EMAIL_ADDRESS_IS_INVALID=Your entered email address is not valid.
 ADMIN_BASIC_COMPANY_DATA_LEGEND=Basic data for business contact:
 #Geben Sie die Basisdaten fuer einen geschaeftlichen Kontakt ein.
 ADMIN_BASIC_COMPANY_DATA_LEGEND_TITLE=Enter basic data for a business contact.
-ADMIN_BUSINESS_DATA_COMPANY_NAME=Company name:
-ADMIN_BUSINESS_DATA_COMPANY_NAME_REQUIRED=Please enter the company's name including legal status.
-ADMIN_BUSINESS_DATA_COMPANY_LEGAL_STATUS=Legal status (e.g. Inc.):
-ADMIN_BUSINESS_DATA_COMPANY_EMAIL_ADDRESS=Main email address:
+ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME=Company name:
+ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME_REQUIRED=Please enter the company's name including legal status.
+ADMIN_BASIC_COMPANY_DATA_COMPANY_LEGAL_STATUS=Legal status (e.g. Inc.):
+ADMIN_BASIC_COMPANY_DATA_COMPANY_EMAIL_ADDRESS=Main email address:
 BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON=Add basic data
 #Fehler: Falscher Aufruf der Anmeldeseite, da die Eingangsseite als Anmeldeseite fungiert.
 ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED=Error: Wrong request on registration page as the index page serves as registration page.
 BUTTON_CHANGE_LOCALE=Change
 BUTTON_CHANGE_LOCALE_TITLE=Change here in your current session the used language for text output.
-ADMIN_SELECT_BUSINESS_DATA_COMPANY_FOUNDER=Choose company founder:
+ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_FOUNDER=Choose company founder:
 ADMIN_FEATURE_UNFINISHED_WARNING=This feature is not yet finished.
-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:
+ADMIN_BASIC_COMPANY_DATA_COMPANY_TAX_NUMBER=Tax number:
+ADMIN_BASIC_COMPANY_DATA_COMPANY_WEBSITE_URL=Website URL:
+ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_USER_OWNER=Select user to assign with company:
+ADMIN_SELECT_BASIC_COMPANY_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_SELECT_BASIC_COMPANY_DATA_COMPANY_CONTACT_EMPLOYEE=Choose employee as contact person:
+ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_HEADQUARTERS=Choose headquarters:
+LINK_COMPANY_WEBSITE_URL_TITLE=Link to company's web site (new window)
 ADMIN_BASIC_COMPANY_DATA_COMPANY_FOUNDER=Founder
 ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE=Show data of company founder.
 ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE=Assigns a company founder to this company entry.
@@ -854,8 +849,8 @@ ADMIN_BASIC_COMPANY_DATA_CREATED=Entry created
 ADMIN_USER_NAME_IS_REQUIRED=Please enter a user name. This must be unique.
 NO_WEBSITE_URL_ENTERED=No URL entered
 LINK_ADMIN_LIST_BRANCH_OFFICES=List branch offices
-ADMIN_DATA_STORE=Store:
-ADMIN_DATA_SUITE_NUMBER=Suite number:
+ADMIN_ENTER_DATA_STORE=Enter store:
+ADMIN_ENTER_DATA_SUITE_NUMBER=Enter suite number:
 ADMIN_SELECT_BRANCH_OFFICE_USER_OWNER=Assign branch office to user:
 ADMIN_SELECT_BRANCH_OFFICE_CONTACT_EMPLOYEE=Select contact person to branch office:
 ADMIN_BRANCH_OFFICE_LEGEND=Branch office basic data:
@@ -877,3 +872,15 @@ ENTERED_STORE_INVALID=The entered store is not valid.
 ENTERED_SUITE_NUMBER_INVALID=The entered suite number is not valid.
 ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND=Address data of branch office:
 ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND_TITLE=Enter here the address of the branch office.
+ADMIN_BRANCH_OFFICE_ZIP_CODE_REQUIRED=Please enter ZIP code for the branch office.
+ADMIN_BRANCH_OFFICE_CITY_REQUIRED=Please enter city for the branch office.
+ADMIN_BRANCH_OFFICE_ALREADY_CREATED=A branch office with same data already exists.
+ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE=Show details of this branch office.
+ADMIN_LINK_SHOW_BRANCH_OFFICES_OWNER_USER_TITLE=Show the profile of the branch office entry owning user.
+ADMIN_LINK_ASSIGN_BRANCH_OFFICES_OWNER_USER_TITLE=Assign a user as owner to this branch office.
+ADMIN_LINK_SHOW_BRANCH_OFFICES_CONTACT_PERSON_TITLE=Shows contact data of this branch office's contact person.
+ADMIN_LINK_ASSIGN_BRANCH_OFFICES_CONTACT_PERSON_TITLE=Assign a company employee as contact person for this branch office.
+NO_EMAIL_ADDRESS_ENTERED=No email address entered.
+DATA_ADDRESS=Address
+DATA_STORE=Store:
+DATA_SUITE_NUMBER=Suite number:
index d87c6c779f55a0d7becc9a38da8bc479b92e9551..fe9534eddd0b32cab7683464d55bb8408843f120 100644 (file)
        <navigation-rule>
                <from-view-id>/admin/basic_company_data/admin_basic_company_data_list.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>admin_show_basic_company_data</from-outcome>
-                       <to-view-id>/admin/basic_company_data/admin_basic_company_data_assign.xhtml</to-view-id>
+                       <from-outcome>admin_show_basic_data</from-outcome>
+                       <to-view-id>/admin/basic_company_data/admin_basic_company_data_show.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_assign_basic_company_data_contact</from-outcome>
                        <from-outcome>admin_assign_basic_company_data_owner</from-outcome>
                        <to-view-id>/admin/basic_company_data/admin_basic_company_data_assign_owner.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_business_employee</from-outcome>
+                       <to-view-id>/admin/company_employee/admin_company_employee_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_assign_basic_company_data_employee</from-outcome>
+                       <to-view-id>/admin/basic_company_data/admin_basic_company_data_assign_employee.xhtml</to-view-id>
+               </navigation-case>
        </navigation-rule>
        <navigation-rule>
                <from-view-id>/admin/branch_offices/admin_branch_offices_list.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_branch_office</from-outcome>
+                       <to-view-id>/admin/branch_offices/admin_branch_office_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_user</from-outcome>
+                       <to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_assign_branch_office_owner</from-outcome>
+                       <to-view-id>/admin/branch_offices/admin_branch_office_assign_owner.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_basic_data</from-outcome>
+                       <to-view-id>/admin/basic_company_data/admin_basic_company_data_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_business_employee</from-outcome>
+                       <to-view-id>/admin/company_employee/admin_company_employee_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_assign_branch_office_employee</from-outcome>
+                       <to-view-id>/admin/branch_offices/admin_branch_office_assign_employee.xhtml</to-view-id>
+               </navigation-case>
        </navigation-rule>
        <!--
        <factory>
index 963e838f14e64876a306834cb1dda0866d9a275b..df52be7b6098e21f5cc4c49a25253e644f846d11 100644 (file)
@@ -95,7 +95,7 @@
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+               <h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
                <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
                        <h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
index 10ced2d52f0460f0fd5eefdca79cc8db659bbd32..3650b42c4b9570b24859ae6e1bc31c3bb43d29f2 100644 (file)
@@ -31,7 +31,7 @@
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+               <h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
                <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
                        <h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
index c3795203169e5e7d5642a0956bd2739c2395ddf9..3d71415c09c3b07843ac6f7c228eed52c4ad56de 100644 (file)
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="emailAddress" value="#{msg.ADMIN_PERSONAL_DATA_EMAIL_ADDRESS}" />
+                                       <h:outputLabel for="emailAddress" value="#{msg.DATA_EMAIL_ADDRESS}" />
                                </div>
 
                                <div class="table-right-medium">
index 980c533e3d6beb238ccff0c9f8271d39e8d6d768..15c569047d3ebdfaaa29c003eb49fe9e2bff6e36 100644 (file)
@@ -14,7 +14,7 @@
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="faxNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                                       <h:outputLabel for="faxNumberId" value="#{msg.ADMIN_ID_NUMBER}" />
                                </div>
 
                                <div class="table-right-medium">
index ec1bf0a849e016d4697574f7c21dc4492d74760d..6608556a560825850adb6ace1a8980b0858331ca 100644 (file)
@@ -14,7 +14,7 @@
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="landLineNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                                       <h:outputLabel for="landLineNumberId" value="#{msg.ADMIN_ID_NUMBER}" />
                                </div>
 
                                <div class="table-right-medium">
index 9e8571c39bb5f7afa692de71a0d3c4140f0dcf44..d3f679b3a5a5d388b97b459ebdb32a9a8e5f7e69 100644 (file)
@@ -14,7 +14,7 @@
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="mobileNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                                       <h:outputLabel for="mobileNumberId" value="#{msg.ADMIN_ID_NUMBER}" />
                                </div>
 
                                <div class="table-right-medium">
index 2c376018140f21dcdd055c905d95d543f2d50880..bc0dd680f875218a4907059836715186878b28c8 100644 (file)
@@ -13,7 +13,7 @@
 
                <h:column>
                        <h:panelGroup>
-                               <h:outputLabel for="faxNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                               <h:outputLabel for="faxNumberId" styleClass="table-data-label" value="#{msg.ADMIN_ID_NUMBER}" />
 
                                <h:outputText id="faxNumberId" styleClass="table-data-field" value="#{faxNumber.phoneId}" />
 
index 66a22eba1c997c2647fffb1ae63e3baa23c9f1be..69febe518d40d55ed6dd1ea43c0ce5642ce1888f 100644 (file)
@@ -13,7 +13,7 @@
 
                <h:column>
                        <h:panelGroup>
-                               <h:outputLabel for="landLineNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                               <h:outputLabel for="landLineNumberId" styleClass="table-data-label" value="#{msg.ADMIN_ID_NUMBER}" />
 
                                <h:outputText id="landLineNumberId" styleClass="table-data-field" value="#{landLineNumber.phoneId}" />
 
index 4077b5fa65e36bee04ec1e9865b271804a2cda06..ec6225094659b24a559228f855d9355a13f50974 100644 (file)
@@ -13,7 +13,7 @@
 
                <h:column>
                        <h:panelGroup>
-                               <h:outputLabel for="mobileNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                               <h:outputLabel for="mobileNumberId" styleClass="table-data-label" value="#{msg.ADMIN_ID_NUMBER}" />
 
                                <h:outputText id="mobileNumberId" styleClass="table-data-field" value="#{mobileNumber.phoneId}" />
 
index 1143dc916fa4ad91502d1fc798725811be8ef753..165101ab446fa012f81d312a7fd8b5857026dba2 100644 (file)
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="companyName" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_NAME}" />
+                                       <h:outputLabel for="companyName" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" />
                                </div>
 
                                <div class="table-right-medium">
-                                       <h:inputText styleClass="input" id="companyName" size="30" maxlength="200" required="true" requiredMessage="#{msg.ADMIN_BUSINESS_DATA_COMPANY_NAME_REQUIRED}" value="#{adminCompanyDataController.companyName}">
+                                       <h:inputText styleClass="input" id="companyName" size="30" maxlength="200" required="true" requiredMessage="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME_REQUIRED}" value="#{adminCompanyDataController.companyName}">
                                                <f:validator validatorId="CompanyNameValidator" />
                                                <f:attribute name="checkExisting" value="false" />
                                        </h:inputText>
@@ -31,7 +31,7 @@
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="companyEmailAddress" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_EMAIL_ADDRESS}" />
+                                       <h:outputLabel for="companyEmailAddress" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_EMAIL_ADDRESS}" />
                                </div>
 
                                <div class="table-right-medium">
@@ -48,7 +48,7 @@
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="companyLogo" value="#{msg.ADMIN_SELECT_BUSINESS_DATA_COMPANY_LOGO}" />
+                                       <h:outputLabel for="companyLogo" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_LOGO}" />
                                </div>
 
                                <div class="table-right-medium">
@@ -62,7 +62,7 @@
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="companyTaxNumber" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_TAX_NUMBER}" />
+                                       <h:outputLabel for="companyTaxNumber" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_TAX_NUMBER}" />
                                </div>
 
                                <div class="table-right-medium">
@@ -76,7 +76,7 @@
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="companyWebsiteUrl" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_WEBSITE_URL}" />
+                                       <h:outputLabel for="companyWebsiteUrl" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_WEBSITE_URL}" />
                                </div>
 
                                <div class="table-right-medium">
@@ -93,7 +93,7 @@
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="companyUserOwner" value="#{msg.ADMIN_SELECT_BUSINESS_DATA_COMPANY_USER_OWNER}" />
+                                       <h:outputLabel for="companyUserOwner" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_USER_OWNER}" />
                                </div>
 
                                <div class="table-right-medium">
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="companyContactEmployee" value="#{msg.ADMIN_SELECT_BUSINESS_DATA_COMPANY_CONTACT_EMPLOYEE}" />
+                                       <h:outputLabel for="companyContactEmployee" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_CONTACT_EMPLOYEE}" />
                                </div>
 
                                <div class="table-right-medium">
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="companyFounder" value="#{msg.ADMIN_SELECT_BUSINESS_DATA_COMPANY_FOUNDER}" />
+                                       <h:outputLabel for="companyFounder" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_FOUNDER}" />
                                </div>
 
                                <div class="table-right-medium">
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="companyHeadQuarters" value="#{msg.ADMIN_SELECT_BUSINESS_DATA_COMPANY_HEADQUARTERS}" />
+                                       <h:outputLabel for="companyHeadQuarters" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_HEADQUARTERS}" />
                                </div>
 
                                <div class="table-right-medium">
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="landLineCountry" value="#{msg.ADMIN_BUSINESS_DATA_PHONE_NUMBER}" />
+                                       <h:outputLabel for="landLineCountry" value="#{msg.ADMIN_BASIC_COMPANY_DATA_PHONE_NUMBER}" />
                                </div>
 
                                <div class="table-right-medium">
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="faxCountry" value="#{msg.ADMIN_BUSINESS_DATA_FAX_NUMBER}" />
+                                       <h:outputLabel for="faxCountry" value="#{msg.ADMIN_BASIC_COMPANY_DATA_FAX_NUMBER}" />
                                </div>
 
                                <div class="table-right-medium">
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="companyComments" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_COMMENTS}" />
+                                       <h:outputLabel for="companyComments" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_COMMENTS}" />
                                </div>
 
                                <div class="table-right-medium">
index 876b39aa5018e098d0d6da612c5efe8aa4a352bf..06d132578595998836b6bd622b352e26daac324f 100644 (file)
 
                                <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="branchHouseNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_HOUSE_NUMBER_REQUIRED}">
-                                               <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
+                                               <f:validateLongRange for="branchHouseNumber" minimum="1" maximum="500" />
                                        </h:inputText>
                                </div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="branchStore" value="#{msg.ADMIN_DATA_STORE}" />
+                                       <h:outputLabel for="branchStore" value="#{msg.ADMIN_ENTER_DATA_STORE}" />
                                </div>
 
                                <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="branchStore" size="3" maxlength="5" value="#{adminBranchOfficeController.branchStore}" validatorMessage="#{msg.ENTERED_STORE_INVALID}">
-                                               <f:validateLongRange for="houseNumber" minimum="-5" maximum="200" />
+                                               <f:validateLongRange for="branchStore" minimum="-5" maximum="200" />
                                        </h:inputText>
                                </div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="branchSuiteNumber" value="#{msg.ADMIN_DATA_SUITE_NUMBER}" />
+                                       <h:outputLabel for="branchSuiteNumber" value="#{msg.ADMIN_ENTER_DATA_SUITE_NUMBER}" />
                                </div>
 
                                <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="branchSuiteNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchSuiteNumber}" validatorMessage="#{msg.ENTERED_SUITE_NUMBER_INVALID}">
-                                               <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
+                                               <f:validateLongRange for="branchSuiteNumber" minimum="1" maximum="500" />
                                        </h:inputText>
                                </div>
                        </h:panelGroup>
                                </div>
 
                                <div class="table-right-medium">
-                                       <h:inputText styleClass="input" id="branchZipCode" size="20" maxlength="255" value="#{adminBranchOfficeController.branchZipCode}" />
+                                       <h:inputText styleClass="input" id="branchZipCode" size="5" maxlength="6" value="#{adminBranchOfficeController.branchZipCode}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_ZIP_CODE_REQUIRED}">
+                                               <f:validateLongRange for="branchZipCode" minimum="1" maximum="99999" />
+                                       </h:inputText>
                                </div>
                        </h:panelGroup>
 
                                </div>
 
                                <div class="table-right-medium">
-                                       <h:inputText styleClass="input" id="branchCity" size="20" maxlength="255" value="#{adminBranchOfficeController.branchCity}" />
+                                       <h:inputText styleClass="input" id="branchCity" size="20" maxlength="255" value="#{adminBranchOfficeController.branchCity}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_CITY_REQUIRED}" />
                                </div>
                        </h:panelGroup>
 
index 7ac1eb5f7cfdb11f4ff3fed50341f2c35769e752..4daa7b2a8b5bf900552b6a757f516c700be5e4e7 100644 (file)
                                        <h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_ID}" />
                                </f:facet>
 
-                               <h:link outcome="admin_show_basic_company_data" title="#{msg.ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE}" value="#{companyData.basicDataId}">
+                               <h:link outcome="admin_show_basic_data" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE}" value="#{companyData.basicDataId}">
                                        <f:param name="basicDataId" value="#{companyData.basicDataId}" />
                                </h:link>
                        </h:column>
 
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_OWNER_ID}" />
+                                       <h:outputText value="#{msg.ADMIN_ASSIGNED_USER_ID}" />
                                </f:facet>
 
                                <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_OWNER_USER_TITLE}" value="#{companyData.companyUserOwner.userId}" rendered="#{not empty companyData.companyUserOwner}">
 
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_CONTACT_PERSON}" />
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_PERSON}" />
                                </f:facet>
 
                                <h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE}" value="#{companyData.companyContactEmployee.employeeId}" rendered="#{not empty companyData.companyContactEmployee}">
                                        <f:param name="employeeId" value="#{companyData.companyContactEmployee.employeeId}" />
                                </h:link>
 
-                               <h:link outcome="admin_assign_basic_company_data_contact" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON}" rendered="#{empty companyData.companyContactEmployee}">
+                               <h:link outcome="admin_assign_basic_company_data_employee" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON}" rendered="#{empty companyData.companyContactEmployee}">
                                        <f:param name="basicDataId" value="#{companyData.basicDataId}" />
                                </h:link>
                        </h:column>
index 067f77eed046dbdb10339bc483bf7d986dcc0aab..f432dd86afc6efdd5201f88fd88af4c2c6eb4113 100644 (file)
                <h:dataTable id="table_list_branch_offices" var="branchOffice" value="#{branchOfficeController.allBranchOffices()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BRANCH_OFFICES}" rendered="#{not branchOfficeController.allBranchOffices().isEmpty()}">
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_ID}" />
+                                       <h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
                                </f:facet>
 
-                               <h:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE}" value="#{branchOffice.branchId}">
+                               <h:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{branchOffice.branchId}">
                                        <f:param name="branchOfficeId" value="#{branchOffice.branchId}" />
                                </h:link>
                        </h:column>
 
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_OWNER_ID}" />
+                                       <h:outputText value="#{msg.ADMIN_ASSIGNED_USER_ID}" />
                                </f:facet>
 
                                <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICES_OWNER_USER_TITLE}" value="#{branchOffice.branchUserOwner.userId}" rendered="#{not empty branchOffice.branchUserOwner}">
                                        <f:param name="userId" value="#{branchOffice.branchUserOwner.userId}" />
                                </h:link>
 
-                               <h:link outcome="admin_assign_branch_offices_owner" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchUserOwner}">
+                               <h:link outcome="admin_assign_branch_office_owner" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchUserOwner}">
                                        <f:param name="branchOfficeId" value="#{branchOffice.branchId}" />
                                </h:link>
                        </h:column>
 
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_COMPANY_NAME}" />
+                                       <h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" />
                                </f:facet>
 
-                               <h:link outcome="admin_show_branch_offices" value="#{branchOffice.branchCompany.companyName}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}">
-                                       <f:param name="basicDataId" value="#{branchOffice.branchCompany.basicDataId}" />
-                               </h:link>
+                               <h:outputLink value="#{branchOffice.branchCompany.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty branchOffice.branchCompany.companyWebsiteUrl}">
+                                       <h:outputText value="#{branchOffice.branchCompany.companyName}" />
+                               </h:outputLink>
+
+                               <h:outputText value="#{branchOffice.branchCompany.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty branchOffice.branchCompany.companyWebsiteUrl}" />
                        </h:column>
 
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_EMAIL_ADDRESS}" />
+                                       <h:outputText value="#{msg.DATA_EMAIL_ADDRESS}" />
                                </f:facet>
 
-                               <h:outputText value="#{branchOffice.branchEmailAddress}" />
+                               <h:outputLink value="mailto:#{branchOffice.branchEmailAddress}" rendered="#{not empty branchOffice.branchEmailAddress}" />
+
+                               <h:outputText value="#{msg.NO_EMAIL_ADDRESS_ENTERED}" rendered="#{empty branchOffice.branchEmailAddress}" />
                        </h:column>
 
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.DATA_CITY}" />
+                                       <h:outputText value="#{msg.DATA_ADDRESS}" />
                                </f:facet>
 
-                               <h:outputText value="#{branchOffice.branchZipCode} #{branchOffice.branchCity}" />
+                               <h:outputText value="#{branchOffice.branchZipCode} #{branchOffice.branchCity}" title="#{branchOffice.branchStreet} #{branchOffice.branchHouseNumber} (#{msg.DATA_STORE} #{branchOffice.branchStore}, #{msg.DATA_SUITE_NUMBER} #{branchOffice.branchSuiteNumber})" />
                        </h:column>
 
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_CONTACT_PERSON}" />
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_PERSON}" />
                                </f:facet>
 
                                <h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICES_CONTACT_PERSON_TITLE}" value="#{branchOffice.branchContactEmployee.employeeId}" rendered="#{not empty branchOffice.branchContactEmployee}">
                                        <f:param name="employeeId" value="#{branchOffice.branchContactEmployee.employeeId}" />
                                </h:link>
 
-                               <h:link outcome="admin_assign_branch_office_contact" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_CONTACT_PERSON}" rendered="#{empty branchOffice.branchContactEmployee}">
+                               <h:link outcome="admin_assign_branch_office_employee" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchContactEmployee}">
                                        <f:param name="branchOfficeId" value="#{branchOffice.branchId}" />
                                </h:link>
                        </h:column>
 
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_CREATED}" />
+                                       <h:outputText value="#{msg.ADMIN_LIST_ENTRY_CREATED}" />
                                </f:facet>
 
                                <h:outputText id="branchCreated" value="#{branchOffice.branchCreated.time}">
index 66cdad8d2422f89871b738c8fa4b381954734147..2a04a5772ee8d829c2f0f01eabb8e499dc9f67b3 100644 (file)
@@ -62,7 +62,7 @@
 
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_CONTACT_CREATED}" />
+                                       <h:outputText value="#{msg.ADMIN_LIST_ENTRY_CREATED}" />
                                </f:facet>
 
                                <h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
index ebde8b9570c08c0dae06bf81827085ff70007e1b..9bb415b3ed43caf754e9fd0674c70858259d5983 100644 (file)
@@ -17,7 +17,7 @@
                <h:dataTable id="table_list_countries" var="country" value="#{countryController.allCountries()}" styleClass="table table-medium" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}" rendered="#{not countryController.allCountries().isEmpty()}">
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_ID}" />
+                                       <h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
                                </f:facet>
 
                                <h:link outcome="admin_edit_country" title="#{msg.ADMIN_LINK_EDIT_DELETE_COUNTRY_TITLE}" value="#{country.countryId}">
index 019fcef36c1f070e94ea6b01cf269a3ac41fe42f..c3d608671436ef0c7914942f7d6dd26fe24aad3c 100644 (file)
@@ -18,7 +18,7 @@
                <h:dataTable id="table_list_fax" var="faxNumber" value="#{phoneController.allFaxNumbers()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_FAXS}" rendered="#{not phoneController.allFaxNumbers().isEmpty()}">
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                                       <h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
                                </f:facet>
 
                                <h:link outcome="admin_show_fax" value="#{faxNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
index a50aaa6dbc5856d27121158a2f2ccb09779016cb..0af3d3123760255dcf06b8976e15f38c55c284ca 100644 (file)
@@ -64,7 +64,7 @@
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+                               <h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
                                <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
                                        <h:outputText value="#{contact.contactEmailAddress}" />
index c615e6e1105ee76880d1da23b3dde54f1b5cb449..14bc6404d36fa87389ec990e466621dfc41b29ac 100644 (file)
@@ -18,7 +18,7 @@
                <h:dataTable id="table_list_landline" var="landLineNumber" value="#{phoneController.allLandLineNumbers()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_LAND_LINES}" rendered="#{not phoneController.allLandLineNumbers().isEmpty()}">
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                                       <h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
                                </f:facet>
 
                                <h:link outcome="admin_show_landline" value="#{landLineNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
index 203da052dca40cf015c746991e6a4ed4f250f637..084cc6d9facb3a10aba4034ac62b7cb01e0ffaab 100644 (file)
@@ -65,7 +65,7 @@
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+                               <h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
                                <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
                                        <h:outputText value="#{contact.contactEmailAddress}" />
index ff224432d0b6a7dd93ed60d4a013bd1d88d584ce..7372fb823a353bd2fabca7059975ee5dc0f2ef25 100644 (file)
@@ -18,7 +18,7 @@
                <h:dataTable id="table_list_mobile" var="mobile" value="#{phoneController.allMobileNumbers()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                                       <h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
                                </f:facet>
 
                                <h:link outcome="admin_show_mobile" value="#{mobile.phoneId}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
index 9f3d72b38d95bab112da78915d585426764e6980..e5e8413c02051dfac6d8ba9468350f1d4a926087 100644 (file)
@@ -64,7 +64,7 @@
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+                               <h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
                                <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
                                        <h:outputText value="#{contact.contactEmailAddress}" />
index 96158ade71475f678d32b92e7ef9d19fcbe2bd98..e04645aaed8373d6177413f6e8321f7baec91f56 100644 (file)
@@ -17,7 +17,7 @@
                <h:dataTable id="table_list_mobile" var="mobile" value="#{mobileProviderController.allMobileProviders()}" styleClass="table table-medium" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}" rendered="#{not mobileProviderController.allMobileProviders().isEmpty()}">
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_ID}" />
+                                       <h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
                                </f:facet>
 
                                <h:link outcome="admin_edit_mobile_provider" title="#{msg.ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE}" value="#{mobile.providerId}">
@@ -51,7 +51,7 @@
 
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_ENTRY_CREATED}" />
+                                       <h:outputText value="#{msg.ADMIN_LIST_ENTRY_CREATED}" />
                                </f:facet>
 
                                <h:outputText id="providerEntryCreated" value="#{mobile.providerEntryCreated.time}" title="#{msg.ADMIN_MOBILE_PROVIDER_ENTRY_CREATED_TITLE}">
index af71ba3c73f8d4085bff68ee0cce18a2ecf20192..4b3f72a3a0e0d526383e466d4b4cfaec864627f9 100644 (file)
@@ -80,7 +80,7 @@
 
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_USER_CREATED}" />
+                                       <h:outputText value="#{msg.ADMIN_LIST_ENTRY_CREATED}" />
                                </f:facet>
 
                                <h:outputText id="userCreated" value="#{user.userCreated.time}">