From: Roland Häder <roland@mxchange.org>
Date: Wed, 20 May 2020 17:51:29 +0000 (+0200)
Subject: Product-only:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6602abd7ff7a068d1ddf0d3a15fd788bc4a95c48;p=jfinancials-war.git

Product-only:
- renamed adminCategoryController to adminProductCategoryController
- added column with filter for categoryShownInStatistics flag
- added missing i18n key

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/src/java/org/mxchange/jfinancials/beans/product_category/action/FinancialAdminProductCategoryActionWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/product_category/action/FinancialAdminProductCategoryActionWebRequestBean.java
index 87d7c80e..a147087b 100644
--- a/src/java/org/mxchange/jfinancials/beans/product_category/action/FinancialAdminProductCategoryActionWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/product_category/action/FinancialAdminProductCategoryActionWebRequestBean.java
@@ -115,7 +115,7 @@ public class FinancialAdminProductCategoryActionWebRequestBean extends BaseFinan
 	/**
 	 * Adds given category data from request to database
 	 */
-	public void addCategory () {
+	public void addProductCategory () {
 		// Is i18n key already used?
 		if (this.productCategoryListController.isCategoryI18nKeyAdded(this.getCategoryI18nKey())) {
 			// Throw exception
@@ -255,11 +255,11 @@ public class FinancialAdminProductCategoryActionWebRequestBean extends BaseFinan
 	}
 
 	/**
-	 * Updates given category data from request to database
+	 * Updates given product category data from request to database.
 	 * <p>
 	 * @return Redirection outcome
 	 */
-	public String updateCategory () {
+	public String updateProductCategory () {
 		// Check if current category is set
 		if (this.getCurrentCategory() == null) {
 			// Throw NPE
diff --git a/src/java/org/mxchange/localization/product_de_DE.properties b/src/java/org/mxchange/localization/product_de_DE.properties
index a85a1622..fd4ca7c6 100644
--- a/src/java/org/mxchange/localization/product_de_DE.properties
+++ b/src/java/org/mxchange/localization/product_de_DE.properties
@@ -213,3 +213,4 @@ ADMIN_EDIT_PRODUCT_CATEGORY_MINIMUM_DATA=Geben Sie mindestens den I18n-Schluesse
 BUTTON_ADMIN_EDIT_PRODUCT_CATEGORY=Produktkategorie \u00e4ndern
 ADMIN_EDIT_PRODUCT_CATEGORY_TITLE=Produktkategorie mit Id {0} editieren:
 ADMIN_PRODUCT_CATEGORY_NOT_UPDATED=Sie haben die Produktkategorie nicht ge\u00e4ndert.
+SHOWN_IN_STATISTICS_HEADER=In Statistiken angezeigt:
diff --git a/src/java/org/mxchange/localization/product_en_US.properties b/src/java/org/mxchange/localization/product_en_US.properties
index aff88ae3..2bebb528 100644
--- a/src/java/org/mxchange/localization/product_en_US.properties
+++ b/src/java/org/mxchange/localization/product_en_US.properties
@@ -172,3 +172,4 @@ ADMIN_EDIT_PRODUCT_CATEGORY_MINIMUM_DATA=Please enter at least the i18n key to e
 BUTTON_ADMIN_EDIT_PRODUCT_CATEGORY=Change product category
 ADMIN_EDIT_PRODUCT_CATEGORY_TITLE=Edit product category Id {0}:
 ADMIN_PRODUCT_CATEGORY_NOT_UPDATED=You have not changed the product category.
+SHOWN_IN_STATISTICS_HEADER=Shown in statistics:
diff --git a/web/admin/product_category/admin_product_category_edit.xhtml b/web/admin/product_category/admin_product_category_edit.xhtml
index d80f14a1..e7934c14 100644
--- a/web/admin/product_category/admin_product_category_edit.xhtml
+++ b/web/admin/product_category/admin_product_category_edit.xhtml
@@ -69,7 +69,7 @@
 						<p:commandButton
 							type="submit"
 							value="#{product.BUTTON_ADMIN_EDIT_PRODUCT_CATEGORY}"
-							action="#{adminProductCategoryActionController.updateCategory()}"
+							action="#{adminProductCategoryActionController.updateProductCategory()}"
 							/>
 					</p:panelGrid>
 				</f:facet>
diff --git a/web/admin/product_category/admin_product_category_list.xhtml b/web/admin/product_category/admin_product_category_list.xhtml
index 67c61b13..ccbcdcba 100644
--- a/web/admin/product_category/admin_product_category_list.xhtml
+++ b/web/admin/product_category/admin_product_category_list.xhtml
@@ -155,6 +155,24 @@
 					</p:link>
 				</p:column>
 
+				<p:column
+					headerText="#{product.SHOWN_IN_STATISTICS_HEADER}"
+					sortBy="#{category.categoryShownInStatistics}"
+					filterBy="#{category.categoryShownInStatistics}"
+					filterMatchMode="exact"
+					>
+					<f:facet name="filter">
+						<p:selectOneMenu onchange="PF('categoryList').filter()">
+							<f:converter converterId="javax.faces.Boolean" />
+							<f:selectItem itemLabel="#{msg.CHOICE_ALL}" itemValue="#{null}" />
+							<f:selectItem itemLabel="#{msg.CHOICE_YES}" itemValue="true" />
+							<f:selectItem itemLabel="#{msg.CHOICE_NO}" itemValue="false" />
+						</p:selectOneMenu>
+					</f:facet>
+
+					<h:outputText value="#{category.categoryShownInStatistics ? msg.CHOICE_YES : msg.CHOICE_NO}" />
+				</p:column>
+
 				<p:column
 					headerText="#{msg.ENTRY_CREATED_HEADER}"
 					sortBy="#{category.categoryEntryCreated}"
@@ -288,7 +306,7 @@
 						<p:commandButton
 							type="submit"
 							value="#{product.BUTTON_ADMIN_ADD_PRODUCT_CATEGORY}"
-							action="#{adminCategoryController.addCategory()}"
+							action="#{adminProductCategoryActionController.addProductCategory()}"
 							update="form-list-categories:categoryList"
 							/>
 					</p:panelGrid>
diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml
index 43392523..349a5a1c 100644
--- a/web/guest/user/user_list.xhtml
+++ b/web/guest/user/user_list.xhtml
@@ -56,7 +56,7 @@
 							<h:outputText value="#{msg.USER_CREATED}" />
 						</f:facet>
 
-						<h:outputFormat id="userEntryCreated" value="#{user.userEntryCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
+						<h:outputFormat value="#{user.userEntryCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
 					</p:column>
 				</ui:fragment>
 			</p:dataTable>