From 7cec58af6f42f34f6b5288a9f70b2029f97d8bb5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 25 Apr 2020 18:48:28 +0200
Subject: [PATCH] Product-only - admin_product_price_input_panel_grid.tpl to a
 ui:include with fixed backing   bean reference for type-safety -
 decimalSeparator and thousandSeparator are both not localizable, let's dump  
 them then and current user's locale will handle it - FSC number exposed in
 product list and modal - categoryEntryUpdated exposed in admin-list-category
 view - removed unneeded id attribute - removed product.jsf.taglib.xml
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../FinancialAdminCategoryWebRequestBean.java |  5 ++-
 .../localization/product_de_DE.properties     |  2 +
 .../localization/product_en_US.properties     |  2 +
 web/WEB-INF/product.jsf.taglib.xml            | 43 -------------------
 .../admin_form_generic_product_data.tpl       |  5 +--
 .../admin_product_price_input_panel_grid.tpl} | 28 ++++--------
 web/WEB-INF/web.xml                           |  2 +-
 .../admin_generic_product_list.xhtml          | 14 +++++-
 .../admin_product_category_list.xhtml         | 22 ++++++++--
 9 files changed, 50 insertions(+), 73 deletions(-)
 delete mode 100644 web/WEB-INF/product.jsf.taglib.xml
 rename web/WEB-INF/{resources/tags/input/panel_grid/generic_product/product_price_input_panel_grid.tpl => templates/admin/generic_product/admin_product_price_input_panel_grid.tpl} (68%)

diff --git a/src/java/org/mxchange/jfinancials/beans/product_category/FinancialAdminCategoryWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/product_category/FinancialAdminCategoryWebRequestBean.java
index ec0721c4..e1a5185c 100644
--- a/src/java/org/mxchange/jfinancials/beans/product_category/FinancialAdminCategoryWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/product_category/FinancialAdminCategoryWebRequestBean.java
@@ -180,7 +180,10 @@ public class FinancialAdminCategoryWebRequestBean extends BaseFinancialsBean imp
 	 */
 	private Category createCategoryInstance () {
 		// Create category
-		final Category category = new ProductCategory(this.getCategoryI18nKey(), this.getCategoryShownInStatistics());
+		final Category category = new ProductCategory(
+					   this.getCategoryI18nKey(),
+					   this.getCategoryShownInStatistics()
+			   );
 
 		// Set all optional fields
 		category.setParentCategory(this.getParentCategory());
diff --git a/src/java/org/mxchange/localization/product_de_DE.properties b/src/java/org/mxchange/localization/product_de_DE.properties
index 983ae2de..36d982fb 100644
--- a/src/java/org/mxchange/localization/product_de_DE.properties
+++ b/src/java/org/mxchange/localization/product_de_DE.properties
@@ -203,3 +203,5 @@ ADMIN_ENTER_GENERIC_PRODUCT_FSC_NUMBER_TITLE=Geben Sie die FSC-Nummer des Produk
 ERROR_PRODUCT_FSC_NUMBER_NOT_VALID=Fehler: FSC-Nummer des Produktes entspricht nicht dem Format: Cxxxxxx
 #@TODO Please fix German umlauts!
 ADMIN_GENERIC_PRODUCT_NOT_UPDATED=Sie haben keine Aenderungen am dem Produkt vorgenommen.
+ADMIN_PRODUCT_FSC_NUMBER_HEADER=FSC-Nummer:
+PRODUCT_FSC_NUMBER_TITLE=The FSC-Nummer des Produktes.
diff --git a/src/java/org/mxchange/localization/product_en_US.properties b/src/java/org/mxchange/localization/product_en_US.properties
index a4a2996e..e2e86e0b 100644
--- a/src/java/org/mxchange/localization/product_en_US.properties
+++ b/src/java/org/mxchange/localization/product_en_US.properties
@@ -162,3 +162,5 @@ ADMIN_ENTER_GENERIC_PRODUCT_FSC_NUMBER=Enter FSC number:
 ADMIN_ENTER_GENERIC_PRODUCT_FSC_NUMBER_TITLE=Enter product's FSC number with leading C and 6 digits.
 ERROR_PRODUCT_FSC_NUMBER_NOT_VALID=Error: FSC number not valid format: Cxxxxxx
 ADMIN_GENERIC_PRODUCT_NOT_UPDATED=You have not changed any product data.
+ADMIN_PRODUCT_FSC_NUMBER_HEADER=FSC number:
+PRODUCT_FSC_NUMBER_TITLE=The FSC number of the product.
diff --git a/web/WEB-INF/product.jsf.taglib.xml b/web/WEB-INF/product.jsf.taglib.xml
deleted file mode 100644
index d9254e25..00000000
--- a/web/WEB-INF/product.jsf.taglib.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (C) 2017 - 2020 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/jproduct/widgets</namespace>
-	<tag>
-		<tag-name>inputProductPricePanelGrid</tag-name>
-		<description>This tag renders input fields for creating a price panel grid for product prices.</description>
-		<source>resources/tags/input/panel_grid/generic_product/product_price_input_panel_grid.tpl</source>
-		<attribute>
-			<name>rendered</name>
-			<description>Whether this tag is being rendered by JSF engine (default: true).</description>
-			<required>false</required>
-			<type>java.lang.Boolean</type>
-		</attribute>
-		<attribute>
-			<name>targetController</name>
-			<description>A target backing bean (EL code resolving into it) extending at least BaseFacesBean where to set the data in.</description>
-			<required>true</required>
-			<!-- @TODO Find an interface for BaseFacesBean and set it here instead -->
-			<type>org.mxchange.jcoreee.bean.faces.BaseFacesBean</type>
-		</attribute>
-	</tag>
-</facelet-taglib>
diff --git a/web/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl b/web/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl
index c2ed32d6..29ad4f67 100644
--- a/web/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl
+++ b/web/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:product="http://mxchange.org/jsf/jproduct/widgets"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 	xmlns:p="http://primefaces.org/ui"
@@ -150,7 +149,7 @@
 				/>
 
 			<p:outputLabel value="#{product.ADMIN_ENTER_GENERIC_PRODUCT_PRICE}" />
-			<product:inputProductPricePanelGrid targetController="#{adminGenericProductActionController}" />
+			<ui:include src="/WEB-INF/templates/admin/generic_product/admin_product_price_input_panel_grid.tpl" />
 
 			<p:outputLabel for="productCurrencyCode" value="#{product.ADMIN_ENTER_GENERIC_PRODUCT_CURRENCY_CODE}" />
 			<p:inputText
@@ -170,8 +169,6 @@
 				size="20"
 				minValue="0.001"
 				maxValue="20000.000"
-				decimalSeparator=","
-				thousandSeparator="."
 				title="#{product.ADMIN_ENTER_GENERIC_PRODUCT_UNIT_AMOUNT_TITLE}"
 				required="true"
 				requiredMessage="#{product.ADMIN_PRODUCT_UNIT_AMOUNT_REQUIRED}"
diff --git a/web/WEB-INF/resources/tags/input/panel_grid/generic_product/product_price_input_panel_grid.tpl b/web/WEB-INF/templates/admin/generic_product/admin_product_price_input_panel_grid.tpl
similarity index 68%
rename from web/WEB-INF/resources/tags/input/panel_grid/generic_product/product_price_input_panel_grid.tpl
rename to web/WEB-INF/templates/admin/generic_product/admin_product_price_input_panel_grid.tpl
index 2fb59b28..5e119654 100644
--- a/web/WEB-INF/resources/tags/input/panel_grid/generic_product/product_price_input_panel_grid.tpl
+++ b/web/WEB-INF/templates/admin/generic_product/admin_product_price_input_panel_grid.tpl
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- @TODO Hard-coded values below -->
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 	xmlns:p="http://primefaces.org/ui"
 	>
@@ -23,38 +21,30 @@
 		<p:inputNumber
 			id="productNetPrice"
 			title="#{product.ENTER_PRODUCT_NET_PRICE_TITLE}"
-			value="#{targetController.productNetPrice}"
+			value="#{adminGenericProductActionController.productNetPrice}"
 			symbol=" EUR"
 			symbolPosition="s"
-			decimalSeparator=","
-			thousandSeparator="."
-			>
-		</p:inputNumber>
+			/>
 
 		<p:inputNumber
 			id="productTaxRate"
 			title="#{product.ENTER_PRODUCT_TAX_RATE_TITLE}"
-			value="#{targetController.productTaxRate}"
+			value="#{adminGenericProductActionController.productTaxRate}"
 			symbol="%"
 			symbolPosition="s"
-			thousandSeparator="."
-			decimalSeparator=","
-			emptyValue="sign"
-			>
-			<f:validateDoubleRange minimum="0" maximum="100" />
-		</p:inputNumber>
+			emptyValue="focus"
+			minValue="0"
+			maxValue="100"
+			/>
 
 		<p:inputNumber
 			id="productGrossPrice"
 			title="#{product.ENTER_PRODUCT_GROSS_PRICE_TITLE}"
-			value="#{targetController.productGrossPrice}"
+			value="#{adminGenericProductActionController.productGrossPrice}"
 			symbol=" EUR"
 			symbolPosition="s"
-			decimalSeparator=","
-			thousandSeparator="."
 			required="true"
 			requiredMessage="#{product.PRODUCT_GROSS_PRICE_REQUIRED}"
-			>
-		</p:inputNumber>
+			/>
 	</p:panelGrid>
 </ui:composition>
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index f2174ccc..0c57d37c 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -30,7 +30,7 @@
 	<context-param>
 		<description>Generic custom JSF tags library</description>
 		<param-name>javax.faces.FACELETS_LIBRARIES</param-name>
-		<param-value>/WEB-INF/widgets.jsf.taglib.xml;/WEB-INF/validators.jsf.taglib.xml;/WEB-INF/links.jsf.taglib.xml;/WEB-INF/project-links.jsf.taglib.xml;/WEB-INF/product.jsf.taglib.xml;/WEB-INF/product-links.jsf.taglib.xml</param-value>
+		<param-value>/WEB-INF/widgets.jsf.taglib.xml;/WEB-INF/validators.jsf.taglib.xml;/WEB-INF/links.jsf.taglib.xml;/WEB-INF/project-links.jsf.taglib.xml;;/WEB-INF/product-links.jsf.taglib.xml</param-value>
 	</context-param>
 	<context-param>
 		<description>Project stage</description>
diff --git a/web/admin/generic_product/admin_generic_product_list.xhtml b/web/admin/generic_product/admin_generic_product_list.xhtml
index 8343e6f8..cb23b86b 100644
--- a/web/admin/generic_product/admin_generic_product_list.xhtml
+++ b/web/admin/generic_product/admin_generic_product_list.xhtml
@@ -2,7 +2,6 @@
 <ui:composition
 	template="/WEB-INF/templates/admin/admin_base.tpl"
 	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:product-links="http://mxchange.org/jsf/jproduct/links"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
@@ -121,6 +120,16 @@
 					<h:outputText value="-" rendered="#{empty genericProduct.productNumber}" />
 				</p:column>
 
+				<p:column
+					headerText="#{product.ADMIN_PRODUCT_FSC_NUMBER_HEADER}"
+					sortBy="#{genericProduct.productFscNumber}"
+					filterBy="#{genericProduct.productFscNumber}"
+					filterMatchMode="contains"
+					>
+					<h:outputText value="#{genericProduct.productFscNumber}" rendered="#{not empty genericProduct.productFscNumber}" />
+					<h:outputText value="-" rendered="#{empty genericProduct.productFscNumber}" />
+				</p:column>
+
 				<p:column
 					headerText="#{product.ADMIN_PRODUCT_BARCODE_HEADER}"
 					sortBy="#{genericProduct.productBarCodeNumber}"
@@ -327,6 +336,9 @@
 						<h:outputText value="#{product.PRODUCT_NO_BARCODE_NUMBER_ASSIGNED}" rendered="#{empty productListController.selectedProduct.productBarCodeNumber}" />
 						<p:barcode format="svg" width="100%" type="#{initParam['product_barcode_type']}" value="#{productListController.selectedProduct.productBarCodeNumber}" rendered="#{not empty productListController.selectedProduct.productBarCodeNumber}" />
 
+						<p:outputLabel value="#{product.ADMIN_PRODUCT_FSC_NUMBER_HEADER}" title="#{product.PRODUCT_FSC_NUMBER_TITLE}" />
+						<h:outputText value="#{productListController.selectedProduct.productFscNumber}" />
+
 						<p:outputLabel value="#{msg.AVAILABLE_HEADER}" title="#{product.PRODUCT_AVAILABILITY_TITLE}" />
 						<h:outputText value="#{productListController.selectedProduct.productAvailability ? msg.CHOICE_YES : msg.CHOICE_NO}" />
 
diff --git a/web/admin/product_category/admin_product_category_list.xhtml b/web/admin/product_category/admin_product_category_list.xhtml
index ee96d9f2..9f5f9f64 100644
--- a/web/admin/product_category/admin_product_category_list.xhtml
+++ b/web/admin/product_category/admin_product_category_list.xhtml
@@ -2,7 +2,6 @@
 <ui:composition
 	template="/WEB-INF/templates/admin/admin_base.tpl"
 	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:product-links="http://mxchange.org/jsf/jproduct/links"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
@@ -158,10 +157,20 @@
 
 				<p:column
 					headerText="#{msg.ENTRY_CREATED_HEADER}"
-					sortBy="#{category.categoryCreated}"
+					sortBy="#{category.categoryEntryCreated}"
 					filterable="false"
 					>
-					<h:outputText id="categoryCreated" value="#{category.categoryCreated}">
+					<h:outputText value="#{category.categoryEntryCreated}">
+						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ENTRY_UPDATED_HEADER}"
+					sortBy="#{category.categoryEntryUpdated}"
+					filterable="false"
+					>
+					<h:outputText value="#{category.categoryEntryUpdated}">
 						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
 					</h:outputText>
 				</p:column>
@@ -241,7 +250,12 @@
 						<h:outputText value="#{product.CATEGORY_HAS_NO_PARENT}" rendered="#{empty categoryListController.selectedCategory.parentCategory}" />
 
 						<p:outputLabel value="#{msg.ENTRY_CREATED_HEADER}" title="#{product.ADMIN_CATEGORY_ENTRY_CREATED_TITLE}" />
-						<h:outputText value="#{categoryListController.selectedCategory.categoryCreated}">
+						<h:outputText value="#{categoryListController.selectedCategory.categoryEntryCreated}">
+							<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+						</h:outputText>
+
+						<p:outputLabel value="#{msg.ENTRY_UPDATED_HEADER}" title="#{product.ADMIN_CATEGORY_ENTRY_UPDATED_TITLE}" />
+						<h:outputText value="#{categoryListController.selectedCategory.categoryEntryUpdated}">
 							<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
 						</h:outputText>
 					</p:panelGrid>
-- 
2.39.5