From: Roland Häder Date: Thu, 28 Apr 2016 12:17:13 +0000 (+0200) Subject: Continued with customers and rewrite a bit: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;ds=sidebyside;h=703ecffa494750c86ae89c5d95f9a2456ee05476;p=pizzaservice-war.git Continued with customers and rewrite a bit: - page show_customer "basicly finished" - removed double redundant i18n strings (no need) - added customer's i18n strings (admin) - now always handle a contact to "cellhpone templates", this is much easier and users/customers don't have cellphones/land-line or fax numbers, only contacts - added template for administrative links for customers (similar to users) - added missing navigation rules Signed-off-by: Roland Häder --- diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index e0541e8c..c3b04490 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -2,58 +2,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index ad37cb8b..38951981 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -236,27 +236,27 @@ ERROR_PARAMETER_USER_ID_NOT_SET=Fehler: Benutzer-Id nicht gesetzt (Parameter: us ERROR_USER_ID_NOT_FOUND=Fehler: Benutzer-Id nicht gefunden. ADMIN_TABLE_SUMMARY_SHOW_USER=Zeigt ein Benutzerprofil f\u00fcr administrative Zwecke an. ADMIN_HEADER_SHOW_USER=Benutzer {0} (Nummer {1}): -ADMIN_SHOW_USER_ID=Benutzer-Id: -ADMIN_SHOW_USER_NAME=Benutzername: -ADMIN_SHOW_USER_CREATED=Wann Benutzer erstellt: -ADMIN_SHOW_USER_UPDATED=Wann Benutzerdaten ge\u00e4ndert: -ADMIN_SHOW_USER_ACCOUNT_STATUS=Account-Status: -ADMIN_SHOW_USER_PROFILE_MODE=Profilmodus: -ADMIN_SHOW_USER_LAST_LOCKED=Zuletzt gesperrt: -ADMIN_SHOW_USER_LAST_LOCKED_REASON=Letzter Sperrgrund: -ADMIN_SHOW_USER_CONTACT_CREATED=Wann Kontaktdaten erstellt: -ADMIN_SHOW_USER_CONTACT_UPDATED=Wann Kontaktdaten ge\u00e4ndert: -ADMIN_SHOW_USER_IS_OWN_CONTACT=Eigenes Account: -ADMIN_SHOW_USER_GENDER=Anrede: -ADMIN_SHOW_USER_TITLE=Titel: -ADMIN_SHOW_USER_FIRST_NAME=Vorname: -ADMIN_SHOW_USER_FAMILY_NAME=Nachname: -ADMIN_SHOW_USER_STREET=Strasse: -ADMIN_SHOW_USER_HOUSE_NUMBER=Hausnummer: -ADMIN_SHOW_USER_ZIP_CODE=Postleitzahl: -ADMIN_SHOW_USER_CITY=Stadt: -ADMIN_SHOW_USER_EMAIL_ADDRESS=Email-Adresse: -ADMIN_SHOW_USER_BIRTHDAY=Geburtstag: +ADMIN_USER_ID=Benutzer-Id: +ADMIN_USER_NAME=Benutzername: +ADMIN_USER_CREATED=Wann Benutzer erstellt: +ADMIN_USER_UPDATED=Wann Benutzerdaten ge\u00e4ndert: +ADMIN_USER_ACCOUNT_STATUS=Account-Status: +ADMIN_USER_PROFILE_MODE=Profilmodus: +ADMIN_USER_LAST_LOCKED=Zuletzt gesperrt: +ADMIN_USER_LAST_LOCKED_REASON=Letzter Sperrgrund: +ADMIN_USER_CONTACT_CREATED=Wann Kontaktdaten erstellt: +ADMIN_USER_CONTACT_UPDATED=Wann Kontaktdaten ge\u00e4ndert: +ADMIN_CONTACT_IS_OWN_CONTACT=Eigenes Account: +ADMIN_CONTACT_GENDER=Anrede: +ADMIN_CONTACT_TITLE=Titel: +ADMIN_CONTACT_FIRST_NAME=Vorname: +ADMIN_CONTACT_FAMILY_NAME=Nachname: +ADMIN_CONTACT_STREET=Strasse: +ADMIN_CONTACT_HOUSE_NUMBER=Hausnummer: +ADMIN_CONTACT_ZIP_CODE=Postleitzahl: +ADMIN_CONTACT_CITY=Stadt: +ADMIN_CONTACT_EMAIL_ADDRESS=Email-Adresse: +ADMIN_CONTACT_BIRTHDAY=Geburtstag: ADMIN_LINKS_HEADER=Administrative Links: ADMIN_LINK_EDIT_USER=Benutzerdaten editieren ADMIN_LINK_EDIT_USER_TITLE=Editieren der Benutzerdaten. @@ -355,5 +355,18 @@ ADMIN_LINK_SHOW_CUSTOMER_TITLE=Kundendaten anzeigen ADMIN_MENU_CONTACT_TITLE=Manage contact data LINK_ADMIN_LIST_CONTACT=Kontaktdaten auflisten LINK_ADMIN_LIST_CONTACT_TITLE=Listet alle Kontaktdaten auf, egal wo her sie angelegt wurden. -ERROR_PARAMETER_CELLPHONE_NUMBER_USER_NOT_SET=Fehler: Parameter 'cellphoneNumber' und 'user' nicht gesetzt. +ERROR_PARAMETER_CELLPHONE_NUMBER_CONTACT_NOT_SET=Fehler: Parameter 'cellphoneNumber' und 'contact' nicht gesetzt. ADMIN_ADD_CONTACT_MINIMUM_DATA=Bitte geben Sie mindestens Anrede, Vorname und Nachname an. +ADMIN_HEADER_SHOW_CUSTOMER=Kunde {0}: +ERROR_PARAMETER_CUSTOMER_NOT_SET=Fehler: Parameter 'customer' nicht gesetzt. +ADMIN_CUSTOMER_UPDATED=Kundendaten ge\u00e4ndert: +ADMIN_CUSTOMER_LAST_LOCKED=Kunde zuletzt gesperrt: +ADMIN_CUSTOMER_LAST_LOCKED_REASON=Letzter Sperrgrund: +ADMIN_CUSTOMER_CONTACT_CREATED=Kontaktdaten erstellt: +ADMIN_CUSTOMER_CONTACT_UPDATED=Kontaktdaten ge\u00e4ndert: +ADMIN_LINK_EDIT_CUSTOMER=Kundendaten editieren +ADMIN_LINK_EDIT_CUSTOMER_TITLE=Kundendaten editieren. +ADMIN_LINK_UNLOCK_CUSTOMER=Kunde ent-/sperren +ADMIN_LINK_DELETE_CUSTOMER=Kundendaten l\u00f6schen +ADMIN_LINK_DELETE_CUSTOMER_TITLE=Kundendaten l\u00f6schen (mit Best\u00e4tigung). +ADMIN_LINK_UNLOCK_CUSTOMER_TITLE=Kunde sperren oder entsperren. Bitte einen Grund mit angeben. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 79b38f9e..60df49fa 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -237,27 +237,27 @@ ERROR_PARAMETER_USER_ID_NOT_SET=Error: User id not set (parameter userId). ERROR_USER_ID_NOT_FOUND=Error: User id not found. ADMIN_TABLE_SUMMARY_SHOW_USER=Shows a single user profile for administrative purposes. ADMIN_HEADER_SHOW_USER=User {0} (id {1}): -ADMIN_SHOW_USER_ID=User id: -ADMIN_SHOW_USER_NAME=User name: -ADMIN_SHOW_USER_CREATED=When user created: -ADMIN_SHOW_USER_UPDATED=When user data updated: -ADMIN_SHOW_USER_ACCOUNT_STATUS=Account status: -ADMIN_SHOW_USER_PROFILE_MODE=Profile mode: -ADMIN_SHOW_USER_LAST_LOCKED=Last locked: -ADMIN_SHOW_USER_LAST_LOCKED_REASON=Last lock reason: -ADMIN_SHOW_USER_CONTACT_CREATED=When contact data created: -ADMIN_SHOW_USER_CONTACT_UPDATED=When contact data updated: -ADMIN_SHOW_USER_IS_OWN_CONTACT=Own account: -ADMIN_SHOW_USER_GENDER=Gender: -ADMIN_SHOW_USER_TITLE=Title: -ADMIN_SHOW_USER_FIRST_NAME=First name: -ADMIN_SHOW_USER_FAMILY_NAME=Family name: -ADMIN_SHOW_USER_STREET=Street: -ADMIN_SHOW_USER_HOUSE_NUMBER=House number: -ADMIN_SHOW_USER_ZIP_CODE=ZIP code: -ADMIN_SHOW_USER_CITY=City: -ADMIN_SHOW_USER_EMAIL_ADDRESS=Email address: -ADMIN_SHOW_USER_BIRTHDAY=Birthday: +ADMIN_USER_ID=User id: +ADMIN_USER_NAME=User name: +ADMIN_USER_CREATED=When user created: +ADMIN_USER_UPDATED=When user data updated: +ADMIN_USER_ACCOUNT_STATUS=Account status: +ADMIN_USER_PROFILE_MODE=Profile mode: +ADMIN_USER_LAST_LOCKED=Last locked: +ADMIN_USER_LAST_LOCKED_REASON=Last lock reason: +ADMIN_USER_CONTACT_CREATED=When contact data created: +ADMIN_USER_CONTACT_UPDATED=When contact data updated: +ADMIN_CONTACT_IS_OWN_CONTACT=Own account: +ADMIN_CONTACT_GENDER=Gender: +ADMIN_CONTACT_TITLE=Title: +ADMIN_CONTACT_FIRST_NAME=First name: +ADMIN_CONTACT_FAMILY_NAME=Family name: +ADMIN_CONTACT_STREET=Street: +ADMIN_CONTACT_HOUSE_NUMBER=House number: +ADMIN_CONTACT_ZIP_CODE=ZIP code: +ADMIN_CONTACT_CITY=City: +ADMIN_CONTACT_EMAIL_ADDRESS=Email address: +ADMIN_CONTACT_BIRTHDAY=Birthday: ADMIN_LINKS_HEADER=Administrative links: ADMIN_LINK_EDIT_USER=Edit user data ADMIN_LINK_EDIT_USER_TITLE=Editing of user and contact data. @@ -356,5 +356,18 @@ ADMIN_LINK_SHOW_CUSTOMER_TITLE=Show customer data ADMIN_MENU_CONTACT_TITLE=Manage contact data LINK_ADMIN_LIST_CONTACT=List contact data LINK_ADMIN_LIST_CONTACT_TITLE=Lists all contact data regardless where they was created. -ERROR_PARAMETER_CELLPHONE_NUMBER_USER_NOT_SET=Error: Parameter 'cellphoneNumber' and 'user' are not set. +ERROR_PARAMETER_CELLPHONE_NUMBER_CONTACT_NOT_SET=Error: Parameter 'cellphoneNumber' and 'contact' are not set. ADMIN_ADD_CONTACT_MINIMUM_DATA=Please enter at least gender, first name and family name. +ADMIN_HEADER_SHOW_CUSTOMER=Customer {0}: +ERROR_PARAMETER_CUSTOMER_NOT_SET=Error: Parameter 'customer' is not set. +ADMIN_CUSTOMER_UPDATED=Updated customer data: +ADMIN_CUSTOMER_LAST_LOCKED=Customer last locked: +ADMIN_CUSTOMER_LAST_LOCKED_REASON=Last lock reason: +ADMIN_CUSTOMER_CONTACT_CREATED=Contact data created: +ADMIN_CUSTOMER_CONTACT_UPDATED=Contact data updated: +ADMIN_LINK_EDIT_CUSTOMER=Edit customer data +ADMIN_LINK_EDIT_CUSTOMER_TITLE=Edit customer data. +ADMIN_LINK_UNLOCK_CUSTOMER=Un-/lock customer +ADMIN_LINK_DELETE_CUSTOMER=Delete customer data +ADMIN_LINK_DELETE_CUSTOMER_TITLE=Delete customer data (with confirmation). +ADMIN_LINK_UNLOCK_CUSTOMER_TITLE=Lock or unlock customer. Please provide a reason. diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index f77844e3..d7d03f2e 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -212,6 +212,10 @@ /admin/user/admin_user_show.xhtml + + admin_show_mobile_provider + /admin/mobile_provider/admin_mobile_provider_show.xhtml + admin_show_contact_cellphone /admin/cellphone/admin_contact_cellphone_show.xhtml @@ -244,10 +248,45 @@ admin_edit_contact /admin/contact/admin_contact_edit.xhtml + + + /admin/customer/admin_customer_show.xhtml admin_show_mobile_provider /admin/mobile_provider/admin_mobile_provider_show.xhtml + + admin_show_contact_cellphone + /admin/cellphone/admin_contact_cellphone_show.xhtml + + + admin_edit_contact_cellphone + /admin/cellphone/admin_contact_cellphone_edit.xhtml + + + admin_unlink_contact_cellphone + /admin/cellphone/admin_contact_cellphone_unlink.xhtml + + + admin_delete_contact_cellphone + /admin/cellphone/admin_contact_cellphone_delete.xhtml + + + admin_edit_customer + /admin/customer/admin_customer_edit.xhtml + + + admin_delete_customer + /admin/customer/admin_customer_delete.xhtml + + + admin_unlock_customer + /admin/customer/admin_customer_unlock.xhtml + + + admin_edit_contact + /admin/contact/admin_contact_edit.xhtml + /admin/cellphone/admin_contact_cellphone_list.xhtml diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl index 854b15ec..02a8c00b 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl +++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl @@ -5,20 +5,20 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - - + + - + - + - + - + diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl index 81d46fb1..db480479 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl +++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl @@ -37,15 +37,15 @@
- + - + - + diff --git a/web/WEB-INF/templates/admin/customer/admin_customer_links.tpl b/web/WEB-INF/templates/admin/customer/admin_customer_links.tpl new file mode 100644 index 00000000..d9ddb6f6 --- /dev/null +++ b/web/WEB-INF/templates/admin/customer/admin_customer_links.tpl @@ -0,0 +1,46 @@ + + + + + + +
+
+ +
+ +
+
    +
  • + + + +
    • + +
  • + + + +
    • + +
  • + + + +
    • + +
  • + + + + +
    • +
+
+
+ + diff --git a/web/admin/cellphone/admin_contact_cellphone_show.xhtml b/web/admin/cellphone/admin_contact_cellphone_show.xhtml index fc67b5fe..31d6ce38 100644 --- a/web/admin/cellphone/admin_contact_cellphone_show.xhtml +++ b/web/admin/cellphone/admin_contact_cellphone_show.xhtml @@ -42,31 +42,31 @@ - + - + - + - + - + diff --git a/web/admin/customer/admin_customer_show.xhtml b/web/admin/customer/admin_customer_show.xhtml index 61a68401..8724d2ef 100644 --- a/web/admin/customer/admin_customer_show.xhtml +++ b/web/admin/customer/admin_customer_show.xhtml @@ -21,7 +21,162 @@ - Here goes your content. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ +
+ + + + +
diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml index ce271471..aa679c85 100644 --- a/web/admin/user/admin_user_show.xhtml +++ b/web/admin/user/admin_user_show.xhtml @@ -31,19 +31,19 @@ - + - + - + @@ -51,7 +51,7 @@ - + @@ -59,19 +59,19 @@ - + - + - + @@ -79,13 +79,13 @@ - + - + @@ -93,7 +93,7 @@ - + @@ -101,61 +101,61 @@ - + - + - + - + - + - + - + - + - + - + @@ -163,7 +163,7 @@ - + @@ -180,7 +180,7 @@
- +