more changes for additional intervals and mailing summary report

diff --git a/CRM/Report/Form/Mailing/Summary.php b/CRM/Report/Form/Mailing/Summary.php
index 2c2a0b798d13446df22609b42c98aea4fba2f148..2386ac479e8c7940c3118dbbf1430698b72ddd2d 100644 (file)
--- a/CRM/Report/Form/Mailing/Summary.php
+++ b/CRM/Report/Form/Mailing/Summary.php
@@ -580,26 +580,26 @@ class CRM_Report_Form_Mailing_Summary extends CRM_Report_Form {
     foreach ($rows as $row) {
       $chartInfo['values'][$row['civicrm_mailing_name']] = array();
       if ($plotCount) {
-        foreach ($criteria['count'] as $criteria => $label) {
-          if (isset($row[$criteria])) {
-            $chartInfo['values'][$row['civicrm_mailing_name']][$label] = $row[$criteria];
+        foreach ($criteria['count'] as $criteriaName => $label) {
+          if (isset($row[$criteriaName])) {
+            $chartInfo['values'][$row['civicrm_mailing_name']][$label] = $row[$criteriaName];
             $chartInfo['tip'][$label] = "{$label} #val#";
             $plotRate = FALSE;
           }
-          elseif (isset($criteria['count'][$criteria])) {
-            unset($criteria['count'][$criteria]);
+          elseif (isset($criteria['count'][$criteriaName])) {
+            unset($criteria['count'][$criteriaName]);
           }
         }
       }
       if ($plotRate) {
-        foreach ($criteria['rate'] as $criteria => $label) {
+        foreach ($criteria['rate'] as $criteriaName => $label) {
           if (isset($row[$criteria])) {
-            $chartInfo['values'][$row['civicrm_mailing_name']][$label] = $row[$criteria];
+            $chartInfo['values'][$row['civicrm_mailing_name']][$label] = $row[$criteriaName];
             $chartInfo['tip'][$label] = "{$label} #val#";
             $plotCount = FALSE;
           }
-          elseif (isset($criteria['rate'][$criteria])) {
-            unset($criteria['rate'][$criteria]);
+          elseif (isset($criteria['rate'][$criteriaName])) {
+            unset($criteria['rate'][$criteriaName]);
           }
         }
       }

diff --git a/CRM/Utils/OpenFlashChart.php b/CRM/Utils/OpenFlashChart.php
index 0cd64aa973d348395f98c5e1cea5730f2f4a6858..99e7ed8396586a89ed4ab717e1dd84277eeec1bd 100644 (file)
--- a/CRM/Utils/OpenFlashChart.php
+++ b/CRM/Utils/OpenFlashChart.php
@@ -410,23 +410,22 @@ class CRM_Utils_OpenFlashChart {
     $label = ucfirst($lcInterval);
     $chartData = $dateKeys = array();
     $intervalLabels = array(
+      'year' => ts('Yearly'),
+      'fiscalyear' => ts('Yearly (Fiscal)'),
       'month' => ts('Monthly'),
       'quarter' => ts('Quarterly'),
       'week' => ts('Weekly'),
+      'yearweek' => ts('Weekly'),
     );
 
     switch ($lcInterval) {
       case 'month':
       case 'quarter':
       case 'week':
+      case 'yearweek':
         foreach ($rows['receive_date'] as $key => $val) {
           list($year, $month) = explode('-', $val);
-          if ($lcInterval != 'year') {
-            $dateKeys[] = substr($rows[$interval][$key], 0, 3) . ' of ' . $year;
-          }
-          else {
-            $dateKeys[] = $year;
-          }
+          $dateKeys[] = substr($rows[$interval][$key], 0, 3) . ' of ' . $year;
         }
         $legend = $intervalLabels[$lcInterval];
         break;
@@ -437,6 +436,9 @@ class CRM_Utils_OpenFlashChart {
           $dateKeys[] = $year;
         }
         $legend = ts("%1", array(1 => $label));
+        if (!empty($intervalLabels[$lcInterval])) {
+          $legend = $intervalLabels[$lcInterval];
+        }
         break;
     }