Continued with add/link forms: (please cherry-pick)

- implemented doLinkAdd(Fax|LandLine|Mobile)Number() which fire events when the number has been linked/added
- removed field mobileNumber as it is redundant to phoneNumber
- form_contact_data needs mobileNumber as all 3 are being asked there
- renamed countryPhoneCode -> phoneCountry as this is more accurate
- added missing i18n strings

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java
index fcbed56e5612de81f20e30e56b7ee9d57ce18b4c..6b20fd0f5003a3345771a3001b1f999d536acdbf 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java
@@ -30,18 +30,33 @@ import javax.naming.NamingException;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent;
 import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent;
+import org.mxchange.jcontacts.events.fax.linked.AdminFaxNumberLinkedEvent;
+import org.mxchange.jcontacts.events.fax.linked.AdminLinkedFaxNumberEvent;
 import org.mxchange.jcontacts.events.fax.unlinked.AdminFaxNumberUnlinkedEvent;
 import org.mxchange.jcontacts.events.fax.unlinked.AdminUnlinkedFaxNumberEvent;
+import org.mxchange.jcontacts.events.landline.linked.AdminLandLineNumberLinkedEvent;
+import org.mxchange.jcontacts.events.landline.linked.AdminLinkedLandLineNumberEvent;
 import org.mxchange.jcontacts.events.landline.unlinked.AdminLandLineNumberUnlinkedEvent;
 import org.mxchange.jcontacts.events.landline.unlinked.AdminUnlinkedLandLineNumberEvent;
+import org.mxchange.jcontacts.events.mobile.linked.AdminLinkedMobileNumberEvent;
+import org.mxchange.jcontacts.events.mobile.linked.AdminMobileNumberLinkedEvent;
 import org.mxchange.jcontacts.events.mobile.unlinked.AdminMobileNumberUnlinkedEvent;
 import org.mxchange.jcontacts.events.mobile.unlinked.AdminUnlinkedMobileNumberEvent;
 import org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote;
+import org.mxchange.jcountry.data.Country;
 import org.mxchange.jjobs.beans.BaseJobsController;
 import org.mxchange.jjobs.beans.helper.JobsWebRequestController;
+import org.mxchange.jjobs.beans.phone.JobsAdminPhoneWebRequestController;
 import org.mxchange.jphone.exceptions.FaxNumberNotLinkedException;
 import org.mxchange.jphone.exceptions.LandLineNumberNotLinkedException;
 import org.mxchange.jphone.exceptions.MobileNumberNotLinkedException;
+import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
+import org.mxchange.jphone.phonenumbers.fax.FaxNumber;
+import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
+import org.mxchange.jphone.phonenumbers.landline.LandLineNumber;
+import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
+import org.mxchange.jphone.phonenumbers.mobile.MobileNumber;
+import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
 import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
 
 /**
@@ -58,11 +73,32 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl
         */
        private static final long serialVersionUID = 542_145_347_916L;
 
+       /**
+        * Event being fired when a fax number has been linked
+        */
+       private Event<AdminLinkedFaxNumberEvent> adminLinkedFaxNumberEvent;
+
+       /**
+        * Event being fired when a land-line number has been linked
+        */
+       private Event<AdminLinkedLandLineNumberEvent> adminLinkedLandLineNumberEvent;
+
+       /**
+        * Event being fired when a mobile number has been linked
+        */
+       private Event<AdminLinkedMobileNumberEvent> adminLinkedMobileNumberEvent;
+
        /**
         * Administrative EJB for phone number
         */
        private AdminContactsPhoneSessionBeanRemote adminPhoneBean;
 
+       /**
+        * Administrative phone controller
+        */
+       @Inject
+       private JobsAdminPhoneWebRequestController adminPhoneController;
+
        /**
         * Admin helper instance
         */
@@ -170,6 +206,167 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl
                this.clear();
        }
 
+       @Override
+       public String doLinkAddFaxNumber (final Contact contact) {
+               // Is all data properly set?
+               if (null == contact) {
+                       // Throw NPE
+                       throw new NullPointerException("contact is null"); //NOI18N
+               } else if (contact.getContactId() == null) {
+                       // Throw it again
+                       throw new NullPointerException("contact.contactId is null"); //NOI18N
+               } else if (contact.getContactId() < 1) {
+                       // Is not valid
+                       throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid", contact.getContactId())); //NOI18N
+               } else if ((this.adminPhoneController.getChoosenFaxNumber() == null) && (this.adminPhoneController.getPhoneCountry() == null) && ((this.adminPhoneController.getPhoneAreaCode() == null) || (this.adminPhoneController.getPhoneAreaCode() < 1)) && ((this.adminPhoneController.getPhoneNumber() == null) || (this.adminPhoneController.getPhoneNumber() < 1))) {
+                       // All fields are empty
+                       throw new NullPointerException("choosenFaxNumber, mobileProvider and phoneNumer are null"); //NOI18N
+               } else if ((this.adminPhoneController.getChoosenFaxNumber() instanceof DialableFaxNumber) && (this.adminPhoneController.getPhoneCountry() instanceof Country) && (this.adminPhoneController.getPhoneAreaCode() instanceof Integer) && (this.adminPhoneController.getPhoneNumber() instanceof Long)) {
+                       // All fields are set
+                       throw new IllegalStateException("choosenFaxNumber, mobileProvider and phoneNumer are all set"); //NOI18N
+               } else if ((this.adminPhoneController.getPhoneCountry() == null) && ((this.adminPhoneController.getPhoneAreaCode() instanceof Integer) || (this.adminPhoneController.getPhoneNumber() instanceof Long))) {
+                       // No country selected
+                       this.showFacesMessage("form_add_contact_fax:phoneCountry", "ERROR_ADMIN_NO_PHONE_COUNTRY_SELECTED"); //NOI18N
+                       return ""; //NOI18N
+               } else if (((this.adminPhoneController.getPhoneAreaCode() == null) || (this.adminPhoneController.getPhoneAreaCode() < 1)) && ((this.adminPhoneController.getPhoneCountry() instanceof Country) || (this.adminPhoneController.getPhoneNumber() instanceof Long))) {
+                       // No area code entered
+                       this.showFacesMessage("form_add_contact_fax:phoneAreaCode", "ERROR_ADMIN_NO_PHONE_AREA_CODE_ENTERED"); //NOI18N
+                       return ""; //NOI18N
+               } else if (((this.adminPhoneController.getPhoneNumber() == null) || (this.adminPhoneController.getPhoneNumber() < 1)) && ((this.adminPhoneController.getPhoneCountry() instanceof Country) || (this.adminPhoneController.getPhoneAreaCode() instanceof Integer))) {
+                       // No phone number entered
+                       this.showFacesMessage("form_add_contact_fax:phoneNumber", "ERROR_ADMIN_NO_PHONE_NUMBER_ENTERED"); //NOI18N
+                       return ""; //NOI18N
+               }
+
+               // Init instances
+               Contact updatedContact;
+               DialableFaxNumber faxNumber = this.adminPhoneController.getChoosenFaxNumber();
+
+               // All fine so far, then which was choosen?
+               if (faxNumber instanceof DialableFaxNumber) {
+                       // User has choosen number
+                       updatedContact = this.adminPhoneBean.linkExistingFaxNumberWithContact(contact, faxNumber);
+               } else {
+                       // Create new instance
+                       faxNumber = new FaxNumber(this.adminPhoneController.getPhoneCountry(), this.adminPhoneController.getPhoneAreaCode(), this.adminPhoneController.getPhoneNumber());
+
+                       // Link it, too
+                       updatedContact = this.adminPhoneBean.linkNewFaxNumberWithContact(contact, faxNumber);
+               }
+
+               // Fire event
+               this.adminLinkedFaxNumberEvent.fire(new AdminFaxNumberLinkedEvent(updatedContact, faxNumber));
+
+               // Return to contact profile
+               return "admin_show_contact?faces-redirect=true&includeViewParams=true"; //NOI18N
+       }
+
+       @Override
+       public String doLinkAddLandLineNumber (final Contact contact) {
+               // Is all data properly set?
+               if (null == contact) {
+                       // Throw NPE
+                       throw new NullPointerException("contact is null"); //NOI18N
+               } else if (contact.getContactId() == null) {
+                       // Throw it again
+                       throw new NullPointerException("contact.contactId is null"); //NOI18N
+               } else if (contact.getContactId() < 1) {
+                       // Is not valid
+                       throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid", contact.getContactId())); //NOI18N
+               } else if ((this.adminPhoneController.getChoosenLandLineNumber() == null) && (this.adminPhoneController.getPhoneCountry() == null) && ((this.adminPhoneController.getPhoneAreaCode() == null) || (this.adminPhoneController.getPhoneAreaCode() < 1)) && ((this.adminPhoneController.getPhoneNumber() == null) || (this.adminPhoneController.getPhoneNumber() < 1))) {
+                       // All fields are empty
+                       throw new NullPointerException("choosenLandLineNumber, mobileProvider and phoneNumer are null"); //NOI18N
+               } else if ((this.adminPhoneController.getChoosenLandLineNumber() instanceof DialableLandLineNumber) && (this.adminPhoneController.getPhoneCountry() instanceof Country) && (this.adminPhoneController.getPhoneAreaCode() instanceof Integer) && (this.adminPhoneController.getPhoneNumber() instanceof Long)) {
+                       // All fields are set
+                       throw new IllegalStateException("choosenLandLineNumber, mobileProvider and phoneNumer are all set"); //NOI18N
+               } else if ((this.adminPhoneController.getPhoneCountry() == null) && ((this.adminPhoneController.getPhoneAreaCode() instanceof Integer) || (this.adminPhoneController.getPhoneNumber() instanceof Long))) {
+                       // No country selected
+                       this.showFacesMessage("form_add_contact_landLine:phoneCountry", "ERROR_ADMIN_NO_PHONE_COUNTRY_SELECTED"); //NOI18N
+                       return ""; //NOI18N
+               } else if (((this.adminPhoneController.getPhoneAreaCode() == null) || (this.adminPhoneController.getPhoneAreaCode() < 1)) && ((this.adminPhoneController.getPhoneCountry() instanceof Country) || (this.adminPhoneController.getPhoneNumber() instanceof Long))) {
+                       // No area code entered
+                       this.showFacesMessage("form_add_contact_landLine:phoneAreaCode", "ERROR_ADMIN_NO_PHONE_AREA_CODE_ENTERED"); //NOI18N
+                       return ""; //NOI18N
+               } else if (((this.adminPhoneController.getPhoneNumber() == null) || (this.adminPhoneController.getPhoneNumber() < 1)) && ((this.adminPhoneController.getPhoneCountry() instanceof Country) || (this.adminPhoneController.getPhoneAreaCode() instanceof Integer))) {
+                       // No phone number entered
+                       this.showFacesMessage("form_add_contact_landLine:phoneNumber", "ERROR_ADMIN_NO_PHONE_NUMBER_ENTERED"); //NOI18N
+                       return ""; //NOI18N
+               }
+
+               // Init instance
+               Contact updatedContact;
+               DialableLandLineNumber landLineNumber = this.adminPhoneController.getChoosenLandLineNumber();
+
+               // All fine so far, then which was choosen?
+               if (landLineNumber instanceof DialableLandLineNumber) {
+                       // User has choosen number
+                       updatedContact = this.adminPhoneBean.linkExistingLandLineNumberWithContact(contact, landLineNumber);
+               } else {
+                       // Create new instance
+                       landLineNumber = new LandLineNumber(this.adminPhoneController.getPhoneCountry(), this.adminPhoneController.getPhoneAreaCode(), this.adminPhoneController.getPhoneNumber());
+
+                       // Link it, too
+                       updatedContact = this.adminPhoneBean.linkNewLandLineNumberWithContact(contact, landLineNumber);
+               }
+
+               // Fire event
+               this.adminLinkedLandLineNumberEvent.fire(new AdminLandLineNumberLinkedEvent(updatedContact, landLineNumber));
+
+               // Return to contact profile
+               return "admin_show_contact?faces-redirect=true&includeViewParams=true"; //NOI18N
+       }
+
+       @Override
+       public String doLinkAddMobileNumber (final Contact contact) {
+               // Is all data properly set?
+               if (null == contact) {
+                       // Throw NPE
+                       throw new NullPointerException("contact is null"); //NOI18N
+               } else if (contact.getContactId() == null) {
+                       // Throw it again
+                       throw new NullPointerException("contact.contactId is null"); //NOI18N
+               } else if (contact.getContactId() < 1) {
+                       // Is not valid
+                       throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid", contact.getContactId())); //NOI18N
+               } else if ((this.adminPhoneController.getChoosenMobileNumber() == null) && (this.adminPhoneController.getMobileProvider() == null) && ((this.adminPhoneController.getPhoneNumber() == null) || (this.adminPhoneController.getPhoneNumber() < 1))) {
+                       // All fields are empty
+                       throw new NullPointerException("choosenMobileNumber, mobileProvider and phoneNumer are null"); //NOI18N
+               } else if ((this.adminPhoneController.getChoosenMobileNumber() instanceof DialableMobileNumber) && (this.adminPhoneController.getMobileProvider() instanceof MobileProvider) && (this.adminPhoneController.getPhoneNumber() instanceof Long)) {
+                       // All fields are set
+                       throw new IllegalStateException("choosenMobileNumber, mobileProvider and phoneNumer are all set"); //NOI18N
+               } else if ((this.adminPhoneController.getMobileProvider() == null) && (this.adminPhoneController.getPhoneNumber() instanceof Long)) {
+                       // No mobile provider selected
+                       this.showFacesMessage("form_add_contact_mobile:phoneCountry", "ERROR_ADMIN_NO_PHONE_MOBILE_PROVIDER_SELECTED"); //NOI18N
+                       return ""; //NOI18N
+               } else if (((this.adminPhoneController.getPhoneNumber() == null) || (this.adminPhoneController.getPhoneNumber() < 1)) && (this.adminPhoneController.getMobileProvider() instanceof MobileProvider)) {
+                       // No phone number entered
+                       this.showFacesMessage("form_add_contact_mobile:phoneNumber", "ERROR_ADMIN_NO_PHONE_NUMBER_ENTERED"); //NOI18N
+                       return ""; //NOI18N
+               }
+
+               // Init instance
+               Contact updatedContact;
+               DialableMobileNumber mobileNumber = this.adminPhoneController.getChoosenMobileNumber();
+
+               // All fine so far, then which was choosen?
+               if (mobileNumber instanceof DialableMobileNumber) {
+                       // User has choosen number
+                       updatedContact = this.adminPhoneBean.linkExistingMobileNumberWithContact(contact, mobileNumber);
+               } else {
+                       // Create new instance
+                       mobileNumber = new MobileNumber(this.adminPhoneController.getMobileProvider(), this.adminPhoneController.getPhoneNumber());
+
+                       // Link it, too
+                       updatedContact = this.adminPhoneBean.linkNewMobileNumberWithContact(contact, mobileNumber);
+               }
+
+               // Fire event
+               this.adminLinkedMobileNumberEvent.fire(new AdminMobileNumberLinkedEvent(updatedContact, mobileNumber));
+
+               // Return to contact profile
+               return "admin_show_contact?faces-redirect=true&includeViewParams=true"; //NOI18N
+       }
+
        @Override
        public String unlinkFaxContactData () {
                // Is all data set

diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestController.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestController.java
index e72aad95f11401a88119b3a0825a3087ee2d5e14..04d483a8b2069c2ccfa612d48192a22d75132db7 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestController.java
+++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestController.java
@@ -19,6 +19,7 @@ package org.mxchange.jjobs.beans.contact.phone;
 
 import java.io.Serializable;
 import javax.ejb.Local;
+import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent;
 import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent;
 import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
@@ -74,4 +75,35 @@ public interface JobsAdminContactPhoneWebRequestController extends Serializable
         */
        void afterAdminUpdatedContactDataEvent (final AdminUpdatedContactEvent event);
 
+       /**
+        * Links given contact instance with setted fax number or entered data. If
+        * both is set, a proper exception is thrown as this is an invalid state.
+        * <p>
+        * @param contact Contact instance to link with existing/new data
+        * <p>
+        * @return Redirect outcome
+        */
+       String doLinkAddFaxNumber (final Contact contact);
+
+       /**
+        * Links given contact instance with setted land-line number or entered
+        * data. If both is set, a proper exception is thrown as this is an invalid
+        * state.
+        * <p>
+        * @param contact Contact instance to link with existing/new data
+        * <p>
+        * @return Redirect outcome
+        */
+       String doLinkAddLandLineNumber (final Contact contact);
+
+       /**
+        * Links given contact instance with setted mobile or entered data. If both
+        * is set, a proper exception is thrown as this is an invalid state.
+        * <p>
+        * @param contact Contact instance to link with existing/new data
+        * <p>
+        * @return Redirect outcome
+        */
+       String doLinkAddMobileNumber (final Contact contact);
+
 }

diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java
index e1de16d8ddf8f5119aecfd385fc75a1a2622018f..462d12f9eafa07e52ec9ea0f4ef63912c3d3e624 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java
@@ -87,11 +87,6 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements
         */
        private DialableMobileNumber choosenMobileNumber;
 
-       /**
-        * (Entered) mobile number
-        */
-       private Long mobileNumber;
-
        /**
         * Event being fired when an administrator has deleted mobile number
         */
@@ -341,16 +336,6 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements
                this.choosenMobileNumber = choosenMobileNumber;
        }
 
-       @Override
-       public Long getMobileNumber () {
-               return this.mobileNumber;
-       }
-
-       @Override
-       public void setMobileNumber (final Long mobileNumber) {
-               this.mobileNumber = mobileNumber;
-       }
-
        @Override
        public MobileProvider getMobileProvider () {
                return this.mobileProvider;

diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java
index 5c6d95f0d3be185d5475e27e336c21a68c996b9d..278b72e940534da3255163c242315f012202fbba 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java
+++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java
@@ -125,20 +125,6 @@ public interface JobsAdminPhoneWebRequestController extends Serializable {
         */
        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 phone area code
         * <p>

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index a96f3ea130a1a34d22be443051a30a2bcbfb3498..0750393d0f61fa6575555ffe55ee3a1fe3106f8b 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -703,3 +703,6 @@ ADMIN_EDIT_LAND_LINE_NUMBER=Festnetznummer \u00e4ndern:
 ADMIN_EDIT_FAX_NUMBER=Faxnummer \u00e4ndern:
 BUTTON_ADMIN_EDIT_LAND_LINE_NUMBER=Festnetznummer ab\u00e4ndern
 BUTTON_ADMIN_EDIT_FAX_NUMBER=Faxnummer ab\u00e4ndern
+ERROR_ADMIN_NO_PHONE_COUNTRY_SELECTED=Keine Landesvorwahl ausgew\u00e4hlt.
+ERROR_ADMIN_NO_PHONE_AREA_CODE_ENTERED=Keine Ortsvorwahl eingegeben.
+ERROR_ADMIN_NO_PHONE_NUMBER_ENTERED=Keine Rufnummer eingegeben.

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 66f9531eb8cb266dc1b2b7b16ee74e12190c8d2e..1679ced86c4791d3732a1f692a2ef77cc890879e 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -703,3 +703,6 @@ ADMIN_EDIT_LAND_LINE_NUMBER=Change land-line number:
 ADMIN_EDIT_FAX_NUMBER=Change fax number:
 BUTTON_ADMIN_EDIT_LAND_LINE_NUMBER=Change land-line number
 BUTTON_ADMIN_EDIT_FAX_NUMBER=Change fax number
+ERROR_ADMIN_NO_PHONE_COUNTRY_SELECTED=No country dial prefix selected.
+ERROR_ADMIN_NO_PHONE_AREA_CODE_ENTERED=No city (area) dial prefix entered.
+ERROR_ADMIN_NO_PHONE_NUMBER_ENTERED=No call number entered.

diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index 264bac9499892dc7f2a94b1fdbef8c8ba156b68c..ed8551ad899c3906d05f51feff67404e9f5b37b7 100644 (file)
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -266,9 +266,19 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <ui:include src="/WEB-INF/templates/input_fields/mobile_input_fields.tpl">
-                                               <ui:param name="targetController" value="#{contactController}" />
-                                       </ui:include>
+                                       <h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{contactController.phoneCountry}">
+                                               <f:converter converterId="CountryConverter" />
+                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
+                                       </h:selectOneMenu>
+
+                                       <h:inputText styleClass="input right_space" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.phoneAreaCode}">
+                                               <f:validator validatorId="PhoneNumberValidator" />
+                                       </h:inputText>
+
+                                       <h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{contactController.phoneNumber}">
+                                               <f:validator validatorId="PhoneNumberValidator" />
+                                       </h:inputText>
                                </div>
 
                                <div class="clear"></div>

diff --git a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
index 27e3a4d3c93e80af00f1aa7b6c68fd63603efa11..99df50070c0ede806007609032afa685a8818431 100644 (file)
--- a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
@@ -6,10 +6,10 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{not empty targetController}">
-               <h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{targetController.phoneCountry}">
+               <h:selectOneMenu styleClass="select right_space" id="phoneCountry" value="#{targetController.phoneCountry}">
                        <f:converter converterId="CountryConverter" />
                        <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                       <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
+                       <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.phoneCountry}" />
                </h:selectOneMenu>
 
                <h:inputText styleClass="input right_space" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.phoneAreaCode}">

diff --git a/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
index b515e622967728fedaa83390b0c8af295978500b..02d81bd489341381054f442189a8fb05d853f36b 100644 (file)
--- a/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
@@ -12,7 +12,7 @@
                        <f:selectItems value="#{mobileProviderController.allMobileProvider()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
                </h:selectOneMenu>
 
-               <h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{targetController.mobileNumber}">
+               <h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{targetController.phoneNumber}">
                        <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
                </h:inputText>
        </ui:fragment>