Skip to content

Update state-card and more-info card to support new methods. #1532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 3 commits into from
Aug 3, 2018
Merged

Update state-card and more-info card to support new methods. #1532

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c5a86d
Update state-card and more-info card to support new start and pause m…
cnrd Aug 1, 2018
cb9c7cf
Revert some changes
cnrd Aug 2, 2018
f0db5ed
fixed checking the same thing twice
cnrd Aug 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/components/ha-vacuum-state.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ const STATES_INTERCEPTABLE = {
},
docked: {
action: 'start_cleaning',
service: 'start_pause'
service: 'start'
},
idle: {
action: 'start_cleaning',
service: 'start_pause'
service: 'start'
},
off: {
action: 'turn_on',
Expand All @@ -27,7 +27,7 @@ const STATES_INTERCEPTABLE = {
},
paused: {
action: 'resume_cleaning',
service: 'start_pause'
service: 'start'
},
};

Expand Down
36 changes: 32 additions & 4 deletions src/dialogs/more-info/controls/more-info-vacuum.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,20 @@ class MoreInfoVacuum extends PolymerElement {
<p></p>
<div class="status-subtitle">Vacuum cleaner commands:</div>
<div class="horizontal justified layout">
<div hidden$="[[!supportsPause(stateObj)]]">
<paper-icon-button icon="hass:play-pause" on-click="onPlayPause" title="Start/Pause"></paper-icon-button>
</div>
<template is="dom-if" if="[[supportsStart(stateObj)]]">
<div hidden$="[[!supportsStart(stateObj)]]">

@balloob balloob Aug 3, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why have this hidden attribute if you're already inside a dom-if checking for the opposite?

<paper-icon-button icon="hass:play" on-click="onStart" title="Start"></paper-icon-button>
</div>
<div hidden$="[[!supportsPause(stateObj)]]">
<paper-icon-button icon="hass:pause" on-click="onPause" title="Pause"></paper-icon-button>
</div>
</template>
<template is="dom-if" if="[[!supportsStart(stateObj)]]">
<div hidden$="[[!supportsPause(stateObj)]]">
<paper-icon-button icon="hass:play-pause" on-click="onPlayPause" title="Pause"></paper-icon-button>
</div>
</template>

<div hidden$="[[!supportsStop(stateObj)]]">
<paper-icon-button icon="hass:stop" on-click="onStop" title="Stop"></paper-icon-button>
</div>
Expand Down Expand Up @@ -135,12 +146,17 @@ class MoreInfoVacuum extends PolymerElement {
return (stateObj.attributes.supported_features & 1024) !== 0;
}

supportsStart(stateObj) {
return (stateObj.attributes.supported_features & 8192) !== 0;
}

supportsCommandBar(stateObj) {
return (((stateObj.attributes.supported_features & 4) !== 0)
| ((stateObj.attributes.supported_features & 8) !== 0)
| ((stateObj.attributes.supported_features & 16) !== 0)
| ((stateObj.attributes.supported_features & 512) !== 0)
| ((stateObj.attributes.supported_features & 1024) !== 0));
| ((stateObj.attributes.supported_features & 1024) !== 0)
| ((stateObj.attributes.supported_features & 8192) !== 0));
}

/* eslint-enable no-bitwise */
Expand Down Expand Up @@ -171,6 +187,18 @@ class MoreInfoVacuum extends PolymerElement {
});
}

onPause() {
this.hass.callService('vacuum', 'pause', {
entity_id: this.stateObj.entity_id
});
}

onStart() {
this.hass.callService('vacuum', 'start', {
entity_id: this.stateObj.entity_id
});
}

onLocate() {
this.hass.callService('vacuum', 'locate', {
entity_id: this.stateObj.entity_id
Expand Down