projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #4914 from eileenmcnaughton/minor-tidies
[civicrm-core.git]
/
CRM
/
Report
/
Form
/
Contribute
/
PCP.php
diff --git
a/CRM/Report/Form/Contribute/PCP.php
b/CRM/Report/Form/Contribute/PCP.php
index caee0375ac69f47cd9a56806d7712b81e7fdd8e5..72709a3ea61011a8e4d8cb8559f625c7674e8aa9 100644
(file)
--- a/
CRM/Report/Form/Contribute/PCP.php
+++ b/
CRM/Report/Form/Contribute/PCP.php
@@
-1,8
+1,7
@@
<?php
<?php
-
/*
+--------------------------------------------------------------------+
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
5
|
+ | CiviCRM version 4.
6
|
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
@@
-35,12
+34,10
@@
*/
class CRM_Report_Form_Contribute_PCP extends CRM_Report_Form {
/**
*/
class CRM_Report_Form_Contribute_PCP extends CRM_Report_Form {
/**
- *
*/
/**
*/
/**
- *
*/
*/
- function __construct() {
+
public
function __construct() {
$this->_columns = array(
'civicrm_contact' => array(
'dao' => 'CRM_Contact_DAO_Contact',
$this->_columns = array(
'civicrm_contact' => array(
'dao' => 'CRM_Contact_DAO_Contact',
@@
-174,7
+171,7
@@
class CRM_Report_Form_Contribute_PCP extends CRM_Report_Form {
parent::__construct();
}
parent::__construct();
}
- function from() {
+
public
function from() {
$this->_from = "
FROM civicrm_pcp {$this->_aliases['civicrm_pcp']}
$this->_from = "
FROM civicrm_pcp {$this->_aliases['civicrm_pcp']}
@@
-195,15
+192,15
@@
LEFT JOIN civicrm_contribution_page {$this->_aliases['civicrm_contribution_page'
{$this->_aliases['civicrm_contribution_page']}.id";
}
{$this->_aliases['civicrm_contribution_page']}.id";
}
- function groupBy() {
+
public
function groupBy() {
$this->_groupBy = "GROUP BY {$this->_aliases['civicrm_pcp']}.id";
}
$this->_groupBy = "GROUP BY {$this->_aliases['civicrm_pcp']}.id";
}
- function orderBy() {
+
public
function orderBy() {
$this->_orderBy = " ORDER BY {$this->_aliases['civicrm_contact']}.sort_name ";
}
$this->_orderBy = " ORDER BY {$this->_aliases['civicrm_contact']}.sort_name ";
}
- function where() {
+
public
function where() {
$whereClauses = $havingClauses = array();
foreach ($this->_columns as $tableName => $table) {
$whereClauses = $havingClauses = array();
foreach ($this->_columns as $tableName => $table) {
@@
-264,7
+261,7
@@
LEFT JOIN civicrm_contribution_page {$this->_aliases['civicrm_contribution_page'
*
* @return array
*/
*
* @return array
*/
- function statistics(&$rows) {
+
public
function statistics(&$rows) {
$statistics = parent::statistics($rows);
$select =
$statistics = parent::statistics($rows);
$select =
@@
-278,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,
$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,
);
$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,
);
$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,
);
$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;
}
);
return $statistics;
}
@@
-301,7
+298,7
@@
LEFT JOIN civicrm_contribution_page {$this->_aliases['civicrm_contribution_page'
/**
* @param $rows
*/
/**
* @param $rows
*/
- function alterDisplay(&$rows) {
+
public
function alterDisplay(&$rows) {
// custom code to alter rows
$entryFound = FALSE;
$checkList = array();
// custom code to alter rows
$entryFound = FALSE;
$checkList = array();
@@
-344,4
+341,3
@@
LEFT JOIN civicrm_contribution_page {$this->_aliases['civicrm_contribution_page'
}
}
}
}
}
}
-