X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FReport%2FForm%2FContribute%2FPCP.php;h=72709a3ea61011a8e4d8cb8559f625c7674e8aa9;hb=fa84149cbbbbba2df1bd65c29522a28507dd83a2;hp=9c8369d2df0681dcbe0d56de757a32d969618d6e;hpb=64c2aeba7eea943c799caafed1c82e4f383a1e2d;p=civicrm-core.git diff --git a/CRM/Report/Form/Contribute/PCP.php b/CRM/Report/Form/Contribute/PCP.php index 9c8369d2df..72709a3ea6 100644 --- a/CRM/Report/Form/Contribute/PCP.php +++ b/CRM/Report/Form/Contribute/PCP.php @@ -1,8 +1,7 @@ _columns = array( - 'civicrm_contact' => - array( + 'civicrm_contact' => array( 'dao' => 'CRM_Contact_DAO_Contact', - 'fields' => - array( - 'sort_name' => - array('title' => ts('Supporter'), + 'fields' => array( + 'sort_name' => array( + 'title' => ts('Supporter'), 'required' => TRUE, 'default' => TRUE, ), - 'id' => - array( + 'id' => array( 'required' => TRUE, 'no_display' => TRUE, ), - 'contact_type' => - array( + 'contact_type' => array( 'title' => ts('Supporter Contact Type'), ), - 'contact_sub_type' => - array( + 'contact_sub_type' => array( 'title' => ts('Supporter Contact Subtype'), ), ), - 'filters' => - array( - 'sort_name' => - array('title' => ts('Supporter Name'), + 'filters' => array( + 'sort_name' => array( + 'title' => ts('Supporter Name'), 'type' => CRM_Utils_Type::T_STRING, 'operator' => 'like', ), - 'id' => - array('title' => ts('Contact ID'), + 'id' => array( + 'title' => ts('Contact ID'), 'no_display' => TRUE, ), ), 'grouping' => 'pcp-fields', ), - 'civicrm_contribution_page' => - array( + 'civicrm_contribution_page' => array( 'dao' => 'CRM_Contribute_DAO_ContributionPage', - 'fields' => - array( - 'page_title' => - array('title' => ts('Contribution Page Title'), + 'fields' => array( + 'page_title' => array( + 'title' => ts('Contribution Page Title'), 'name' => 'title', 'default' => TRUE, ), ), - 'filters' => - array( - 'page_title' => - array('title' => ts('Contribution Page Title'), + 'filters' => array( + 'page_title' => array( + 'title' => ts('Contribution Page Title'), 'name' => 'title', 'type' => CRM_Utils_Type::T_STRING, ), ), 'grouping' => 'pcp-fields', ), - 'civicrm_pcp' => - array( + 'civicrm_pcp' => array( 'dao' => 'CRM_PCP_DAO_PCP', - 'fields' => - array( - 'title' => - array('title' => ts('Personal Campaign Title'), + 'fields' => array( + 'title' => array( + 'title' => ts('Personal Campaign Title'), 'default' => TRUE, ), - 'goal_amount' => - array('title' => ts('Goal Amount'), + 'goal_amount' => array( + 'title' => ts('Goal Amount'), 'type' => CRM_Utils_Type::T_MONEY, 'default' => TRUE, ), ), - 'filters' => - array( - 'title' => - array('title' => ts('Personal Campaign Title'), + 'filters' => array( + 'title' => array( + 'title' => ts('Personal Campaign Title'), 'type' => CRM_Utils_Type::T_STRING, ), ), 'grouping' => 'pcp-fields', ), - 'civicrm_contribution_soft' => - array( + 'civicrm_contribution_soft' => array( 'dao' => 'CRM_Contribute_DAO_ContributionSoft', - 'fields' => - array( - 'amount_1' => - array('title' => ts('Committed Amount'), + 'fields' => array( + 'amount_1' => array( + 'title' => ts('Committed Amount'), 'name' => 'amount', 'type' => CRM_Utils_Type::T_MONEY, 'default' => TRUE, - 'statistics' => - array('sum' => ts('Committed Amount'), + 'statistics' => array( + 'sum' => ts('Committed Amount'), ), ), - 'amount_2' => - array('title' => ts('Amount Received'), + 'amount_2' => array( + 'title' => ts('Amount Received'), 'name' => 'amount', 'type' => CRM_Utils_Type::T_MONEY, 'default' => TRUE, // nice trick with dbAlias 'dbAlias' => 'SUM(IF( contribution_civireport.contribution_status_id > 1, 0, contribution_soft_civireport.amount))', ), - 'soft_id' => - array('title' => ts('Number of Donors'), + 'soft_id' => array( + 'title' => ts('Number of Donors'), 'name' => 'id', 'default' => TRUE, - 'statistics' => - array('count' => ts('Number of Donors'), + 'statistics' => array( + 'count' => ts('Number of Donors'), ), ), ), - 'filters' => - array( - 'amount_2' => - array('title' => ts('Amount Received'), + 'filters' => array( + 'amount_2' => array( + 'title' => ts('Amount Received'), 'type' => CRM_Utils_Type::T_MONEY, 'dbAlias' => 'SUM(IF( contribution_civireport.contribution_status_id > 1, 0, contribution_soft_civireport.amount))', ), ), 'grouping' => 'pcp-fields', ), - 'civicrm_contribution' => - array( + 'civicrm_contribution' => array( 'dao' => 'CRM_Contribute_DAO_Contribution', - 'fields' => - array( - 'contribution_id' => - array( + 'fields' => array( + 'contribution_id' => array( 'name' => 'id', 'no_display' => TRUE, 'required' => TRUE, ), - 'receive_date' => - array('title' => ts('Most Recent Contribution'), + 'receive_date' => array( + 'title' => ts('Most Recent Contribution'), 'default' => TRUE, - 'statistics' => - array('max' => ts('Most Recent Contribution'), + 'statistics' => array( + 'max' => ts('Most Recent Contribution'), ), ), ), @@ -192,7 +171,7 @@ class CRM_Report_Form_Contribute_PCP extends CRM_Report_Form { parent::__construct(); } - function from() { + public function from() { $this->_from = " FROM civicrm_pcp {$this->_aliases['civicrm_pcp']} @@ -213,15 +192,15 @@ LEFT JOIN civicrm_contribution_page {$this->_aliases['civicrm_contribution_page' {$this->_aliases['civicrm_contribution_page']}.id"; } - function groupBy() { + public function groupBy() { $this->_groupBy = "GROUP BY {$this->_aliases['civicrm_pcp']}.id"; } - function orderBy() { + public function orderBy() { $this->_orderBy = " ORDER BY {$this->_aliases['civicrm_contact']}.sort_name "; } - function where() { + public function where() { $whereClauses = $havingClauses = array(); foreach ($this->_columns as $tableName => $table) { @@ -231,9 +210,9 @@ LEFT JOIN civicrm_contribution_page {$this->_aliases['civicrm_contribution_page' if (CRM_Utils_Array::value('type', $field) & CRM_Utils_Type::T_DATE) { $relative = CRM_Utils_Array::value("{$fieldName}_relative", $this->_params); - $from = CRM_Utils_Array::value("{$fieldName}_from", $this->_params); - $to = CRM_Utils_Array::value("{$fieldName}_to", $this->_params); - $clause = $this->dateClause($field['name'], $relative, $from, $to, $field['type']); + $from = CRM_Utils_Array::value("{$fieldName}_from", $this->_params); + $to = CRM_Utils_Array::value("{$fieldName}_to", $this->_params); + $clause = $this->dateClause($field['name'], $relative, $from, $to, $field['type']); } else { $op = CRM_Utils_Array::value("{$fieldName}_op", $this->_params); @@ -282,12 +261,13 @@ LEFT JOIN civicrm_contribution_page {$this->_aliases['civicrm_contribution_page' * * @return array */ - function statistics(&$rows) { + public function statistics(&$rows) { $statistics = parent::statistics($rows); - $select = "SELECT SUM({$this->_aliases['civicrm_pcp']}.goal_amount) as goal_total, ". - "SUM({$this->_aliases['civicrm_contribution_soft']}.amount) as committed_total, ". - "COUNT({$this->_aliases['civicrm_contribution_soft']}.id) as donors_total, ". + $select = + "SELECT SUM({$this->_aliases['civicrm_pcp']}.goal_amount) as goal_total, " . + "SUM({$this->_aliases['civicrm_contribution_soft']}.amount) as committed_total, " . + "COUNT({$this->_aliases['civicrm_contribution_soft']}.id) as donors_total, " . "SUM(IF( contribution_civireport.contribution_status_id > 1, 0, contribution_soft_civireport.amount)) AS received_total "; $sql = "{$select} {$this->_from} {$this->_where}"; $dao = CRM_Core_DAO::executeQuery($sql); @@ -295,22 +275,22 @@ LEFT JOIN civicrm_contribution_page {$this->_aliases['civicrm_contribution_page' $statistics['counts']['goal_total'] = array( 'title' => ts('Goal Total'), 'value' => $dao->goal_total, - 'type' => CRM_Utils_Type::T_MONEY + 'type' => CRM_Utils_Type::T_MONEY, ); $statistics['counts']['committed_total'] = array( 'title' => ts('Total Committed'), 'value' => $dao->committed_total, - 'type' => CRM_Utils_Type::T_MONEY + 'type' => CRM_Utils_Type::T_MONEY, ); $statistics['counts']['received_total'] = array( 'title' => ts('Total Received'), 'value' => $dao->received_total, - 'type' => CRM_Utils_Type::T_MONEY + 'type' => CRM_Utils_Type::T_MONEY, ); $statistics['counts']['donors_total'] = array( 'title' => ts('Total Donors'), 'value' => $dao->donors_total, - 'type' => CRM_Utils_Type::T_INT + 'type' => CRM_Utils_Type::T_INT, ); return $statistics; } @@ -318,7 +298,7 @@ LEFT JOIN civicrm_contribution_page {$this->_aliases['civicrm_contribution_page' /** * @param $rows */ - function alterDisplay(&$rows) { + public function alterDisplay(&$rows) { // custom code to alter rows $entryFound = FALSE; $checkList = array(); @@ -361,4 +341,3 @@ LEFT JOIN civicrm_contribution_page {$this->_aliases['civicrm_contribution_page' } } } -