[OFBiz] SVN: r6462 - trunk/applications/marketing/entitydef

[sichen@svn.ofbiz.org]

Author: sichen
Date: 2006-01-03 11:02:26 -0600 (Tue, 03 Jan 2006)
New Revision: 6462

Modified:
   trunk/applications/marketing/entitydef/entitygroup.xml
   trunk/applications/marketing/entitydef/entitymodel.xml
Log:
Added new view-entities for marketing campaign reports.  Fixed up some of the tracking code ones to give correct information

Modified: trunk/applications/marketing/entitydef/entitygroup.xml
===================================================================
--- trunk/applications/marketing/entitydef/entitygroup.xml	2006-01-03 11:43:10 UTC (rev 6461)
+++ trunk/applications/marketing/entitydef/entitygroup.xml	2006-01-03 17:02:26 UTC (rev 6462)
@@ -70,5 +70,7 @@
 
     <entity-group group="org.ofbiz" entity="TrackingCodeAndVisit"/>
     <entity-group group="org.ofbiz" entity="TrackingCodeAndOrderHeader"/>
+    <entity-group group="org.ofbiz" entity="MarketingCampaignAndVisit"/>
+    <entity-group group="org.ofbiz" entity="MarketingCampaignAndOrderHeader"/>
 
 </entitygroup>

Modified: trunk/applications/marketing/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/marketing/entitydef/entitymodel.xml	2006-01-03 11:43:10 UTC (rev 6461)
+++ trunk/applications/marketing/entitydef/entitymodel.xml	2006-01-03 17:02:26 UTC (rev 6462)
@@ -453,8 +453,12 @@
         <member-entity entity-alias="TCV" entity-name="TrackingCodeVisit"/>
         <alias entity-alias="TC" name="trackingCodeId" group-by="true"/>
         <alias entity-alias="TCV" name="visitId" function="count"/>
-        <alias entity-alias="TCV" name="fromDate" group-by="false"/>  <!-- this means we want to use TrackingCodeVisit.fromDate but not group-by it -->
-        <view-link entity-alias="TCV" rel-entity-alias="TC" rel-optional="true">
+        <!-- this means we want to use TrackingCodeVisit.fromDate but not group-by it.  because of this, we cannot have fromDate as one of the fields
+            of a select on this view-entity.  this means we must explicitly specify the fields to select by, and the "view all" button in webtools won't
+            work.  but it is important to have this date here: it can be a condition of searches. -->
+        <alias entity-alias="TCV" name="fromDate" group-by="false"/>  
+        <!-- the sequence of view-links is important.  if reversed here, it means we won't see tracking codes for which there were no visits -->
+        <view-link entity-alias="TC" rel-entity-alias="TCV" rel-optional="true">
             <key-map field-name="trackingCodeId"/>
         </view-link>
       </view-entity>
@@ -466,8 +470,37 @@
         <alias entity-alias="TCO" name="orderId" function="count"/>
         <alias entity-alias="OH" name="orderDate" group-by="false"/>
         <alias entity-alias="TCO" name="trackingCodeId" group-by="true"/>
-        <view-link entity-alias="OH" rel-entity-alias="TCO">
+        <view-link entity-alias="TCO" rel-entity-alias="OH">
             <key-map field-name="orderId"/>
         </view-link>
     </view-entity>
+    <view-entity entity-name="MarketingCampaignAndVisit" package-name="org.ofbiz.marketing.reports"
+         title="View entity for reporting number of visits for a marketing campaign.  Note that because
+         marketingCampaignId is a field of TrackingCode, this is really very similar to TrackingCodeAndVisit, 
+         except the group-by is with marketingCampaignId instead of trackingCodeId">
+        <member-entity entity-alias="TC" entity-name="TrackingCode"/>
+        <member-entity entity-alias="TCV" entity-name="TrackingCodeVisit"/>
+        <alias entity-alias="TC" name="marketingCampaignId" group-by="true"/>
+        <alias entity-alias="TCV" name="visitId" function="count"/>
+        <alias entity-alias="TCV" name="fromDate" group-by="false"/>  
+        <view-link entity-alias="TC" rel-entity-alias="TCV" rel-optional="true">
+            <key-map field-name="trackingCodeId"/>
+        </view-link>
+      </view-entity>
+      <view-entity entity-name="MarketingCampaignAndOrderHeader" package-name="org.ofibz.marketing.reports"
+          title="View entity for reporting number of orders and total order amounts">
+        <member-entity entity-alias="TC" entity-name="TrackingCode"/>
+        <member-entity entity-alias="TCO" entity-name="TrackingCodeOrder"/>
+        <member-entity entity-alias="OH" entity-name="OrderHeader"/>
+        <alias entity-alias="OH" name="grandTotal" function="sum"/>
+        <alias entity-alias="TCO" name="orderId" function="count"/>
+        <alias entity-alias="OH" name="orderDate" group-by="false"/>
+        <alias entity-alias="TC" name="marketingCampaignId" group-by="true"/>
+        <view-link entity-alias="TC" rel-entity-alias="TCO">
+            <key-map field-name="trackingCodeId"/>
+        </view-link>
+        <view-link entity-alias="TCO" rel-entity-alias="OH">  <!-- the sequence of TCO and OH in this view-link is important -->
+            <key-map field-name="orderId"/>
+        </view-link>
+    </view-entity>
 </entitymodel>