Fix SuiteCRM#5557 Make dashlet drilldown use the correct key

Author: p.ernst

include/SuiteGraphs/RGraphIncludes.php

@@ -143,7 +143,9 @@ function opportunitiesByLeadSourceDashletClick(e,bar)
                 var searchFormTab = $(divHolder).find(".searchFormTab").val();
 
                 var labels = bar["object"]["properties"]["chart.labels"];
-                var clicked = encodeURI(labels[bar[5]]);
+
+                var keys = window["chartHBarKeys"+graphId];
+                var clicked = encodeURI(keys[bar[5]]);
 
                 window.open('index.php?module='+module+'&action='+action+'&query='+query+'&searchFormTab='+searchFormTab+'&lead_source='+clicked,'_self');
             }

modules/Charts/Dashlets/OpportunitiesByLeadSourceDashlet/OpportunitiesByLeadSourceDashlet.php

@@ -99,6 +99,7 @@ public function display()
         $chartHeight    = 500;
 
         $jsonData = json_encode($chartReadyData['data']);
+        $jsonKeys = json_encode($chartReadyData['keys']);
         $jsonLabels = json_encode($chartReadyData['labels']);
         $jsonLabelsAndValues = json_encode($chartReadyData['labelsAndValues']);
 
@@ -128,6 +129,7 @@ public function display()
         <input type='hidden' class='searchFormTab' value='$searchFormTab' />
         $autoRefresh
         <script>
+           window["chartHBarKeys$canvasId"] = $jsonKeys;
            var pie = new RGraph.Pie({
                 id: '$canvasId',
                 data: $jsonData,
@@ -203,13 +205,14 @@ public function display()
     function getChartData($query)
     {
         global $app_list_strings, $db;
-        $dataSet = array();
+        $dataSet = [];
         $result = $db->query($query);
 
         $row = $db->fetchByAssoc($result);
 
-        while ($row != null){
-            if(isset($row['lead_source']) && $app_list_strings['lead_source_dom'][$row['lead_source']] ) {
+        while ($row != null) {
+            if (isset($row['lead_source']) && $app_list_strings['lead_source_dom'][$row['lead_source']]) {
+                $row['lead_source_key'] = $row['lead_source'];
                 $row['lead_source'] = $app_list_strings['lead_source_dom'][$row['lead_source']];
             }
             $dataSet[] = $row;
@@ -218,21 +221,22 @@ function getChartData($query)
         return $dataSet;
     }
 
-    protected function prepareChartData($data,$currency_symbol, $thousands_symbol)
+    protected function prepareChartData($data, $currency_symbol, $thousands_symbol)
     {
         //return $data;
-        $chart['labels']=array();
-        $chart['data']=array();
+        $chart['labels'] = [];
+        $chart['data'] = [];
+        $chart['keys'] = [];
         $total = 0;
-        foreach($data as $i)
-        {
-            $chart['labelsAndValues'][]=$i['lead_source'].' ('.$currency_symbol.(int)$i['total'].$thousands_symbol.')';
+        foreach ($data as $i) {
+            $chart['labelsAndValues'][] = $i['lead_source'] . ' (' . $currency_symbol . (int)$i['total'] . $thousands_symbol . ')';
             //$chart['labelsAndValues'][]=$currency_symbol.(int)$i['total'].$thousands_symbol;
-            $chart['labels'][]=$i['lead_source'];
-            $chart['data'][]=(int)$i['total'];
-            $total+=(int)$i['total'];
+            $chart['labels'][] = $i['lead_source'];
+            $chart['keys'][] = $i['lead_source_key'];
+            $chart['data'][] = (int)$i['total'];
+            $total += (int)$i['total'];
         }
-        $chart['total']=$total;
+        $chart['total'] = $total;
         return $chart;
     }