Continued with customer:

[pizzaservice-war.git] / web / WEB-INF / templates / generic / form_personal_data.tpl

diff --git a/web/WEB-INF/templates/generic/form_personal_data.tpl b/web/WEB-INF/templates/generic/form_personal_data.tpl
index 26da8c966a4da22e9e002b17cdc98797e58e4808..39ca0137b8ccb17f9a580596314fc3c21abfca18 100644 (file)
--- a/web/WEB-INF/templates/generic/form_personal_data.tpl
+++ b/web/WEB-INF/templates/generic/form_personal_data.tpl
@@ -3,7 +3,7 @@
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://java.sun.com/jsf/facelets">
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <div class="para notice">
                #{msg.PERSONAL_DATA_MINIMUM_NOTICE}
@@ -19,7 +19,9 @@
                                </div>
 
                                <div class="table_right">
-                                       <ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl" />
+                                       <ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl">
+                                               <ui:param  name="targetController" value="#{contactController}" />
+                                       </ui:include>
                                </div>
 
                                <div class="clear"></div>
@@ -31,8 +33,8 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="firstName" size="10" maxlength="255" value="#{customerController.firstName}" required="true">
-                                               <f:validator validatorId="NameValidator" />
+                                       <h:inputText class="input" id="firstName" size="10" maxlength="255" value="#{contactController.firstName}" required="true">
+                                               <f:validator for="firstName" validatorId="NameValidator" />
                                        </h:inputText>
                                </div>
 
@@ -45,8 +47,8 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="familyName" size="10" maxlength="255" value="#{customerController.familyName}" required="true">
-                                               <f:validator validatorId="NameValidator" />
+                                       <h:inputText class="input" id="familyName" size="10" maxlength="255" value="#{contactController.familyName}" required="true">
+                                               <f:validator for="familyName" validatorId="NameValidator" />
                                        </h:inputText>
                                </div>
 
@@ -59,8 +61,8 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="street" size="20" maxlength="255" value="#{customerController.street}" required="true">
-                                               <f:validator validatorId="NameValidator" />
+                                       <h:inputText class="input" id="street" size="20" maxlength="255" value="#{contactController.street}" required="true">
+                                               <f:validator for="street" validatorId="NameValidator" />
                                        </h:inputText>
                                </div>
 
@@ -73,8 +75,8 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="houseNumber" size="3" maxlength="5" value="#{customerController.houseNumber}" required="true">
-                                               <f:validateLongRange minimum="1" maximum="500" />
+                                       <h:inputText class="input" id="houseNumber" size="3" maxlength="5" value="#{contactController.houseNumber}" required="true" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
+                                               <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
                                        </h:inputText>
                                </div>
 
@@ -87,7 +89,9 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="zipCode" size="5" maxlength="6" value="#{customerController.zipCode}" required="true" />
+                                       <h:inputText class="input" id="zipCode" size="5" maxlength="6" value="#{contactController.zipCode}" required="true" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
+                                               <f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
+                                       </h:inputText>
                                </div>
 
                                <div class="clear"></div>
@@ -99,8 +103,8 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="city" size="10" maxlength="255" value="#{customerController.city}" required="true">
-                                               <f:validator validatorId="NameValidator" />
+                                       <h:inputText class="input" id="city" size="10" maxlength="255" value="#{contactController.city}" required="true">
+                                               <f:validator for="city" validatorId="NameValidator" />
                                        </h:inputText>
                                </div>
 
@@ -113,8 +117,9 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:selectOneMenu class="select" id="country" value="#{userController.country}">
-                                               <f:selectItems value="#{country.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{msg[c.countryI18nkey]}" />
+                                       <h:selectOneMenu class="select" id="country" value="#{contactController.country}" converter="country">
+                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
                                        </h:selectOneMenu>
                                </div>
 
@@ -123,11 +128,22 @@
 
                        <div class="table_row">
                                <div class="table_left">
-                                       <h:outputLabel for="phoneNumber" value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
+                                       <h:outputLabel value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="phoneNumber" size="20" maxlength="255" value="#{customerController.phoneNumber}" />
+                                       <h:selectOneMenu class="select" id="countryPhoneCode" value="#{contactController.phoneCountry}" converter="country">
+                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+                                       </h:selectOneMenu>
+
+                                       <h:inputText class="input" id="phoneAreaCode" size="5" maxlength="10" value="#{contactController.phoneAreaCode}">
+                                               <f:validator for="phoneAreaCode" validatorId="PhoneNumberValidator" />
+                                       </h:inputText>
+
+                                       <h:inputText class="input" id="phoneNumber" size="10" maxlength="20" value="#{contactController.phoneNumber}">
+                                               <f:validator for="phoneNumber" validatorId="PhoneNumberValidator" />
+                                       </h:inputText>
                                </div>
 
                                <div class="clear"></div>
@@ -139,7 +155,18 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="faxNumber" size="20" maxlength="255" value="#{customerController.faxNumber}" />
+                                       <h:selectOneMenu class="select" id="faxCountryCode" value="#{contactController.faxCountry}" converter="country">
+                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+                                       </h:selectOneMenu>
+
+                                       <h:inputText class="input" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
+                                               <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
+                                       </h:inputText>
+
+                                       <h:inputText class="input" id="faxNumber" size="10" maxlength="20" value="#{contactController.faxNumber}">
+                                               <f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
+                                       </h:inputText>
                                </div>
 
                                <div class="clear"></div>
@@ -151,7 +178,9 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="cellphoneNumber" size="20" maxlength="255" value="#{customerController.cellphoneNumber}" />
+                                       <ui:include src="/WEB-INF/templates/generic/mobile_selection_box.tpl">
+                                               <ui:param name="targetController" value="#{contactController}" />
+                                       </ui:include>
                                </div>
 
                                <div class="clear"></div>