Merge 51cd13a into c6d707c

openhab · May 21, 2021 · 15f49a3 · 15f49a3
2 parents c6d707c + 51cd13a
commit 15f49a3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/widgets/home/index.js b/bundles/org.openhab.ui/web/src/assets/definitions/widgets/home/index.js
@@ -53,6 +53,7 @@ export const OhLocationCardParameters = () => new WidgetDefinition('oh-location-
     pb('disableBadges', 'Disable badges', 'Do not examine items to display badges - can help with performance if you don\'t need them.'),
     pt('badges', 'Enabled badges', 'Select the badges you wish to show in the header of the card. Display all if none are selected.')
       .o([
+        { value: 'battery', label: 'Low Battery Warning' },
         { value: 'lights', label: 'Lights On' },
         { value: 'windows', label: 'Open Windows' },
         { value: 'doors', label: 'Open Doors' },

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
@@ -42,6 +42,7 @@ export default {
     return {
       badgeConfigs: {
         alarms: { icon: 'f7:exclamationmark_triangle_fill' },
+        battery: { icon: 'f7:battery_25', state: 'on' },
         lights: { icon: 'oh:lightbulb' },
         windows: { icon: 'oh:window', state: 'open' },
         doors: { icon: 'oh:door', state: 'open' },
@@ -70,6 +71,10 @@ export default {
     query () {
       let direct, equipment, allPoints, points
       switch (this.type) {
+        case 'battery':
+          direct = findPoints(this.element.properties, 'Point_Status_LowBattery', true)
+          if (direct.length) return direct
+          return findPoints(allEquipmentPoints(this.element.equipment), 'Point_LowBattery', true)
         case 'lights':
           direct = findPoints(this.element.properties, 'Point_Control', true, 'Property_Light')
           if (direct.length) return direct

diff --git a/bundles/org.openhab.ui/web/src/components/cards/location-card.vue b/bundles/org.openhab.ui/web/src/components/cards/location-card.vue
@@ -8,7 +8,7 @@
         <generic-widget-component :context="childContext(slotComponent)" v-for="(slotComponent, idx) in context.component.slots.glance" :key="'glance-' + idx" @command="onCommand" />
       </div>
       <div class="location-stats margin-top" :class="config.invertText ? 'invert-text' : ''" v-if="!config.disableBadges">
-        <span v-for="badgeType in ['alarms', 'lights', 'windows', 'doors', 'garagedoors', 'blinds', 'presence', 'lock', 'climate', 'screens', 'projectors', 'speakers']" :key="badgeType">
+        <span v-for="badgeType in ['alarms', 'battery', 'lights', 'windows', 'doors', 'garagedoors', 'blinds', 'presence', 'lock', 'climate', 'screens', 'projectors', 'speakers']" :key="badgeType">
           <status-badge v-if="!config.badges || !config.badges.length || config.badges.indexOf(badgeType) >= 0"
                         :store="context.store" :element="element" :type="badgeType" :invert-color="config.invertText" :badgeOverrides="badgeOverrides" />
         </span>