svn commit: r717986 - in /ofbiz/trunk/applications/humanres/widget: EmploymentScreens.xml forms/EmploymentForms.xml

[apatel-2]

Author: apatel
Date: Sat Nov 15 22:33:21 2008
New Revision: 717986

URL: http://svn.apache.org/viewvc?rev=717986&view=rev
Log:
Added form of employment list to on employee profile page. I'll build Profile Portal page once Portal patch to be added in trunk.

Modified:
    ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
    ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml

Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?rev=717986&r1=717985&r2=717986&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Sat Nov 15 22:33:21 2008
@@ -49,7 +49,7 @@
                                 <include-form name="FindEmployments" location="component://humanres/widget/forms/EmploymentForms.xml"/>
                             </decorator-section>
                             <decorator-section name="search-results">
-                                <include-form name="ListEmployments" location="component://humanres/widget/forms/EmploymentForms.xml"/>
+                                <include-form name="ListEmploymentsPerson" location="component://humanres/widget/forms/EmploymentForms.xml"/>
                             </decorator-section>
                         </decorator-screen>
                     </decorator-section>

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=717986&r1=717985&r2=717986&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Sat Nov 15 22:33:21 2008
@@ -47,7 +47,7 @@
         <field name="noConditionFind"><hidden value="Y"/></field>    
         <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="ListEmployments" type="list" paginate-target="FindEmployments" default-entity-name="EmploymentAndPerson" list-name="listIt" separate-columns="true"
+    <form name="ListEmploymentsPerson" type="list" paginate-target="FindEmployments" default-entity-name="EmploymentAndPerson" list-name="listIt" separate-columns="true"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
@@ -69,6 +69,26 @@
             <hyperlink target="EditEmployment?partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;roleTypeIdFrom=${roleTypeIdFrom}&amp;fromDate=${fromDate}&amp;roleTypeIdTo=${roleTypeIdTo}" description="${uiLabelMap.CommonEdit}"/>
         </field>
     </form>
+    <form name="ListEmployments" type="list" paginate-target="FindEmployments" default-entity-name="EmploymentAndPerson" list-name="listIt" separate-columns="true"
+        odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
+        <actions>
+            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" env-name="employmentCtx"/>
+                <field-map field-name="entityName" value="Employment"/>
+            </service>
+        </actions>
+        <field name="partyIdFrom" title="${uiLabelMap.HumanResEmploymentPartyIdFrom}"><display></display></field>
+        <field name="partyIdTo" title="${uiLabelMap.HumanResEmployeePartyIdTo}" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${partyIdTo}" target="viewprofile?partyId=${partyIdTo}"/>
+        </field>
+        <field name="fromDate"><display also-hidden="true"/></field>
+        <field name="thruDate"><display/></field>
+        <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><display/></field>
+        <field name="terminationTypeId" title="${uiLabelMap.HumanResTerminationTypeId}"><display/></field>
+        <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
+            <hyperlink target="EditEmployment?partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;roleTypeIdFrom=${roleTypeIdFrom}&amp;fromDate=${fromDate}&amp;roleTypeIdTo=${roleTypeIdTo}" description="${uiLabelMap.CommonEdit}"/>
+        </field>
+    </form>
     <form name="EditEmployment" type="single" target="updateEmployment" default-map-name="employment"
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="employment==null" target="createEmployment"/>