Browse Source

UI. Possibility to transmit interval into time service

pull/1588/head^2
okolesnik 8 years ago
parent
commit
1aac2ec758
  1. 6
      ui/src/app/api/time.service.js
  2. 6
      ui/src/app/components/dashboard.directive.js
  3. 4
      ui/src/app/components/widget/widget.controller.js

6
ui/src/app/api/time.service.js

@ -256,11 +256,9 @@ function TimeService($translate, $http, $q, types) {
return timewindow;
}
function toHistoryTimewindow(timewindow, startTimeMs, endTimeMs) {
var interval = 0;
function toHistoryTimewindow(timewindow, startTimeMs, endTimeMs, interval = 0) {
if (timewindow.history) {
interval = timewindow.history.interval;
interval = angular.isDefined(interval) ? interval : timewindow.history.interval;
} else if (timewindow.realtime) {
interval = timewindow.realtime.interval;
}

6
ui/src/app/components/dashboard.directive.js

@ -219,14 +219,14 @@ function DashboardController($scope, $rootScope, $element, $timeout, $mdMedia, $
}
}, 0);
},
onUpdateTimewindow: function(startTimeMs, endTimeMs) {
onUpdateTimewindow: function(startTimeMs, endTimeMs, interval) {
if (!vm.originalDashboardTimewindow) {
vm.originalDashboardTimewindow = angular.copy(vm.dashboardTimewindow);
}
$timeout(function() {
vm.dashboardTimewindow = timeService.toHistoryTimewindow(vm.dashboardTimewindow, startTimeMs, endTimeMs);
vm.dashboardTimewindow = timeService.toHistoryTimewindow(vm.dashboardTimewindow, startTimeMs, endTimeMs, interval);
}, 0);
}
},
};
addResizeListener(gridsterParent[0], onGridsterParentResize); // eslint-disable-line no-undef

4
ui/src/app/components/widget/widget.controller.js

@ -76,9 +76,9 @@ export default function WidgetController($scope, $state, $timeout, $window, $ele
defaultSubscription: null,
dashboardTimewindow: dashboardTimewindow,
timewindowFunctions: {
onUpdateTimewindow: function(startTimeMs, endTimeMs) {
onUpdateTimewindow: function(startTimeMs, endTimeMs, interval) {
if (widgetContext.defaultSubscription) {
widgetContext.defaultSubscription.onUpdateTimewindow(startTimeMs, endTimeMs);
widgetContext.defaultSubscription.onUpdateTimewindow(startTimeMs, endTimeMs, interval);
}
},
onResetTimewindow: function() {

Loading…
Cancel
Save