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

[jonesde]

Author: jonesde
Date: Wed Dec  6 19:17:02 2006
New Revision: 483332

URL: http://svn.apache.org/viewvc?view=rev&rev=483332
Log:
Added WorkEffortReview entity, seed data, etc; and a WorkEffortGoodStandardType for associating general sales products to the WorkEffort

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=483332&r1=483331&r2=483332
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml (original)
+++ incubator/ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml Wed Dec  6 19:17:02 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
@@ -254,9 +253,20 @@
     <WorkEffortGoodStandardType workEffortGoodStdTypeId="PRUN_PROD_DELIV" description="Production Run and Product to Deliver Association" hasTable="N" parentTypeId=""/>
     <WorkEffortGoodStandardType workEffortGoodStdTypeId="PRUNT_PROD_NEEDED" description="Production Run Task and Needed Product Association" hasTable="N" parentTypeId=""/>
     <WorkEffortGoodStandardType workEffortGoodStdTypeId="PRUNT_PROD_DELIV" description="Production Run Task and Deliverable Product Association" hasTable="N" parentTypeId=""/>
+    <WorkEffortGoodStandardType workEffortGoodStdTypeId="GENERAL_SALES" description="Product to Represent General Sales of the WorkEffort" hasTable="N" parentTypeId=""/>
+    
     <!--  <StatusType description="WorkEffort Assignment" hasTable="N" parentTypeId="" statusTypeId="WORK_EFFORT_ASSIGN"/> -->
     <StatusType description="Work Effort Good Standard Status" hasTable="N" parentTypeId="" statusTypeId="WEFG_STATUS"/>
     <StatusItem description="Created" sequenceId="01" statusCode="CREATED" statusId="WEGS_CREATED" statusTypeId="WEFG_STATUS"/>
     <StatusItem description="Completed" sequenceId="02" statusCode="COMPLETED" statusId="WEGS_COMPLETED" statusTypeId="WEFG_STATUS"/>
     <StatusItem description="Cancelled" sequenceId="03" statusCode="CANCELLED" statusId="WEGS_CANCELLED" statusTypeId="WEFG_STATUS"/>
+
+    <!-- WorkEffort Review Status -->
+    <StatusType description="WorkEffort Review" hasTable="N" parentTypeId="" statusTypeId="WEFF_REVIEW_STTS"/>
+    <StatusItem description="Pending" sequenceId="01" statusCode="PENDING" statusId="WERV_PENDING" statusTypeId="WEFF_REVIEW_STTS"/>
+    <StatusItem description="Approved" sequenceId="02" statusCode="APPROVED" statusId="WERV_APPROVED" statusTypeId="WEFF_REVIEW_STTS"/>
+    <StatusItem description="Deleted" sequenceId="99" statusCode="DELETED" statusId="WERV_DELETED" statusTypeId="WEFF_REVIEW_STTS"/>
+    <StatusValidChange condition="" statusId="WERV_PENDING" statusIdTo="WERV_APPROVED" transitionName="Review Approved"/>
+    <StatusValidChange condition="" statusId="WERV_PENDING" statusIdTo="WERV_DELETED" transitionName="Review Deleted"/>
+    <StatusValidChange condition="" statusId="WERV_APPROVED" statusIdTo="WERV_DELETED" transitionName="Review Deleted"/>
 </entity-engine-xml>

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=483332&r1=483331&r2=483332
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/entitydef/entitygroup.xml (original)
+++ incubator/ofbiz/trunk/applications/workeffort/entitydef/entitygroup.xml Wed Dec  6 19:17:02 2006
@@ -65,6 +65,7 @@
     <entity-group group="org.ofbiz" entity="WorkEffortPartyAssignByRole" />
     <entity-group group="org.ofbiz" entity="WorkEffortPartyAssignment" />
     <entity-group group="org.ofbiz" entity="WorkEffortPurposeType" />
+    <entity-group group="org.ofbiz" entity="WorkEffortReview" />
     <entity-group group="org.ofbiz" entity="WorkEffortSkillStandard" />
     <entity-group group="org.ofbiz" entity="WorkEffortStatus" />
     <entity-group group="org.ofbiz" entity="WorkEffortTransBox" />

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=483332&r1=483331&r2=483332
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml (original)
+++ incubator/ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml Wed Dec  6 19:17:02 2006
@@ -552,33 +552,31 @@
         <key-map field-name="fixedAssetTypeId"/>
       </relation>
     </entity>
-    <entity entity-name="WorkEffortGoodStandard"
-            package-name="org.ofbiz.workeffort.workeffort"
-            title="Work Effort Good Standard Entity">
-      <field name="workEffortId" type="id-ne"></field>
-      <field name="workEffortGoodStdTypeId" type="id-ne"></field>
-      <field name="productId" type="id-ne"></field>
-      <field name="statusId" type="id-ne"></field>
-      <field name="estimatedQuantity" type="floating-point"></field>
-      <field name="estimatedCost" type="currency-amount"></field>
-      <field name="fromDate" type="date-time"></field>
-      <field name="thruDate" type="date-time"></field>
-      <prim-key field="workEffortId"/>
-      <prim-key field="workEffortGoodStdTypeId"/>
-      <prim-key field="productId"/>
-      <prim-key field="fromDate"/>
-      <relation type="one" fk-name="WKEFF_GDSTD_WEFF" rel-entity-name="WorkEffort">
-        <key-map field-name="workEffortId"/>
-      </relation>
-      <relation type="one" fk-name="WKEFF_GDSTD_TYPE" rel-entity-name="WorkEffortGoodStandardType">
-        <key-map field-name="workEffortGoodStdTypeId"/>
-      </relation>
-      <relation type="one" fk-name="WKEFF_GDSTD_PROD" rel-entity-name="Product">
-        <key-map field-name="productId"/>
-      </relation>
-      <relation type="one" fk-name="WKEFF_GDSTD_STTS" rel-entity-name="StatusItem">
-        <key-map field-name="statusId"/>
-      </relation>
+    <entity entity-name="WorkEffortGoodStandard" package-name="org.ofbiz.workeffort.workeffort" title="Work Effort Good Standard Entity">
+        <field name="workEffortId" type="id-ne"></field>
+        <field name="productId" type="id-ne"></field>
+        <field name="workEffortGoodStdTypeId" type="id-ne"></field>
+        <field name="fromDate" type="date-time"></field>
+        <field name="thruDate" type="date-time"></field>
+        <field name="statusId" type="id-ne"></field>
+        <field name="estimatedQuantity" type="floating-point"></field>
+        <field name="estimatedCost" type="currency-amount"></field>
+        <prim-key field="workEffortId"/>
+        <prim-key field="productId"/>
+        <prim-key field="workEffortGoodStdTypeId"/>
+        <prim-key field="fromDate"/>
+        <relation type="one" fk-name="WKEFF_GDSTD_WEFF" rel-entity-name="WorkEffort">
+            <key-map field-name="workEffortId"/>
+        </relation>
+        <relation type="one" fk-name="WKEFF_GDSTD_TYPE" rel-entity-name="WorkEffortGoodStandardType">
+            <key-map field-name="workEffortGoodStdTypeId"/>
+        </relation>
+        <relation type="one" fk-name="WKEFF_GDSTD_PROD" rel-entity-name="Product">
+            <key-map field-name="productId"/>
+        </relation>
+        <relation type="one" fk-name="WKEFF_GDSTD_STTS" rel-entity-name="StatusItem">
+            <key-map field-name="statusId"/>
+        </relation>
     </entity>
     <entity entity-name="WorkEffortGoodStandardType"
             package-name="org.ofbiz.workeffort.workeffort"
@@ -694,6 +692,27 @@
       <field name="workEffortPurposeTypeId" type="id-ne"></field>
       <field name="description" type="description"></field>
       <prim-key field="workEffortPurposeTypeId"/>
+    </entity>
+    <entity entity-name="WorkEffortReview" package-name="org.ofbiz.product.product" title="WorkEffort Review Entity">
+        <field name="workEffortId" type="id-ne"></field>
+        <field name="userLoginId" type="id-vlong-ne"></field>
+        <field name="reviewDate" type="date-time"></field>
+        <field name="statusId" type="id"></field>
+        <field name="postedAnonymous" type="indicator"></field>
+        <field name="rating" type="floating-point"></field>
+        <field name="reviewText" type="very-long"></field>
+        <prim-key field="workEffortId"/>
+        <prim-key field="userLoginId"/>
+        <prim-key field="reviewDate"/>
+        <relation type="one" fk-name="WEFF_REVIEW_WEFF" rel-entity-name="WorkEffort">
+            <key-map field-name="workEffortId"/>
+        </relation>
+        <relation type="one" fk-name="WEFF_REVIEW_UL" rel-entity-name="UserLogin">
+            <key-map field-name="userLoginId"/>
+        </relation>
+        <relation type="one" fk-name="WEFF_REVIEW_STTS" rel-entity-name="StatusItem">
+            <key-map field-name="statusId"/>
+        </relation>
     </entity>
     <entity entity-name="WorkEffortSkillStandard"
             package-name="org.ofbiz.workeffort.workeffort"