Просмотр исходного кода

Ticket #5043 - Analytics: "total number" isn't showing.

AntonLV 1 год назад
Родитель
Сommit
ffb4bc5172

+ 0 - 1
modules/boonex/analytics/classes/BxAnalyticsModule.php

@@ -316,7 +316,6 @@ class BxAnalyticsModule extends BxDolModule
                 
             default:
                 $sType = "line";
-                $bIsTimeX = true;
                 $sTableName = '';
                 $aValues['strings'][0] = _t('_bx_analytics_txt_date');
                 $bDefaultFillData = false;

+ 7 - 4
modules/boonex/analytics/js/analytics.js

@@ -72,8 +72,8 @@ BxAnalytics.prototype.reloadData = function () {
                 top: 0,
                 bottom: 0
             }
-        }
-		
+        };
+
         Chart.defaults.scale.ticks.callback = function (label, index, labels) {
             if (label.length > 10)
                 return label.slice(0, 10) + '...';
@@ -82,15 +82,18 @@ BxAnalytics.prototype.reloadData = function () {
         };
 
         bx_loading($($this._sContainerDataSelector), false);
-        var oDataForChart = oData.data || false;
-        var oChartOptions = oData.options || oOptionsDefault;
+
         if ($this._oChart)
             $this._oChart.destroy();
+
+        var oDataForChart = oData.data || {};
+        var oChartOptions = oData.options || {};
         $this._oChart = new Chart($($this._sCanvasSelector), {
             type: oData.type != undefined ? oData.type : 'line',
             data: oDataForChart,
             options: $.extend({}, $this._oChartOptionsDefault, oChartOptions)
         });
+
         $this.dataToTable(oData);
     });
 };