Continued:

- added missing properties userName and comments (getter/setter)
- added user name to registration form
- updated jar
Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/lib/juser-core.jar b/lib/juser-core.jar
index 9f4d28016bd74ed088844f6a0089b4ec33c9129f..a5c15c7f86ebce62030ecaffb02d4573ecb239a4 100644 (file)
Binary files a/lib/juser-core.jar and b/lib/juser-core.jar differ

diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java
index aa652c8f0ac5e02433e253de4bd7a8299b08b39f..36affa12c2a1d39de728a5c739978f02dc73b398 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java
+++ b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java
@@ -69,11 +69,6 @@ public class UserWebBean implements UserWebController {
         */
        private String countryCode;
 
-       /**
-        * Remote user bean
-        */
-       private final UserSessionBeanRemote userBean;
-
        /**
         * Email address
         */
@@ -114,6 +109,16 @@ public class UserWebBean implements UserWebController {
         */
        private String street;
 
+       /**
+        * Remote user bean
+        */
+       private final UserSessionBeanRemote userBean;
+
+       /**
+        * User name
+        */
+       private String userName;
+
        /**
         * ZIP code
         */
@@ -149,6 +154,7 @@ public class UserWebBean implements UserWebController {
 
                // Create new user instance
                User user = new LoginUser();
+               user.setUserName(this.getUserName());
 
                // Create new contact
                Contact contact = new UserContact(this.getGender(), this.getFirstName(), this.getFamilyName(), this.getCompanyName());
@@ -159,6 +165,7 @@ public class UserWebBean implements UserWebController {
                contact.setPhoneNumber(this.getPhoneNumber());
                contact.setFaxNumber(this.getFaxNumber());
                contact.setCellphoneNumber(this.getCellphoneNumber());
+               contact.setComment(this.getComment());
 
                // Set contact in user
                user.setContact(contact);
@@ -189,6 +196,16 @@ public class UserWebBean implements UserWebController {
                this.city = city;
        }
 
+       @Override
+       public String getComment () {
+               return this.comment;
+       }
+
+       @Override
+       public void setComment (final String comment) {
+               this.comment = comment;
+       }
+
        @Override
        public String getCompanyName () {
                return this.companyName;
@@ -289,6 +306,16 @@ public class UserWebBean implements UserWebController {
                this.street = street;
        }
 
+       @Override
+       public String getUserName () {
+               return this.userName;
+       }
+
+       @Override
+       public void setUserName (final String userName) {
+               this.userName = userName;
+       }
+
        @Override
        public Integer getZipCode () {
                return this.zipCode;

diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebController.java b/src/java/org/mxchange/addressbook/beans/user/UserWebController.java
index 0dcf04297e2ed4839861211493ee04dd9e80d2c0..085c0e649ec75115eef06729fe90f3eae062b0fc 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/user/UserWebController.java
+++ b/src/java/org/mxchange/addressbook/beans/user/UserWebController.java
@@ -62,6 +62,34 @@ public interface UserWebController extends Serializable {
         */
        public void setCity (final String city);
 
+       /**
+        * Getter for comments
+        * <p>
+        * @return Comments
+        */
+       public String getComment ();
+
+       /**
+        * Setter for comment
+        * <p>
+        * @param comment Comments
+        */
+       public void setComment (final String comment);
+
+       /**
+        * Getter for user name
+        * <p>
+        * @return User name
+        */
+       public String getUserName ();
+
+       /**
+        * Setter for user name
+        * <p>
+        * @param userName User name
+        */
+       public void setUserName (final String userName);
+
        /**
         * Company name
         * <p>

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 69d1da9b7c317e14f985471ee723385f4803f0cd..f1df412fc15fda8b99b30606e674c61a5ddfb821 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -107,3 +107,4 @@ MENU_USER_TITLE=Benutzer
 ENTER_USER_NAME=Benutzernamen:
 BUTTON_USER_LOGIN=Einloggen
 BUTTON_CONTINUE_STEP_2=Weiter zu Schritt 2
+GUEST_REGISTRATION_ENTER_USER_NAME=Benutzernamen eingeben:

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 2d4e31f429c34823ff46534d2d72b6921f12a4f8..53fbc1d2de943e75795e2254b9caae56480d23e4 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -107,3 +107,4 @@ MENU_USER_TITLE=User
 ENTER_USER_NAME=User name:
 BUTTON_USER_LOGIN=Login
 BUTTON_CONTINUE_STEP_2=Weiter zu Schritt 2
+GUEST_REGISTRATION_ENTER_USER_NAME=Enter user name:

diff --git a/web/WEB-INF/templates/guest/guest_registration_form.tpl b/web/WEB-INF/templates/guest/guest_registration_form.tpl
index 4b6f9e3d0d63ffea14d6155b35ddf01f7ddec02c..67513825a9bd8374ddafce1d6e0d9155c5191f4f 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_registration_form.tpl
+++ b/web/WEB-INF/templates/guest/guest_registration_form.tpl
@@ -18,6 +18,18 @@
                                <fieldset id="login_data">
                                        <legend title="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND_TITLE}">#{msg.GUEST_REGISTRATION_EMAIL_LEGEND}</legend>
 
+                                       <div class="table_row">
+                                               <div class="table_left">
+                                                       <h:outputLabel for="userName" value="#{msg.GUEST_REGISTRATION_ENTER_USER_NAME}" />
+                                               </div>
+
+                                               <div class="table_right">
+                                                       <h:inputText class="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" />
+                                               </div>
+
+                                               <div class="clear"></div>
+                                       </div>
+
                                        <div class="table_row">
                                                <div class="table_left">
                                                        <h:outputLabel for="emailAddress1" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL1}" />