From 09b5cdcf495ba0d61b7e7c4b9fd882cab7808090 Mon Sep 17 00:00:00 2001 From: Web Access Date: Mon, 15 Feb 2016 18:38:36 +0530 Subject: [PATCH] Additional changes for Case, Campaign and Grant reports --- CRM/Report/Form/Activity.php | 2 ++ CRM/Report/Form/Campaign/SurveyDetails.php | 2 ++ CRM/Report/Form/Case/Detail.php | 3 +++ CRM/Report/Form/Case/Summary.php | 2 ++ CRM/Report/Form/Case/TimeSpent.php | 2 ++ CRM/Report/Form/Contribute/Summary.php | 1 + CRM/Report/Form/Grant/Detail.php | 3 +++ CRM/Report/Form/Grant/Statistics.php | 3 +++ 8 files changed, 18 insertions(+) diff --git a/CRM/Report/Form/Activity.php b/CRM/Report/Form/Activity.php index a1500f9b56..84bc5ea730 100644 --- a/CRM/Report/Form/Activity.php +++ b/CRM/Report/Form/Activity.php @@ -312,6 +312,7 @@ class CRM_Report_Form_Activity extends CRM_Report_Form { ); $this->_columns['civicrm_activity']['filters']['campaign_id'] = array( 'title' => ts('Campaign'), + 'type' => CRM_Utils_Type::T_INT, 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => $this->activeCampaigns, ); @@ -323,6 +324,7 @@ class CRM_Report_Form_Activity extends CRM_Report_Form { ); $this->_columns['civicrm_activity']['filters']['engagement_level'] = array( 'title' => ts('Engagement Index'), + 'type' => CRM_Utils_Type::T_INT, 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => $this->engagementLevels, ); diff --git a/CRM/Report/Form/Campaign/SurveyDetails.php b/CRM/Report/Form/Campaign/SurveyDetails.php index 7c2eb30c9c..895d3f9508 100644 --- a/CRM/Report/Form/Campaign/SurveyDetails.php +++ b/CRM/Report/Form/Campaign/SurveyDetails.php @@ -204,12 +204,14 @@ class CRM_Report_Form_Campaign_SurveyDetails extends CRM_Report_Form { 'state_province_id' => array( 'name' => 'state_province_id', 'title' => ts('State/Province'), + 'type' => CRM_Utils_Type::T_INT, 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Core_PseudoConstant::stateProvince(), ), 'country_id' => array( 'name' => 'country_id', 'title' => ts('Country'), + 'type' => CRM_Utils_Type::T_INT, 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Core_PseudoConstant::country(), ), diff --git a/CRM/Report/Form/Case/Detail.php b/CRM/Report/Form/Case/Detail.php index 3ae4c7597c..3637d7eb06 100644 --- a/CRM/Report/Form/Case/Detail.php +++ b/CRM/Report/Form/Case/Detail.php @@ -117,11 +117,13 @@ class CRM_Report_Form_Case_Detail extends CRM_Report_Form { ), 'status_id' => array( 'title' => ts('Case Status'), + 'type' => CRM_Utils_Type::T_INT, 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Case_BAO_Case::buildOptions('status_id', 'search'), ), 'case_type_id' => array( 'title' => ts('Case Type'), + 'type' => CRM_Utils_Type::T_INT, 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Case_BAO_Case::buildOptions('case_type_id', 'search'), ), @@ -163,6 +165,7 @@ class CRM_Report_Form_Case_Detail extends CRM_Report_Form { 'case_role' => array( 'name' => 'relationship_type_id', 'title' => ts('Case Role(s)'), + 'type' => CRM_Utils_Type::T_INT, 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => $this->rel_types, ), diff --git a/CRM/Report/Form/Case/Summary.php b/CRM/Report/Form/Case/Summary.php index 6d30e3ecdb..65fa79dfe4 100644 --- a/CRM/Report/Form/Case/Summary.php +++ b/CRM/Report/Form/Case/Summary.php @@ -130,6 +130,7 @@ class CRM_Report_Form_Case_Summary extends CRM_Report_Form { ), 'status_id' => array( 'title' => ts('Status'), + 'type' => CRM_Utils_Type::T_INT, 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Case_BAO_Case::buildOptions('status_id', 'search'), ), @@ -161,6 +162,7 @@ class CRM_Report_Form_Case_Summary extends CRM_Report_Form { 'filters' => array( 'relationship_type_id' => array( 'title' => ts('Staff Relationship'), + 'type' => CRM_Utils_Type::T_INT, 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => $this->rel_types, ), diff --git a/CRM/Report/Form/Case/TimeSpent.php b/CRM/Report/Form/Case/TimeSpent.php index 1afb6f8dc0..f00f02d662 100644 --- a/CRM/Report/Form/Case/TimeSpent.php +++ b/CRM/Report/Form/Case/TimeSpent.php @@ -103,6 +103,7 @@ class CRM_Report_Form_Case_TimeSpent extends CRM_Report_Form { ), 'subject' => array( 'title' => ts('Activity Subject'), + 'type' => CRM_Utils_Type::T_STRING, 'operator' => 'like', ), 'activity_type_id' => array( @@ -112,6 +113,7 @@ class CRM_Report_Form_Case_TimeSpent extends CRM_Report_Form { ), 'status_id' => array( 'title' => ts('Activity Status'), + 'type' => CRM_Utils_Type::T_INT, 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => $this->activityStatuses, ), diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php index f385e6e2a0..685458c637 100644 --- a/CRM/Report/Form/Contribute/Summary.php +++ b/CRM/Report/Form/Contribute/Summary.php @@ -265,6 +265,7 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form { ); $this->_columns['civicrm_contribution']['filters']['campaign_id'] = array( 'title' => ts('Campaign'), + 'type' => CRM_Utils_Type::T_INT, 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => $this->activeCampaigns, ); diff --git a/CRM/Report/Form/Grant/Detail.php b/CRM/Report/Form/Grant/Detail.php index 36d3f2e694..34dbfa209b 100644 --- a/CRM/Report/Form/Grant/Detail.php +++ b/CRM/Report/Form/Grant/Detail.php @@ -81,11 +81,13 @@ class CRM_Report_Form_Grant_Detail extends CRM_Report_Form { 'filters' => array( 'country_id' => array( 'title' => ts('Country'), + 'type' => CRM_Utils_Type::T_INT, 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Core_PseudoConstant::country(), ), 'state_province_id' => array( 'title' => ts('State/Province'), + 'type' => CRM_Utils_Type::T_INT, 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Core_PseudoConstant::stateProvince(), ), @@ -150,6 +152,7 @@ class CRM_Report_Form_Grant_Detail extends CRM_Report_Form { 'status_id' => array( 'name' => 'status_id', 'title' => ts('Grant Status'), + 'type' => CRM_Utils_Type::T_INT, 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Core_PseudoConstant::get('CRM_Grant_DAO_Grant', 'status_id'), ), diff --git a/CRM/Report/Form/Grant/Statistics.php b/CRM/Report/Form/Grant/Statistics.php index 8d2a1f19b1..2146d12e3d 100644 --- a/CRM/Report/Form/Grant/Statistics.php +++ b/CRM/Report/Form/Grant/Statistics.php @@ -109,6 +109,7 @@ class CRM_Report_Form_Grant_Statistics extends CRM_Report_Form { 'status_id' => array( 'name' => 'status_id', 'title' => ts('Grant Status'), + 'type' => CRM_Utils_Type::T_INT, 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Core_PseudoConstant::get('CRM_Grant_DAO_Grant', 'status_id'), ), @@ -180,6 +181,7 @@ class CRM_Report_Form_Grant_Statistics extends CRM_Report_Form { 'region_id' => array( 'name' => 'id', 'title' => ts('World Region'), + 'type' => CRM_Utils_Type::T_INT, 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Core_PseudoConstant::worldRegion(), ), @@ -196,6 +198,7 @@ class CRM_Report_Form_Grant_Statistics extends CRM_Report_Form { 'filters' => array( 'country_id' => array( 'title' => ts('Country'), + 'type' => CRM_Utils_Type::T_INT, 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Core_PseudoConstant::country(), ), -- 2.25.1