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 15:45:39 +02:00
parent 85f317b99b
commit 3688c6aa44
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -270,15 +270,21 @@ export function initModelFromDefaultTimewindow(value: Timewindow, quickIntervalO
} else { } else {
model.history.historyType = value.history.historyType; model.history.historyType = value.history.historyType;
} }
if (model.history.historyType === HistoryWindowType.LAST_INTERVAL) { if (isDefined(value.history.timewindowMs)) {
model.history.timewindowMs = value.history.timewindowMs; model.history.timewindowMs = value.history.timewindowMs;
} else if (model.history.historyType === HistoryWindowType.INTERVAL) { }
if (isDefined(value.history.quickInterval)) {
model.history.quickInterval = value.history.quickInterval; model.history.quickInterval = value.history.quickInterval;
} else { }
if (isDefined(value.history.fixedTimewindow)) {
if (isDefined(value.history.fixedTimewindow.startTimeMs)) {
model.history.fixedTimewindow.startTimeMs = value.history.fixedTimewindow.startTimeMs; model.history.fixedTimewindow.startTimeMs = value.history.fixedTimewindow.startTimeMs;
}
if (isDefined(value.history.fixedTimewindow.endTimeMs)) {
model.history.fixedTimewindow.endTimeMs = value.history.fixedTimewindow.endTimeMs; model.history.fixedTimewindow.endTimeMs = value.history.fixedTimewindow.endTimeMs;
} }
} }
}
if (value.aggregation) { if (value.aggregation) {
if (value.aggregation.type) { if (value.aggregation.type) {
model.aggregation.type = value.aggregation.type; model.aggregation.type = value.aggregation.type;