Skip to content

Commit

Permalink
Merge branch 'esphome:dev' into v3-grouping
Browse files Browse the repository at this point in the history
  • Loading branch information
RFDarter authored Jun 27, 2024
2 parents d40496e + 726e756 commit d410ae1
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 4 deletions.
25 changes: 24 additions & 1 deletion packages/v2/public/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 14 additions & 1 deletion packages/v2/src/esp-entity-table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ class ActionRenderer {
const val = (<HTMLTextAreaElement>e.target)?.value;
this.actioner?.restAction(
entity,
`${action}?${opt}=${val}`
`${action}?${opt}=${val.replace('T', ' ')}`
);
}}"
/>
Expand Down Expand Up @@ -460,6 +460,19 @@ class ActionRenderer {
`;
}

render_datetime() {
if (!this.entity) return;
return html`
${this._datetime(
this.entity,
"datetime-local",
"set",
"value",
this.entity.value,
)}
`;
}

render_text() {
if (!this.entity) return;
return this._textinput(
Expand Down
25 changes: 24 additions & 1 deletion packages/v3/public/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 14 additions & 1 deletion packages/v3/src/esp-entity-table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ class ActionRenderer {
const val = (<HTMLTextAreaElement>e.target)?.value;
this.actioner?.restAction(
entity,
`${action}?${opt}=${val}`
`${action}?${opt}=${val.replace('T', ' ')}`
);
}}"
/>
Expand Down Expand Up @@ -526,6 +526,19 @@ class ActionRenderer {
`;
}

render_datetime() {
if (!this.entity) return;
return html`
${this._datetime(
this.entity,
"datetime-local",
"set",
"value",
this.entity.value,
)}
`;
}

render_switch() {
if (!this.entity) return;
if (this.entity.assumed_state)
Expand Down

0 comments on commit d410ae1

Please sign in to comment.