+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
protected $_aclWhere = NULL;
/**
- * Array of DAO tables having columns included in SELECT or ORDER BY clause
+ * Array of DAO tables having columns included in SELECT or ORDER BY clause.
+ *
+ * Where has also been added to this although perhaps the 'includes both' array should have a different name.
*
* @var array
*/
protected $_selectedTables;
+ /**
+ * Array of DAO tables having columns included in WHERE or HAVING clause
+ *
+ * @var array
+ */
+ protected $filteredTables;
+
/**
* Output mode e.g 'print', 'csv', 'pdf'.
*
'tagid' => array(
'name' => 'tag_id',
'title' => ts('Tag'),
+ 'type' => CRM_Utils_Type::T_INT,
'tag' => TRUE,
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => $contactTags,
'gid' => array(
'name' => 'group_id',
'title' => ts('Group'),
+ 'type' => CRM_Utils_Type::T_INT,
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'group' => TRUE,
'options' => CRM_Core_PseudoConstant::nestedGroup(),
public function whereClause(&$field, $op, $value, $min, $max) {
$type = CRM_Utils_Type::typeToString(CRM_Utils_Array::value('type', $field));
+
+ // CRM-18010: Ensure type of each report filters
+ if (!$type) {
+ trigger_error('Type is not defined for field ' . $field['name'], E_USER_WARNING);
+ }
$clause = NULL;
switch ($op) {
* @return bool
*/
public function grandTotal(&$rows) {
- if (!$this->_rollup || ($this->_rollup == '' || count($rows) == 1) ||
- ($this->_limit && count($rows) >= self::ROW_COUNT_LIMIT)
- ) {
+ if (!$this->_rollup || count($rows) == 1) {
+ return FALSE;
+ }
+
+ $this->moveSummaryColumnsToTheRightHandSide();
+
+ if ($this->_limit && count($rows) >= self::ROW_COUNT_LIMIT) {
return FALSE;
}
// use this method to modify $this->_columnHeaders
}
+ /**
+ * Move totals columns to the right edge of the table.
+ *
+ * It seems like a more logical layout to have any totals columns on the far right regardless of
+ * the location of the rest of their table.
+ */
+ public function moveSummaryColumnsToTheRightHandSide() {
+ $statHeaders = (array_intersect_key($this->_columnHeaders, array_flip($this->_statFields)));
+ $this->_columnHeaders = array_merge(array_diff_key($this->_columnHeaders, $statHeaders), $this->_columnHeaders, $statHeaders);
+ }
+
/**
* Assign rows to the template.
*
$count = count($rows);
// Why do we increment the count for rollup seems to artificially inflate the count.
+ // It seems perhaps intentional to include the summary row in the count of results - although
+ // this just seems odd.
if ($this->_rollup && ($this->_rollup != '') && $this->_grandFlag) {
$count++;
}
* @param int $rowCount
*/
public function setPager($rowCount = self::ROW_COUNT_LIMIT) {
-
// CRM-14115, over-ride row count if rowCount is specified in URL
if ($this->_dashBoardRowCount) {
$rowCount = $this->_dashBoardRowCount;
}
if ($this->_limit && ($this->_limit != '')) {
- $sql = "SELECT FOUND_ROWS();";
- $this->_rowsFound = CRM_Core_DAO::singleValueQuery($sql);
+ if (!$this->_rowsFound) {
+ $sql = "SELECT FOUND_ROWS();";
+ $this->_rowsFound = CRM_Core_DAO::singleValueQuery($sql);
+ }
$params = array(
'total' => $this->_rowsFound,
'rowCount' => $rowCount,
case 'Money':
$curFilters[$fieldName]['operatorType'] = CRM_Report_Form::OP_FLOAT;
$curFilters[$fieldName]['type'] = CRM_Utils_Type::T_MONEY;
+ $curFields[$fieldName]['type'] = CRM_Utils_Type::T_MONEY;
break;
case 'Float':
/**
* Build custom data from clause.
+ *
+ * @param bool $joinsForFiltersOnly
+ * Only include joins to support filters. This would be used if creating a table of contacts to include first.
*/
- public function customDataFrom() {
+ public function customDataFrom($joinsForFiltersOnly = FALSE) {
if (empty($this->_customGroupExtends)) {
return;
}
$mapper = CRM_Core_BAO_CustomQuery::$extendsMap;
- $customTables = explode(',', CRM_Core_DAO::singleValueQuery("SELECT GROUP_CONCAT(table_name) FROM civicrm_custom_group"));
+ //CRM-18276 GROUP_CONCAT could be used with singleValueQuery and then exploded,
+ //but by default that truncates to 1024 characters, which causes errors with installs with lots of custom field sets
+ $customTables = array();
+ $customTablesDAO = CRM_Core_DAO::executeQuery("SELECT table_name FROM civicrm_custom_group", CRM_Core_DAO::$_nullArray);
+ while ($customTablesDAO->fetch()) {
+ $customTables[] = $customTablesDAO->table_name;
+ }
foreach ($this->_columns as $table => $prop) {
if (in_array($table, $customTables)) {
$extendsTable = $mapper[$prop['extends']];
-
- // check field is in params
- if (!$this->isFieldSelected($prop)) {
+ // Check field is required for rendering the report.
+ if ((!$this->isFieldSelected($prop)) || ($joinsForFiltersOnly && !$this->isFieldFiltered($prop))) {
continue;
}
$baseJoin = CRM_Utils_Array::value($prop['extends'], $this->_customGroupExtendsJoin, "{$this->_aliases[$extendsTable]}.id");
}
}
}
+ return $this->isFieldFiltered($prop);
+ }
+
+ /**
+ * Check if the field is used as a filter.
+ *
+ * @param string $prop
+ *
+ * @return bool
+ */
+ protected function isFieldFiltered($prop) {
if (!empty($prop['filters']) && $this->_customGroupFilters) {
foreach ($prop['filters'] as $fieldAlias => $val) {
foreach (array(
return in_array($tableName, $this->selectedTables());
}
+ /**
+ * Check if table name has columns in WHERE or HAVING clause.
+ *
+ * @param string $tableName
+ * Name of table (index of $this->_columns array).
+ *
+ * @return bool
+ */
+ public function isTableFiltered($tableName) {
+ // Cause the array to be generated if not previously done.
+ if (!$this->_selectedTables && !$this->filteredTables) {
+ $this->selectedTables();
+ }
+ return in_array($tableName, $this->filteredTables);
+ }
+
/**
* Fetch array of DAO tables having columns included in SELECT or ORDER BY clause.
*
'nnll'
) {
$this->_selectedTables[] = $tableName;
+ $this->filteredTables[] = $tableName;
break;
}
}
if (array_key_exists('civicrm_address_country_id', $row)) {
if ($value = $row['civicrm_address_country_id']) {
$rows[$rowNum]['civicrm_address_country_id'] = CRM_Core_PseudoConstant::country($value, FALSE);
- $url = CRM_Report_Utils_Report::getNextUrl($baseUrl,
- "reset=1&force=1&{$criteriaQueryParams}&" .
- "country_id_op=in&country_id_value={$value}",
- $this->_absoluteUrl, $this->_id
- );
- $rows[$rowNum]['civicrm_address_country_id_link'] = $url;
- $rows[$rowNum]['civicrm_address_country_id_hover'] = ts("%1 for this country.",
- array(1 => $linkText)
- );
+ if ($baseUrl) {
+ $url = CRM_Report_Utils_Report::getNextUrl($baseUrl,
+ "reset=1&force=1&{$criteriaQueryParams}&" .
+ "country_id_op=in&country_id_value={$value}",
+ $this->_absoluteUrl, $this->_id
+ );
+ $rows[$rowNum]['civicrm_address_country_id_link'] = $url;
+ $rows[$rowNum]['civicrm_address_country_id_hover'] = ts("%1 for this country.",
+ array(1 => $linkText)
+ );
+ }
}
$entryFound = TRUE;
if (array_key_exists('civicrm_address_county_id', $row)) {
if ($value = $row['civicrm_address_county_id']) {
$rows[$rowNum]['civicrm_address_county_id'] = CRM_Core_PseudoConstant::county($value, FALSE);
- $url = CRM_Report_Utils_Report::getNextUrl($baseUrl,
- "reset=1&force=1&{$criteriaQueryParams}&" .
- "county_id_op=in&county_id_value={$value}",
- $this->_absoluteUrl, $this->_id
- );
- $rows[$rowNum]['civicrm_address_county_id_link'] = $url;
- $rows[$rowNum]['civicrm_address_county_id_hover'] = ts("%1 for this county.",
- array(1 => $linkText)
- );
+ if ($baseUrl) {
+ $url = CRM_Report_Utils_Report::getNextUrl($baseUrl,
+ "reset=1&force=1&{$criteriaQueryParams}&" .
+ "county_id_op=in&county_id_value={$value}",
+ $this->_absoluteUrl, $this->_id
+ );
+ $rows[$rowNum]['civicrm_address_county_id_link'] = $url;
+ $rows[$rowNum]['civicrm_address_county_id_hover'] = ts("%1 for this county.",
+ array(1 => $linkText)
+ );
+ }
}
$entryFound = TRUE;
}
if (array_key_exists('civicrm_address_state_province_id', $row)) {
if ($value = $row['civicrm_address_state_province_id']) {
$rows[$rowNum]['civicrm_address_state_province_id'] = CRM_Core_PseudoConstant::stateProvince($value, FALSE);
-
- $url = CRM_Report_Utils_Report::getNextUrl($baseUrl,
- "reset=1&force=1&{$criteriaQueryParams}&state_province_id_op=in&state_province_id_value={$value}",
- $this->_absoluteUrl, $this->_id
- );
- $rows[$rowNum]['civicrm_address_state_province_id_link'] = $url;
- $rows[$rowNum]['civicrm_address_state_province_id_hover'] = ts("%1 for this state.",
- array(1 => $linkText)
- );
+ if ($baseUrl) {
+ $url = CRM_Report_Utils_Report::getNextUrl($baseUrl,
+ "reset=1&force=1&{$criteriaQueryParams}&state_province_id_op=in&state_province_id_value={$value}",
+ $this->_absoluteUrl, $this->_id
+ );
+ $rows[$rowNum]['civicrm_address_state_province_id_link'] = $url;
+ $rows[$rowNum]['civicrm_address_state_province_id_hover'] = ts("%1 for this state.",
+ array(1 => $linkText)
+ );
+ }
}
$entryFound = TRUE;
}
if (array_key_exists('civicrm_contact_' . $fieldName, $row)) {
if (($value = $row['civicrm_contact_' . $fieldName]) != FALSE) {
$rows[$rowNum]['civicrm_contact_' . $fieldName] = CRM_Core_Pseudoconstant::getLabel('CRM_Contact_BAO_Contact', $fieldName, $value);
- if (($title = CRM_Utils_Array::value($fieldName, $addLinks)) != FALSE) {
+ if ($baseUrl && ($title = CRM_Utils_Array::value($fieldName, $addLinks)) != FALSE) {
$this->addLinkToRow($rows[$rowNum], $baseUrl, $linkText, $value, $fieldName, 'civicrm_contact', $title);
}
}
$entryFound = TRUE;
}
}
+ $yesNoFields = array(
+ 'do_not_email', 'is_deceased', 'do_not_phone', 'do_not_sms', 'do_not_mail', 'is_opt_out',
+ );
+ foreach ($yesNoFields as $fieldName) {
+ if (array_key_exists('civicrm_contact_' . $fieldName, $row)) {
+ // Since these are essentially 'negative fields' it feels like it
+ // makes sense to only highlight the exceptions hence no 'No'.
+ $rows[$rowNum]['civicrm_contact_' . $fieldName] = !empty($rows[$rowNum]['civicrm_contact_' . $fieldName]) ? ts('Yes') : '';
+ $entryFound = TRUE;
+ }
+ }
return $entryFound;
}
'external_identifier' => array(
'title' => ts('Contact identifier from external system'),
),
+ 'do_not_email' => array(),
+ 'do_not_phone' => array(),
+ 'do_not_mail' => array(),
+ 'do_not_sms' => array(),
+ 'is_opt_out' => array(),
+ 'is_deceased' => array(),
);
}
return $selectColumns;
}
+ /**
+ * Add location tables to the query if they are used for filtering.
+ *
+ * This is for when we are running the query separately for filtering and retrieving display fields.
+ */
+ public function selectivelyAddLocationTablesJoinsToFilterQuery() {
+ if ($this->isTableFiltered('civicrm_email')) {
+ $this->_from .= "
+ 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";
+ }
+ if ($this->isTableFiltered('civicrm_phone')) {
+ $this->_from .= "
+ 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";
+ }
+ if ($this->isTableFiltered('civicrm_address')) {
+ $this->_from .= "
+ LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']}
+ ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id)
+ AND {$this->_aliases['civicrm_address']}.is_primary = 1\n";
+ }
+ }
+
}
projects / civicrm-core.git / blobdiff