From d6ef512968149752f146750ff144d2b750227125 Mon Sep 17 00:00:00 2001 From: Yannick Schaus Date: Fri, 8 Jan 2021 16:50:25 +0100 Subject: [PATCH] Consider blinds open when state is ON or 0 in blinds glance (#771) Fixes #747. Fixes #746. Signed-off-by: Yannick Schaus --- .../components/cards/glance/location/status-badge.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bundles/org.openhab.ui/web/src/components/cards/glance/location/status-badge.vue b/bundles/org.openhab.ui/web/src/components/cards/glance/location/status-badge.vue index 15e6c3142..658d0087b 100644 --- a/bundles/org.openhab.ui/web/src/components/cards/glance/location/status-badge.vue +++ b/bundles/org.openhab.ui/web/src/components/cards/glance/location/status-badge.vue @@ -75,10 +75,10 @@ export default { equipment = [ ...findEquipment(this.element.equipment, 'Equipment_Door', false), ...findEquipment(this.element.equipment, 'Equipment_Door_FrontDoor', false), - ...findEquipment(this.element.equipment, 'Equipment_Door_BackDoor', false), - ...findEquipment(this.element.equipment, 'Equipment_Door_InnerDoor', false), - ...findEquipment(this.element.equipment, 'Equipment_Door_CellarDoor', false), - ...findEquipment(this.element.equipment, 'Equipment_Door_SideDoor', false) + ...findEquipment(this.element.equipment, 'Equipment_Door_BackDoor', false), + ...findEquipment(this.element.equipment, 'Equipment_Door_InnerDoor', false), + ...findEquipment(this.element.equipment, 'Equipment_Door_CellarDoor', false), + ...findEquipment(this.element.equipment, 'Equipment_Door_SideDoor', false) ] if (!equipment.length) return [] allPoints = allEquipmentPoints(equipment) @@ -171,7 +171,7 @@ export default { case 'lights': return this.map.filter((state) => state === 'ON' || (state.split(',').length === 3 && state.split(',')[2] !== '0') || (state.indexOf(',') < 0 && Number.parseInt(state) > 0)).length case 'blinds': - return this.map.filter((state) => state === 'OPEN' || Number.parseInt(state) > 0).length + return this.map.filter((state) => state === 'OPEN' || state === 'ON' || Number.parseInt(state) === 0).length default: return this.map.filter((state) => state === 'ON' || state === 'OPEN').length }