[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add filters to mailing report.
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/367847 )
Change subject: Add filters to mailing report.
..
Add filters to mailing report.
Primary goal here is to add an order by to received date on the mailing report
here civicrm/report/instance/99?reset=1=1 so Caitlin can better review,
use it.
As a byproduct added a bunch more order bys & filters & a link to view mailing
text
Upstream PR
https://github.com/australiangreens/au.org.greens.extendedmailingstats/pull/3
Bug: T161758
Change-Id: I04fff923322e23586d222dfe582cdbfafe61876d
---
M
sites/default/civicrm/extensions/civicrm-extendedmailingstats/CRM/ExtendedMailingStats/Form/Report/ExtendedMailingStats.php
M sites/default/civicrm/extensions/civicrm-extendedmailingstats/info.xml
2 files changed, 208 insertions(+), 144 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git
a/sites/default/civicrm/extensions/civicrm-extendedmailingstats/CRM/ExtendedMailingStats/Form/Report/ExtendedMailingStats.php
b/sites/default/civicrm/extensions/civicrm-extendedmailingstats/CRM/ExtendedMailingStats/Form/Report/ExtendedMailingStats.php
index e06745f..b59a4b8 100644
---
a/sites/default/civicrm/extensions/civicrm-extendedmailingstats/CRM/ExtendedMailingStats/Form/Report/ExtendedMailingStats.php
+++
b/sites/default/civicrm/extensions/civicrm-extendedmailingstats/CRM/ExtendedMailingStats/Form/Report/ExtendedMailingStats.php
@@ -1,11 +1,9 @@
_columns['civicrm_mailing'] = array(
'fields' => array(
+ 'mailing_id' => array(
+'title' => ts('Mailing ID'),
+'name' => 'id',
+'required' => TRUE,
+ ),
'mailing_campaign_id' => array(
'title' => ts('Campaign'),
'name' => 'campaign_id',
@@ -75,126 +73,23 @@
);
}
-$this->_columns = array_merge($this->_columns,
$this->getCampaignColumns());
+$this->_columns = array_merge($this->_columns,
$this->getCampaignColumns(), $this->getMailingStatColumns());
-$this->_columns['civicrm_mailing_stats'] = array(
- 'dao' => 'CRM_Mailing_DAO_Mailing',
- 'fields' => array(
-'mailing_id' => array(
- 'title' => ts('Mailing ID'),
- 'required' => TRUE,
-),
-'mailing_name' => array(
- 'title' => ts('Mailing Name'),
- 'default' => TRUE,
-),
-'is_completed' => array(
- 'title' => ts('Is Completed'),
- 'default' => TRUE,
-),
-'created_date' => array(
- 'title' => ts('Date Created'),
- 'default' => TRUE,
-),
-'start' => array(
- 'title' => ts('Start Date'),
- 'default' => TRUE,
-),
-'finish' => array(
- 'title' => ts('End Date'),
-),
-'recipients' => array(
- 'title' => ts('recipients'),
- 'default' => TRUE,
-),
-'delivered' => array(
- 'title' => ts('delivered'),
- 'default' => TRUE,
-),
-'send_rate' => array(
- 'title' => ts('Send Rate'),
- 'default' => TRUE,
-),
-'bounced' => array(
- 'title' => ts('bounced'),
- 'default' => TRUE,
-),
-'opened_total' => array(
- 'title' => ts('Total Opens'),
- 'default' => TRUE,
-),
-'opened_unique' => array(
- 'title' => ts('Unique Opens'),
- 'default' => TRUE,
-),
-'unsubscribed' => array(
- 'title' => ts('unsubscribed'),
- 'default' => TRUE,
-),
-'forwarded' => array(
- 'title' => ts('forwarded'),
- 'default' => TRUE,
-),
-'clicked_total' => array(
- 'title' => ts('clicked_total'),
- 'default' => TRUE,
-),
-'clicked_unique' => array(
- 'title' => ts('clicked_unique'),
- 'default' => TRUE,
-),
-'trackable_urls' => array(
- 'title' => ts('trackable_urls'),
- 'default' => TRUE,
-),
-'clicked_contribution_page' => array(
- 'title' => ts('clicked_contribution_page'),
- 'default' => TRUE,
-),
-'contribution_count' => array(
- 'title' => ts('Contribution Count'),
- 'default' => TRUE,
-),
-'contribution_total' => array(
- 'title' => ts('contributions_total'),
- 'default' => TRUE,
-),
- ),
- 'filters' => array(
-'is_completed' => array(
- 'title' => ts('Mailing Status'),
- 'operatorType' => CRM_Report_Form::OP_SELECT,
- 'type' => CRM_Utils_Type::T_INT,
- 'options' => array(
-0 => 'Incomplete',
-1 => 'Complete',
- ),
- //'operator' => 'like',
- 'default' => 1,
-
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add filters to mailing report.
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/367847 )
Change subject: Add filters to mailing report.
..
Add filters to mailing report.
Primary goal here is to add an order by to received date on the mailing report
here civicrm/report/instance/99?reset=1=1 so Caitlin can better review,
use it.
As a byproduct added a bunch more order bys & filters & a link to view mailing
text
Upstream PR
https://github.com/australiangreens/au.org.greens.extendedmailingstats/pull/3
Bug: T161758
Change-Id: I04fff923322e23586d222dfe582cdbfafe61876d
---
M
sites/default/civicrm/extensions/civicrm-extendedmailingstats/CRM/ExtendedMailingStats/Form/Report/ExtendedMailingStats.php
M sites/default/civicrm/extensions/civicrm-extendedmailingstats/info.xml
2 files changed, 208 insertions(+), 144 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/47/367847/1
diff --git
a/sites/default/civicrm/extensions/civicrm-extendedmailingstats/CRM/ExtendedMailingStats/Form/Report/ExtendedMailingStats.php
b/sites/default/civicrm/extensions/civicrm-extendedmailingstats/CRM/ExtendedMailingStats/Form/Report/ExtendedMailingStats.php
index e06745f..b59a4b8 100644
---
a/sites/default/civicrm/extensions/civicrm-extendedmailingstats/CRM/ExtendedMailingStats/Form/Report/ExtendedMailingStats.php
+++
b/sites/default/civicrm/extensions/civicrm-extendedmailingstats/CRM/ExtendedMailingStats/Form/Report/ExtendedMailingStats.php
@@ -1,11 +1,9 @@
_columns['civicrm_mailing'] = array(
'fields' => array(
+ 'mailing_id' => array(
+'title' => ts('Mailing ID'),
+'name' => 'id',
+'required' => TRUE,
+ ),
'mailing_campaign_id' => array(
'title' => ts('Campaign'),
'name' => 'campaign_id',
@@ -75,126 +73,23 @@
);
}
-$this->_columns = array_merge($this->_columns,
$this->getCampaignColumns());
+$this->_columns = array_merge($this->_columns,
$this->getCampaignColumns(), $this->getMailingStatColumns());
-$this->_columns['civicrm_mailing_stats'] = array(
- 'dao' => 'CRM_Mailing_DAO_Mailing',
- 'fields' => array(
-'mailing_id' => array(
- 'title' => ts('Mailing ID'),
- 'required' => TRUE,
-),
-'mailing_name' => array(
- 'title' => ts('Mailing Name'),
- 'default' => TRUE,
-),
-'is_completed' => array(
- 'title' => ts('Is Completed'),
- 'default' => TRUE,
-),
-'created_date' => array(
- 'title' => ts('Date Created'),
- 'default' => TRUE,
-),
-'start' => array(
- 'title' => ts('Start Date'),
- 'default' => TRUE,
-),
-'finish' => array(
- 'title' => ts('End Date'),
-),
-'recipients' => array(
- 'title' => ts('recipients'),
- 'default' => TRUE,
-),
-'delivered' => array(
- 'title' => ts('delivered'),
- 'default' => TRUE,
-),
-'send_rate' => array(
- 'title' => ts('Send Rate'),
- 'default' => TRUE,
-),
-'bounced' => array(
- 'title' => ts('bounced'),
- 'default' => TRUE,
-),
-'opened_total' => array(
- 'title' => ts('Total Opens'),
- 'default' => TRUE,
-),
-'opened_unique' => array(
- 'title' => ts('Unique Opens'),
- 'default' => TRUE,
-),
-'unsubscribed' => array(
- 'title' => ts('unsubscribed'),
- 'default' => TRUE,
-),
-'forwarded' => array(
- 'title' => ts('forwarded'),
- 'default' => TRUE,
-),
-'clicked_total' => array(
- 'title' => ts('clicked_total'),
- 'default' => TRUE,
-),
-'clicked_unique' => array(
- 'title' => ts('clicked_unique'),
- 'default' => TRUE,
-),
-'trackable_urls' => array(
- 'title' => ts('trackable_urls'),
- 'default' => TRUE,
-),
-'clicked_contribution_page' => array(
- 'title' => ts('clicked_contribution_page'),
- 'default' => TRUE,
-),
-'contribution_count' => array(
- 'title' => ts('Contribution Count'),
- 'default' => TRUE,
-),
-'contribution_total' => array(
- 'title' => ts('contributions_total'),
- 'default' => TRUE,
-),
- ),
- 'filters' => array(
-'is_completed' => array(
- 'title' => ts('Mailing Status'),
- 'operatorType' => CRM_Report_Form::OP_SELECT,
- 'type' => CRM_Utils_Type::T_INT,
- 'options' => array(
-0 => 'Incomplete',
-1 => 'Complete',
- ),
- //'operator' => 'like',
- 'default' =>
