CRM-19190: Notices on using barchart

diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php
index ee09282b3ddd717078878cd9d7e35fc718167aec..4171fc9fc8d9ade05e3c1d681f08d499f71f1faa 100644 (file)
--- a/CRM/Report/Form/Contribute/Summary.php
+++ b/CRM/Report/Form/Contribute/Summary.php
@@ -350,7 +350,7 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form {
                 break;
             }
             if (!empty($this->_params['group_bys_freq'][$fieldName])) {
-              $this->_interval = $field['title'];
+              $this->_interval = $this->_params['group_bys_freq'][$fieldName];
               $this->_columnHeaders["{$tableName}_{$fieldName}_start"]['title'] = $field['title'];
               $this->_columnHeaders["{$tableName}_{$fieldName}_start"]['type'] = $field['type'];
               $this->_columnHeaders["{$tableName}_{$fieldName}_start"]['group_by'] = $this->_params['group_bys_freq'][$fieldName];

diff --git a/CRM/Utils/OpenFlashChart.php b/CRM/Utils/OpenFlashChart.php
index 6e4f3c337ae5af84c4238b98f21aaed2a921009e..0cd64aa973d348395f98c5e1cea5730f2f4a6858 100644 (file)
--- a/CRM/Utils/OpenFlashChart.php
+++ b/CRM/Utils/OpenFlashChart.php
@@ -406,39 +406,37 @@ class CRM_Utils_OpenFlashChart {
    * @return array
    */
   public static function chart($rows, $chart, $interval) {
+    $lcInterval = strtolower($interval);
+    $label = ucfirst($lcInterval);
     $chartData = $dateKeys = array();
+    $intervalLabels = array(
+      'month' => ts('Monthly'),
+      'quarter' => ts('Quarterly'),
+      'week' => ts('Weekly'),
+    );
 
-    switch ($interval) {
-      case 'Month':
-        foreach ($rows['receive_date'] as $key => $val) {
-          list($year, $month) = explode('-', $val);
-          $dateKeys[] = substr($rows['Month'][$key], 0, 3) . ' ' . $year;
-        }
-        $legend = ts('Monthly');
-        break;
-
-      case 'Quarter':
-        foreach ($rows['receive_date'] as $key => $val) {
-          list($year, $month) = explode('-', $val);
-          $dateKeys[] = 'Quarter ' . $rows['Quarter'][$key] . ' of ' . $year;
-        }
-        $legend = ts('Quarterly');
-        break;
-
-      case 'Week':
+    switch ($lcInterval) {
+      case 'month':
+      case 'quarter':
+      case 'week':
         foreach ($rows['receive_date'] as $key => $val) {
           list($year, $month) = explode('-', $val);
-          $dateKeys[] = 'Week ' . $rows['Week'][$key] . ' of ' . $year;
+          if ($lcInterval != 'year') {
+            $dateKeys[] = substr($rows[$interval][$key], 0, 3) . ' of ' . $year;
+          }
+          else {
+            $dateKeys[] = $year;
+          }
         }
-        $legend = ts('Weekly');
+        $legend = $intervalLabels[$lcInterval];
         break;
 
-      case 'Year':
+      default:
         foreach ($rows['receive_date'] as $key => $val) {
           list($year, $month) = explode('-', $val);
           $dateKeys[] = $year;
         }
-        $legend = ts('Yearly');
+        $legend = ts("%1", array(1 => $label));
         break;
     }