svn commit: r703600 - in /ofbiz/trunk/applications/workeffort/entitydef: entitymodel.xml entitymodel_view.xml

[ad...@apache.org]

Author: adrianc
Date: Fri Oct 10 16:15:40 2008
New Revision: 703600

URL: http://svn.apache.org/viewvc?rev=703600&view=rev
Log:
New Work Effort view entity and some field deprecations.

Modified:
    ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
    ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml

Modified: ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml?rev=703600&r1=703599&r2=703600&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml Fri Oct 10 16:15:40 2008
@@ -273,13 +273,13 @@
       <field name="totalMoneyAllowed" type="currency-amount"></field>
       <field name="moneyUomId" type="id"></field>
       <field name="specialTerms" type="long-varchar"></field>
-      <field name="timeTransparency" type="numeric"></field>
+      <field name="timeTransparency" type="numeric"><description>Deprecated - use the availabilityStatusId field in the assignment entities instead</description></field>
       <field name="universalId" type="short-varchar"></field>
       <field name="sourceReferenceId" type="id-long"></field>
-      <field name="fixedAssetId" type="id"></field>
+      <field name="fixedAssetId" type="id"><description>Deprecated - use the WorkEffortFixedAssetAssign entity instead</description></field>
       <field name="facilityId" type="id"></field>
       <field name="infoUrl" type="long-varchar"></field>
-      <field name="recurrenceInfoId" type="id"></field>
+      <field name="recurrenceInfoId" type="id"><description>Deprecated - use the tempExprId field instead</description></field>
       <field name="tempExprId" type="id"></field>
       <field name="runtimeDataId" type="id"></field>
       <field name="noteId" type="id"></field>

Modified: ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml?rev=703600&r1=703599&r2=703600&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml (original)
+++ ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml Fri Oct 10 16:15:40 2008
@@ -169,6 +169,30 @@
         <key-map field-name="workEffortId"/>
       </relation>
     </view-entity>
+    <view-entity entity-name="WorkEffortAndFixedAssetAssign"
+            package-name="org.ofbiz.workeffort.workeffort"
+            title="Work Effort And Fixed Asset Assignment View Entity">
+      <member-entity entity-alias="WE" entity-name="WorkEffort"/>
+      <member-entity entity-alias="WEFAA" entity-name="WorkEffortFixedAssetAssign"/>
+      <alias-all entity-alias="WE">
+        <exclude field="fixedAssetId"/>
+      </alias-all>
+      <alias-all entity-alias="WEFAA"/>
+      <view-link entity-alias="WE" rel-entity-alias="WEFAA">
+        <key-map field-name="workEffortId"/>
+      </view-link>
+      <relation type="one-nofk" rel-entity-name="WorkEffort">
+        <key-map field-name="workEffortId"/>
+      </relation>
+      <relation type="one-nofk" rel-entity-name="WorkEffortFixedAssetAssign">
+        <key-map field-name="workEffortId"/>
+        <key-map field-name="fixedAssetId"/>
+        <key-map field-name="fromDate"/>
+      </relation>
+      <relation type="one-nofk" rel-entity-name="WorkEffortType">
+        <key-map field-name="workEffortTypeId"/>
+      </relation>
+    </view-entity>
     <view-entity entity-name="WorkEffortAndPartyAssign"
             package-name="org.ofbiz.workeffort.workeffort"
             title="Work Effort And Party Assignment Entity">