svn commit: r1232158 - in /ofbiz/trunk: applications/humanres/data/HumanResTypeData.xml applications/humanres/entitydef/entitymodel.xml applications/humanres/widget/forms/EmplLeaveForms.xml framework/common/config/CommonEntityLabels.xml

[erwan]

Author: erwan
Date: Mon Jan 16 20:51:18 2012
New Revision: 1232158

URL: http://svn.apache.org/viewvc?rev=1232158&view=rev
Log:
Improvements on the EmplLeave entity. Adding entityLabels for the leaveStatus field

Modified:
    ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
    ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
    ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml
    ofbiz/trunk/framework/common/config/CommonEntityLabels.xml

Modified: ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml?rev=1232158&r1=1232157&r2=1232158&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml (original)
+++ ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml Mon Jan 16 20:51:18 2012
@@ -55,6 +55,7 @@ under the License.
 
     <StatusType statusTypeId="LEAVE_STATUS" description="Employee Leave Status"/>
     <StatusItem statusId="LEAVE_APPROVED" statusTypeId="LEAVE_STATUS"  description="Approved"/>
+    <StatusItem statusId="LEAVE_CREATED" statusTypeId="LEAVE_STATUS"  description="Created"/>
     <StatusItem statusId="LEAVE_REJECTED" statusTypeId="LEAVE_STATUS"  description="Rejected"/>
 
     <EmplPositionType description="Programmer" hasTable="N" parentTypeId="" emplPositionTypeId="PROGRAMMER"/>

Modified: ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml?rev=1232158&r1=1232157&r2=1232158&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml Mon Jan 16 20:51:18 2012
@@ -436,7 +436,7 @@ under the License.
         <field name="fromDate" type="date-time"/>
         <field name="thruDate" type="date-time"/>
         <field name="approverPartyId" type="id-ne"/>
-        <field name="leaveStatus" type="short-varchar"/>
+        <field name="leaveStatus" type="id-ne"/>
         <field name="description" type="description"/>
         <prim-key field="partyId"/>
         <prim-key field="leaveTypeId"/>
@@ -453,6 +453,9 @@ under the License.
         <relation type="one" fk-name="EMPL_LEAVE_APPR" title="Approver" rel-entity-name="Party">
             <key-map field-name="approverPartyId" rel-field-name="partyId"/>
         </relation>
+        <relation type="one" fk-name="EMPL_LEAVE_STS" rel-entity-name="StatusItem">
+            <key-map field-name="leaveStatus" rel-field-name="statusId"/>
+        </relation>
     </entity>
     <entity entity-name="EmplLeaveType"
             package-name="org.ofbiz.humanres.employment"

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml?rev=1232158&r1=1232157&r2=1232158&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml Mon Jan 16 20:51:18 2012
@@ -73,7 +73,7 @@
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="leaveStatus"><display/></field>
+        <field name="leaveStatus"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="updateLeave" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext" use-when="hasAdminPermission">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonUpdate}" target="EditEmplLeave">
                 <parameter param-name="partyId"/>
@@ -151,7 +151,7 @@
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="leaveStatus"><display/></field>
+        <field name="leaveStatus"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="UpdateStatus" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext">
             <hyperlink target="EditEmplLeaveStatus" description="${uiLabelMap.CommonUpdate}" >
                 <parameter param-name="partyId"/>

Modified: ofbiz/trunk/framework/common/config/CommonEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonEntityLabels.xml?rev=1232158&r1=1232157&r2=1232158&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonEntityLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonEntityLabels.xml Mon Jan 16 20:51:18 2012
@@ -8711,6 +8711,18 @@
         <value xml:lang="zh">合格的</value>
         <value xml:lang="zh_TW">合格的</value>
     </property>
+    <property key="StatusItem.description.LEAVE_CREATED">
+        <value xml:lang="en">Created</value>
+        <value xml:lang="fr">Créé</value>
+    </property>
+    <property key="StatusItem.description.LEAVE_APPROVED">
+        <value xml:lang="en">Approved</value>
+        <value xml:lang="fr">Validé</value>
+    </property>
+    <property key="StatusItem.description.LEAVE_REJECTED">
+        <value xml:lang="en">Rejected</value>
+        <value xml:lang="fr">Rejeté</value>
+    </property>
     <property key="StatusItem.description.MKTG_CAMP_APPROVED">
         <value xml:lang="de">Genehmigt</value>
         <value xml:lang="en">Approved</value>