dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: Improve default time window calculation

Browse Source
This commit is contained in:
Igor Kulikov 2023-03-08 16:02:04 +02:00
parent 3688c6aa44
commit 11f54d96fd
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui-ngx/src/app/shared/models/time/time.models.ts
View File

@ -237,7 +237,7 @@ export function initModelFromDefaultTimewindow(value: Timewindow, quickIntervalO
model.hideAggInterval = value.hideAggInterval; model.hideAggInterval = value.hideAggInterval;
model.hideTimezone = value.hideTimezone; model.hideTimezone = value.hideTimezone;
model.selectedTab = getTimewindowType(value); model.selectedTab = getTimewindowType(value);
if (model.selectedTab === TimewindowType.REALTIME) { if (isDefined(value.realtime)) {
if (isDefined(value.realtime.interval)) { if (isDefined(value.realtime.interval)) {
model.realtime.interval = value.realtime.interval; model.realtime.interval = value.realtime.interval;
} }
@ -250,12 +250,14 @@ export function initModelFromDefaultTimewindow(value: Timewindow, quickIntervalO
} else { } else {
model.realtime.realtimeType = value.realtime.realtimeType; model.realtime.realtimeType = value.realtime.realtimeType;
} }
if (model.realtime.realtimeType === RealtimeWindowType.INTERVAL) { if (isDefined(value.realtime.quickInterval)) {
model.realtime.quickInterval = value.realtime.quickInterval; model.realtime.quickInterval = value.realtime.quickInterval;
} else { }
if (isDefined(value.realtime.timewindowMs)) {
model.realtime.timewindowMs = value.realtime.timewindowMs; model.realtime.timewindowMs = value.realtime.timewindowMs;
} }
} else { }
if (isDefined(value.history)) {
if (isDefined(value.history.interval)) { if (isDefined(value.history.interval)) {
model.history.interval = value.history.interval; model.history.interval = value.history.interval;
} }