Commit 0f57c4b2 by Marcus Efraimsson

create time regions solely based on utc time

parent e8e189d1
...@@ -82,9 +82,7 @@ export class TimeRegionManager { ...@@ -82,9 +82,7 @@ export class TimeRegionManager {
return; return;
} }
const tRange = this.panelCtrl.dashboard.isTimezoneUtc() const tRange = { from: moment(this.panelCtrl.range.from).utc(), to: moment(this.panelCtrl.range.to).utc() };
? { from: this.panelCtrl.range.from, to: this.panelCtrl.range.to }
: { from: this.panelCtrl.range.from.local(), to: this.panelCtrl.range.to.local() };
let i, hRange, timeRegion, regions, fromStart, fromEnd, timeRegionColor; let i, hRange, timeRegion, regions, fromStart, fromEnd, timeRegionColor;
...@@ -188,7 +186,14 @@ export class TimeRegionManager { ...@@ -188,7 +186,14 @@ export class TimeRegionManager {
fromEnd.add(24, 'hours'); fromEnd.add(24, 'hours');
} }
regions.push({ from: fromStart.valueOf(), to: fromEnd.valueOf() }); const outsideRange =
(fromStart.unix() < tRange.from.unix() && fromEnd.unix() < tRange.from.unix()) ||
(fromStart.unix() > tRange.to.unix() && fromEnd.unix() > tRange.to.unix());
if (!outsideRange) {
regions.push({ from: fromStart.valueOf(), to: fromEnd.valueOf() });
}
fromStart.add(24, 'hours'); fromStart.add(24, 'hours');
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment