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

Replace double percent sign in chart unit, fixes #870, fixes #928 (#976) 

Signed-off-by: Hubert Nusser <hubsif@gmx.de>
3.0.x
hubsif 2021-03-26 00:13:35 +01:00 committed by Yannick Schaus
parent 48c968260b
commit 762d46e30c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bundles/org.openhab.ui/web/src/pages/analyzer/analyzer.vue
View File

@ -290,13 +290,14 @@ export default {
// dynamically add value axes according to unit if determined // dynamically add value axes according to unit if determined
const seriesOptions = this.seriesOptions[item.name] const seriesOptions = this.seriesOptions[item.name]
if (!seriesOptions.discrete && (seriesOptions.type === 'line' || seriesOptions.type === 'bar')) { if (!seriesOptions.discrete && (seriesOptions.type === 'line' || seriesOptions.type === 'bar')) {
const unit = (item.transformedState && item.transformedState.split(' ').length === 2) let unit = (item.transformedState && item.transformedState.split(' ').length === 2)
? item.transformedState.split(' ')[1] ? item.transformedState.split(' ')[1]
: (item.state.split(' ').length === 2) : (item.state.split(' ').length === 2)
? item.state.split(' ')[1] ? item.state.split(' ')[1]
: (item.stateDescription && item.stateDescription.pattern && item.stateDescription.pattern.split(' ').length === 2) : (item.stateDescription && item.stateDescription.pattern && item.stateDescription.pattern.split(' ').length === 2)
? item.stateDescription.pattern.split(' ')[1] ? item.stateDescription.pattern.split(' ')[1]
: undefined : undefined
if (unit) unit = unit.replace(/^%%/, '%')
let unitAxis = this.valueAxesOptions.findIndex((a) => a.unit === unit) let unitAxis = this.valueAxesOptions.findIndex((a) => a.unit === unit)
if (unitAxis >= 0) { if (unitAxis >= 0) {
this.$set(seriesOptions, 'valueAxisIndex', unitAxis) this.$set(seriesOptions, 'valueAxisIndex', unitAxis)