From 7bed22fc4d8a7ee989a6d649065d3b25658fd103 Mon Sep 17 00:00:00 2001
From: Pradeep Nayak <pradeep.nayak@webaccess.co.in>
Date: Sat, 3 May 2014 16:56:10 +0530
Subject: [PATCH] -- CRM-14632, removed hard-coded status filtering and also
 fixed notice errors.

----------------------------------------
* CRM-14632: Grant Statistics Report crash
  https://issues.civicrm.org/jira/browse/CRM-14632
---
 CRM/Report/Form/Grant/Statistics.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/CRM/Report/Form/Grant/Statistics.php b/CRM/Report/Form/Grant/Statistics.php
index d503f65e59..af534fac25 100644
--- a/CRM/Report/Form/Grant/Statistics.php
+++ b/CRM/Report/Form/Grant/Statistics.php
@@ -283,11 +283,10 @@ class CRM_Report_Form_Grant_Statistics extends CRM_Report_Form {
   }
 
   function where() {
-    $approved = CRM_Core_PseudoConstant::getKey('CRM_Grant_DAO_Grant', 'status_id', 'Approved', array('labelColumn' => 'name'));
     $whereClause = "
 WHERE {$this->_aliases['civicrm_grant']}.amount_total IS NOT NULL
   AND {$this->_aliases['civicrm_grant']}.amount_total > 0";
-    $this->_where = $whereClause . " AND {$this->_aliases['civicrm_grant']}.status_id = {$approved} ";
+    $this->_where = $whereClause;
 
     foreach ($this->_columns as $tableName => $table) {
       if (array_key_exists('filters', $table)) {
@@ -549,13 +548,25 @@ SELECT COUNT({$this->_aliases['civicrm_grant']}.id) as count ,
     $currencies = CRM_Core_PseudoConstant::get('CRM_Grant_DAO_Grant', 'currency', array('labelColumn' => 'symbol'));
     $currency = $currencies[$values['civicrm_grant_currency']];
 
+
     if (!$customData) {
+      if (!isset($grantStatistics['value'][$fieldValue]['currency'][$currency]) 
+        || !isset($grantStatistics['value'][$fieldValue]['currency'][$currency]['value'])) {
+        $grantStatistics['value'][$fieldValue]['currency'][$currency]['value'] = 0;
+      }
       $grantStatistics['value'][$fieldValue]['currency'][$currency]['value'] += $values['civicrm_grant_amount_total'];
       $grantStatistics['value'][$fieldValue]['currency'][$currency]['percentage'] = round(($grantStatistics['value'][$fieldValue]['currency'][$currency]['value'] / $awardedGrantsAmount) * 100);
+      if (!isset($grantStatistics['value'][$fieldValue]['count'])) {
+        $grantStatistics['value'][$fieldValue]['count'] = 0;
+      }
       $grantStatistics['value'][$fieldValue]['count']++;
       $grantStatistics['value'][$fieldValue]['percentage'] = round(($grantStatistics['value'][$fieldValue]['count'] / $awardedGrants) * 100);
     }
     else {
+      if (!isset($grantStatistics['value'][$fieldValue]['unassigned_currency'][$currency]) 
+        || !isset($grantStatistics['value'][$fieldValue]['unassigned_currency'][$currency]['value'])) {
+        $grantStatistics['value'][$fieldValue]['unassigned_currency'][$currency]['value'] = 0;
+      }      
       $grantStatistics['value'][$fieldValue]['unassigned_currency'][$currency]['value'] += $values['civicrm_grant_amount_total'];
       $grantStatistics['value'][$fieldValue]['unassigned_currency'][$currency]['percentage'] = round(($grantStatistics['value'][$fieldValue]['unassigned_currency'][$currency]['value'] / $awardedGrantsAmount) * 100);
       $grantStatistics['value'][$fieldValue]['unassigned_count']++;
-- 
2.25.1