From 7909bcdfb30fa6cbb97fb250b33bf03fa1b59e8d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 16 Aug 2016 12:34:29 +0200
Subject: [PATCH] Continued a bit: (please cherry-pick) - added missing
 (template required it) propery "mobileNumber" - added missing i18n string

---
 .../phone/JobsAdminPhoneWebRequestBean.java   | 27 ++++++++++++++-----
 .../JobsAdminPhoneWebRequestController.java   | 20 +++++++++++---
 .../localization/bundle_de_DE.properties      |  1 +
 .../localization/bundle_en_US.properties      |  1 +
 .../mobile/admin_form_add_contact_mobile.tpl  |  2 +-
 5 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java
index 66728ce6..239ccb6b 100644
--- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java
@@ -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
diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java
index ca294b96..cab34861 100644
--- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java
+++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java
@@ -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
diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index d13ce1a1..de183d3e 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -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:
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index ca0267fe..8a5c8171 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -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:
diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
index 461a2c67..61269e60 100644
--- a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
@@ -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}" />
-- 
2.39.5