From 44b06ed4d4321f91993c1593e11d3f237f76037d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 31 Mar 2018 05:58:09 +0200 Subject: [PATCH] Product-only: - added dialog (modal) for details about a single category - updated header for same list - added missing i18n keys MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../FinancialsCategoryListWebViewBean.java | 23 +++++++ .../localization/project_de_DE.properties | 16 ++++- .../localization/project_en_US.properties | 12 +++- .../admin_generic_product_list.xhtml | 7 +- .../admin_product_category_list.xhtml | 69 +++++++++++++++++-- 5 files changed, 119 insertions(+), 8 deletions(-) diff --git a/src/java/org/mxchange/jfinancials/beans/product_category/list/FinancialsCategoryListWebViewBean.java b/src/java/org/mxchange/jfinancials/beans/product_category/list/FinancialsCategoryListWebViewBean.java index 3f7aac14..ac6c29e7 100644 --- a/src/java/org/mxchange/jfinancials/beans/product_category/list/FinancialsCategoryListWebViewBean.java +++ b/src/java/org/mxchange/jfinancials/beans/product_category/list/FinancialsCategoryListWebViewBean.java @@ -73,6 +73,11 @@ public class FinancialsCategoryListWebViewBean extends BaseFinancialsBean implem */ private List filteredCategories; + /** + * Selected category + */ + private Category selectedCategory; + /** * Default constructor */ @@ -162,6 +167,24 @@ public class FinancialsCategoryListWebViewBean extends BaseFinancialsBean implem this.filteredCategories = filteredCategories; } + /** + * Getter for selected category + *

+ * @return Selected category + */ + public Category getSelectedCategory () { + return this.selectedCategory; + } + + /** + * Setter for selected category + *

+ * @param selectedCategory Selected category + */ + public void setSelectedCategory (final Category selectedCategory) { + this.selectedCategory = selectedCategory; + } + /** * Initialization of this bean */ diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties index 6c915c0c..bdd82382 100644 --- a/src/java/org/mxchange/localization/project_de_DE.properties +++ b/src/java/org/mxchange/localization/project_de_DE.properties @@ -171,7 +171,6 @@ CONTENT_TITLE_ADMIN_LIST_PRODUCT_CATEGORY=Produktkategorien auflisten: TABLE_SUMMARY_ADMIN_LIST_PRODUCT_CATEGORIES=Diese Tabelle listet alle eingetragenen Produktkategorien auf. #@TODO Please fix German umlauts! ADMIN_EMPTY_LIST_PRODUCT_CATEGORIES=Es befinden sich keine Produktkategorien in der Datenbank. Oder Ihre Suche ergab keine Uebereinstimmungen. -ADMIN_LIST_PRODUCT_CATEGORIES_HEADER=Alle Produktkategorien auflisten ADMIN_ASSIGNED_PARENT_CATEGORY_HEADER=Zugewiesene Elternkategorie: ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE=Zeigt Daten der Produktkategorie an. ADMIN_LINK_ASSIGN_PARENT_CATEGORY_TITLE=Elternkategorie zuweisen. @@ -210,6 +209,7 @@ SELECT_RECEIPT_ITEM_MANUFACTURER=Hersteller zum Kassenboneintrah auswaehlen: ADMIN_RECEIPT_ITEM_MANUFACTURER_NAME_HEADER=Hersteller des Boneintrages: ENTER_RECEIPT_ITEM_BRAND_NAME=Warenzeichen/Marke eingeben: ENTER_RECEIPT_ITEM_BRAND_NAME_TITLE=Geben Sie das Warenzeichen ein, dass Sie auf dem Kassenbon finden. +#@TODO Please fix German umlauts! ADMIN_PRODUCT_CURRENCY_CODE_REQUIRED=Bitte geben Sie den Waehrungscode fuer das Produkt ein. Beispiele: EUR, USD, PHP #@TODO Please fix German umlauts! ADMIN_PRODUCT_UNIT_AMOUNT_REQUIRED=Bitte geben Sie die Stueckanzahl des Produktes ein. Beispiel: 500 fuer 500g @@ -289,3 +289,17 @@ PRODUCT_UNIT_I18N_KEY_TITLE=Internationalisierungsschluessel fuer Einheit PRODUCT_HAS_NO_MANUFACTURER_ASSIGNED=Produkt hat keinen Hersteller zugewiesen. ADMIN_ASSIGNED_PRODUCT_MANUFACTURER_HEADER=Zugewiesener Hersteller: ADMIN_ASSIGNED_PRODUCT_MANUFACTURER_TITLE=Diesem Produkt zugewiesner Hersteller. +#@TODO Please fix German umlauts! +ADMIN_PRODUCT_ENTRY_CREATED_TITLE=Wann dieses Produkt der Datenbank hinzugefuegt wurde. +#@TODO Please fix German umlauts! +ADMIN_CATEGORY_ENTRY_CREATED_TITLE=Wann diese Kategorie der Datenbank hinzugefuegt wurde. +ADMIN_SINGLE_CATEGORY_DETAILS_HEADER=Details zur einzelnen Kategorie +ADMIN_CATEGORY_DETAILS_HEADER=Details zur Kategorie "{0}" (Id {1}): +CATEGORY_ID_NUMBER_TITLE=Id-Nummer der Kategorie +#@TODO Please fix German umlauts! +CATEGORY_I18N_KEY_TITLE=Internationalisationsschluessel fuer Kategorie +CATEGORY_IN_STATISTICS_HEADER=In Statistiken: +CATEGORY_SHOW_IN_STATISTICS_TITLE=Ob diese Kategorie in Statistiken vorkommt. +CATEGORY_PARENT_HEADER=Elternkategorie: +CATEGORY_PARENT_TITLE=Elternkategorie dieser Kategorie. +CATEGORY_HAS_NO_PARENT=Diese Kategorie hat keine Elternkategorie. diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties index 6c749589..9c7b9ae1 100644 --- a/src/java/org/mxchange/localization/project_en_US.properties +++ b/src/java/org/mxchange/localization/project_en_US.properties @@ -123,7 +123,6 @@ PAGE_TITLE_ADMIN_LIST_PRODUCT_CATEGORY=List product categories CONTENT_TITLE_ADMIN_LIST_PRODUCT_CATEGORY=List product categories: TABLE_SUMMARY_ADMIN_LIST_PRODUCT_CATEGORIES=This table lists all product categories. ADMIN_EMPTY_LIST_PRODUCT_CATEGORIES=There are no product categories in database. Or your search criteria doesn't match anything. -ADMIN_LIST_PRODUCT_CATEGORIES_HEADER=List all product categories ADMIN_ASSIGNED_PARENT_CATEGORY_HEADER=Assigned parent category: ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE=Shows product category data. ADMIN_LINK_ASSIGN_PARENT_CATEGORY_TITLE=Assign parent cateogory. @@ -211,3 +210,14 @@ PRODUCT_UNIT_I18N_KEY_TITLE=Internationalization key for unit PRODUCT_HAS_NO_MANUFACTURER_ASSIGNED=Product has no manufacturer assigned. ADMIN_ASSIGNED_PRODUCT_MANUFACTURER_HEADER=Assigned manufacturer: ADMIN_ASSIGNED_PRODUCT_MANUFACTURER_TITLE=This product assigned manufacturer. +ADMIN_PRODUCT_ENTRY_CREATED_TITLE=When this product has been created in database. +ADMIN_CATEGORY_ENTRY_CREATED_TITLE=When this category has been created in database. +ADMIN_SINGLE_CATEGORY_DETAILS_HEADER=Details of a single category +ADMIN_CATEGORY_DETAILS_HEADER=Details of category "{0}" (Id {1}): +CATEGORY_ID_NUMBER_TITLE=Id number of category +CATEGORY_I18N_KEY_TITLE=Internationalization key for category +CATEGORY_IN_STATISTICS_HEADER=In Statistics: +CATEGORY_SHOW_IN_STATISTICS_TITLE=Whether this category is shown in statistics. +CATEGORY_PARENT_HEADER=Parent category: +CATEGORY_PARENT_TITLE=Parent category of this category. +CATEGORY_HAS_NO_PARENT=This category has no parent category. diff --git a/web/admin/generic_product/admin_generic_product_list.xhtml b/web/admin/generic_product/admin_generic_product_list.xhtml index d98d5da2..ce6deff3 100644 --- a/web/admin/generic_product/admin_generic_product_list.xhtml +++ b/web/admin/generic_product/admin_generic_product_list.xhtml @@ -154,7 +154,7 @@ hideEffect="fade" showEffect="fade" widgetVar="productDialog" - position="center center" + position="center,center" responsive="true" > @@ -232,6 +232,11 @@ + + + + + diff --git a/web/admin/product_category/admin_product_category_list.xhtml b/web/admin/product_category/admin_product_category_list.xhtml index 0d7176f5..a940780c 100644 --- a/web/admin/product_category/admin_product_category_list.xhtml +++ b/web/admin/product_category/admin_product_category_list.xhtml @@ -24,8 +24,9 @@ tableStyleClass="table table-full" paginator="true" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" - filteredValue="#{categoryController.filteredCategories}" + filteredValue="#{categoryListController.filteredCategories}" rows="10" + rowKey="#{category.categoryId}" reflow="true" resizableColumns="true" rowsPerPageTemplate="5,10,20,50,100" @@ -33,19 +34,34 @@ summary="#{project.TABLE_SUMMARY_ADMIN_LIST_PRODUCT_CATEGORIES}" emptyMessage="#{project.ADMIN_EMPTY_LIST_PRODUCT_CATEGORIES}" widgetVar="categoryList" + selectionMode="single" + selection="#{categoryListController.selectedCategory}" + skipChildren="true" > - - + + - + + + + + + + - + + + @@ -91,6 +107,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.39.5