From 0783bd8855897fd8bf981b6324c7df0899c42114 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 21 Apr 2016 18:02:05 +0200 Subject: [PATCH] Continued with contact data editing (admin): - added instance to helper - renamed editFooData() to changeFooData() - added handling contactId - added form (with include) - added method copyContactToController() - added admin helper injection MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../JobsAdminContactWebRequestBean.java | 100 +++++++++++++++++- .../JobsAdminContactWebRequestController.java | 7 ++ .../helper/JobsAdminWebRequestController.java | 20 ++++ .../helper/JobsAdminWebRequestHelper.java | 44 +++++++- .../user/JobsAdminUserWebRequestBean.java | 2 +- .../JobsAdminUserWebRequestController.java | 2 +- .../localization/bundle_de_DE.properties | 2 +- .../localization/bundle_en_US.properties | 2 +- web/admin/contact/admin_contact_edit.xhtml | 28 ++++- 9 files changed, 195 insertions(+), 12 deletions(-) diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java index 1e389c79..fba60362 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java @@ -31,9 +31,12 @@ import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.ContactSessionBeanRemote; import org.mxchange.jcontacts.contact.gender.Gender; +import org.mxchange.jcontacts.contact.utils.ContactUtils; import org.mxchange.jcountry.data.Country; +import org.mxchange.jjobs.beans.helper.JobsAdminWebRequestController; import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; -import org.mxchange.jusercore.events.user.AdminAddedUserEvent; +import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; +import org.mxchange.jusercore.events.user.update.AdminUserDataUpdatedEvent; /** * A user bean (controller) @@ -56,6 +59,12 @@ public class JobsAdminContactWebRequestBean implements JobsAdminContactWebReques @Any private Event addedUserEvent; + /** + * Admin helper instance + */ + @Inject + private JobsAdminWebRequestController adminHelper; + /** * Birth day */ @@ -196,15 +205,48 @@ public class JobsAdminContactWebRequestBean implements JobsAdminContactWebReques } } + @Override + public String changeContactData () { + // Get contact instance + Contact contact = this.adminHelper.getContact(); + + // Check if contact instance is in helper and valid + if (null == contact) { + // Throw NPE + throw new NullPointerException("adminHelper.contact is null"); //NOI18N + } else if (contact.getContactId() == null) { + // Throw NPE again + throw new NullPointerException("adminHelper.contact.contactId is null"); //NOI18N //NOI18N + } else if (contact.getContactId() < 1) { + // Invalid id + throw new IllegalStateException(MessageFormat.format("adminHelper.contact.contactId={0} is invalid", contact.getContactId())); //NOI18N + } + + // Update all data in contact + this.updateContactData(contact); + + // Call EJB for updating contact data + Contact updatedContact = this.contactBean.updateContactData(contact); + + // Update list + this.updateList(updatedContact); + + // Fire event + this.updatedContactDataEvent.fire(new AdminUserDataUpdatedEvent(updatedContact)); + + // Return to contact list (for now) + return "admin_list_contact"; //NOI18N + } + @Override public void copyContactToController (final Contact contact) { // The contact instance must be valid if (null == contact) { // Throw NPE again - throw new NullPointerException("this.user.userContact is null"); + throw new NullPointerException("contact is null"); //NOI18N } else if (contact.getContactId() < 1) { // Not valid - throw new IllegalStateException(MessageFormat.format("this.user.userContact.contactId={0} is not valid.", contact.getContactId())); + throw new IllegalStateException(MessageFormat.format("contact.contactId={0} is not valid.", contact.getContactId())); //NOI18N } // Set all fields: contact @@ -476,4 +518,56 @@ public class JobsAdminContactWebRequestBean implements JobsAdminContactWebReques public void init () { } + /** + * Updates all data in contact instance. + *

+ * @param contact Contact instance + */ + private void updateContactData (final Contact contact) { + // Contact instance should be valid + if (null == contact) { + // Throw NPE + throw new NullPointerException("contact is null"); //NOI18N + } else if (contact.getContactId() == null) { + // Throw NPE again + throw new NullPointerException("contact.contactId is null"); //NOI18N //NOI18N + } else if (contact.getContactId() < 1) { + // Invalid id + throw new IllegalStateException(MessageFormat.format("contact.contactId={0} is invalid", contact.getContactId())); //NOI18N + } + + // Update all fields + contact.setContactGender(this.getGender()); + contact.setContactFirstName(this.getFirstName()); + contact.setContactFamilyName(this.getFamilyName()); + contact.setContactStreet(this.getStreet()); + contact.setContactHouseNumber(this.getHouseNumber()); + contact.setContactZipCode(this.getZipCode()); + contact.setContactCity(this.getCity()); + contact.setContactCountry(this.getCountry()); + + // Update contact's cellphone number + ContactUtils.updateCellPhoneNumber(contact, this.getCellphoneCarrier(), this.getCellphoneNumber()); + + // Is there a phone number? + if (contact.getContactLandLineNumber() instanceof DialableLandLineNumber) { + // Debug message + System.out.println(MessageFormat.format("updateContactData: phoneId={0}", contact.getContactLandLineNumber().getPhoneId())); //NOI18N + + // Yes, then update as well + contact.getContactLandLineNumber().setPhoneAreaCode(this.getPhoneAreaCode()); + contact.getContactLandLineNumber().setPhoneNumber(this.getPhoneNumber()); + } + + // Is there a fax number? + if (contact.getContactFaxNumber() instanceof DialableFaxNumber) { + // Debug message + System.out.println(MessageFormat.format("updateContactData: faxId={0}", contact.getContactFaxNumber().getPhoneId())); //NOI18N + + // Yes, then update as well + contact.getContactFaxNumber().setPhoneAreaCode(this.getFaxAreaCode()); + contact.getContactFaxNumber().setPhoneNumber(this.getFaxNumber()); + } + } + } diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java index 4b720968..493aefbd 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java @@ -37,6 +37,13 @@ public interface JobsAdminContactWebRequestController extends Serializable { */ void copyContactToController (final Contact contact); + /** + * Edits cuirrently loaded contact's data in database. + *

+ * @return Redirect outcome + */ + String changeContactData (); + /** * Getter for cellphone id *

diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsAdminWebRequestController.java b/src/java/org/mxchange/jjobs/beans/helper/JobsAdminWebRequestController.java index 4275f20e..1cb8f2e7 100644 --- a/src/java/org/mxchange/jjobs/beans/helper/JobsAdminWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/helper/JobsAdminWebRequestController.java @@ -17,6 +17,7 @@ package org.mxchange.jjobs.beans.helper; import java.io.Serializable; +import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jusercore.model.user.User; /** @@ -45,4 +46,23 @@ public interface JobsAdminWebRequestController extends Serializable { */ void copyUserToController (); + /** + * Getter for contact instance + *

+ * @return Contact instance + */ + Contact getContact (); + + /** + * Setter for contact instance + *

+ * @param contact Contact instance + */ + void setContact (final Contact contact); + + /** + * Copies currently set contact instance's data to adminContactController + */ + void copyContactToController (); + } diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsAdminWebRequestHelper.java b/src/java/org/mxchange/jjobs/beans/helper/JobsAdminWebRequestHelper.java index 37f91756..2e796f80 100644 --- a/src/java/org/mxchange/jjobs/beans/helper/JobsAdminWebRequestHelper.java +++ b/src/java/org/mxchange/jjobs/beans/helper/JobsAdminWebRequestHelper.java @@ -51,6 +51,11 @@ public class JobsAdminWebRequestHelper implements JobsAdminWebRequestController @Inject private JobsAdminUserWebRequestController adminUserController; + /** + * Contact instance + */ + private Contact contact; + /** * User instance */ @@ -62,6 +67,30 @@ public class JobsAdminWebRequestHelper implements JobsAdminWebRequestController public JobsAdminWebRequestHelper () { } + @Override + public void copyContactToController () { + // Log message + System.out.println("AdminHelper::copyContactToController - CALLED!"); //NOI18N + + // Validate user instance + if (this.getContact() == null) { + // Throw NPE + throw new NullPointerException("this.contact is null"); //NOI18N + } else if (this.getContact().getContactId() == null) { + // Throw NPE again + throw new NullPointerException("this.contact.contactId is null"); //NOI18N + } else if (this.getContact().getContactId() < 1) { + // Not valid + throw new IllegalStateException(MessageFormat.format("this.contact.contactId={0} is not valid.", this.getContact().getContactId())); //NOI18N + } + + // Set all fields: user + this.adminContactController.copyContactToController(this.getContact()); + + // Log message + System.out.println("AdminHelper::copyContactToController - EXIT!"); //NOI18N + } + @Override public void copyUserToController () { // Validate user instance @@ -79,11 +108,18 @@ public class JobsAdminWebRequestHelper implements JobsAdminWebRequestController // Set all fields: user this.adminUserController.setUserName(this.getUser().getUserName()); - // Get contact instance (shortens stuff) - Contact contact = this.getUser().getUserContact(); + // Log message + System.out.println("AdminHelper::copyUserToController - EXIT!"); //NOI18N + } - // Call contact controller - this.adminContactController.copyContactToController(contact); + @Override + public Contact getContact () { + return this.contact; + } + + @Override + public void setContact (final Contact contact) { + this.contact = contact; } @Override diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java index 9eedb0b9..877ef69a 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java @@ -238,7 +238,7 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr } @Override - public String editUserData () { + public String changeUserData () { // Get user instance User user = this.adminHelper.getUser(); diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java index a3893561..a59d9af9 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java @@ -76,7 +76,7 @@ public interface JobsAdminUserWebRequestController extends Serializable { *

* @return Redirect outcome */ - String editUserData(); + String changeUserData (); /** * Getter for user name diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 372f0a5d..35f542a1 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Cho-Time GmbH +# Copyright (C) 2016 Roland Haeder # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 0c7c699f..1b90fabb 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Cho-Time GmbH +# Copyright (C) 2016 Roland Haeder # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml index 9397ecfd..1df661ec 100644 --- a/web/admin/contact/admin_contact_edit.xhtml +++ b/web/admin/contact/admin_contact_edit.xhtml @@ -8,6 +8,11 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > + + + + + #{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT} @@ -16,7 +21,28 @@ - Here goes your content. + + + +

+
+ #{msg.ADMIN_EDIT_CONTACT_TITLE} +
+ +
+ #{msg.ADMIN_PERSONAL_DATA_MINIMUM_NOTICE} +
+ + + + + +
+ + +
+
+ -- 2.39.5