Skip to content

Add clearing of checked items to shopping-list-card #2034

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 1 commit into from
Nov 10, 2018
Merged

Add clearing of checked items to shopping-list-card #2034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions src/data/shopping-list.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,6 @@ export const completeItem = (
hass.callApi("POST", "shopping_list/item/" + itemId, {
complete,
});

export const clearItems = (hass: HomeAssistant): Promise<void> =>
hass.callApi("POST", "shopping_list/clear_completed");
45 changes: 37 additions & 8 deletions src/panels/lovelace/cards/hui-shopping-list-card.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import "@polymer/paper-checkbox/paper-checkbox";
import "@polymer/paper-input/paper-input";

import "../../../components/ha-card";
import "../../../components/ha-icon";

import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
import { HomeAssistant } from "../../../types";
Expand All @@ -14,6 +15,7 @@ import {
completeItem,
saveEdit,
ShoppingListItem,
clearItems,
} from "../../../data/shopping-list";

interface Config extends LovelaceConfig {
Expand Down Expand Up @@ -106,12 +108,25 @@ class HuiShoppingListCard extends hassLocalizeLitMixin(LitElement)
this._checkedItems!.length > 0
? html`
<div class="divider"></div>
<div class="label">
${
this.localize(
"ui.panel.lovelace.cards.shopping-list.checked_items"
)
}
<div class="checked">
<span class="label">
${
this.localize(
"ui.panel.lovelace.cards.shopping-list.checked_items"
)
}
</span>
<ha-icon
class="clearall"
@click="${this._clearItems}"
icon="hass:notification-clear-all"
.title="${
this.localize(
"ui.panel.lovelace.cards.shopping-list.clear_items"
)
}"
>
</ha-icon>
</div>
${
repeat(
Expand Down Expand Up @@ -170,17 +185,25 @@ class HuiShoppingListCard extends hassLocalizeLitMixin(LitElement)
position: relative;
top: 1px;
}
.label {
color: var(--primary-color);
.checked {
margin-left: 17px;
margin-bottom: 11px;
margin-top: 11px;
}
.label {
color: var(--primary-color);
}
.divider {
height: 1px;
background-color: var(--divider-color);
margin: 10px;
}
.clearall {
cursor: pointer;
margin-bottom: 3px;
float: right;
padding-right: 10px;
}
</style>
`;
}
Expand Down Expand Up @@ -215,6 +238,12 @@ class HuiShoppingListCard extends hassLocalizeLitMixin(LitElement)

ev.target.blur();
}

private _clearItems(): void {
if (this.hass) {
clearItems(this.hass).catch(() => this._fetchData());
}
}
}

declare global {
Expand Down
3 changes: 2 additions & 1 deletion src/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,8 @@
"lovelace": {
"cards": {
"shopping-list": {
"checked_items": "Checked items"
"checked_items": "Checked items",
"clear_items": "Clear checked items"
}
}
},
Expand Down