svn commit: r673574 - in /ofbiz/trunk/applications/workeffort: data/WorkEffortTypeData.xml entitydef/entitymodel.xml

[jonesde]

Author: jonesde
Date: Wed Jul  2 20:58:17 2008
New Revision: 673574

URL: http://svn.apache.org/viewvc?rev=673574&view=rev
Log:
Added Timesheet.approvedByUserLoginId to track approvals; added approved status for timesheet

Modified:
    ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml
    ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml

Modified: ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml?rev=673574&r1=673573&r2=673574&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml (original)
+++ ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml Wed Jul  2 20:58:17 2008
@@ -90,7 +90,9 @@
     <StatusType description="Timesheet" hasTable="N" parentTypeId="" statusTypeId="TIMESHEET_STATUS"/>
     <StatusItem description="In-Process" sequenceId="01" statusCode="IN_PROCESS" statusId="TIMESHEET_IN_PROCESS" statusTypeId="TIMESHEET_STATUS"/>
     <StatusItem description="Completed" sequenceId="02" statusCode="COMPLETED" statusId="TIMESHEET_COMPLETED" statusTypeId="TIMESHEET_STATUS"/>
+    <StatusItem description="Approved" sequenceId="03" statusCode="APPROVED" statusId="TIMESHEET_APPROVED" statusTypeId="TIMESHEET_STATUS"/>
     <StatusValidChange condition="" statusId="TIMESHEET_IN_PROCESS" statusIdTo="TIMESHEET_COMPLETED" transitionName="Confirm complete"/>
+    <StatusValidChange condition="" statusId="TIMESHEET_COMPLETED" statusIdTo="TIMESHEET_APPROVED" transitionName="Approve"/>
     
     <!-- Project Statuses -->
     <StatusType description="Project" hasTable="N" parentTypeId="WORK_EFFORT_STATUS" statusTypeId="WE_PROJECT_STATUS"/>

Modified: ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml?rev=673574&r1=673573&r2=673574&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml Wed Jul  2 20:58:17 2008
@@ -117,6 +117,7 @@
       <field name="fromDate" type="date-time"></field>
       <field name="thruDate" type="date-time"></field>
       <field name="statusId" type="id"></field>
+      <field name="approvedByUserLoginId" type="id-vlong"></field>
       <field name="comments" type="comment"></field>
       <prim-key field="timesheetId"/>
       <relation type="one" fk-name="TIMESHEET_PRTY" rel-entity-name="Party">
@@ -128,6 +129,9 @@
       <relation type="one" fk-name="TIMESHEET_STS" rel-entity-name="StatusItem">
         <key-map field-name="statusId"/>
       </relation>
+        <relation type="one" fk-name="TIMESHEET_AB_UL" title="ApprovedBy" rel-entity-name="UserLogin">
+            <key-map field-name="approvedByUserLoginId" rel-field-name="userLoginId"/>
+        </relation>
     </entity>
     <entity entity-name="TimesheetRole"
             package-name="org.ofbiz.workeffort.timesheet"