Skip to content

Fix state display for binary_sensor entity with device_class #74

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
merged 2 commits into from
Jun 9, 2020
Merged

Fix state display for binary_sensor entity with device_class #74

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21f7eb2
Fix state display for binary_sensor entity with device_class
sebr May 1, 2020
58fa991
Simplify logic for entityStateValue and support all entity types with…
sebr May 6, 2020
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
42 changes: 24 additions & 18 deletions multiple-entity-row.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
const html = LitElement.prototype.html;
const css = LitElement.prototype.css;

const UNAVAILABLE = "unavailable";
const UNKNOWN = "unknown";

class MultipleEntityRow extends LitElement {

static get properties() {
Expand Down Expand Up @@ -231,30 +234,33 @@
}

entityStateValue(stateObj, unit) {
let display;
if (stateObj.state === UNKNOWN || stateObj.state === UNAVAILABLE) {
return this._hass.localize(`state.default.${stateObj.state}`);
}

if (unit !== false && (unit || stateObj.attributes.unit_of_measurement)) {
return `${stateObj.state} ${unit || stateObj.attributes.unit_of_measurement}`;
}

const domain = stateObj.entity_id.substr(0, stateObj.entity_id.indexOf("."));

if (domain === 'binary_sensor') {
if (stateObj.attributes.device_class) {
display = this._hass.localize(`state.${domain}.${stateObj.attributes.device_class}.${stateObj.state}`);
}
if (!display) {
display = this._hass.localize(`state.${domain}.default.${stateObj.state}`);
}
} else if (unit !== false && (unit || stateObj.attributes.unit_of_measurement) && !['unknown', 'unavailable'].includes(stateObj.state)) {
display = `${stateObj.state} ${unit || stateObj.attributes.unit_of_measurement}`;
} else if (domain === 'zwave') {
display = ['initializing', 'dead'].includes(stateObj.state)
if (domain === 'zwave') {
return ['initializing', 'dead'].includes(stateObj.state)
? this._hass.localize(`state.zwave.query_stage.${stateObj.state}`, 'query_stage', stateObj.attributes.query_stage)
: this._hass.localize(`state.zwave.default.${stateObj.state}`);
} else {
display = this._hass.localize(`state.${domain}.${stateObj.state}`);
}

return display ||
this._hass.localize(`state.default.${stateObj.state}`) ||
this._hass.localize(`component.${domain}.state.${stateObj.state}`) ||
stateObj.state;
return (
// Return device class translation
(stateObj.attributes.device_class &&
this._hass.localize(
`component.${domain}.state.${stateObj.attributes.device_class}.${stateObj.state}`
)) ||
// Return default translation
this._hass.localize(`component.${domain}.state._.${stateObj.state}`) ||
// We don't know! Return the raw state.
stateObj.state
);
}

getAction(config, entityId) {
Expand Down