]> git.mxchange.org Git - jfinancials-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Tue, 20 Mar 2018 23:19:39 +0000 (00:19 +0100)
committerRoland Häder <roland@mxchange.org>
Tue, 20 Mar 2018 23:19:39 +0000 (00:19 +0100)
- removed no longer required profile-mode backing bean
- removed admin_form_user_personal_data.tpl as there is no need for it
- added validators.jsf.taglib.xml which holds descriptions for JSF validators ...
- always sort/filter by direct entity
- fixed i18n keys, was missing an underscore

Signed-off-by: Roland Häder <roland@mxchange.org>
14 files changed:
lib/primefaces/primefaces-6.1_LICENSE.txt [deleted file]
lib/primefaces/primefaces-6.2_LICENSE.txt [new file with mode: 0644]
src/java/org/mxchange/jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationBean.java [deleted file]
src/java/org/mxchange/jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationController.java [deleted file]
web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl [deleted file]
web/WEB-INF/validators.jsf.taglib.xml [new file with mode: 0644]
web/admin/basic_data/admin_basic_data_list.xhtml
web/admin/branch_office/admin_branch_office_list.xhtml
web/admin/contact/admin_contact_edit.xhtml
web/admin/contact/admin_contact_list.xhtml
web/admin/department/admin_department_list.xhtml
web/admin/employee/admin_employee_list.xhtml
web/admin/headquarter/admin_headquarter_list.xhtml
web/admin/user/admin_user_list.xhtml

diff --git a/lib/primefaces/primefaces-6.1_LICENSE.txt b/lib/primefaces/primefaces-6.1_LICENSE.txt
deleted file mode 100644 (file)
index d645695..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/lib/primefaces/primefaces-6.2_LICENSE.txt b/lib/primefaces/primefaces-6.2_LICENSE.txt
new file mode 100644 (file)
index 0000000..d645695
--- /dev/null
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/src/java/org/mxchange/jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationBean.java b/src/java/org/mxchange/jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationBean.java
deleted file mode 100644 (file)
index 54d720b..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2016, 2017 Roland Häder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jfinancials.beans.profilemode;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
-import org.mxchange.jfinancials.beans.BaseFinancialsBean;
-import org.mxchange.jusercore.model.user.profilemodes.ProfileMode;
-
-/**
- * A profile mode bean
- * <p>
- * @author Roland Häder<roland@mxchange.org>
- */
-@Named ("profileModeController")
-@ApplicationScoped
-public class FinancialsProfileModeWebApplicationBean extends BaseFinancialsBean implements FinancialsProfileModeWebApplicationController {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 835_482_364_189L;
-
-       /**
-        * A list of all profile modes
-        */
-       private final List<ProfileMode> allProfileModes;
-
-       /**
-        * Default constructor
-        */
-       public FinancialsProfileModeWebApplicationBean () {
-               // Call super constructor
-               super();
-
-               // Init list
-               this.allProfileModes = Arrays.asList(ProfileMode.values());
-       }
-
-       /**
-        * Getter for all profile modes as array
-        * <p>
-        * @return All profile modes as list
-        */
-       public List<ProfileMode> allProfileModes () {
-               // Return it
-               return Collections.unmodifiableList(this.allProfileModes);
-       }
-}
diff --git a/src/java/org/mxchange/jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationController.java b/src/java/org/mxchange/jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationController.java
deleted file mode 100644 (file)
index 20331e0..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2016, 2017 Roland Häder
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jfinancials.beans.profilemode;
-
-import java.io.Serializable;
-
-/**
- * An interface for data beans
- * <p>
- * @author Roland Häder<roland@mxchange.org>
- */
-public interface FinancialsProfileModeWebApplicationController extends Serializable {
-
-}
diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
deleted file mode 100644 (file)
index 973b944..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:core="http://mxchange.org/jsf/core/widgets"
-       xmlns:f="http://java.sun.com/jsf/core"
-       xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-       <core:outputAdminUserDataFormFields mode="add" />
-
-       <h:panelGroup styleClass="para notice">
-               <h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
-       </h:panelGroup>
-
-       <core:outputAdminContactDataFormFields allowEmptyRequiredData="true" />
-</ui:composition>
diff --git a/web/WEB-INF/validators.jsf.taglib.xml b/web/WEB-INF/validators.jsf.taglib.xml
new file mode 100644 (file)
index 0000000..e575a7a
--- /dev/null
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2017, 2018 Free Software Foundation
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<facelet-taglib version="2.2"
+                               xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+                               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                               xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_2.xsd">
+       <namespace>http://mxchange.org/jsf/core/validators</namespace>
+       <tag>
+               <tag-name>emailAddressValidator</tag-name>
+               <validator>
+                       <validator-id>EmailAddressValidator</validator-id>
+               </validator>
+               <attribute>
+                       <description>Whether email address is allowed to be empty.</description>
+                       <name>allowEmptyRequiredData</name>
+                       <type>java.lang.Boolean</type>
+                       <required>false</required>
+               </attribute>
+       </tag>
+       <tag>
+               <tag-name>basicDataEmailAddressValidator</tag-name>
+               <validator>
+                       <validator-id>BasicDataEmailAddressValidator</validator-id>
+               </validator>
+               <attribute>
+                       <description>Whether email address is allowed to be empty.</description>
+                       <name>allowEmptyRequiredData</name>
+                       <type>java.lang.Boolean</type>
+                       <required>false</required>
+               </attribute>
+       </tag>
+       <tag>
+               <tag-name>employeeEmailAddressValidator</tag-name>
+               <validator>
+                       <validator-id>EmployeeEmailAddressValidator</validator-id>
+               </validator>
+               <attribute>
+                       <description>Whether email address is allowed to be empty.</description>
+                       <name>allowEmptyRequiredData</name>
+                       <type>java.lang.Boolean</type>
+                       <required>false</required>
+               </attribute>
+       </tag>
+       <tag>
+               <tag-name>headquarterEmailAddressValidator</tag-name>
+               <validator>
+                       <validator-id>HeadquarterEmailAddressValidator</validator-id>
+               </validator>
+               <attribute>
+                       <description>Whether email address is allowed to be empty.</description>
+                       <name>allowEmptyRequiredData</name>
+                       <type>java.lang.Boolean</type>
+                       <required>false</required>
+               </attribute>
+       </tag>
+       <tag>
+               <tag-name>urlValidator</tag-name>
+               <validator>
+                       <validator-id>UrlValidator</validator-id>
+               </validator>
+               <attribute>
+                       <description>Whether URL is allowed to be empty.</description>
+                       <name>allowEmptyRequiredData</name>
+                       <type>java.lang.Boolean</type>
+                       <required>false</required>
+               </attribute>
+       </tag>
+</facelet-taglib>
index 86988c96a641bf556c455d7c2e7b8b457a2fec57..db8572808feb0fb47c049853326f5f45f5eff4b1 100644 (file)
@@ -32,7 +32,7 @@
                                rowsPerPageTemplate="5,10,20,50,100"
                                sortMode="multiple"
                                summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BASIC_DATA}"
-                               emptyMessage="#{msg.ADMIN__EMPTY_LISTBASIC_DATA}"
+                               emptyMessage="#{msg.ADMIN__EMPTY_LIST_BASIC_DATA}"
                                widgetVar="basicDataList"
                                >
 
@@ -53,7 +53,7 @@
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{basicData.companyUserOwner.userName}" filterBy="#{basicData.companyUserOwner}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{basicData.companyUserOwner}" filterBy="#{basicData.companyUserOwner}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
index 6f14b7259e07e11690156904c34501c6ee65832a..5c7d4bc43f5fadf526ff9a3fb4a0ccf95a5a0877 100644 (file)
@@ -53,7 +53,7 @@
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{branchOffice.branchUserOwner.userName}" filterBy="#{branchOffice.branchUserOwner}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{branchOffice.branchUserOwner}" filterBy="#{branchOffice.branchUserOwner}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
@@ -78,7 +78,7 @@
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_BASIC_DATA_COMPANY_NAME}" sortBy="#{branchOffice.branchCompany.companyName}" filterBy="#{branchOffice.branchCompany}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_HEADER_BASIC_DATA_COMPANY_NAME}" sortBy="#{branchOffice.branchCompany}" filterBy="#{branchOffice.branchCompany}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        </f:facet>
 
                                        <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:outputText value="#{beanHelper.renderBasicData(branchOffice.branchCompany)}" />
                                        </h:outputLink>
 
-                                       <h:outputText value="#{branchOffice.branchCompany.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty branchOffice.branchCompany.companyWebsiteUrl}" />
+                                       <h:outputText value="#{beanHelper.renderBasicData(branchOffice.branchCompany)}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty branchOffice.branchCompany.companyWebsiteUrl}" />
                                </p:column>
 
                                <p:column headerText="#{msg.DATA_EMAIL_ADDRESS}" sortBy="#{branchOffice.branchEmailAddress}" filterBy="#{branchOffice.branchEmailAddress}" filterMatchMode="contains">
                                        <h:outputText value="#{beanHelper.renderBranchOffice(branchOffice)}" title="#{beanHelper.renderBranchOffice(branchOffice)}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_COMPANY_CONTACT_PERSON}" sortBy="#{branchOffice.branchContactEmployee.employeePersonalData}" filterBy="#{branchOffice.branchContactEmployee}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_HEADER_COMPANY_CONTACT_PERSON}" sortBy="#{branchOffice.branchContactEmployee}" filterBy="#{branchOffice.branchContactEmployee}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
index ad35c2b9e2648d676032fb2b1819468960d101a2..720bb4639051cded284a016b2e62cbc47b3aa2ab 100644 (file)
@@ -37,7 +37,7 @@
                                        <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE}" />
                                </div>
 
-                               <core:outputAdminContactDataFormFields />
+                               <core:outputAdminContactDataFormFields allowEmptyRequiredData="true" />
 
                                <div class="table-footer">
                                        <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
index cab7c664cd24c9c048a8f8d9401b6f6facca8436..23a8c17d7d6d3e4de6b5495ba4f6b2570f726f60 100644 (file)
@@ -99,7 +99,7 @@
 
                                <h:outputText value="#{msg.ADMIN_ADD_CONTACT_MINIMUM_DATA}" />
 
-                               <core:outputAdminContactDataFormFields />
+                               <core:outputAdminContactDataFormFields allowEmptyRequiredData="true" />
 
                                <f:facet name="footer">
                                        <p:commandButton
index a019fee0b7409b0b7bf7068b16a3559a293c6de7..612e2966a6141d0069c1e0a26d2b0365e830824d 100644 (file)
                                        </f:facet>
 
                                        <h:outputLink value="#{department.departmentCompany.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty department.departmentCompany.companyWebsiteUrl}">
-                                               <h:outputText value="#{department.departmentCompany.companyName}" />
+                                               <h:outputText value="#{beanHelper.renderBasicData(department.departmentCompany)}" />
                                        </h:outputLink>
 
-                                       <h:outputText value="#{department.departmentCompany.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty department.departmentCompany.companyWebsiteUrl}" />
+                                       <h:outputText value="#{beanHelper.renderBasicData(department.departmentCompany)}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty department.departmentCompany.companyWebsiteUrl}" />
                                </p:column>
 
                                <p:column headerText="#{msg.ADMIN_ASSIGNED_BRANCH_OFFICE}" sortBy="#{department.departmentBranchOffice}" filterBy="#{department.departmentBranchOffice}" filterMatchMode="in">
@@ -95,7 +95,7 @@
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{department.departmentBranchOffice.branchId}" rendered="#{not empty department.departmentBranchOffice}">
+                                       <p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{beanHelper.renderBranchOffice(department.departmentBranchOffice)}" rendered="#{not empty department.departmentBranchOffice}">
                                                <f:param name="branchId" value="#{department.departmentBranchOffice.branchId}" />
                                        </p:link>
 
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{department.departmentUserOwner.userName}" filterBy="#{department.departmentUserOwner}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{department.departmentUserOwner}" filterBy="#{department.departmentUserOwner}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
index eb02e42f5fd58340f3a1b92a30edfb06f611651b..d8317bbb0312b8e555056f09a0c1496e2742eaac 100644 (file)
                                id="table-list-company-employees"
                                var="employee"
                                value="#{employeeController.allEmployees()}"
+                               filteredValue="#{employeeController.filteredEmployees}"
                                tableStyleClass="table table-full"
                                paginator="true"
                                paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
-                               filteredValue="#{employeeController.filteredEmployees}"
                                rows="10"
                                reflow="true"
                                resizableColumns="true"
@@ -78,7 +78,7 @@
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{employee.employeeUserOwner.userName}" filterBy="#{employee.employeeUserOwner}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{employee.employeeUserOwner}" filterBy="#{employee.employeeUserOwner}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                <f:param name="userId" value="#{employee.employeeUserOwner.userId}" />
                                        </p:link>
 
-                                       <p:link outcome="admin_assign_employee_owner" title="#{msg.ADMIN_LINK_ASSIGN_EMPLOYEES_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty employee.employeeUserOwner}">
+                                       <p:link outcome="admin_assign_user_owner" title="#{msg.ADMIN_LINK_ASSIGN_EMPLOYEES_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty employee.employeeUserOwner}">
                                                <f:param name="employeeId" value="#{employee.employeeId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_BASIC_DATA_COMPANY_NAME}" sortBy="#{employee.employeeCompany.companyName}" filterBy="#{employee.employeeCompany}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_HEADER_BASIC_DATA_COMPANY_NAME}" sortBy="#{employee.employeeBasicData}" filterBy="#{employee.employeeBasicData}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <h:outputLink value="#{employee.employeeCompany.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty employee.employeeCompany.companyWebsiteUrl}">
-                                               <h:outputText value="#{employee.employeeCompany.companyName}" />
+                                       <h:outputLink value="#{employee.employeeBasicData.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty employee.employeeBasicData.companyWebsiteUrl}">
+                                               <h:outputText value="#{beanHelper.renderBasicData(employee.employeeBasicData)}" />
                                        </h:outputLink>
 
-                                       <h:outputText value="#{employee.employeeCompany.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty employee.employeeCompany.companyWebsiteUrl}" />
+                                       <h:outputText value="#{beanHelper.renderBasicData(employee.employeeBasicData)}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty employee.employeeBasicData.companyWebsiteUrl}" />
                                </p:column>
 
                                <p:column headerText="#{msg.DATA_EMAIL_ADDRESS}" sortBy="#{employee.employeeEmailAddress}" filterBy="#{employee.employeeEmailAddress}" filterMatchMode="contains">
index 60309dac56c69947ff18ba684da682674356163d..7aaf81c1b22b315d7cee73ecf3f291dcb2f88c6b 100644 (file)
@@ -52,7 +52,7 @@
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{headquarter.headquarterUserOwner.userName}" filterBy="#{headquarter.headquarterUserOwner}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{headquarter.headquarterUserOwner}" filterBy="#{headquarter.headquarterUserOwner}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
@@ -87,7 +87,7 @@
                                        <h:outputText value="#{beanHelper.renderHeadquarter(headquarter)}" title="#{beanHelper.renderHeadquarter(headquarter)}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_COMPANY_CONTACT_PERSON}" sortBy="#{headquarter.headquarterContactEmployee.employeePersonalData}" filterBy="#{headquarter.headquarterContactEmployee}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_HEADER_COMPANY_CONTACT_PERSON}" sortBy="#{headquarter.headquarterContactEmployee}" filterBy="#{headquarter.headquarterContactEmployee}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
index fdd0c1408d4aa34a0f0417c5fa1471db89adeacb..1f8eb8ff0a112ae870f2e7f3d5834bcd29ffceb0 100644 (file)
 
                                <!-- ... or enter it directly together it creating user account //-->
                                <h:panelGroup layout="block">
-                                       <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
+                                       <core:outputAdminUserDataFormFields mode="add" />
+
+                                       <h:panelGroup styleClass="para notice">
+                                               <h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
+                                       </h:panelGroup>
+
+                                       <core:outputAdminContactDataFormFields allowEmptyRequiredData="true" />
                                </h:panelGroup>
 
                                <f:facet name="footer">