From 711801a7ba80f14005c31770fcbbbb97d3958e0d Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Fri, 5 Sep 2014 12:24:48 +1200 Subject: [PATCH] reformat whitespace --- .../Form/Contribute/OrganizationSummary.php | 117 ++++++++---------- 1 file changed, 50 insertions(+), 67 deletions(-) diff --git a/CRM/Report/Form/Contribute/OrganizationSummary.php b/CRM/Report/Form/Contribute/OrganizationSummary.php index 2bd2396bda..cc29840690 100644 --- a/CRM/Report/Form/Contribute/OrganizationSummary.php +++ b/CRM/Report/Form/Contribute/OrganizationSummary.php @@ -60,50 +60,39 @@ class CRM_Report_Form_Contribute_OrganizationSummary extends CRM_Report_Form { } $this->_columns = array( - 'civicrm_contact_organization' => - array( + 'civicrm_contact_organization' => array( 'dao' => 'CRM_Contact_DAO_Contact', - 'fields' => - array( - 'organization_name' => - array('title' => ts('Organization Name'), + 'fields' => array( + 'organization_name' => array( + 'title' => ts('Organization Name'), 'required' => TRUE, 'no_repeat' => TRUE, ), - 'id' => - array( + 'id' => array( 'no_display' => TRUE, 'required' => TRUE, ), - 'contact_type' => - array( + 'contact_type' => array( 'title' => ts('Contact Type'), ), - 'contact_sub_type' => - array( + 'contact_sub_type' => array( 'title' => ts('Contact SubType'), ), ), - 'filters' => - array( - 'organization_name' => - array('title' => ts('Organization Name')), + 'filters' => array( + 'organization_name' => array('title' => ts('Organization Name')), ), 'grouping' => 'organization-fields', ), - 'civicrm_relationship' => - array( + 'civicrm_relationship' => array( 'dao' => 'CRM_Contact_DAO_Relationship', - 'fields' => - array( - 'relationship_type_id' => - array('title' => ts('Relationship Type'), + 'fields' => array( + 'relationship_type_id' => array( + 'title' => ts('Relationship Type'), ), ), - 'filters' => - array( - 'relationship_type_id' => - array( + 'filters' => array( + 'relationship_type_id' => array( 'title' => ts('Relationship Type'), 'type' => CRM_Utils_Type::T_INT, 'operatorType' => CRM_Report_Form::OP_SELECT, @@ -113,28 +102,25 @@ class CRM_Report_Form_Contribute_OrganizationSummary extends CRM_Report_Form { ), 'grouping' => 'organization-fields', ), - 'civicrm_contact' => - array( + 'civicrm_contact' => array( 'dao' => 'CRM_Contact_DAO_Contact', - 'fields' => - array( - 'sort_name' => - array('title' => ts('Contact Name'), + 'fields' => array( + 'sort_name' => array( + 'title' => ts('Contact Name'), 'required' => TRUE, ), - 'id' => - array( + 'id' => array( 'no_display' => TRUE, 'required' => TRUE, ), ), 'grouping' => 'contact-fields', ), - 'civicrm_contribution' => - array( + 'civicrm_contribution' => array( 'dao' => 'CRM_Contribute_DAO_Contribution', - 'fields' => - array('total_amount' => array('title' => ts('Amount'), + 'fields' => array( + 'total_amount' => array( + 'title' => ts('Amount'), 'required' => TRUE, ), 'id' => array( @@ -145,7 +131,8 @@ class CRM_Report_Form_Contribute_OrganizationSummary extends CRM_Report_Form { 'title' => 'Contribution Status', 'default' => TRUE, ), - 'check_number' => array('title' => ts('Check Number'), + 'check_number' => array( + 'title' => ts('Check Number'), ), 'currency' => array( 'required' => TRUE, @@ -155,21 +142,18 @@ class CRM_Report_Form_Contribute_OrganizationSummary extends CRM_Report_Form { 'receive_date' => array('default' => TRUE), 'receipt_date' => NULL, ), - 'filters' => - array( - 'receive_date' => - array('operatorType' => CRM_Report_Form::OP_DATE), - 'total_amount' => - array('title' => ts('Amount Between')), - 'currency' => - array('title' => 'Currency', + 'filters' => array( + 'receive_date' => array('operatorType' => CRM_Report_Form::OP_DATE), + 'total_amount' => array('title' => ts('Amount Between')), + 'currency' => array( + 'title' => 'Currency', 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Core_OptionGroup::values('currencies_enabled'), 'default' => NULL, 'type' => CRM_Utils_Type::T_STRING, ), - 'contribution_status_id' => - array('title' => ts('Contribution Status'), + 'contribution_status_id' => array( + 'title' => ts('Contribution Status'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Contribute_PseudoConstant::contributionStatus(), 'default' => array(1), @@ -177,28 +161,24 @@ class CRM_Report_Form_Contribute_OrganizationSummary extends CRM_Report_Form { ), 'grouping' => 'contri-fields', ), - 'civicrm_address' => - array( + 'civicrm_address' => array( 'dao' => 'CRM_Core_DAO_Address', - 'fields' => - array( + 'fields' => array( 'street_address' => NULL, 'city' => NULL, 'postal_code' => NULL, - 'state_province_id' => - array('title' => ts('State/Province'), + 'state_province_id' => array( + 'title' => ts('State/Province'), ), - 'country_id' => - array('title' => ts('Country'), + 'country_id' => array( + 'title' => ts('Country'), ), ), 'grouping' => 'contact-fields', ), - 'civicrm_email' => - array( + 'civicrm_email' => array( 'dao' => 'CRM_Core_DAO_Email', - 'fields' => - array('email' => NULL), + 'fields' => array('email' => NULL), 'grouping' => 'contact-fields', ), ); @@ -208,7 +188,8 @@ class CRM_Report_Form_Contribute_OrganizationSummary extends CRM_Report_Form { 'title' => 'Campaign', 'default' => 'false', ); - $this->_columns['civicrm_contribution']['filters']['campaign_id'] = array('title' => ts('Campaign'), + $this->_columns['civicrm_contribution']['filters']['campaign_id'] = array( + 'title' => ts('Campaign'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => $this->activeCampaigns, ); @@ -291,8 +272,8 @@ class CRM_Report_Form_Contribute_OrganizationSummary extends CRM_Report_Form { $clause = NULL; 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); + $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']); } @@ -352,7 +333,8 @@ class CRM_Report_Form_Contribute_OrganizationSummary extends CRM_Report_Form { $type = substr($this->_params['relationship_type_id_value'], -3); foreach ($statistics['filters'] as $id => $value) { if ($value['title'] == 'Relationship Type' && !empty($id)) { - $statistics['filters'][$id]['value'] = 'Is equal to ' . $this->relationTypes[$this->relationshipId . '_' . $type]; + $statistics['filters'][$id]['value'] = 'Is equal to ' . + $this->relationTypes[$this->relationshipId . '_' . $type]; } } return $statistics; @@ -462,7 +444,7 @@ class CRM_Report_Form_Contribute_OrganizationSummary extends CRM_Report_Form { // convert Organization display name to links if (array_key_exists('civicrm_contact_organization_organization_name', $row) && !empty($rows[$rowNum] -['civicrm_contact_organization_organization_name']) && + ['civicrm_contact_organization_organization_name']) && array_key_exists('civicrm_contact_organization_id', $row) ) { $url = CRM_Utils_System::url('civicrm/contact/view', @@ -544,7 +526,8 @@ class CRM_Report_Form_Contribute_OrganizationSummary extends CRM_Report_Form { CRM_Core_Permission::check('access CiviContribute') ) { $url = CRM_Utils_System::url('civicrm/contact/view/contribution', - "reset=1&id=" . $row['civicrm_contribution_id'] . "&cid=" . $row['civicrm_contact_id'] . "&action=view&context=contribution&selectedChild=contribute", + "reset=1&id=" . $row['civicrm_contribution_id'] . "&cid=" . $row['civicrm_contact_id'] . + "&action=view&context=contribution&selectedChild=contribute", $this->_absoluteUrl ); $rows[$rowNum]['civicrm_contribution_total_amount_link'] = $url; -- 2.25.1