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

[hansbak-2]

Author: hansbak
Date: Wed Jan 28 06:22:27 2009
New Revision: 738377

URL: http://svn.apache.org/viewvc?rev=738377&view=rev
Log:
some display enhancements and showing function keys after new employment is created

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

Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=738377&r1=738376&r2=738377&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Wed Jan 28 06:22:27 2009
@@ -153,10 +153,23 @@
                             <widgets>
                                 <section>
                                     <condition>
-                                        <not><if-empty field="employment"/></not>
+                                        <not><if-empty field="parameters.partyIdFrom"/></not>
                                     </condition>
+                                    <actions>
+                                        <entity-one entity-name="PartyNameView" value-field="emplName">
+                                            <field-map field-name="partyId" from-field="parameters.partyIdTo"/>
+                                        </entity-one>
+                                        <entity-one entity-name="PartyNameView" value-field="orgName">
+                                            <field-map field-name="partyId" from-field="parameters.partyIdFrom"/>
+                                        </entity-one>
+                                    </actions>
                                     <widgets>
                                         <include-menu name="EmploymentBar" location="component://humanres/widget/Menus.xml"/>
+                                        <container style="button-bar">
+                                            <link target="EditEmployment" text="${uiLabelMap.HumanResNewEmployment}" style="buttontext"/>
+                                        </container>
+                                        <label style="h1" text="${emplName.lastName},${emplName.firstName} ${emplName.middleName} [${emplName.partyId}] ${uiLabelMap.CommonFor}"></label>
+                                        <label style="h1" text="${orgName.groupName} [${orgName.partyId}]"></label>
                                     </widgets>
                                 </section>                                
                                 <decorator-section-include name="body"/>

Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?rev=738377&r1=738376&r2=738377&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Wed Jan 28 06:22:27 2009
@@ -167,7 +167,7 @@
             <actions>
                 <set field="titleProperty" value="HumanResAddUnemploymentClaim"/>
                 <set field="headerItem" value="Employment"/>
-                <set field="tabButtonItem" value="EditUnemploymentClaim"/>
+                <set field="tabButtonItem" value="EditUnemploymentClaims"/>
                 <set field="unemploymentClaimId" from-field="parameters.unemploymentClaimId" />
                 <set field="roleTypeIdFrom" from-field="parameters.roleTypeIdFrom"/>
                 <set field="roleTypeIdTo" from-field="parameters.roleTypeIdTo"/>

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=738377&r1=738376&r2=738377&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Wed Jan 28 06:22:27 2009
@@ -102,9 +102,9 @@
                 </entity-options>
             </drop-down>            
         </field>
-        <field name="partyIdFrom" use-when="employment!=null" title="${uiLabelMap.HumanResEmploymentPartyIdFrom}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+        <field name="partyIdFrom" use-when="employment!=null" title="${uiLabelMap.HumanResEmploymentPartyIdFrom}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><hidden/></field>
         <field name="partyIdTo" use-when="employment==null" title="${uiLabelMap.HumanResEmployeePartyIdTo}" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="partyIdTo" use-when="employment!=null" title="${uiLabelMap.HumanResEmployeePartyIdTo}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+        <field name="partyIdTo" use-when="employment!=null" title="${uiLabelMap.HumanResEmployeePartyIdTo}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><hidden/></field>
         <field name="fromDate" use-when="employment==null" title="${uiLabelMap.CommonFromDate}" tooltip="${uiLabelMap.CommonRequired}"><date-time/></field>
         <field name="fromDate" use-when="employment!=null" title="${uiLabelMap.CommonFromDate}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
         <field name="thruDate" use-when="employment!=null" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
@@ -141,8 +141,8 @@
         <auto-fields-service service-name="updatePayHistory"/>
         <field name="roleTypeIdFrom"><hidden/></field>
         <field name="roleTypeIdTo"><hidden/></field>
-        <field name="partyIdFrom"><display/></field>
-        <field name="partyIdTo"><display/></field>
+        <field name="partyIdFrom"><hidden/></field>
+        <field name="partyIdTo"><hidden/></field>
         <field name="fromDate"><display/></field>        
         <field name="amount"><hidden/></field>
         <field name="comments"><hidden/></field>
@@ -168,8 +168,8 @@
         <auto-fields-service service-name="updatePartyBenefit"/>        
         <field name="roleTypeIdFrom"><hidden/></field>
         <field name="roleTypeIdTo"><hidden/></field>
-        <field name="partyIdFrom"><display/></field>
-        <field name="partyIdTo"><display/></field>
+        <field name="partyIdFrom"><hidden/></field>
+        <field name="partyIdTo"><hidden/></field>
         <field name="benefitTypeId"><display-entity entity-name="BenefitType" description="${description}"/></field>
         <field name="fromDate"><display/></field>      
         <field name="periodTypeId">