Please cherry-pick:

[pizzaservice-war.git] / web / WEB-INF / templates / admin / branch_offices / admin_form_branch_offices_data.tpl

diff --git a/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl b/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl
index 876b39aa5018e098d0d6da612c5efe8aa4a352bf..8eaab2926a7cbde54e3dba65b602eb752ef33e43 100644 (file)
--- a/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl
+++ b/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl
@@ -21,7 +21,7 @@
                                        <h:selectOneMenu styleClass="select" id="branchCompany" value="#{adminBranchOfficeController.branchCompany}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_COMPANY_REQUIRED}">
                                                <f:converter converterId="BasicCompanyDataConverter" />
                                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" itemDisabled="true" />
-                                               <f:selectItems value="#{companyDataController.allCompanyBasicData()}" var="companyData" itemValue="#{companyData}" itemLabel="#{companyData.companyName}" />
+                                               <f:selectItems value="#{basicDataController.allCompanyBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
                                        </h:selectOneMenu>
                                </div>
                        </h:panelGroup>
@@ -178,7 +178,7 @@
 
                                <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="branchHouseNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_HOUSE_NUMBER_REQUIRED}">
-                                               <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
+                                               <f:validateLongRange for="branchHouseNumber" minimum="1" maximum="500" />
                                        </h:inputText>
                                </div>
                        </h:panelGroup>
@@ -189,12 +189,12 @@
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="branchStore" value="#{msg.ADMIN_DATA_STORE}" />
+                                       <h:outputLabel for="branchStore" value="#{msg.ADMIN_ENTER_DATA_STORE}" />
                                </div>
 
                                <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="branchStore" size="3" maxlength="5" value="#{adminBranchOfficeController.branchStore}" validatorMessage="#{msg.ENTERED_STORE_INVALID}">
-                                               <f:validateLongRange for="houseNumber" minimum="-5" maximum="200" />
+                                               <f:validateLongRange for="branchStore" minimum="-5" maximum="200" />
                                        </h:inputText>
                                </div>
                        </h:panelGroup>
@@ -205,12 +205,12 @@
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <h:outputLabel for="branchSuiteNumber" value="#{msg.ADMIN_DATA_SUITE_NUMBER}" />
+                                       <h:outputLabel for="branchSuiteNumber" value="#{msg.ADMIN_ENTER_DATA_SUITE_NUMBER}" />
                                </div>
 
                                <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="branchSuiteNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchSuiteNumber}" validatorMessage="#{msg.ENTERED_SUITE_NUMBER_INVALID}">
-                                               <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
+                                               <f:validateLongRange for="branchSuiteNumber" minimum="1" maximum="500" />
                                        </h:inputText>
                                </div>
                        </h:panelGroup>
@@ -225,7 +225,9 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <h:inputText styleClass="input" id="branchZipCode" size="20" maxlength="255" value="#{adminBranchOfficeController.branchZipCode}" />
+                                       <h:inputText styleClass="input" id="branchZipCode" size="5" maxlength="6" value="#{adminBranchOfficeController.branchZipCode}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_ZIP_CODE_REQUIRED}">
+                                               <f:validateLongRange for="branchZipCode" minimum="1" maximum="99999" />
+                                       </h:inputText>
                                </div>
                        </h:panelGroup>
 
@@ -239,7 +241,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <h:inputText styleClass="input" id="branchCity" size="20" maxlength="255" value="#{adminBranchOfficeController.branchCity}" />
+                                       <h:inputText styleClass="input" id="branchCity" size="20" maxlength="255" value="#{adminBranchOfficeController.branchCity}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_CITY_REQUIRED}" />
                                </div>
                        </h:panelGroup>