svn commit: r1848469 - in /ofbiz/ofbiz-framework/trunk/applications/humanres: webapp/humanres/WEB-INF/controller.xml widget/EmployeeScreens.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1848469 - in /ofbiz/ofbiz-framework/trunk/applications/humanres: webapp/humanres/WEB-INF/controller.xml widget/EmployeeScreens.xml

mbrohl
Author: mbrohl
Date: Sat Dec  8 13:36:26 2018
New Revision: 1848469

URL: http://svn.apache.org/viewvc?rev=1848469&view=rev
Log:
Improved: Implement dependency from "State/Province" Field to "Country"
in New Employee Form.
(OFBIZ-10326)

Thanks Benjamin Jugl and Julian Leichert for reporting and providing
the patch.

Modified:
    ofbiz/ofbiz-framework/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
    ofbiz/ofbiz-framework/trunk/applications/humanres/widget/EmployeeScreens.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=1848469&r1=1848468&r2=1848469&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Sat Dec  8 13:36:26 2018
@@ -753,6 +753,12 @@ under the License.
         <response name="success" type="view" value="EditAgreementEmploymentAppls"/>
     </request-map>
     <!--====================Extended Requests===================================-->
+    <request-map uri="getAssociatedStateList">
+        <security https="true" auth="false"/>
+        <event type="service" invoke="getAssociatedStateList"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
+    </request-map>
     <request-map uri="EditPartySkillsExt">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="EditPartySkills"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/widget/EmployeeScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/widget/EmployeeScreens.xml?rev=1848469&r1=1848468&r2=1848469&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/humanres/widget/EmployeeScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/humanres/widget/EmployeeScreens.xml Sat Dec  8 13:36:26 2018
@@ -60,12 +60,25 @@ under the License.
             <actions>
                 <set field="titleProperty" value="PartyCreateNewEmployee"/>
                 <set field="headerItem" value="Employees"/>
-                <property-to-field field="defaultCountryGeoId" resource="general" property="country.geo.id.default" default="USA"/>
+                <set field="dependentForm" value="AddEmployee"/>
+                <set field="paramKey" value="countryGeoId"/>
+                <set field="mainId" value="countryGeoId"/>
+                <set field="dependentId" value="stateProvinceGeoId"/>
+                <set field="requestName" value="getAssociatedStateList"/>
+                <set field="responseName" value="stateList"/>
+                <set field="dependentKeyName" value="geoId"/>
+                <set field="descName" value="geoName"/>
+                <set field="selectedDependentOption" from-field="country.geo.id.default" default-value="USA"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.HumanResNewEmployee}">
+                        <platform-specific>
+                            <html>
+                                <html-template location="component://common-theme/template/includes/SetDependentDropdownValuesJs.ftl"/>
+                            </html>
+                        </platform-specific>
                             <section>
                                 <widgets>
                                     <include-form name="AddEmployee" location="component://humanres/widget/forms/EmployeeForms.xml"/>