NGFW-10253 Pass/receive the date as a numeric timestamp instead of a …

…string.
luislopes-nf · Dec 19, 2016 · 25e86dc · 25e86dc
1 parent 16967a0
commit 25e86dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/reports/servlets/reports/root/script/main.js b/reports/servlets/reports/root/script/main.js
@@ -247,7 +247,7 @@ Ext.define("Ung.Main", {
                         default:
                             this.chart = Ung.charts.categoriesChart(this.entry, result.list, this.viewport.down('#highchart').body, false, true);
                     }
-                }, this), this.entry, new Date(decodeURI(config.startDate)), new Date(decodeURI(config.endDate)), [], -1);
+                }, this), this.entry, new Date(parseInt(decodeURI(config.startDate))), new Date(parseInt(decodeURI(config.endDate))), [], -1);
             }
             }, this), decodeURI(config.reportCategory), decodeURI(config.reportTitle));
 

diff --git a/reports/src/com/untangle/node/reports/FixedReports.java b/reports/src/com/untangle/node/reports/FixedReports.java
@@ -1735,8 +1735,8 @@ String getChart(Object reportCategory, Object reportTitle, String id){
             String url = "http://127.0.0.1/reports/?reportChart=1" + 
                 "&reportCategory=" + URLEncoder.encode((String) reportCategory, "UTF-8") + 
                 "&reportTitle=" + URLEncoder.encode((String) reportTitle, "UTF-8") + 
-                "&startDate=" + URLEncoder.encode(startDate.toString(), "UTF-8") + 
-                "&endDate=" + URLEncoder.encode(endDate.toString(), "UTF-8");
+                "&startDate=" + URLEncoder.encode(Long.toString(startDate.getTime()), "UTF-8") + 
+                "&endDate=" + URLEncoder.encode(Long.toString(endDate.getTime()), "UTF-8");
             webbrowser.openUrl(url);
             webbrowser.waitForElement("highcharts-0");
             webbrowser.takeScreenshot(filename);