Author: jonesde
Date: Tue Nov 28 01:08:00 2006
New Revision: 479957
URL: http://svn.apache.org/viewvc?view=rev&rev=479957
Log:
Added WorkEffortContent and WorkEffortContentType entities, part of various
upcoming WorkEffort enhancements for a project management type site
Modified:
incubator/ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml
incubator/ofbiz/trunk/applications/workeffort/entitydef/entitygroup.xml
incubator/ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
Modified:
incubator/ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml?view=diff&rev=479957&r1=479956&r2=479957
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml
(original)
+++ incubator/ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml
Tue Nov 28 01:08:00 2006
@@ -176,6 +176,11 @@
<!-- For Routing definition, (workEffort Template) -->
<WorkEffortAssocType description="Routing and Routing Task Association"
hasTable="N" parentTypeId="" workEffortAssocTypeId="ROUTING_COMPONENT"/>
+ <WorkEffortContentType workEffortContentTypeId="PROJECT_SPEC"
description="Project Specification" parentTypeId=""/>
+ <WorkEffortContentType workEffortContentTypeId="PROPOSAL_MEDIA"
description="Proposal Media" parentTypeId=""/>
+ <WorkEffortContentType workEffortContentTypeId="SUPPORTING_MEDIA"
description="Supporting Media" parentTypeId=""/>
+ <WorkEffortContentType workEffortContentTypeId="CREATED_MEDIA"
description="Created Media" parentTypeId=""/>
+
<WorkflowParticipantType description="A set of resource" hasTable="N"
parentTypeId="" participantTypeId="RESOURCE_SET" typeCode="RESOURCE_SET"/>
<WorkflowParticipantType description="A specific resource agent"
hasTable="N" parentTypeId="" participantTypeId="RESOURCE" typeCode="RESOURCE"/>
<WorkflowParticipantType description="Specifies a role that may map to a
group of humans" hasTable="N" parentTypeId="" participantTypeId="ROLE"
typeCode="ROLE"/>
Modified:
incubator/ofbiz/trunk/applications/workeffort/entitydef/entitygroup.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/workeffort/entitydef/entitygroup.xml?view=diff&rev=479957&r1=479956&r2=479957
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/entitydef/entitygroup.xml
(original)
+++ incubator/ofbiz/trunk/applications/workeffort/entitydef/entitygroup.xml Tue
Nov 28 01:08:00 2006
@@ -50,6 +50,8 @@
<entity-group group="org.ofbiz" entity="WorkEffortAttribute" />
<entity-group group="org.ofbiz" entity="WorkEffortBilling" />
<entity-group group="org.ofbiz" entity="WorkEffortContactMech" />
+ <entity-group group="org.ofbiz" entity="WorkEffortContent" />
+ <entity-group group="org.ofbiz" entity="WorkEffortContentType" />
<entity-group group="org.ofbiz" entity="WorkEffortDeliverableProd" />
<entity-group group="org.ofbiz" entity="WorkEffortFixedAssetAssign" />
<entity-group group="org.ofbiz" entity="WorkEffortFixedAssetStd" />
@@ -80,6 +82,4 @@
<entity-group group="org.ofbiz" entity="WorkEffortCustRequestItemView" />
<entity-group group="org.ofbiz" entity="WorkEffortCustRequestView" />
<entity-group group="org.ofbiz" entity="WorkEffortRequirementView" />
-
</entitygroup>
-
Modified:
incubator/ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml?view=diff&rev=479957&r1=479956&r2=479957
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
(original)
+++ incubator/ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml Tue
Nov 28 01:08:00 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2001-2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -469,6 +468,35 @@
<relation type="one-nofk" rel-entity-name="TelecomNumber">
<key-map field-name="contactMechId"/>
</relation>
+ </entity>
+ <entity entity-name="WorkEffortContent"
package-name="org.ofbiz.workeffort.workeffort" title="WorkEffort Content
Entity">
+ <field name="workEffortId" type="id-ne"></field>
+ <field name="contentId" type="id-ne"></field>
+ <field name="workEffortContentTypeId" type="id-ne"></field>
+ <field name="fromDate" type="date-time"></field>
+ <field name="thruDate" type="date-time"></field>
+ <prim-key field="workEffortId"/>
+ <prim-key field="contentId"/>
+ <prim-key field="workEffortContentTypeId"/>
+ <prim-key field="fromDate"/>
+ <relation type="one" fk-name="WKEFF_CNT_WKEFF"
rel-entity-name="WorkEffort">
+ <key-map field-name="workEffortId"/>
+ </relation>
+ <relation type="one" fk-name="WKEFF_CNT_CNT" rel-entity-name="Content">
+ <key-map field-name="contentId"/>
+ </relation>
+ <relation type="one" fk-name="WKEFF_CNT_WCTP"
rel-entity-name="WorkEffortContentType">
+ <key-map field-name="workEffortContentTypeId"/>
+ </relation>
+ </entity>
+ <entity entity-name="WorkEffortContentType"
package-name="org.ofbiz.workeffort.workeffort" title="WorkEffort Content Type
Entity">
+ <field name="workEffortContentTypeId" type="id-ne"></field>
+ <field name="parentTypeId" type="id"></field>
+ <field name="description" type="description"></field>
+ <prim-key field="workEffortContentTypeId"/>
+ <relation type="one" fk-name="WEFFCTP_TP_PAR" title="Parent"
rel-entity-name="WorkEffortContentType">
+ <key-map field-name="parentTypeId"
rel-field-name="workEffortContentTypeId"/>
+ </relation>
</entity>
<entity entity-name="WorkEffortDeliverableProd"
package-name="org.ofbiz.workeffort.workeffort"
