You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2007/10/19 10:57:53 UTC
svn commit: r586339 - in /ofbiz/trunk/applications/workeffort:
data/WorkEffortTypeData.xml entitydef/entitymodel.xml
widget/TimesheetForms.xml
Author: hansbak
Date: Fri Oct 19 01:57:52 2007
New Revision: 586339
URL: http://svn.apache.org/viewvc?rev=586339&view=rev
Log:
add simple status to timesheet and correct wrong foreign key
Modified:
ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml
ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml
Modified: ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml?rev=586339&r1=586338&r2=586339&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml (original)
+++ ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml Fri Oct 19 01:57:52 2007
@@ -131,6 +131,11 @@
<StatusValidChange condition="" statusId="CAL_ACCEPTED" statusIdTo="CAL_CANCELLED" transitionName="Cancel"/>
<StatusValidChange condition="" statusId="CAL_ACCEPTED" statusIdTo="CAL_DELEGATED" transitionName="Delegate"/>
+ <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"/>
+ <StatusValidChange condition="" statusId="TIMESHEET_IN_PROCESS" statusIdTo="TIMESHEET_COMPLETED" transitionName="Confirm complete"/>
+
<StatusType description="Event" hasTable="N" parentTypeId="CALENDAR_STATUS" statusTypeId="EVENT_STATUS"/>
<StatusItem description="Tentative" sequenceId="01" statusCode="TENTATIVE" statusId="CAL_TENTATIVE" statusTypeId="EVENT_STATUS"/>
<StatusItem description="Confirmed" sequenceId="02" statusCode="CONFIRMED" statusId="CAL_CONFIRMED" statusTypeId="EVENT_STATUS"/>
Modified: ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml?rev=586339&r1=586338&r2=586339&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml Fri Oct 19 01:57:52 2007
@@ -110,13 +110,17 @@
<field name="clientPartyId" type="id"></field>
<field name="fromDate" type="date-time"></field>
<field name="thruDate" type="date-time"></field>
+ <field name="statusId" type="id"></field>
<field name="comments" type="comment"></field>
<prim-key field="timesheetId"/>
<relation type="one" fk-name="TIMESHEET_PRTY" rel-entity-name="Party">
<key-map field-name="partyId"/>
</relation>
<relation type="one" fk-name="TIMESHEET_CPTY" title="Client" rel-entity-name="Party">
- <key-map field-name="partyId"/>
+ <key-map field-name="clientPartyId" rel-field-name="partyId"/>
+ </relation>
+ <relation type="one" fk-name="TIMESHEET_STS" title="Status" rel-entity-name="StatusItem">
+ <key-map field-name="statusId"/>
</relation>
</entity>
<entity entity-name="TimesheetRole"
Modified: ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml?rev=586339&r1=586338&r2=586339&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml Fri Oct 19 01:57:52 2007
@@ -92,6 +92,14 @@
<field name="partyId" title="${uiLabelMap.PartyParty}*"><lookup target-form-name="LookupPartyName"/></field>
<field name="clientPartyId"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}*" position="1">
+ <drop-down no-current-selected-key="TIMESHEET_IN_PROCESS">
+ <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+ <entity-constraint name="statusTypeId" value="TIMESHEET_STATUS"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="DisplayTimesheetEntries" type="list" list-name="timesheetEntries">