]> git.mxchange.org Git - jjobs-war.git/commitdiff
Continued a bit: (please cherry-pick)
authorRoland Häder <roland@mxchange.org>
Tue, 16 Aug 2016 10:34:29 +0000 (12:34 +0200)
committerRoland Haeder <roland@mxchange.org>
Sun, 21 Aug 2016 18:11:49 +0000 (20:11 +0200)
- added missing (template required it) propery "mobileNumber"
- added missing i18n string

src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java
src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl

index 66728ce6ac8aa7af6a8bdd3d26fd22be37be9efb..239ccb6bfbed5ed420fd86a8b505ee0945269eea 100644 (file)
@@ -80,9 +80,14 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements
        private Event<AdminUpdatedMobileNumberEvent> mobileNumberUpdatedEvent;
 
        /**
-        * Cell phone number
+        * Choosen mobile number
         */
-       private DialableMobileNumber choosenCellphoneNumber;
+       private DialableMobileNumber choosenMobileNumber;
+
+       /**
+        * (Entered) mobile number
+        */
+       private Long mobileNumber;
 
        /**
         * Mobile provider
@@ -240,13 +245,23 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements
        }
 
        @Override
-       public DialableMobileNumber getChoosenCellphoneNumber () {
-               return this.choosenCellphoneNumber;
+       public DialableMobileNumber getChoosenMobileNumber () {
+               return this.choosenMobileNumber;
+       }
+
+       @Override
+       public void setChoosenMobileNumber (final DialableMobileNumber choosenMobileNumber) {
+               this.choosenMobileNumber = choosenMobileNumber;
+       }
+
+       @Override
+       public Long getMobileNumber () {
+               return this.mobileNumber;
        }
 
        @Override
-       public void setChoosenCellphoneNumber (final DialableMobileNumber choosenCellphoneNumber) {
-               this.choosenCellphoneNumber = choosenCellphoneNumber;
+       public void setMobileNumber (final Long mobileNumber) {
+               this.mobileNumber = mobileNumber;
        }
 
        @Override
index ca294b965ca7ff969725c046994a7f49606c11db..cab34861b32981fb114a2d775738773a899ac933 100644 (file)
@@ -71,14 +71,28 @@ public interface JobsAdminPhoneWebRequestController extends Serializable {
         * <p>
         * @return Choosen mobile number
         */
-       DialableMobileNumber getChoosenCellphoneNumber ();
+       DialableMobileNumber getChoosenMobileNumber ();
 
        /**
         * Setter for choosen mobile number
         * <p>
-        * @param choosenCellphoneNumber Choosen mobile number
+        * @param choosenMobileNumber Choosen mobile number
         */
-       void setChoosenCellphoneNumber (final DialableMobileNumber choosenCellphoneNumber);
+       void setChoosenMobileNumber (final DialableMobileNumber choosenMobileNumber);
+
+       /**
+        * Getter for mobile number
+        * <p>
+        * @return Mobile number
+        */
+       Long getMobileNumber ();
+
+       /**
+        * Setter for mobile number
+        * <p>
+        * @param mobileNumber Mobile number
+        */
+       void setMobileNumber (final Long mobileNumber);
 
        /**
         * Getter for dial number without prefix
index d13ce1a15c84fa1e7520a193068b42af40e9eef2..de183d3e0721306b3fe93c867b2d6aaebbc0e9af 100644 (file)
@@ -644,3 +644,4 @@ ERROR_MOBILE_CONTACT_NOT_LINKED=Fehler: Mobilfunk-Id {0} ist nicht mit Kontakt-I
 ADMIN_ADD_CONTACT_MOBILE_FORM_TITLE=Mobilfunknummer einem Kontakt hinzuf\u00fcgen
 ADMIN_SELECT_MOBILE=Mobilfunknummer ausw\u00e4hlen:
 BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE=Mobilfunknummer zum Kontakt hinzuf\u00fcgen
+ADMIN_OR_ENTER_CONTACT_NEW_MOBILE_DATA=... oder neue Mobilfunknummer eingeben:
index ca0267fe5aac06b6b567aa7eec15198c408e4095..8a5c8171959fbf6f54457ee4f524b018a67e50ef 100644 (file)
@@ -644,3 +644,4 @@ ERROR_MOBILE_CONTACT_NOT_LINKED=Error: Cell phone id {0} is not linked with cont
 ADMIN_ADD_CONTACT_MOBILE_FORM_TITLE=Add mobile number to contact
 ADMIN_SELECT_MOBILE=Choose mobile number:
 BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE=Add mobile number to contact
+ADMIN_OR_ENTER_CONTACT_NEW_MOBILE_DATA=... or add new mobile number:
index 461a2c67b41332ba02a91a4e1a41d8077831d32e..61269e60302a135d0f4695c08b86248cc9dec59b 100644 (file)
@@ -23,7 +23,7 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="choosenCellphoneNumber" value="#{adminPhoneController.choosenCellphoneNumber}">
+                                       <h:selectOneMenu styleClass="select right_space" id="choosenCellphoneNumber" value="#{adminPhoneController.choosenMobileNumber}">
                                                <f:converter converterId="MobileConverter" />
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{adminPhoneController.allNonLinkedMobileNumbers()}" var="mobileNumber" itemValue="#{mobileNumber}" itemLabel="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix} (#{mobileNumber.mobileProvider.providerDialPrefix}) #{mobileNumber.phoneNumber}" />