jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-29 04:06:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enforce "good" states of binary_sensor as green in history timeline chart (#8145)

Browse Source
This commit is contained in:
Philip Allgaier 2021-01-27 17:22:01 +01:00 committed by GitHub
parent 12acb5473b
commit 4d6c11ce31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/entity/ha-chart-base.js
View File

@ -638,8 +638,14 @@ class HaChartBase extends mixinBehaviors(
const name = data[3]; const name = data[3];
if (name === null) return Color().hsl(0, 40, 38); if (name === null) return Color().hsl(0, 40, 38);
if (name === undefined) return Color().hsl(120, 40, 38); if (name === undefined) return Color().hsl(120, 40, 38);
const name1 = name.toLowerCase(); let name1 = name.toLowerCase();
if (ret === undefined) { if (ret === undefined) {
if (data[4]) {
// Invert on/off if data[4] is true. Required for some binary_sensor device classes
// (BINARY_SENSOR_DEVICE_CLASS_COLOR_INVERTED) where "off" is the good (= green color) value.
name1 = name1 === "on" ? "off" : name1 === "off" ? "on" : name1;
}
ret = colorDict[name1]; ret = colorDict[name1];
} }
if (ret === undefined) { if (ret === undefined) {

39
src/components/state-history-chart-timeline.js
View File

@ -3,10 +3,27 @@ import { html } from "@polymer/polymer/lib/utils/html-tag";
/* eslint-plugin-disable lit */ /* eslint-plugin-disable lit */
import { PolymerElement } from "@polymer/polymer/polymer-element"; import { PolymerElement } from "@polymer/polymer/polymer-element";
import { formatDateTimeWithSeconds } from "../common/datetime/format_date_time"; import { formatDateTimeWithSeconds } from "../common/datetime/format_date_time";
import { computeDomain } from "../common/entity/compute_domain";
import { computeRTL } from "../common/util/compute_rtl"; import { computeRTL } from "../common/util/compute_rtl";
import LocalizeMixin from "../mixins/localize-mixin"; import LocalizeMixin from "../mixins/localize-mixin";
import "./entity/ha-chart-base"; import "./entity/ha-chart-base";
/** Binary sensor device classes for which the static colors for on/off need to be inverted.
* List the ones were "off" = good or normal state = should be rendered "green".
*/
const BINARY_SENSOR_DEVICE_CLASS_COLOR_INVERTED = new Set([
"battery",
"door",
"garage_door",
"gas",
"lock",
"opening",
"problem",
"safety",
"smoke",
"window",
]);
class StateHistoryChartTimeline extends LocalizeMixin(PolymerElement) { class StateHistoryChartTimeline extends LocalizeMixin(PolymerElement) {
static get template() { static get template() {
return html` return html`
@ -129,6 +146,12 @@ class StateHistoryChartTimeline extends LocalizeMixin(PolymerElement) {
let prevLastChanged = startTime; let prevLastChanged = startTime;
const entityDisplay = names[stateInfo.entity_id] || stateInfo.name; const entityDisplay = names[stateInfo.entity_id] || stateInfo.name;
const invertOnOff =
computeDomain(stateInfo.entity_id) === "binary_sensor" &&
BINARY_SENSOR_DEVICE_CLASS_COLOR_INVERTED.has(
this.hass.states[stateInfo.entity_id].attributes.device_class
);
const dataRow = []; const dataRow = [];
stateInfo.data.forEach((state) => { stateInfo.data.forEach((state) => {
let newState = state.state; let newState = state.state;
@ -144,7 +167,13 @@ class StateHistoryChartTimeline extends LocalizeMixin(PolymerElement) {
if (prevState !== null && newState !== prevState) { if (prevState !== null && newState !== prevState) {
newLastChanged = new Date(state.last_changed); newLastChanged = new Date(state.last_changed);
dataRow.push([prevLastChanged, newLastChanged, locState, prevState]); dataRow.push([
prevLastChanged,
newLastChanged,
locState,
prevState,
invertOnOff,
]);
prevState = newState; prevState = newState;
locState = state.state_localize; locState = state.state_localize;
@ -157,7 +186,13 @@ class StateHistoryChartTimeline extends LocalizeMixin(PolymerElement) {
}); });
if (prevState !== null) { if (prevState !== null) {
dataRow.push([prevLastChanged, endTime, locState, prevState]); dataRow.push([
prevLastChanged,
endTime,
locState,
prevState,
invertOnOff,
]);
} }
datasets.push({ data: dataRow, entity_id: stateInfo.entity_id }); datasets.push({ data: dataRow, entity_id: stateInfo.entity_id });
labels.push(entityDisplay); labels.push(entityDisplay);