You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mo...@apache.org on 2009/05/20 11:55:01 UTC
svn commit: r776643 - in /ofbiz/trunk/applications/marketing:
config/MarketingUiLabels.xml webapp/marketing/WEB-INF/controller.xml
widget/MarketingReportScreens.xml widget/ReportForms.xml
Author: mor
Date: Wed May 20 09:55:01 2009
New Revision: 776643
URL: http://svn.apache.org/viewvc?rev=776643&view=rev
Log:
Added two new reports in Marketing component. These reports are related to emails sent, bounced and opened, subscriptions and canceled for given time period.
Patch from Shweta Singhai, part of OFBIZ-2489 (https://issues.apache.org/jira/browse/OFBIZ-2489)
Modified:
ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml
ofbiz/trunk/applications/marketing/widget/ReportForms.xml
Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml?rev=776643&r1=776642&r2=776643&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Wed May 20 09:55:01 2009
@@ -451,6 +451,9 @@
<value xml:lang="th">à¸à¹à¸à¸¡à¸¹à¸¥à¹à¸à¸§</value>
<value xml:lang="zh">æ¥æèå´</value>
</property>
+ <property key="MarketingEmailStatusReport">
+ <value xml:lang="en">Email Status Report</value>
+ </property>
<property key="MarketingFindAccounts">
<value xml:lang="en">Find SFA Accounts</value>
<value xml:lang="fr">Rechercher les comptes de ventes</value>
@@ -514,6 +517,9 @@
<value xml:lang="th">รหัสà¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¸§à¸²à¸à¹à¸à¸</value>
<value xml:lang="zh">ä¸çº§æ»å¿æ è¯</value>
</property>
+ <property key="MarketingPartyStatusReport">
+ <value xml:lang="en">Party Status Report</value>
+ </property>
<property key="MarketingReports">
<value xml:lang="de">Berichte</value>
<value xml:lang="en">Reports</value>
Modified: ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml?rev=776643&r1=776642&r2=776643&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml Wed May 20 09:55:01 2009
@@ -373,6 +373,15 @@
<response name="success" type="view" value="MarketingCampaignReport"/>
</request-map>
+ <request-map uri="EmailStatusReport">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EmailStatusReport"/>
+ </request-map>
+ <request-map uri="PartyStatusReport">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="PartyStatusReport"/>
+ </request-map>
+
<!-- end of request mappings -->
<!-- View Mappings -->
@@ -431,5 +440,7 @@
<view-map name="TrackingCodeReport" type="screen" page="component://marketing/widget/MarketingReportScreens.xml#TrackingCodeReport"/>
<view-map name="MarketingCampaignReport" type="screen" page="component://marketing/widget/MarketingReportScreens.xml#MarketingCampaignReport"/>
- <!-- end of view mappings -->
+ <view-map name="EmailStatusReport" type="screen" page="component://marketing/widget/MarketingReportScreens.xml#EmailStatusReport"/>
+ <view-map name="PartyStatusReport" type="screen" page="component://marketing/widget/MarketingReportScreens.xml#PartyStatusReport"/>
+<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml?rev=776643&r1=776642&r2=776643&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml Wed May 20 09:55:01 2009
@@ -56,33 +56,65 @@
<container style="h1">
<label text="${uiLabelMap.MarketingReports}"/>
</container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.MarketingTrackingCodeReportTitle}"/>
+ <container style="lefthalf">
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.MarketingTrackingCodeReportTitle}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="TrackingCodeReportOptions" location="component://marketing/widget/ReportForms.xml"/>
+ </widgets>
+ </section>
</container>
</container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="TrackingCodeReportOptions" location="component://marketing/widget/ReportForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.MarketingCampaignReportTitle}"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.MarketingEmailStatusReport}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EmailStatusOptions" location="component://marketing/widget/ReportForms.xml"/>
+ </widgets>
+ </section>
</container>
</container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="MarketingCampaignOptions" location="component://marketing/widget/ReportForms.xml"/>
- </widgets>
- </section>
+ </container>
+ <container style="righthalf">
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.MarketingCampaignReportTitle}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="MarketingCampaignOptions" location="component://marketing/widget/ReportForms.xml"/>
+ </widgets>
+ </section>
+ </container>
</container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.MarketingPartyStatusReport}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="PartyStatusOptions" location="component://marketing/widget/ReportForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</container>
</decorator-section>
</decorator-screen>
@@ -154,5 +186,71 @@
</decorator-screen>
</widgets>
</section>
+ </screen>
+ <screen name= "EmailStatusReport">
+ <section>
+ <actions>
+ <set field="title" value="${uiLabelMap.MarketingEmailStatusReport}"/>
+ <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>
+ <set field="thruDate" from-field="parameters.thruDate" type="Timestamp"/>
+ <set field="statusId" from-field="parameters.statusId" type="String"/>
+ <set field="partyIdFrom" from-field="parameters.partyIdFrom" type="String"/>
+ <set field="partyIdTo" from-field="parameters.partyIdTo" type="String"/>
+ <script location="component://marketing/webapp/marketing/WEB-INF/actions/reports/EmailStatusReport.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonMarketReportDecorator">
+ <decorator-section name="body">
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.MarketingEmailStatusReport}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EmailStatusReport" location="component://marketing/widget/ReportForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name= "PartyStatusReport">
+ <section>
+ <actions>
+ <set field="title" value="${uiLabelMap.MarketingPartyStatusReport}"/>
+ <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>
+ <set field="statusDate" from-field="parameters.statusDate" type="Timestamp"/>
+ <set field="thruDate" from-field="parameters.thruDate" type="Timestamp"/>
+ <set field="contactListId" from-field="parameters.contactListId" type="String"/>
+ <set field="statusId" from-field="parameters.statusId" type="String"/>
+ <script location="component://marketing/webapp/marketing/WEB-INF/actions/reports/PartyStatusReport.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonMarketReportDecorator">
+ <decorator-section name="body">
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.MarketingPartyStatusReport}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="PartyStatusReport" location="component://marketing/widget/ReportForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
</screen>
</screens>
\ No newline at end of file
Modified: ofbiz/trunk/applications/marketing/widget/ReportForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ReportForms.xml?rev=776643&r1=776642&r2=776643&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/ReportForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/ReportForms.xml Wed May 20 09:55:01 2009
@@ -65,6 +65,64 @@
</field>
</form>
+ <form name="EmailStatusOptions" type="single" target="EmailStatusReport"
+ header-row-style="header-row" default-table-style="basic-table">
+ <field name="fromDate" title="${uiLabelMap.CommonFromDate} (${uiLabelMap.CommonDate}>=)">
+ <date-time type="timestamp"/>
+ </field>
+ <field name="thruDate" title="${uiLabelMap.CommonThruDate} (${uiLabelMap.CommonDate}<)">
+ <date-time type="timestamp"/>
+ </field>
+ <field name="partyIdTo" title="${uiLabelMap.FormFieldTitle_partyIdTo}">
+ <lookup target-form-name="LookupPartyName"/>
+ </field>
+ <field name="partyIdFrom" title="${uiLabelMap.FormFieldTitle_fromPartyId}">
+ <lookup target-form-name="LookupPartyName"/>
+ </field>
+ <field name="statusId" title="${uiLabelMap.PartyStatus}">
+ <drop-down allow-empty="true">
+ <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
+ <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+ <entity-constraint name="statusTypeId" operator="equals" value="COM_EVENT_STATUS"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonRun} ${uiLabelMap.MarketingEmailStatusReport}" widget-style="smallSubmit">
+ <submit button-type="button"/>
+ </field>
+ </form>
+
+ <form name="PartyStatusOptions" type="single" target="PartyStatusReport"
+ header-row-style="header-row" default-table-style="basic-table">
+ <field name="fromDate" title="${uiLabelMap.CommonFromDate} (${uiLabelMap.CommonDate}>=)">
+ <date-time type="timestamp"/>
+ </field>
+ <field name="statusDate" title="${uiLabelMap.PartyStatus} (${uiLabelMap.CommonDate}>=)">
+ <date-time type="timestamp"/>
+ </field>
+ <field name="thruDate" title="${uiLabelMap.CommonThruDate} (${uiLabelMap.CommonDate}<)">
+ <date-time type="timestamp"/>
+ </field>
+ <field name="contactListId" title="${uiLabelMap.PartyContactLists}">
+ <drop-down allow-empty="true">
+ <option key="" description="- ${uiLabelMap.CommonAny} -"/>
+ <entity-options entity-name="ContactList" description="${contactListName}">
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="statusId" title="${uiLabelMap.PartyStatus}">
+ <drop-down allow-empty="true">
+ <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
+ <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+ <entity-constraint name="statusTypeId" operator="equals" value="CONTACTLST_PARTY"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonRun} ${uiLabelMap.MarketingPartyStatusReport}" widget-style="smallSubmit">
+ <submit button-type="button"/>
+ </field>
+ </form>
+
<form name="TrackingCodeReport" list-name="trackingCodeVisitAndOrders" target="" title="${uiLabelMap.MarketingTrackingCodeReportTitle}" type="list" paginate-target="TrackingCodeReport"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCode}">
@@ -86,4 +144,31 @@
<field name="orderAmount" title="${uiLabelMap.MarketingOrderAmount}"><display/></field>
<field name="conversionRate" title="${uiLabelMap.MarketingConversionRate}"><display/></field>
</form>
+
+ <form name="EmailStatusReport" title="${uiLabelMap.MarketingEmailStatusReport}" type="list" list-name="commStatausList" target="" paginate-target="EmailStatusReport"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <row-actions>
+ <entity-one entity-name="CommunicationEventType" value-field="communicationEventType"/>
+ <entity-one entity-name="StatusItem" value-field="statusItem"/>
+ </row-actions>
+ <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}"><display/></field>
+ <field name="communicationEventTypeId" title="${uiLabelMap.MarketingContactListCommEventTypeId}"><display description="${communicationEventType.description}"/></field>
+ <field name="statusId" title="${uiLabelMap.PartyStatus}"><display description="${statusItem.description}"/></field>
+ <field name="partyIdTo" title="${uiLabelMap.FormFieldTitle_toPartyId}"><display/></field>
+ <field name="partyIdFrom" title="${uiLabelMap.FormFieldTitle_fromPartyId}"><display/></field>
+ <field name="entryDate" title="${uiLabelMap.PartyEnteredDate}"><display/></field>
+ <field name="subject" title="${uiLabelMap.PartySubject}"><display/></field>
+ </form>
+
+ <form name="PartyStatusReport" title="${uiLabelMap.MarketingPartyStatusReport}" type="list" list-name="partyStatusLists" target="" paginate-target="PartyStatusReport"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <row-actions>
+ <entity-one entity-name="StatusItem" value-field="statusItem"/>
+ </row-actions>
+ <field name="contactListId" title="${uiLabelMap.MarketingContactList}"><display/></field>
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}"><display/></field>
+ <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
+ <field name="statusDate" title="${uiLabelMap.PartyStatus} ${uiLabelMap.CommonDate}"><display/></field>
+ <field name="statusId" title="${uiLabelMap.PartyStatus}"><display description="${statusItem.description}"/></field>
+ </form>
</forms>
\ No newline at end of file