X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FReport%2FForm%2FContact%2FCurrentEmployer.php;h=6a8177a5d632653e8c1d4645f93ccde73860db43;hb=b77b3cdff4fe14a1b8a33ae47afbd2dfbf75fe35;hp=46253862118af3f5775d177203c9906cfa587e1e;hpb=5563fe43b44b754e6441841a5d92664470b20366;p=civicrm-core.git diff --git a/CRM/Report/Form/Contact/CurrentEmployer.php b/CRM/Report/Form/Contact/CurrentEmployer.php index 4625386211..6a8177a5d6 100644 --- a/CRM/Report/Form/Contact/CurrentEmployer.php +++ b/CRM/Report/Form/Contact/CurrentEmployer.php @@ -42,6 +42,12 @@ class CRM_Report_Form_Contact_CurrentEmployer extends CRM_Report_Form { public $_drilldownReport = array('contact/detail' => 'Link to Detail Report'); + /** + * + */ + /** + * + */ function __construct() { $this->_columns = array( @@ -131,6 +137,18 @@ class CRM_Report_Form_Contact_CurrentEmployer extends CRM_Report_Form { ), ), ), + 'civicrm_phone' => + array( + 'dao' => 'CRM_Core_DAO_Phone', + 'grouping' => 'contact-fields', + 'fields' => + array( + 'phone' => + array('title' => ts('Phone'), + 'default' => TRUE, + ), + ), + ), 'civicrm_email' => array( 'dao' => 'CRM_Core_DAO_Email', @@ -235,6 +253,9 @@ FROM civicrm_contact {$this->_aliases['civicrm_contact']} ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id AND {$this->_aliases['civicrm_address']}.is_primary = 1 ) + LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']} + ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id + AND {$this->_aliases['civicrm_phone']}.is_primary = 1) LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']} ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND {$this->_aliases['civicrm_email']}.is_primary = 1) "; @@ -299,6 +320,9 @@ FROM civicrm_contact {$this->_aliases['civicrm_contact']} parent::postProcess(); } + /** + * @param $rows + */ function alterDisplay(&$rows) { // custom code to alter rows $checkList = array(); @@ -378,4 +402,3 @@ FROM civicrm_contact {$this->_aliases['civicrm_contact']} } } } -