From 3d060825916b05291528becf901537e1d95290e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 29 Sep 2017 23:42:20 +0200 Subject: [PATCH] Don't cherry-pick: - cleared receipt backing bean after the receipt has been successfull added and event has been triggered - rewrote more towards PrimeFaces to have (more but not fully) responsive forms - renamed i18n strings - tpzo fixed MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../FinancialAdminReceiptWebRequestBean.java | 18 ++++++++ .../FinancialsReceiptWebRequestBean.java | 17 ++++++++ .../localization/project_de_DE.properties | 4 +- .../localization/project_en_US.properties | 4 +- .../receipt/admin_form_financial_receipt.tpl | 38 ++++++---------- web/WEB-INF/templates/admin/menu/project.tpl | 7 ++- .../receipt/login_form_financial_receipt.tpl | 8 ++-- web/admin/fax/admin_fax_show.xhtml | 2 +- .../receipts/admin_receipt_list.xhtml | 43 ++++++++++++------- web/admin/landline/admin_landline_show.xhtml | 2 +- web/admin/mobile/admin_mobile_show.xhtml | 2 +- .../login_financials_add_income.xhtml | 2 +- .../login_financials_add_receipt.xhtml | 6 +-- .../login_financials_overview.xhtml | 4 +- 14 files changed, 98 insertions(+), 59 deletions(-) diff --git a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialAdminReceiptWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialAdminReceiptWebRequestBean.java index 00af46b6..0c797f2e 100644 --- a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialAdminReceiptWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialAdminReceiptWebRequestBean.java @@ -167,6 +167,9 @@ public class FinancialAdminReceiptWebRequestBean extends BaseFinancialsBean impl // Fire event with updated instance this.adminAddedReceiptEvent.fire(new ReceiptAddedEvent(updatedReceipt)); + // Clear bean + this.clear(); + // Return redirect outcome return "add_receipt_item?faces-redirect=true"; //NOI18N } @@ -317,6 +320,21 @@ public class FinancialAdminReceiptWebRequestBean extends BaseFinancialsBean impl this.receiptUser = receiptUser; } + /** + * Clears this bean + */ + private void clear () { + // Clear all fields + this.setReceiptBarCodeNumber(null); + this.setReceiptBranchOffice(null); + this.setReceiptIssued(null); + this.setReceiptNumber(null); + this.setReceiptPaymentType(null); + this.setReceiptRegisterNumber(null); + this.setReceiptSellerEmployee(null); + this.setReceiptUser(null); + } + /** * Creates a new instance from all available data of this bean. *

diff --git a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialsReceiptWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialsReceiptWebRequestBean.java index 46a90a6d..b1dc31e3 100644 --- a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialsReceiptWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialsReceiptWebRequestBean.java @@ -202,6 +202,9 @@ public class FinancialsReceiptWebRequestBean extends BaseFinancialsBean implemen // Fire event with updated instance this.addedReceiptEvent.fire(new ReceiptAddedEvent(updatedReceipt)); + // Clear bean + this.clear(); + // Return redirect outcome return "add_receipt_item?faces-redirect=true"; //NOI18N } @@ -475,6 +478,20 @@ public class FinancialsReceiptWebRequestBean extends BaseFinancialsBean implemen return this.allReceipts.contains(receipt); } + /** + * Clears this bean + */ + private void clear () { + // Clear all fields + this.setReceiptBarCodeNumber(null); + this.setReceiptBranchOffice(null); + this.setReceiptIssued(null); + this.setReceiptNumber(null); + this.setReceiptPaymentType(null); + this.setReceiptRegisterNumber(null); + this.setReceiptSellerEmployee(null); + } + /** * Returns a fully created receipt instance (except primary key, of course) *

diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties index dd5c1590..3ee7f47d 100644 --- a/src/java/org/mxchange/localization/project_de_DE.properties +++ b/src/java/org/mxchange/localization/project_de_DE.properties @@ -48,8 +48,8 @@ ADMIN_ADD_FINANCIAL_RECEIPT_TITLE=Neuen Kassenbon hinzufuegen BUTTON_ADMIN_ADD_FINANCIAL_RECEIPT=Kassenbon hinzufuegen ADMIN_FINANCIAL_RECEIPT_ISSUE_DATE_REQUIRED=Bitte geben Sie das Ausstellungsdatum des Kassenbons ein. ADMIN_MENU_FINANCIAL_RECEIPTS_TITLE=Kassenbons -LINK_ADMIN_LIST_FINANCIAL_RECEIPTS_TITLE=Listet alle registrierten Kassenbos/Rechnungen auf.. -LINK_ADMIN_LIST_FINANCIAL_RECEIPTS=Kassenbons/Rechnungen auflisten +ADMIN_LINK_LIST_FINANCIAL_RECEIPTS_TITLE=Listet alle registrierten Kassenbons/Rechnungen auf.. +ADMIN_LINK_LIST_FINANCIAL_RECEIPTS=Kassenbons/Rechnungen auflisten ADMIN_LIST_FINANCIAL_RECEIPTS_HEADER=Alle Kassenbons/Rechnungen auflisten ADMIN_FINANCIAL_RECEIPT_BASIC_LEGEND=Grunddaten des Kassenbons ADMIN_FINANCIAL_RECEIPT_BASIC_LEGEND_TITLE=Geben Sie hier die Grunddaten des neuen Kassenbons einn. diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties index 839e4222..30c46e15 100644 --- a/src/java/org/mxchange/localization/project_en_US.properties +++ b/src/java/org/mxchange/localization/project_en_US.properties @@ -36,8 +36,8 @@ ADMIN_ADD_FINANCIAL_RECEIPT_TITLE=Add new receipt BUTTON_ADMIN_ADD_FINANCIAL_RECEIPT=Add receipt ADMIN_FINANCIAL_RECEIPT_ISSUE_DATE_REQUIRED=Please enter date of issue of receipt. ADMIN_MENU_FINANCIAL_RECEIPTS_TITLE=Receipts -LINK_ADMIN_LIST_FINANCIAL_RECEIPTS_TITLE=Lists all registered receipts. -LINK_ADMIN_LIST_FINANCIAL_RECEIPTS=List receipts +ADMIN_LINK_LIST_FINANCIAL_RECEIPTS_TITLE=Lists all registered receipts. +ADMIN_LINK_LIST_FINANCIAL_RECEIPTS=List receipts ADMIN_LIST_FINANCIAL_RECEIPTS_HEADER=List all receipts ADMIN_FINANCIAL_RECEIPT_BASIC_LEGEND=Basic data of receipt: ADMIN_FINANCIAL_RECEIPT_BASIC_LEGEND_TITLE=Enter here basic data of the new receipt. diff --git a/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl b/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl index a9bb9e50..abcb5de3 100644 --- a/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl +++ b/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl @@ -7,12 +7,11 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:p="http://primefaces.org/ui"> -

- - - - - + + + - - - - - - -
- -
- - - + + - + + + - - - - -
+ + diff --git a/web/WEB-INF/templates/admin/menu/project.tpl b/web/WEB-INF/templates/admin/menu/project.tpl index aa442752..f0d00989 100644 --- a/web/WEB-INF/templates/admin/menu/project.tpl +++ b/web/WEB-INF/templates/admin/menu/project.tpl @@ -3,7 +3,10 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:h="http://xmlns.jcp.org/jsf/html" - xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> + xmlns:ui="http://xmlns.jcp.org/jsf/facelets" + xmlns:p="http://primefaces.org/ui"> - + + + diff --git a/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl b/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl index 848a92b3..f6c1a3de 100644 --- a/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl +++ b/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl @@ -12,7 +12,7 @@ - + - +
@@ -77,7 +77,7 @@ - + @@ -93,6 +93,6 @@ - +
diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml index 70570c4e..1d5407b9 100644 --- a/web/admin/fax/admin_fax_show.xhtml +++ b/web/admin/fax/admin_fax_show.xhtml @@ -25,7 +25,7 @@ - + diff --git a/web/admin/financials/receipts/admin_receipt_list.xhtml b/web/admin/financials/receipts/admin_receipt_list.xhtml index e24fff89..5eb3796a 100644 --- a/web/admin/financials/receipts/admin_receipt_list.xhtml +++ b/web/admin/financials/receipts/admin_receipt_list.xhtml @@ -20,7 +20,6 @@ id="table-list-financial-receipt" var="receipt" value="#{receiptController.allReceipts()}" - widgetVar="receiptTable" filteredValue="#{receiptController.filteredReceipts}" tableStyleClass="table table-full" rows="10" @@ -31,8 +30,9 @@ rowsPerPageTemplate="5,10,20,50,100" sortMode="multiple" summary="#{project.TABLE_SUMMARY_ADMIN_LIST_FINANCIAL_RECEIPTS}" - emptyMessage="#{project.ADMIN_FINANCIAL_RECEIPT_LIST_EMPTY}"> - + emptyMessage="#{project.ADMIN_FINANCIAL_RECEIPT_LIST_EMPTY}" + widgetVar="receiptList" + > @@ -41,21 +41,32 @@ - - - - - + + + +

+ +

+
- - - + - - - - -
+ + + + + +
diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml index 7fc7f091..052f450b 100644 --- a/web/admin/landline/admin_landline_show.xhtml +++ b/web/admin/landline/admin_landline_show.xhtml @@ -25,7 +25,7 @@ - + diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml index 7ee27039..68e532e1 100644 --- a/web/admin/mobile/admin_mobile_show.xhtml +++ b/web/admin/mobile/admin_mobile_show.xhtml @@ -25,7 +25,7 @@ - + diff --git a/web/user/financials/login_financials_add_income.xhtml b/web/user/financials/login_financials_add_income.xhtml index 9541a547..e4a34748 100644 --- a/web/user/financials/login_financials_add_income.xhtml +++ b/web/user/financials/login_financials_add_income.xhtml @@ -16,7 +16,7 @@ - +
diff --git a/web/user/financials/login_financials_add_receipt.xhtml b/web/user/financials/login_financials_add_receipt.xhtml index fe029289..ec59537b 100644 --- a/web/user/financials/login_financials_add_receipt.xhtml +++ b/web/user/financials/login_financials_add_receipt.xhtml @@ -16,7 +16,7 @@ - + @@ -27,9 +27,9 @@ - + - + diff --git a/web/user/financials/login_financials_overview.xhtml b/web/user/financials/login_financials_overview.xhtml index 592ad41f..ac4bde5d 100644 --- a/web/user/financials/login_financials_overview.xhtml +++ b/web/user/financials/login_financials_overview.xhtml @@ -16,7 +16,7 @@ - + @@ -38,7 +38,7 @@ - + -- 2.39.5