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.

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

Speed/Preset mode header fix #60

Merged
merged 2 commits into from
Aug 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 13 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,17 +102,19 @@ compact_view: false

Here is what every option means:

| Name | Type | Default | Description |
| -------------- | :-------: | ------------ | ------------------------------------------------ |
| `type` | `string` | **Required** | `custom:purifier-card` |
| `entity` | `string` | **Required** | An entity_id within the `fan` domain. |
| `show_name` | `boolean` | `true` | Show friendly name of the purifier. |
| `show_status` | `boolean` | `true` | Show status of the purifier. |
| `show_toolbar` | `boolean` | `true` | Show toolbar with actions. |
| `compact_view` | `boolean` | `false` | Compact view without image. |
| `aqi` | `object` | Optional | Custom entity or attribute for AQI value. |
| `stats` | `object` | Optional | Custom per state stats for your purifier cleaner |
| `actions` | `object` | Optional | Custom actions for your purifier cleaner. |
| Name | Type | Default | Description |
| ----------------- | :-------: | ------------ | ------------------------------------------------ |
| `type` | `string` | **Required** | `custom:purifier-card` |
| `entity` | `string` | **Required** | An entity_id within the `fan` domain. |
| `show_name` | `boolean` | `true` | Show friendly name of the purifier. |
| `show_status` | `boolean` | `true` | Show status of the purifier. |
| `show_speed` | `boolean` | `false` | Show speed of the purifier in the header. |
| `show_preset_mode`| `boolean` | `true` | Show preset mode of the purifier in the header. |
| `show_toolbar` | `boolean` | `true` | Show toolbar with actions. |
| `compact_view` | `boolean` | `false` | Compact view without image. |
| `aqi` | `object` | Optional | Custom entity or attribute for AQI value. |
| `stats` | `object` | Optional | Custom per state stats for your purifier cleaner |
| `actions` | `object` | Optional | Custom actions for your purifier cleaner. |

### `aqi` object

Expand Down
128 changes: 74 additions & 54 deletions src/purifier-card.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,23 @@ class PurifierCard extends LitElement {
get entity() {
return this.hass.states[this.config.entity];
}

get showSpeed() {
if (this.config.show_speed === undefined) {
return false;
}

return this.config.show_speed;
}

get showPresetMode() {
if (this.config.show_preset_mode === undefined) {
return true;
}

return this.config.show_preset_mode;
}

get showName() {
if (this.config.show_name === undefined) {
return true;
Expand Down Expand Up @@ -145,38 +161,40 @@ class PurifierCard extends LitElement {
} = this.entity;

// TODO handle percentages
if (!speed_list || !(supported_features & SUPPORT_SET_SPEED)) {
if (!this.showSpeed() || !speed_list || !(supported_features & SUPPORT_SET_SPEED)) {
return html``;
}

const selected = speed_list.indexOf(speed);

return html`
<paper-menu-button
slot="dropdown-trigger"
.horizontalAlign=${'right'}
.verticalAlign=${'top'}
.verticalOffset=${40}
.noAnimations=${true}
@click="${(e) => e.stopPropagation()}"
>
<paper-button slot="dropdown-trigger">
<ha-icon icon="mdi:fan"></ha-icon>
<span show=${true}> ${localize(`speed.${speed}`) || speed} </span>
</paper-button>
<paper-listbox
slot="dropdown-content"
selected=${selected}
@click="${(e) => this.handleSpeed(e)}"
<div class="speed>
<paper-menu-button
slot="dropdown-trigger"
.horizontalAlign=${'right'}
.verticalAlign=${'top'}
.verticalOffset=${40}
.noAnimations=${true}
@click="${(e) => e.stopPropagation()}"
>
${speed_list.map(
(item) =>
html`<paper-item value=${item}
>${localize(`speed.${item}`) || item}</paper-item
>`
)}
</paper-listbox>
</paper-menu-button>
<paper-button slot="dropdown-trigger">
<ha-icon icon="mdi:fan"></ha-icon>
<span show=${true}> ${localize(`speed.${speed}`) || speed} </span>
</paper-button>
<paper-listbox
slot="dropdown-content"
selected=${selected}
@click="${(e) => this.handleSpeed(e)}"
>
${speed_list.map(
(item) =>
html`<paper-item value=${item}
>${localize(`speed.${item}`) || item}</paper-item
>`
)}
</paper-listbox>
</paper-menu-button>
</div>
`;
}

Expand All @@ -185,40 +203,42 @@ class PurifierCard extends LitElement {
attributes: { preset_mode, preset_modes, supported_features },
} = this.entity;

if (!preset_modes || !(supported_features & SUPPORT_PRESET_MODE)) {
if (!this.showPresetMode() || !preset_modes || !(supported_features & SUPPORT_PRESET_MODE)) {
return html``;
}

const selected = preset_modes.indexOf(preset_mode);

return html`
<paper-menu-button
slot="dropdown-trigger"
.horizontalAlign=${'right'}
.verticalAlign=${'top'}
.verticalOffset=${40}
.noAnimations=${true}
@click="${(e) => e.stopPropagation()}"
>
<paper-button slot="dropdown-trigger">
<ha-icon icon="mdi:fan"></ha-icon>
<span show=${true}
>${localize(`preset_mode.${preset_mode}`) || preset_mode}
</span>
</paper-button>
<paper-listbox
slot="dropdown-content"
selected=${selected}
@click="${(e) => this.handlePresetMode(e)}"
<div class="preset-mode">
<paper-menu-button
slot="dropdown-trigger"
.horizontalAlign=${'right'}
.verticalAlign=${'top'}
.verticalOffset=${40}
.noAnimations=${true}
@click="${(e) => e.stopPropagation()}"
>
${preset_modes.map(
(item) =>
html`<paper-item value=${item}
>${localize(`preset_mode.${item}`) || item}</paper-item
>`
)}
</paper-listbox>
</paper-menu-button>
<paper-button slot="dropdown-trigger">
<ha-icon icon="mdi:fan"></ha-icon>
<span show=${true}
>${localize(`preset_mode.${preset_mode}`) || preset_mode}
</span>
</paper-button>
<paper-listbox
slot="dropdown-content"
selected=${selected}
@click="${(e) => this.handlePresetMode(e)}"
>
${preset_modes.map(
(item) =>
html`<paper-item value=${item}
>${localize(`preset_mode.${item}`) || item}</paper-item
>`
)}
</paper-listbox>
</paper-menu-button>
</div>
`;
}

Expand Down Expand Up @@ -414,8 +434,8 @@ class PurifierCard extends LitElement {
?more-info="true"
>
<div class="header">
<div class="speed">${this.renderSpeed()}</div>
<div class="preset-mode">${this.renderPresetMode()}</div>
${this.renderSpeed()}
${this.renderPresetMode()}
</div>

<div class="image ${className}">${this.renderAQI()}</div>
Expand Down