OpenHAB
/
openhab-webui
mirror of https://github.com/openhab/openhab-webui.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Generalize chart periods, fixes #808 (#953) 

Signed-off-by: Hubert Nusser <hubsif@gmx.de>
3.0.x
hubsif 2021-03-14 10:29:36 +01:00 committed by Yannick Schaus
parent a00b43653e
commit 86b297d7e3
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bundles/org.openhab.ui/web/src/components/widgets/chart/chart-mixin.js
View File

@ -173,21 +173,9 @@ export default {
if (chartType) {
day = fn.apply(day, [1, chartType === 'isoWeek' ? 'week' : chartType])
} else {
switch (this.period) {
case 'h': day = fn.apply(day, [1, 'hour']); break
case '2h': day = fn.apply(day, [2, 'hour']); break
case '4h': day = fn.apply(day, [4, 'hour']); break
case '12h': day = fn.apply(day, [12, 'hour']); break
case 'D': day = fn.apply(day, [1, 'day']); break
case '2D': day = fn.apply(day, [2, 'day']); break
case '3D': day = fn.apply(day, [3, 'day']); break
case 'W': day = fn.apply(day, [1, 'week']); break
case '2W': day = fn.apply(day, [2, 'week']); break
case 'M': day = fn.apply(day, [1, 'month']); break
case '2M': day = fn.apply(day, [2, 'month']); break
case '4M': day = fn.apply(day, [4, 'month']); break
case '6M': day = fn.apply(day, [6, 'month']); break
case 'Y': day = fn.apply(day, [365, 'day']); break
let span = this.period.match(/^([\d]*)([smhdDwWMQyY])$/)
if (span) {
day = fn.apply(day, [parseInt(span[1]) || 1, span[2].replace(/[DWY]/, (x) => x.toLowerCase())])
}
}
}