From 0e74289190870695995f1fbed2f6eaeef501e3d0 Mon Sep 17 00:00:00 2001 From: yashodha Date: Mon, 21 Oct 2019 16:22:29 +0530 Subject: [PATCH] CRM-21677 - report clean up for case demographic report --- CRM/Report/Form/Case/Demographics.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/CRM/Report/Form/Case/Demographics.php b/CRM/Report/Form/Case/Demographics.php index 75c3bd83f8..c971c19183 100644 --- a/CRM/Report/Form/Case/Demographics.php +++ b/CRM/Report/Form/Case/Demographics.php @@ -242,8 +242,6 @@ where (cg.extends='Contact' OR cg.extends='Individual' OR cg.extends_entity_colu ]; } - $this->_genders = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'gender_id'); - parent::__construct(); } @@ -414,14 +412,6 @@ where (cg.extends='Contact' OR cg.extends='Individual' OR cg.extends_entity_colu $entryFound = TRUE; } - // handle gender - if (array_key_exists('civicrm_contact_gender_id', $row)) { - if ($value = $row['civicrm_contact_gender_id']) { - $rows[$rowNum]['civicrm_contact_gender_id'] = $this->_genders[$value]; - } - $entryFound = TRUE; - } - // handle custom fields foreach ($row as $k => $r) { if (substr($k, 0, 13) == 'civicrm_value' || @@ -436,6 +426,7 @@ where (cg.extends='Contact' OR cg.extends='Individual' OR cg.extends_entity_colu } } + $entryFound = $this->alterDisplayContactFields($row, $rows, $rowNum, NULL, NULL) ? TRUE : $entryFound; $entryFound = $this->alterDisplayAddressFields($row, $rows, $rowNum, NULL, NULL) ? TRUE : $entryFound; // skip looking further in rows, if first row itself doesn't -- 2.25.1