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

Option to display last changed in glance-card #3584

Merged
merged 3 commits into from
Sep 3, 2019
Merged

Option to display last changed in glance-card #3584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dcad2f2
Option to display last changed in glance-card
iantrich Sep 3, 2019
872a193
move show_last_changed to entity-level
iantrich Sep 3, 2019
acf50b4
address review comments
iantrich Sep 3, 2019
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
26 changes: 16 additions & 10 deletions src/panels/lovelace/cards/hui-glance-card.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { classMap } from "lit-html/directives/class-map";
import computeStateDisplay from "../../../common/entity/compute_state_display";
import computeStateName from "../../../common/entity/compute_state_name";
import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
import relativeTime from "../../../common/datetime/relative_time";

import "../../../components/entity/state-badge";
import "../../../components/ha-card";
Expand All @@ -24,7 +25,7 @@ import { LovelaceCard, LovelaceCardEditor } from "../types";
import { longPress } from "../common/directives/long-press-directive";
import { processConfigEntities } from "../common/process-config-entities";
import { handleClick } from "../common/handle-click";
import { GlanceCardConfig, ConfigEntity } from "./types";
import { GlanceCardConfig, GlanceConfigEntity } from "./types";

@customElement("hui-glance-card")
export class HuiGlanceCard extends LitElement implements LovelaceCard {
Expand All @@ -41,7 +42,7 @@ export class HuiGlanceCard extends LitElement implements LovelaceCard {

@property() private _config?: GlanceCardConfig;

private _configEntities?: ConfigEntity[];
private _configEntities?: GlanceConfigEntity[];

public getCardSize(): number {
return (
Expand All @@ -52,7 +53,7 @@ export class HuiGlanceCard extends LitElement implements LovelaceCard {

public setConfig(config: GlanceCardConfig): void {
this._config = { theme: "default", ...config };
const entities = processConfigEntities<ConfigEntity>(config.entities);
const entities = processConfigEntities<GlanceConfigEntity>(config.entities);

for (const entity of entities) {
if (
Expand Down Expand Up @@ -207,11 +208,16 @@ export class HuiGlanceCard extends LitElement implements LovelaceCard {
${this._config!.show_state !== false
? html`
<div>
${computeStateDisplay(
this.hass!.localize,
stateObj,
this.hass!.language
)}
${entityConf.show_last_changed
? relativeTime(
new Date(stateObj.last_changed),
this.hass!.localize
)
: computeStateDisplay(
this.hass!.localize,
stateObj,
this.hass!.language
)}
</div>
`
: ""}
Expand All @@ -220,12 +226,12 @@ export class HuiGlanceCard extends LitElement implements LovelaceCard {
}

private _handleTap(ev: MouseEvent): void {
const config = (ev.currentTarget as any).entityConf as ConfigEntity;
const config = (ev.currentTarget as any).entityConf as GlanceConfigEntity;
handleClick(this, this.hass!, config, false);
}

private _handleHold(ev: MouseEvent): void {
const config = (ev.currentTarget as any).entityConf as ConfigEntity;
const config = (ev.currentTarget as any).entityConf as GlanceConfigEntity;
handleClick(this, this.hass!, config, true);
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/panels/lovelace/cards/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ export interface ConfigEntity extends EntityConfig {
hold_action?: ActionConfig;
}

export interface GlanceConfigEntity extends ConfigEntity {
show_last_changed?: boolean;
}

export interface GlanceCardConfig extends LovelaceCardConfig {
show_name?: boolean;
show_state?: boolean;
Expand Down