Merge pull request #4737 from Cookiezaurs/master

[server-stats] Passing period as 2 strings repesenting time (not timestamps) to esnure correctly selected periods

Author: Cookiezaurs

frontend/express/public/javascripts/countly/countly.common.js

@@ -169,6 +169,22 @@
 
             store.set("countly_date", period);
         };
+        /* Returns strings representing dates, not timestamps*/
+        countlyCommon.getPeriodAsDateStrings = function() {
+            var array = [];
+            if (Array.isArray(_period)) {
+                if (countlyCommon.periodObj.currentPeriodArr && countlyCommon.periodObj.currentPeriodArr.length > 0) {
+                    var splitted = countlyCommon.periodObj.currentPeriodArr[0].split(".");
+                    array.push(splitted[2] + "-" + splitted[1] + "-" + splitted[0] + " 00:00:00");
+                    splitted = countlyCommon.periodObj.currentPeriodArr[countlyCommon.periodObj.currentPeriodArr.length - 1].split(".");
+                    array.push(splitted[2] + "-" + splitted[1] + "-" + splitted[0] + " 23:59:59");
+                }
+                return JSON.stringify(array);
+            }
+            else {
+                return countlyCommon.getPeriodForAjax();
+            }
+        };
 
         /**
         * Get currently selected period

plugins/server-stats/frontend/public/javascripts/countly.models.js

@@ -15,7 +15,7 @@
                 type: "GET",
                 url: countlyCommon.API_PARTS.data.r + "/server-stats/data-points",
                 data: {
-                    "period": countlyCommon.getPeriodForAjax(),
+                    "period": countlyCommon.getPeriodAsDateStrings(),
                     "selected_app": options.app_id || "",
                 },
                 dataType: "json",
@@ -31,7 +31,7 @@
 
     countlyDataPoints.punchCard = function(options) {
         var data = {};
-        data.period = countlyCommon.getPeriodForAjax();
+        data.period = countlyCommon.getPeriodAsDateStrings();
 
         if (options.app_id) {
             data.selected_app = options.app_id;
@@ -53,7 +53,7 @@
 
     countlyDataPoints.calculateTop = function(/*options*/) {
         var data = {};
-        data.period = countlyCommon.getPeriodForAjax();
+        data.period = countlyCommon.getPeriodAsDateStrings();
         return $.when(
             $.ajax({
                 type: "GET",