Skip to content
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

Thermostat fix #1867

Merged
merged 5 commits into from
Oct 27, 2018
Merged

Thermostat fix #1867

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aaba9be
Thermostat fix
zsarnett Oct 26, 2018
ca4bdc7
Fix for unknown operation mode
zsarnett Oct 26, 2018
24af3e0
No title for you
zsarnett Oct 26, 2018
470564d
I suck at removing unnecessary things
zsarnett Oct 26, 2018
04e13c2
Fixing pointless Ternary operator
zsarnett Oct 26, 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
25 changes: 19 additions & 6 deletions src/panels/lovelace/cards/hui-thermostat-card.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { roundSliderStyle } from "../../../resources/jquery.roundslider";
import { HomeAssistant } from "../../../types.js";
import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
import { LovelaceCard, LovelaceConfig } from "../types.js";
import computeStateName from "../../../common/entity/compute_state_name.js";

const thermostatConfig = {
radius: 150,
Expand Down Expand Up @@ -66,18 +67,21 @@ export class HuiThermostatCard extends hassLocalizeLitMixin(LitElement)
}
const stateObj = this.hass.states[this.config.entity];
const broadCard = this.clientWidth > 390;
const mode = modeIcons[stateObj.attributes.operation_mode]
? stateObj.attributes.operation_mode
: "unknown-mode";
return html`
${this.renderStyle()}
<ha-card
class="${classMap({
[stateObj.attributes.operation_mode]: true,
[mode]: true,
large: broadCard,
small: !broadCard,
})}">
<div id="root">
<div id="thermostat"></div>
<div id="tooltip">
<div class="title">Upstairs</div>
<div class="title">${computeStateName(stateObj)}</div>
<div class="current-temperature">
<span class="current-temperature-text">${
stateObj.attributes.current_temperature
Expand All @@ -94,7 +98,7 @@ export class HuiThermostatCard extends hassLocalizeLitMixin(LitElement)
)}</div>
<div class="modes">
${stateObj.attributes.operation_list.map((modeItem) =>
this._renderIcon(modeItem, stateObj.attributes.operation_mode)
this._renderIcon(modeItem, mode)
)}
</div>
</div>
Expand All @@ -105,10 +109,10 @@ export class HuiThermostatCard extends hassLocalizeLitMixin(LitElement)

protected shouldUpdate(changedProps) {
if (changedProps.get("hass")) {
return changedProps.get("hass").states[this.config!.entity] !==
return (
changedProps.get("hass").states[this.config!.entity] !==
this.hass!.states[this.config!.entity]
? true
: false;
);
}
return changedProps;
}
Expand Down Expand Up @@ -178,6 +182,12 @@ export class HuiThermostatCard extends hassLocalizeLitMixin(LitElement)
.off {
--mode-color: #8a8a8a;
}
.unknown-mode {
--mode-color: #bac;
}
.no-title {
--title-margin-top: 33% !important;
}
.large {
--thermostat-padding-top: 25px;
--thermostat-margin-bottom: 25px;
Expand Down Expand Up @@ -324,6 +334,9 @@ export class HuiThermostatCard extends hassLocalizeLitMixin(LitElement)
}

private _renderIcon(mode, currentMode) {
if (!modeIcons[mode]) {
return html``;
}
return html`<ha-icon
class="${classMap({ "selected-icon": currentMode === mode })}"
.mode="${mode}"
Expand Down