Merge 6c56798 into d08803b

openhab · May 30, 2021 · fcfbdd8 · fcfbdd8
2 parents d08803b + 6c56798
commit fcfbdd8
Showing 1 changed file with 8 additions and 3 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
@@ -152,7 +152,8 @@ export default {
         case 'speakers':
           equipment = [
             ...findEquipment(this.element.equipment, 'Equipment_Receiver', false),
-            ...findEquipment(this.element.equipment, 'Equipment_Speaker', false)
+            ...findEquipment(this.element.equipment, 'Equipment_Speaker', false),
+            ...findEquipment(this.element.equipment, 'Equipment_VoiceAssistant', false)
           ]
           if (!equipment.length) return []
           allPoints = allEquipmentPoints(equipment)
@@ -189,10 +190,14 @@ export default {
         return this.map.filter((state) => expr.eval(ast, { state: state, Number: Number })).length
       }
       switch (this.type) {
-        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' || state === 'ON' || Number.parseInt(state) === 0).length
+        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 'projectors':
+        case 'screens':
+        case 'speakers':
+          return this.map.filter((state) => state === 'ON' || state === 'PLAY' || state === 'FASTFORWARD' || state === 'REWIND').length
         default:
           return this.map.filter((state) => state === 'ON' || state === 'OPEN').length
       }