thingsboard-aplcache

diff --git a/ui/src/app/api/alarm.service.js b/ui/src/app/api/alarm.service.js
index 3b7a735..d23ede3 100644
--- a/ui/src/app/api/alarm.service.js
+++ b/ui/src/app/api/alarm.service.js
@@ -221,10 +221,10 @@ function AlarmService($http, $q, $interval, $filter, $timeout, utils, types) {
         } else if (alarmsQuery.startTime) {
             pageLink = {
                 limit: 100,
-                startTime: alarmsQuery.startTime
+                startTime: Math.round(alarmsQuery.startTime)
             }
             if (alarmsQuery.endTime) {
-                pageLink.endTime = alarmsQuery.endTime;
+                pageLink.endTime = Math.round(alarmsQuery.endTime);
             }
         }
 

diff --git a/ui/src/app/components/widget/widget.controller.js b/ui/src/app/components/widget/widget.controller.js
index f9ff7a6..0e418a4 100644
--- a/ui/src/app/components/widget/widget.controller.js
+++ b/ui/src/app/components/widget/widget.controller.js
@@ -73,6 +73,7 @@ export default function WidgetController($scope, $state, $timeout, $window, $ele
         decimals: angular.isDefined(widget.config.decimals) ? widget.config.decimals : 2,
         subscriptions: {},
         defaultSubscription: null,
+        dashboardTimewindow: dashboardTimewindow,
         timewindowFunctions: {
             onUpdateTimewindow: function(startTimeMs, endTimeMs) {
                 if (widgetContext.defaultSubscription) {
@@ -646,6 +647,7 @@ export default function WidgetController($scope, $state, $timeout, $window, $ele
 
         $scope.$on('dashboardTimewindowChanged', function (event, newDashboardTimewindow) {
             vm.dashboardTimewindow = newDashboardTimewindow;
+            widgetContext.dashboardTimewindow = newDashboardTimewindow;
         });
 
         $scope.$on("$destroy", function () {