]> git.mxchange.org Git - jjobs-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sun, 8 Oct 2017 00:07:03 +0000 (02:07 +0200)
committerRoland Häder <roland@mxchange.org>
Fri, 19 Jul 2019 22:42:40 +0000 (00:42 +0200)
- renamed companyEmployee to employee as there was no need for
- also renamed EJB name and backing beans
- half-added event for being fired (and fully observed by general bean) when an
  employee has been added
- if an employee's displayed name is being rendered, also try to render an
  assigned department (if any)

Signed-off-by: Roland Häder <roland@mxchange.org>
21 files changed:
src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestBean.java
src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsBranchOfficeWebRequestBean.java
src/java/org/mxchange/jjobs/beans/business/department/JobsDepartmentWebRequestBean.java
src/java/org/mxchange/jjobs/beans/business/employee/JobsAdminCompanyEmployeeWebRequestBean.java
src/java/org/mxchange/jjobs/beans/business/employee/JobsAdminCompanyEmployeeWebRequestController.java
src/java/org/mxchange/jjobs/beans/business/employee/JobsCompanyEmployeeWebRequestBean.java
src/java/org/mxchange/jjobs/beans/business/employee/JobsCompanyEmployeeWebSessionController.java
src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelperBean.java
src/java/org/mxchange/jjobs/beans/mobileprovider/JobsMobileProviderWebRequestBean.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/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl
web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
web/admin/basic_company_data/admin_basic_company_data_list.xhtml
web/admin/branch_office/admin_branch_office_list.xhtml
web/admin/department/admin_department_list.xhtml
web/admin/employee/admin_employee_list.xhtml

index 6d0bd39bac8dc6e0c57713875d18c50f9aa49423..c443c2789983f974785efab81c77f2fa7c9d2ee1 100644 (file)
@@ -407,8 +407,7 @@ public class JobsBusinessDataWebRequestBean extends BaseJobsBean implements Jobs
                                public int compare (final BusinessBasicData o1, final BusinessBasicData o2) {
                                        return o1.getBasicDataId() > o2.getBasicDataId() ? 1 : o1.getBasicDataId() < o2.getBasicDataId() ? -1 : 0;
                                }
-                       }
-                       );
+                       });
                }
        }
 
index 7f36547313c9962fa70a4c38c4a9757fbbe3632b..be301316e3af1fde8ba056e7779bdaafda2a0cef 100644 (file)
@@ -178,8 +178,7 @@ public class JobsBranchOfficeWebRequestBean extends BaseJobsBean implements Jobs
                                public int compare (final BranchOffice o1, final BranchOffice o2) {
                                        return o1.getBranchId() > o2.getBranchId() ? 1 : o1.getBranchId() < o2.getBranchId() ? -1 : 0;
                                }
-                       }
-                       );
+                       });
                }
        }
 
index 967255c04f167a69319e1e96f92b95d326080714..2676e98c40a9bcd608b15bbfd3e50ab3311a682f 100644 (file)
@@ -178,8 +178,7 @@ public class JobsDepartmentWebRequestBean extends BaseJobsBean implements JobsDe
                                public int compare (final Department o1, final Department o2) {
                                        return o1.getDepartmentId() > o2.getDepartmentId() ? 1 : o1.getDepartmentId() < o2.getDepartmentId() ? -1 : 0;
                                }
-                       }
-                       );
+                       });
                }
        }
 
index 1c396b7a2ae4e45bd2c3194fe11ddf1081fd7eed..aae86ee9a4df84bdabc2f34b34165d6adbb50fce 100644 (file)
@@ -18,8 +18,12 @@ package org.mxchange.jjobs.beans.business.employee;
 
 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.jcontacts.model.contact.Contact;
+import org.mxchange.jcontactsbusiness.events.employee.added.ObservableEmployeeAddedEvent;
 import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData;
 import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
 import org.mxchange.jcontactsbusiness.model.department.Department;
@@ -34,15 +38,22 @@ import org.mxchange.jusercore.model.user.User;
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
-@Named ("adminCompanyEmployeeController")
+@Named ("adminEmployeeController")
 @RequestScoped
-public class JobsAdminCompanyEmployeeWebRequestBean extends BaseJobsBean implements JobsAdminCompanyEmployeeWebRequestController {
+public class JobsAdminEmployeeWebRequestBean extends BaseJobsBean implements JobsAdminEmployeeWebRequestController {
 
        /**
         * Serial number
         */
        private static final long serialVersionUID = 12_886_968_547_360L;
 
+       /**
+        * An event being fired when an employee has been added
+        */
+       @Inject
+       @Any
+       private Event<ObservableEmployeeAddedEvent> addedEmployeeEvent;
+
        /**
         * EJB for administrative company employee purposes
         */
@@ -107,7 +118,7 @@ public class JobsAdminCompanyEmployeeWebRequestBean extends BaseJobsBean impleme
        /**
         * Default constructor
         */
-       public JobsAdminCompanyEmployeeWebRequestBean () {
+       public JobsAdminEmployeeWebRequestBean () {
                // Call super constructor
                super();
        }
index dbbe98ea60447a22632d40e708aa4c9d9d2051fc..c8f55a7b4748c65567af812fe14ef128300dd8af 100644 (file)
@@ -23,6 +23,6 @@ import java.io.Serializable;
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
-public interface JobsAdminCompanyEmployeeWebRequestController extends Serializable {
+public interface JobsAdminEmployeeWebRequestController extends Serializable {
 
 }
index 5f03b7a4f8e51d4041d9488add1442c5754cf0a6..ae48e17a6b043fb8162de51eb67fbe72ccc769dd 100644 (file)
@@ -17,6 +17,8 @@
 package org.mxchange.jjobs.beans.business.employee;
 
 import fish.payara.cdi.jsr107.impl.NamedCache;
+import java.text.MessageFormat;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -24,8 +26,10 @@ 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.employee.added.ObservableEmployeeAddedEvent;
 import org.mxchange.jcontactsbusiness.model.employee.CompanyEmployeeSessionBeanRemote;
 import org.mxchange.jcontactsbusiness.model.employee.Employee;
 import org.mxchange.jjobs.beans.BaseJobsBean;
@@ -35,27 +39,32 @@ import org.mxchange.jjobs.beans.BaseJobsBean;
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
-@Named ("companyEmployeeController")
+@Named ("employeeController")
 @RequestScoped
-public class JobsCompanyEmployeeWebRequestBean extends BaseJobsBean implements JobsCompanyEmployeeWebRequestController {
+public class JobsEmployeeWebRequestBean extends BaseJobsBean implements JobsEmployeeWebRequestController {
 
        /**
         * Serial number
         */
        private static final long serialVersionUID = 12_886_968_547_361L;
 
+       /**
+        * List of all employees
+        */
+       private final List<Employee> allEmployees;
+
        /**
         * EJB for general company employee purposes
         */
-       @EJB (lookup = "java:global/jjobs-ejb/companyEmployee!org.mxchange.jcontactsbusiness.model.employee.CompanyEmployeeSessionBeanRemote")
-       private CompanyEmployeeSessionBeanRemote companyEmployeeBean;
+       @EJB (lookup = "java:global/jjobs-ejb/employee!org.mxchange.jcontactsbusiness.model.employee.CompanyEmployeeSessionBeanRemote")
+       private CompanyEmployeeSessionBeanRemote employeeBean;
 
        /**
         * List of all company employees
         */
        @Inject
        @NamedCache (cacheName = "companyEmployeeCache")
-       private Cache<Long, Employee> companyEmployeeCache;
+       private Cache<Long, Employee> employeeCache;
 
        /**
         * A list of filtered employees
@@ -65,9 +74,37 @@ public class JobsCompanyEmployeeWebRequestBean extends BaseJobsBean implements J
        /**
         * Default constructor
         */
-       public JobsCompanyEmployeeWebRequestBean () {
+       public JobsEmployeeWebRequestBean () {
                // Call super constructor
                super();
+
+               // Init list
+               this.allEmployees = new LinkedList<>();
+       }
+
+       /**
+        * Observes events being fired when an employee has been added
+        * <p>
+        * @param event Event being fired
+        */
+       public void afterEmployeeAddedEvent (@Observes final ObservableEmployeeAddedEvent event) {
+               // Validate parameter
+               if (null == event) {
+                       // Throw NPE
+                       throw new NullPointerException("event is null"); //NOI18N
+               } else if (event.getEmployee() == null) {
+                       // Throw it again
+                       throw new NullPointerException("event.employee is null"); //NOI18N
+               } else if (event.getEmployee().getEmployeeId() == null) {
+                       // Throw it again
+                       throw new NullPointerException("event.employee.employeeId is null"); //NOI18N
+               } else if (event.getEmployee().getEmployeeId() < 1) {
+                       // Throw IAE
+                       throw new IllegalArgumentException(MessageFormat.format("event.employee.employeeId={0} is invalid", event.getEmployee().getEmployeeId())); //NOI18N
+               }
+
+               // Add employee to cache and list
+               this.employeeCache.put(event.getEmployee().getEmployeeId(), event.getEmployee());
        }
 
        /**
@@ -77,23 +114,7 @@ public class JobsCompanyEmployeeWebRequestBean extends BaseJobsBean implements J
         */
        @SuppressWarnings ("ReturnOfCollectionOrArrayField")
        public List<Employee> allCompanyEmployees () {
-               // Init list
-               final List<Employee> list = new LinkedList<>();
-
-               // Get iterator
-               final Iterator<Cache.Entry<Long, Employee>> iterator = this.companyEmployeeCache.iterator();
-
-               // Loop over all
-               while (iterator.hasNext()) {
-                       // Get next entry
-                       final Cache.Entry<Long, Employee> next = iterator.next();
-
-                       // Add value to list
-                       list.add(next.getValue());
-               }
-
-               // Return it
-               return list;
+               return this.allEmployees;
        }
 
        /**
@@ -102,7 +123,7 @@ public class JobsCompanyEmployeeWebRequestBean extends BaseJobsBean implements J
         * @return Filtered list of employees
         */
        @SuppressWarnings ("ReturnOfCollectionOrArrayField")
-       public List<Employee> getFilteredEmployees () {
+       public List<Employee> getFilteredEmployees () { //NOI18N
                return this.filteredEmployees;
        }
 
@@ -112,7 +133,7 @@ public class JobsCompanyEmployeeWebRequestBean extends BaseJobsBean implements J
         * @param filteredEmployees Filtered list of employees
         */
        @SuppressWarnings ("AssignmentToCollectionOrArrayFieldFromParameter")
-       public void setFilteredEmployees (final List<Employee> filteredEmployees) {
+       public void setFilteredEmployees (final List<Employee> filteredEmployees) { //NOI18N
                this.filteredEmployees = filteredEmployees;
        }
 
@@ -122,9 +143,9 @@ public class JobsCompanyEmployeeWebRequestBean extends BaseJobsBean implements J
        @PostConstruct
        public void init () {
                // Is cache there?
-               if (!this.companyEmployeeCache.iterator().hasNext()) {
+               if (!this.employeeCache.iterator().hasNext()) {
                        // Get whole list
-                       final List<Employee> list = this.companyEmployeeBean.allCompanyEmployees();
+                       final List<Employee> list = this.employeeBean.allCompanyEmployees();
 
                        // Add all
                        for (final Iterator<Employee> iterator = list.iterator(); iterator.hasNext();) {
@@ -132,9 +153,32 @@ public class JobsCompanyEmployeeWebRequestBean extends BaseJobsBean implements J
                                final Employee next = iterator.next();
 
                                // Add it to cache
-                               this.companyEmployeeCache.put(next.getEmployeeId(), next);
+                               this.employeeCache.put(next.getEmployeeId(), next);
                        }
                }
+
+               // Is cache filled and list is empty
+               if ((this.employeeCache.iterator().hasNext()) && (this.allEmployees.isEmpty())) {
+                       // Get iterator
+                       final Iterator<Cache.Entry<Long, Employee>> iterator = this.employeeCache.iterator();
+
+                       // Build up list
+                       while (iterator.hasNext()) {
+                               // GEt next element
+                               final Cache.Entry<Long, Employee> next = iterator.next();
+
+                               // Add to list
+                               this.allEmployees.add(next.getValue());
+                       }
+
+                       // Sort list
+                       this.allEmployees.sort(new Comparator<Employee>() {
+                               @Override
+                               public int compare (final Employee o1, final Employee o2) {
+                                       return o1.getEmployeeId() > o2.getEmployeeId() ? 1 : o1.getEmployeeId() < o2.getEmployeeId() ? -1 : 0;
+                               }
+                       });
+               }
        }
 
 }
index 2a9d39b53974cca9046083d2c93cdae55c31d435..02ceaa8ae279c5c254155a08f45518c3adaea69c 100644 (file)
@@ -23,6 +23,6 @@ import java.io.Serializable;
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
-public interface JobsCompanyEmployeeWebSessionController extends Serializable {
+public interface JobsEmployeeWebRequestController extends Serializable {
 
 }
index 876608a03cbc0d4c17b50be6c24cb2548851c0d3..b334ecdab4e845c84a201c1ec26ecce02e689cf3 100644 (file)
@@ -537,6 +537,14 @@ public class JobsWebRequestHelperBean extends BaseJobsBean implements JobsWebReq
                        // Then create name
                        sb.append(employee.getEmployeeNumber());
 
+                       // Is a department found?
+                       if (employee.getEmployeeDepartment() instanceof Department) {
+                               // Then add it's name to it
+                               sb.append(" ("); //NOI18N
+                               sb.append(this.renderDepartment(employee.getEmployeeDepartment()));
+                               sb.append(")"); //NOI18N
+                       }
+
                        // Is contact data found?
                        if (employee.getEmployeePersonalData() instanceof Contact) {
                                // Yes, then render it
index 76ce49c90d2f6a41cc40ebbfc447cd05b36a700e..8c796220b1fe6dcc96cdcd5343f9be1668866804 100644 (file)
@@ -176,8 +176,7 @@ public class JobsMobileProviderWebRequestBean extends BaseJobsBean implements Jo
                                public int compare (final MobileProvider o1, final MobileProvider o2) {
                                        return o1.getProviderId() > o2.getProviderId() ? 1 : o1.getProviderId() < o2.getProviderId() ? -1 : 0;
                                }
-                       }
-                       );
+                       });
                }
        }
 }
index fc87f3d84af3d6d315d484a87bf75f531412c629..10f02451b1b95521dca29345f8b2ec9443d64582 100644 (file)
@@ -52,7 +52,7 @@ public class JobsCompanyEmployeeConverter implements Converter<Employee> {
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               EMPLOYEE_BEAN = (CompanyEmployeeSessionBeanRemote) initial.lookup("java:global/jjobs-ejb/companyEmployee!org.mxchange.jcontactsbusiness.model.employee.CompanyEmployeeSessionBeanRemote"); //NOI18N
+                               EMPLOYEE_BEAN = (CompanyEmployeeSessionBeanRemote) initial.lookup("java:global/jjobs-ejb/employee!org.mxchange.jcontactsbusiness.model.employee.CompanyEmployeeSessionBeanRemote"); //NOI18N
                        } catch (final NamingException ex) {
                                // Throw it again
                                throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup EJB", ex.getMessage()), ex); //NOI18N
index aaf6755cb191345356eb26cf8256d4f0b66b8cf5..cd521dc5184c342e10569d6d73c4d71520c1e77f 100644 (file)
@@ -52,7 +52,7 @@ public class JobsCompanyHeadquartersConverter implements Converter<HeadquartersD
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               COMPANY_HEADQUARTERS_BEAN = (CompanyHeadquartersSessionBeanRemote) initial.lookup("java:global/jjobs-ejb/companyEmployee!org.mxchange.jcontactsbusiness.model.headquarters.CompanyHeadquartersSessionBeanRemote"); //NOI18N
+                               COMPANY_HEADQUARTERS_BEAN = (CompanyHeadquartersSessionBeanRemote) initial.lookup("java:global/jjobs-ejb/headquarters!org.mxchange.jcontactsbusiness.model.headquarters.CompanyHeadquartersSessionBeanRemote"); //NOI18N
                        } catch (final NamingException ex) {
                                // Throw it again
                                throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup EJB", ex.getMessage()), ex); //NOI18N
index 0830987877311b498e7cec3bcb1c3daa9f1e410a..7bfc18c2fb275d772c0ce2413ddf284b395cc7f3 100644 (file)
@@ -1077,3 +1077,6 @@ ADMIN_ADD_OPENING_TIME_TITLE=Oeffnungszeit hinzufuegen:
 #@TODO Please fix German umlauts!
 ADMIN_ADD_OPENING_TIME_MINIMUM_DATA=Bitte geben Sie zum Hinzufuegen einer Oeffnungszeit alle Angaben an. Diese sollten nicht konfliktieren.
 BUTTON_ADMIN_ADD_OPENING_TIME=Oeffnungszeit hinzufuegen
+ADMIN_LINK_ASSIGN_DEPARTMENT_BRANCH_OFFICE_TITLE=Dieser Abteilung eine Filiale zuweisen.
+ADMIN_LINK_ASSIGN_DEPARTMENTS_LEAD_EMPLOYEE_TITLE=Dieser Abteilung einen leitenden Mitarbeiter zuweisen.
+ADMIN_LINK_ASSIGN_DEPARTMENTS_OWNER_USER_TITLE=Dieser Abteilung einen besitzenden Benutzer zuweisen.
index 38bb28a2c1191978e08cf4b0f69e57937b0954d6..720266224ca4884578089c57f7144339270df72e 100644 (file)
@@ -1004,3 +1004,6 @@ ADMIN_ADD_OPENING_TIME_TITLE=Add new opening time:
 #BItte geben Sie zum Hinzufuegen einer Oeffnungszeit alle Angaben an. Diese sollten nicht konfliktieren.
 ADMIN_ADD_OPENING_TIME_MINIMUM_DATA=To add new opening time, you have to provide all data. They should not conflict.
 BUTTON_ADMIN_ADD_OPENING_TIME=Add opening time
+ADMIN_LINK_ASSIGN_DEPARTMENT_BRANCH_OFFICE_TITLE=Assign this department a branch office.
+ADMIN_LINK_ASSIGN_DEPARTMENTS_LEAD_EMPLOYEE_TITLE=Assign this department a leading employee.
+ADMIN_LINK_ASSIGN_DEPARTMENTS_OWNER_USER_TITLE=Assign this department an owning user.
index 2d677b60c0936fe09c340e94c28429afcd054a41..9ec478ea01e4e6defbec07eb685453721fee93c4 100644 (file)
@@ -58,7 +58,7 @@
                                        >
                                        <f:converter converterId="CompanyEmployeeConverter" />
                                        <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                       <f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
+                                       <f:selectItems value="#{employeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
                                </p:selectOneMenu>
 
                                <p:outputLabel for="companyFounder" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_FOUNDER}" />
@@ -70,7 +70,7 @@
                                        >
                                        <f:converter converterId="CompanyEmployeeConverter" />
                                        <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                       <f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
+                                       <f:selectItems value="#{employeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
                                </p:selectOneMenu>
 
                                <p:outputLabel for="companyHeadQuarters" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_HEADQUARTERS}" />
index 778e60a760fc930999865ea9008013d7ac0e8918..7e2c72b777ce5b0c9dc721bd0a9049335a4d8bd9 100644 (file)
@@ -35,7 +35,7 @@
                                >
                                <f:converter converterId="CompanyEmployeeConverter" />
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
+                               <f:selectItems value="#{employeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="branchUserOwner" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_USER_OWNER}" />
index fb18bf89cba98f18bfe4e95fdf4213214934b262..838c2a91c8fd4317a634754fbf6060d3e0ce8279 100644 (file)
@@ -62,7 +62,7 @@
                                >
                                <f:converter converterId="CompanyEmployeeConverter" />
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
+                               <f:selectItems value="#{employeeController.allCompanyEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="departmentUserOwner" value="#{msg.ADMIN_ASSIGN_DEPARTMENT_USER_OWNER}" />
index 2ebc40238eac0cc451431b20abe1e28b59dede82..8a2bf9179437cc5a9093de9fd9282bd219cbf2f0 100644 (file)
@@ -15,7 +15,7 @@
                        <p:outputLabel for="employeeCompany" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_COMPANY}" />
                        <p:selectOneMenu
                                id="employeeCompany"
-                               value="#{adminCompanyEmployeeController.employeeCompany}"
+                               value="#{adminEmployeeController.employeeCompany}"
                                filter="true"
                                filterMatchMode="contains"
                                required="true"
@@ -29,7 +29,7 @@
                        <p:outputLabel for="employeeBranchOffice" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_BRANCH_OFFICE}" />
                        <p:selectOneMenu
                                id="employeeBranchOffice"
-                               value="#{adminCompanyEmployeeController.employeeBranchOffice}"
+                               value="#{adminEmployeeController.employeeBranchOffice}"
                                filter="true"
                                filterMatchMode="contains"
                                >
@@ -41,7 +41,7 @@
                        <p:outputLabel for="employeePersonalContact" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_PERSONAL_DATA}" />
                        <p:selectOneMenu
                                id="employeePersonalContact"
-                               value="#{adminCompanyEmployeeController.employeePersonalContact}"
+                               value="#{adminEmployeeController.employeePersonalContact}"
                                filter="true"
                                filterMatchMode="contains"
                                >
@@ -53,7 +53,7 @@
                        <p:outputLabel for="employeeUserOwner" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_USER_OWNER}" />
                        <p:selectOneMenu
                                id="employeeUserOwner"
-                               value="#{adminCompanyEmployeeController.employeeUserOwner}"
+                               value="#{adminEmployeeController.employeeUserOwner}"
                                filter="true"
                                filterMatchMode="contains"
                                >
                        </p:selectOneMenu>
 
                        <p:outputLabel for="employeeEmailAddress" value="#{msg.ADMIN_ENTER_EMPLOYEE_EMAIL_ADDRESS}" />
-                       <p:inputText styleClass="input" id="employeeEmailAddress" size="20" maxlength="255" value="#{adminCompanyEmployeeController.employeeEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+                       <p:inputText styleClass="input" id="employeeEmailAddress" size="20" maxlength="255" value="#{adminEmployeeController.employeeEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
                                <f:validator validatorId="EmailAddressValidator" />
                                <f:attribute name="allowEmptyValue" value="true" />
                        </p:inputText>
 
                        <p:outputLabel for="employeeStaffNumber" value="#{msg.ADMIN_ENTER_EMPLOYEE_STAFF_NUMBER}" />
-                       <p:inputText styleClass="input" id="employeeStaffNumber" size="2" maxlength="10" value="#{adminCompanyEmployeeController.employeeStaffNumber}" />
+                       <p:inputText styleClass="input" id="employeeStaffNumber" size="2" maxlength="10" value="#{adminEmployeeController.employeeStaffNumber}" />
                </p:panelGrid>
        </p:fieldset>
 
        <p:fieldset legend="#{msg.ADMIN_EMPLOYEE_OTHER_LEGEND}">
                <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full">
                        <p:outputLabel for="employeePhoneExtension" value="#{msg.ADMIN_ENTER_PHONE_EXTENSION}" />
-                       <p:inputText styleClass="input" id="employeePhoneExtension" size="2" maxlength="10" value="#{adminCompanyEmployeeController.employeePhoneExtension}" />
+                       <p:inputText styleClass="input" id="employeePhoneExtension" size="2" maxlength="10" value="#{adminEmployeeController.employeePhoneExtension}" />
 
                        <p:outputLabel for="employeeDepartment" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_DEPARTMENT}" />
                        <p:selectOneMenu
                                id="employeeDepartment"
-                               value="#{adminCompanyEmployeeController.employeeDepartment}"
+                               value="#{adminEmployeeController.employeeDepartment}"
                                filter="true"
                                filterMatchMode="contains"
                                >
@@ -96,7 +96,7 @@
                        <p:outputLabel for="employeeHeadquarters" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_HEADQUARTERS}" />
                        <p:selectOneMenu
                                id="employeeHeadquarters"
-                               value="#{adminCompanyEmployeeController.employeeHeadquarters}"
+                               value="#{adminEmployeeController.employeeHeadquarters}"
                                filter="true"
                                filterMatchMode="contains"
                                >
                        </p:selectOneMenu>
 
                        <p:outputLabel for="mobileNumber" value="#{msg.ADMIN_ENTER_EMPLOYEE_MOBILE_NUMBER}" />
-                       <widgets:inputMobileNumberPanelGrid targetController="#{adminCompanyEmployeeController}" />
+                       <widgets:inputMobileNumberPanelGrid targetController="#{adminEmployeeController}" />
                </p:panelGrid>
        </p:fieldset>
 </ui:composition>
index e3059b2c870177583ea3a2acaabd53f62db7a46b..0fb9c237adec7cfcce141c31d798de76661828e1 100644 (file)
@@ -98,7 +98,7 @@
                                                        >
                                                        <f:converter converterId="CompanyEmployeeConverter" />
                                                        <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                                       <f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
+                                                       <f:selectItems value="#{employeeController.allCompanyEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
                                                        >
                                                        <f:converter converterId="CompanyEmployeeConverter" />
                                                        <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                                       <f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
+                                                       <f:selectItems value="#{employeeController.allCompanyEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
index 1b0fca22400dcdc80bcde1ad33d386208ff8cd4b..26bd0c6859436127e81bfb019d9c38a7b6bad464 100644 (file)
                                                        >
                                                        <f:converter converterId="CompanyEmployeeConverter" />
                                                        <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                                       <f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
+                                                       <f:selectItems value="#{employeeController.allCompanyEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
index dfe8a9671b68246bf92afd5dcaffa405ee13c660..d131c45ba5bd67112b102cdfb4cac324e5c3bdc9 100644 (file)
@@ -57,7 +57,7 @@
                                        <h:outputText value="#{department.departmentName}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" sortBy="#{department.departmentCompany.companyName}" filterBy="#{department.departmentCompany}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" sortBy="#{department.departmentCompany}" filterBy="#{department.departmentCompany}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
@@ -85,7 +85,7 @@
                                                        filter="true"
                                                        filterMatchMode="contains"
                                                        label="#{msg.LABEL_BRANCH_OFFICES}"
-                                                       onchange="PF('employeeList').filter()"
+                                                       onchange="PF('departmentList').filter()"
                                                        updateLabel="true"
                                                        title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
                                                        >
@@ -99,7 +99,7 @@
                                                <f:param name="branchId" value="#{department.departmentBranchOffice.branchId}" />
                                        </p:link>
 
-                                       <p:link outcome="admin_assign_department_branch_office" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICE_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty department.departmentBranchOffice}">
+                                       <p:link outcome="admin_assign_department_branch_office" title="#{msg.ADMIN_LINK_ASSIGN_DEPARTMENT_BRANCH_OFFICE_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty department.departmentBranchOffice}">
                                                <f:param name="departmentId" value="#{department.departmentId}" />
                                        </p:link>
                                </p:column>
                                                        >
                                                        <f:converter converterId="CompanyEmployeeConverter" />
                                                        <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                                       <f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
+                                                       <f:selectItems value="#{employeeController.allCompanyEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
index bd6be33075f4ad09f231a4539635adabde62fe37..3ac1c7844a75859a98adf4c9393bec6d0a99c02e 100644 (file)
                        <p:dataTable
                                id="table-list-company-employees"
                                var="employee"
-                               value="#{companyEmployeeController.allCompanyEmployees()}"
+                               value="#{employeeController.allCompanyEmployees()}"
                                tableStyleClass="table table-full"
                                paginator="true"
                                paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
-                               filteredValue="#{companyEmployeeController.filteredEmployees}"
+                               filteredValue="#{employeeController.filteredEmployees}"
                                rows="10"
                                reflow="true"
                                resizableColumns="true"
                                                        styleClass="submit"
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_EMPLOYEE}"
-                                                       action="#{adminCompanyEmployeeController.addCompanyEmployee()}"
+                                                       action="#{adminEmployeeController.addCompanyEmployee()}"
                                                        update=":master:form-list-company-employees:table-list-company-employees"
                                                        />
                                        </p:panelGrid>