Waiting for data...
Waiting for data...
${text}
`;
- };
+ };
- const renderSecondaryOrLabel = (labelText, showLabel, secondaryEntity, hasSecondary) => {
- if (hasSecondary) {
- const secVal = getSecondaryVal(secondaryEntity);
- return html`${secVal}
`;
- }
- return renderLabel(labelText, showLabel);
- };
-
- const renderMainIcon = (type, val, customIcon, color = null) => {
+ const renderMainIcon = (type, val, customIcon, color = null) => {
if (customIcon) {
- const style = color ? `color: ${color};` : (type === 'solar' ? 'color: var(--icon-solar-color);' : (type === 'grid' ? 'color: var(--icon-grid-color);' : (type === 'battery' ? 'color: var(--icon-battery-color);' : (type === 'house' ? 'color: var(--icon-house-color);' : ''))));
- return html` this._handleClick(entities[configKey])}>
+
-
${iconContent}
- ${renderSecondaryOrLabel(label, true, secEntity, hasSecondary)}
-
`;
- };
+ };
- const getConsumerPipeStyle = (isActive, val) => {
+ const getConsumerPipeStyle = (isActive, val) => {
if (!isActive) return "display: none;";
return getPipeStyle(val);
- };
-
- const getConsumerAnimStyle = (isActive, val) => {
+ };
+
+ const getConsumerAnimStyle = (isActive, val) => {
if (!isActive) return "display: none;";
return getAnimStyle(val);
- };
+ };
- const pathSolarHouse = "M 50 160 Q 50 265 165 265";
- const pathSolarBatt = "M 50 70 Q 210 -20 370 70";
- const pathGridImport = "M 210 160 L 210 220";
- const pathGridExport = "M 95 115 Q 130 145 165 115";
- const pathHouseExport = "M 210 220 L 210 160";
- const exportFromSolar = solarVal > 1;
- const activeExportPath = exportFromSolar ? pathGridExport : pathHouseExport;
- const exportTextX = exportFromSolar ? '130' : '185';
- const exportTextY = exportFromSolar ? '145' : '195';
- const pathGridToBatt = "M 255 115 Q 290 145 325 115";
- const pathBattHouse = "M 370 160 Q 370 265 255 265";
- const pathHouseC1 = "M 165 265 Q 50 265 50 370";
- const pathHouseC2 = "M 210 310 L 210 370";
- const pathHouseC3 = "M 255 265 Q 370 265 370 370";
+ const pathSolarHouse = "M 50 160 Q 50 265 165 265";
+ const pathSolarBatt = "M 50 70 Q 210 -20 370 70";
+ const pathGridImport = "M 210 160 L 210 220";
+ const pathGridExport = "M 165 115 Q 130 145 95 115";
+ const pathGridToBatt = "M 255 115 Q 290 145 325 115";
+ const pathBattHouse = "M 370 160 Q 370 265 255 265";
+ const pathHouseC1 = "M 165 265 Q 50 265 50 370";
+ const pathHouseC2 = "M 210 310 L 210 370";
+ const pathHouseC3 = "M 255 265 Q 370 265 370 370";
- const houseTextStyle = this.config.color_text_house
- ? 'color: var(--text-house-color);'
- : (houseTextCol ? `color: ${houseTextCol};` : '');
- const dashArrayVal = showTail ? '30 360' : (showDashedLine ? '13 13' : '0 380');
- const strokeWidthVal = showDashedLine ? 4 : 8;
+ const houseTextStyle = houseTextCol ? `color: ${houseTextCol};` : '';
+ const dashArrayVal = showTail ? '30 360' : (showDashedLine ? '13 13' : '0 380');
+ const strokeWidthVal = showDashedLine ? 4 : 8;
- return html`
+ return html`
${this._formatPower(val)}
+ ${renderLabel(label, true)}
+ ${this._formatPower(val)}
+
${hasSolar ? html`
-
this._handleClick(entities.solar)}>
+
`;
- }
+ }
}
customElements.define("power-flux-card-editor", PowerFluxCardEditor);
diff --git a/src/power-flux-card.js b/src/power-flux-card.js
index 842366d..6c70037 100644
--- a/src/power-flux-card.js
+++ b/src/power-flux-card.js
@@ -1,172 +1,87 @@
-import { } from "./power-flux-card-editor.js";
-import lang_en from "./lang-en.js";
-import lang_de from "./lang-de.js";
-
console.log(
- "%c⚡ Power Flux Card v_2.4 ready",
- "background: #d19525ff; color: #000; padding: 2px 6px; border-radius: 4px; font-weight: bold;"
+ "%c⚡ Power-Flux-Card v_2.0 ready",
+ "background: #2ecc71; color: #000; padding: 2px 6px; border-radius: 4px; font-weight: bold;"
);
-(function (lang_en, lang_de) {
- const cardTranslations = {
- "en": lang_en.card,
- "de": lang_de.card
- };
+class PowerFluxCard extends LitElement {
+
+ static get properties() {
+ return {
+ hass: {},
+ config: {},
+ _cardWidth: { state: true },
+ };
+ }
- const LitElement = customElements.get("ha-lit-element") || Object.getPrototypeOf(customElements.get("home-assistant-main"));
- const html = LitElement.prototype.html;
- const css = LitElement.prototype.css;
+ _localize(key) {
+ const lang = this.hass && this.hass.language ? this.hass.language : 'en';
+ const dict = cardTranslations[lang] || cardTranslations['en'];
+ return dict[key] || cardTranslations['en'][key] || key;
+ }
- class PowerFluxCard extends LitElement {
- static get properties() {
- return {
- hass: {},
- config: {},
- _cardWidth: { state: true },
- };
- }
+ static async getConfigElement() {
+ return document.createElement("power-flux-card-editor");
+ }
- _localize(key) {
- const lang = this.hass && this.hass.language ? this.hass.language : 'en';
- const dict = cardTranslations[lang] || cardTranslations['en'];
- return dict[key] || cardTranslations['en'][key] || key;
- }
-
- static async getConfigElement() {
- return document.createElement("power-flux-card-editor");
- }
-
- static getStubConfig() {
- return {
- zoom: 0.9,
- compact_view: false,
- consumer_1_unit_kw: false,
- consumer_2_unit_kw: false,
- consumer_3_unit_kw: false,
- show_consumer_always: false,
- consumer_1_hide_pipe: false,
- consumer_1_pipe_threshold: 0,
- show_donut_border: false,
- show_neon_glow: true,
- show_comet_tail: false,
- show_dashed_line: false,
- show_tinted_background: false,
- hide_inactive_flows: true,
- show_flow_rate_solar: true,
- show_flow_rate_grid: true,
- show_flow_rate_battery: true,
- show_label_solar: false,
- show_label_grid: false,
- show_label_battery: false,
- show_label_house: false,
- use_colored_values: false,
- hide_consumer_icons: false,
- entities: {
- solar: "",
- grid: "",
- grid_export: "",
- grid_combined: "",
- battery: "",
- battery_soc: "",
- battery_charge: "",
- battery_discharge: "",
- house: "",
- consumer_1: "",
- consumer_2: "",
- consumer_3: ""
- }
- };
- }
-
- _handleClick(entityId) {
- if (!entityId) return;
- const event = new Event("hass-more-info", {
- bubbles: true,
- composed: true,
- });
- event.detail = { entityId };
- this.dispatchEvent(event);
- }
-
- setConfig(config) {
- if (!config.entities) {
- // Init allow
+ static getStubConfig() {
+ return {
+ zoom: 0.9,
+ compact_view: false,
+ show_donut_border: false,
+ show_neon_glow: true,
+ show_comet_tail: false,
+ show_dashed_line: false,
+ show_tinted_background: false,
+ hide_inactive_flows: true,
+ show_flow_rate_solar: true,
+ show_flow_rate_grid: true,
+ show_flow_rate_battery: true,
+ show_label_solar: false,
+ show_label_grid: false,
+ show_label_battery: false,
+ show_label_house: false,
+ use_colored_values: false,
+ hide_consumer_icons: false,
+ entities: {
+ solar: "",
+ grid: "",
+ grid_export: "",
+ battery: "",
+ battery_soc: "",
+ consumer_1: "",
+ consumer_2: "",
+ consumer_3: ""
}
- this.config = config;
- }
+ };
+ }
- firstUpdated() {
- this._resizeObserver = new ResizeObserver(entries => {
- for (const entry of entries) {
- if (entry.contentRect.width > 0) {
- this._cardWidth = entry.contentRect.width;
- }
- }
- });
- this._resizeObserver.observe(this);
+ setConfig(config) {
+ if (!config.entities) {
+ // Init allow
}
+ this.config = config;
+ }
- updated(changedProps) {
- super.updated(changedProps);
- if (changedProps.has('hass') && this.hass) {
- const isDark = this.hass.themes?.darkMode !== false;
- if (isDark) {
- this.removeAttribute('data-theme-light');
- } else {
- this.setAttribute('data-theme-light', '');
+ firstUpdated() {
+ this._resizeObserver = new ResizeObserver(entries => {
+ for (const entry of entries) {
+ if (entry.contentRect.width > 0) {
+ this._cardWidth = entry.contentRect.width;
}
}
- // Apply custom colors from config
- if (this.config) {
- const colorMap = {
- 'color_solar': '--neon-yellow',
- 'color_grid': '--neon-blue',
- 'color_battery': '--neon-green',
- 'color_export': '--export-color',
- 'color_consumer_1': '--consumer-1-color',
- 'color_consumer_2': '--consumer-2-color',
- 'color_consumer_3': '--consumer-3-color',
- 'color_pipe_solar': '--pipe-solar-color',
- 'color_pipe_grid': '--pipe-grid-color',
- 'color_pipe_battery': '--pipe-battery-color',
- 'color_pipe_consumer_1': '--pipe-consumer-1-color',
- 'color_pipe_consumer_2': '--pipe-consumer-2-color',
- 'color_pipe_consumer_3': '--pipe-consumer-3-color',
- 'color_house': '--neon-pink',
- 'color_icon_solar': '--icon-solar-color',
- 'color_icon_grid': '--icon-grid-color',
- 'color_icon_battery': '--icon-battery-color',
- 'color_icon_house': '--icon-house-color',
- 'color_icon_consumer_1': '--icon-consumer-1-color',
- 'color_icon_consumer_2': '--icon-consumer-2-color',
- 'color_icon_consumer_3': '--icon-consumer-3-color',
- 'color_text_solar': '--text-solar-color',
- 'color_text_grid': '--text-grid-color',
- 'color_text_battery': '--text-battery-color',
- 'color_text_house': '--text-house-color',
- 'color_text_consumer_1': '--text-consumer-1-color',
- 'color_text_consumer_2': '--text-consumer-2-color',
- 'color_text_consumer_3': '--text-consumer-3-color',
- };
- for (const [configKey, cssVar] of Object.entries(colorMap)) {
- if (this.config[configKey]) {
- this.style.setProperty(cssVar, this.config[configKey]);
- } else {
- this.style.removeProperty(cssVar);
- }
- }
- }
- }
+ });
+ this._resizeObserver.observe(this);
+ }
- disconnectedCallback() {
- super.disconnectedCallback();
- if (this._resizeObserver) {
- this._resizeObserver.disconnect();
- }
+ disconnectedCallback() {
+ super.disconnectedCallback();
+ if (this._resizeObserver) {
+ this._resizeObserver.disconnect();
}
+ }
- static get styles() {
- return css`
+ static get styles() {
+ return css`
:host {
display: block;
--neon-yellow: #ffdd00;
@@ -174,45 +89,10 @@ console.log(
--neon-green: #00ff88;
--neon-pink: #ff0080;
--neon-red: #ff3333;
+ --grid-grey: #9e9e9e;
--export-purple: #a855f7;
- --export-color: #ff3333;
- --consumer-1-color: #a855f7;
- --consumer-2-color: #f97316;
- --consumer-3-color: #06b6d4;
- --pipe-solar-color: var(--neon-yellow);
- --pipe-grid-color: var(--neon-blue);
- --pipe-battery-color: var(--neon-green);
- --pipe-consumer-1-color: var(--consumer-1-color);
- --pipe-consumer-2-color: var(--consumer-2-color);
- --pipe-consumer-3-color: var(--consumer-3-color);
- --icon-solar-color: var(--neon-yellow);
- --icon-grid-color: var(--neon-blue);
- --icon-battery-color: var(--neon-green);
- --icon-house-color: var(--neon-pink);
- --icon-consumer-1-color: var(--consumer-1-color);
- --icon-consumer-2-color: var(--consumer-2-color);
- --icon-consumer-3-color: var(--consumer-3-color);
- --text-solar-color: var(--neon-yellow);
- --text-grid-color: var(--neon-blue);
- --text-battery-color: var(--neon-green);
- --text-house-color: var(--neon-pink);
- --text-consumer-1-color: var(--consumer-1-color);
- --text-consumer-2-color: var(--consumer-2-color);
- --text-consumer-3-color: var(--consumer-3-color);
--flow-dasharray: 0 380;
}
- :host([data-theme-light]) {
- --neon-yellow: #c8a800;
- --neon-blue: #2563eb;
- --neon-green: #059669;
- --neon-pink: #db2777;
- --neon-red: #dc2626;
- --export-purple: #7c3aed;
- --export-color: #dc2626;
- --consumer-1-color: #7c3aed;
- --consumer-2-color: #ea580c;
- --consumer-3-color: #0891b2;
- }
ha-card {
padding: 0;
position: relative;
@@ -266,7 +146,7 @@ console.log(
.compact-bar-wrapper {
height: 36px;
width: 100%;
- background: var(--card-background-color, #333);
+ background: #333;
border-radius: 5px;
margin: 4px 0;
display: flex;
@@ -287,11 +167,17 @@ console.log(
overflow: hidden;
}
+ /* Source Colors */
+ .src-solar { background: var(--neon-green); color: black; }
+ .src-grid { background: var(--grid-grey); color: black; }
+ .src-battery { background: var(--neon-yellow); color: black; }
+
/* --- STANDARD VIEW STYLES --- */
.scale-wrapper {
width: 420px;
- transform-origin: top left;
- transition: transform 0.1s linear;
+ transform-origin: top center;
+ transition: transform 0.1s linear;
+ margin: 0 auto;
}
.absolute-container {
@@ -311,18 +197,15 @@ console.log(
z-index: 2;
transition: all 0.3s ease;
box-sizing: border-box;
- cursor: pointer;
}
.bubble.tinted { background: rgba(255, 255, 255, 0.05); }
.bubble.tinted.solar { background: color-mix(in srgb, var(--neon-yellow), transparent 85%); }
.bubble.tinted.grid { background: color-mix(in srgb, var(--neon-blue), transparent 85%); }
- .bubble.tinted.grid.exporting { background: color-mix(in srgb, var(--export-color), transparent 85%); }
- .bubble.grid.exporting { border-color: var(--export-color); }
.bubble.tinted.battery { background: color-mix(in srgb, var(--neon-green), transparent 85%); }
- .bubble.tinted.c1 { background: color-mix(in srgb, var(--consumer-1-color), transparent 85%); }
- .bubble.tinted.c2 { background: color-mix(in srgb, var(--consumer-2-color), transparent 85%); }
- .bubble.tinted.c3 { background: color-mix(in srgb, var(--consumer-3-color), transparent 85%); }
+ .bubble.tinted.c1 { background: color-mix(in srgb, #a855f7, transparent 85%); }
+ .bubble.tinted.c2 { background: color-mix(in srgb, #f97316, transparent 85%); }
+ .bubble.tinted.c3 { background: color-mix(in srgb, #06b6d4, transparent 85%); }
.bubble.house { border-color: var(--neon-pink); }
.bubble.house.tinted { background: color-mix(in srgb, var(--neon-pink), transparent 85%); }
@@ -334,35 +217,21 @@ console.log(
-webkit-mask: linear-gradient(#fff 0 0) content-box, linear-gradient(#fff 0 0);
-webkit-mask-composite: xor; mask-composite: exclude; z-index: -1; pointer-events: none;
}
-
- .bubble.grid.donut { border: none !important; background: transparent; }
- .bubble.grid.donut.tinted { background: color-mix(in srgb, var(--neon-blue), transparent 85%); }
- .bubble.grid.donut.tinted.exporting { background: color-mix(in srgb, var(--export-color), transparent 85%); }
- .bubble.grid.donut::before {
- content: ""; position: absolute; inset: 0; border-radius: 50%; padding: 4px;
- background: var(--grid-gradient, var(--neon-blue));
- -webkit-mask: linear-gradient(#fff 0 0) content-box, linear-gradient(#fff 0 0);
- -webkit-mask-composite: xor; mask-composite: exclude; z-index: -1; pointer-events: none;
- }
.icon-svg, .icon-custom {
- width: 33px; height: 33px; position: absolute; top: 10px; left: 50%; margin-left: -17px; z-index: 2; display: block;
+ width: 34px; height: 34px; position: absolute; top: 13px; left: 50%; margin-left: -17px; z-index: 2; display: block;
}
.icon-custom { --mdc-icon-size: 34px; }
.sub {
font-size: 9px; color: var(--secondary-text-color); text-transform: uppercase; letter-spacing: 0.5px;
- line-height: 1.1; z-index: 2; position: absolute; top: 46px; left: 0; width: 100%; text-align: center; margin: 0; pointer-events: none;
- }
- .sub.secondary-val {
- text-transform: none; letter-spacing: 0; font-weight: 500; font-size: 10px;
+ line-height: 1.1; z-index: 2; position: absolute; top: 48px; left: 0; width: 100%; text-align: center; margin: 0; pointer-events: none;
}
.value {
font-weight: bold; font-size: 15px; white-space: nowrap; z-index: 2; transition: color 0.3s ease;
line-height: 1.2; position: absolute; bottom: 11px; left: 0; width: 100%; text-align: center; margin: 0;
}
- .direction-arrow { font-size: 12px; margin-right: 0px; vertical-align: top; }
@keyframes spin { 100% { transform: rotate(360deg); } }
.spin-slow { animation: spin 12s linear infinite; transform-origin: center; }
@@ -376,18 +245,17 @@ console.log(
.solar { border-color: var(--neon-yellow); }
.battery { border-color: var(--neon-green); }
.grid { border-color: var(--neon-blue); }
- .c1 { border-color: var(--consumer-1-color); }
- .c2 { border-color: var(--consumer-2-color); }
- .c3 { border-color: var(--consumer-3-color); }
+ .c1 { border-color: #a855f7; }
+ .c2 { border-color: #f97316; }
+ .c3 { border-color: #06b6d4; }
.inactive { border-color: var(--secondary-text-color); }
- .glow.solar { box-shadow: 0 0 15px color-mix(in srgb, var(--neon-yellow), transparent 60%); }
- .glow.battery { box-shadow: 0 0 15px color-mix(in srgb, var(--neon-green), transparent 60%); }
- .glow.grid { box-shadow: 0 0 15px color-mix(in srgb, var(--neon-blue), transparent 60%); }
- .glow.grid.exporting { box-shadow: 0 0 15px color-mix(in srgb, var(--export-color), transparent 60%); }
- .glow.c1 { box-shadow: 0 0 15px color-mix(in srgb, var(--consumer-1-color), transparent 60%); }
- .glow.c2 { box-shadow: 0 0 15px color-mix(in srgb, var(--consumer-2-color), transparent 60%); }
- .glow.c3 { box-shadow: 0 0 15px color-mix(in srgb, var(--consumer-3-color), transparent 60%); }
+ .glow.solar { box-shadow: 0 0 15px rgba(255, 221, 0, 0.4); }
+ .glow.battery { box-shadow: 0 0 15px rgba(0, 255, 136, 0.4); }
+ .glow.grid { box-shadow: 0 0 15px rgba(59, 130, 246, 0.4); }
+ .glow.c1 { box-shadow: 0 0 15px rgba(168, 85, 247, 0.4); }
+ .glow.c2 { box-shadow: 0 0 15px rgba(249, 115, 22, 0.4); }
+ .glow.c3 { box-shadow: 0 0 15px rgba(6, 182, 212, 0.4); }
.node-solar { top: 70px; left: 5px; }
.node-grid { top: 70px; left: 165px; }
@@ -397,98 +265,84 @@ console.log(
.node-c2 { top: 370px; left: 165px; }
.node-c3 { top: 370px; left: 325px; }
- svg { position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 1; pointer-events: none; }
+ svg { position: absolute; top: 7; left: 25; width: 100%; height: 100%; z-index: 1; pointer-events: none; }
.bg-path { fill: none; stroke-width: 6; transition: opacity 0.3s ease; }
- .bg-solar { stroke: var(--pipe-solar-color); }
- .bg-grid { stroke: var(--pipe-grid-color); }
- .bg-battery { stroke: var(--pipe-battery-color); }
- .bg-export { stroke: var(--export-color); }
- .bg-c1 { stroke: var(--pipe-consumer-1-color); }
- .bg-c2 { stroke: var(--pipe-consumer-2-color); }
- .bg-c3 { stroke: var(--pipe-consumer-3-color); }
+ .bg-solar { stroke: var(--neon-yellow); }
+ .bg-grid { stroke: var(--neon-blue); }
+ .bg-battery { stroke: var(--neon-green); }
+ .bg-export { stroke: var(--neon-red); }
+ .bg-c1 { stroke: #a855f7; }
+ .bg-c2 { stroke: #f97316; }
+ .bg-c3 { stroke: #06b6d4; }
.flow-line {
fill: none; stroke-width: var(--flow-stroke-width, 8px); stroke-linecap: round; stroke-dasharray: var(--flow-dasharray);
animation: dash linear infinite; opacity: 0; transition: opacity 0.5s;
}
- .flow-solar { stroke: var(--pipe-solar-color); }
- .flow-grid { stroke: var(--pipe-grid-color); }
- .flow-battery { stroke: var(--pipe-battery-color); }
- .flow-export { stroke: var(--export-color); }
+ .flow-solar { stroke: var(--neon-yellow); }
+ .flow-grid { stroke: var(--neon-blue); }
+ .flow-battery { stroke: var(--neon-green); }
+ .flow-export { stroke: var(--neon-red); }
@keyframes dash { to { stroke-dashoffset: -1500; } }
.flow-text {
- font-size: 10px; font-weight: bold; text-anchor: middle; fill: #fff; transition: opacity 0.3s ease;
+ font-size: 10px; font-weight: bold; text-anchor: middle; fill: #fff; filter: drop-shadow(0px 1px 2px rgba(0,0,0,0.8)); transition: opacity 0.3s ease;
}
.flow-text.no-shadow { filter: none; }
- .text-solar { fill: var(--pipe-solar-color); }
- .text-grid { fill: var(--pipe-grid-color); }
- .text-export { fill: var(--export-color); }
- .text-battery { fill: var(--pipe-battery-color); }
+ .text-solar { fill: var(--neon-yellow); }
+ .text-grid { fill: var(--neon-blue); }
+ .text-export { fill: var(--neon-red); }
+ .text-battery { fill: var(--neon-green); }
`;
- }
+ }
- // --- SVG ICON RENDERER ---
- _renderIcon(type, val = 0, colorOverride = null) {
+ // --- SVG ICON RENDERER ---
+ _renderIcon(type, val = 0, colorOverride = null) {
if (type === 'solar') {
- const animate = Math.round(val) > 0 ? 'spin-slow' : '';
- const color = colorOverride || 'var(--icon-solar-color)';
- return html``;
+ const animate = Math.round(val) > 0 ? 'spin-slow' : '';
+ const color = colorOverride || 'var(--neon-yellow)';
+ return html``;
}
if (type === 'grid') {
- const animate = Math.round(val) > 0 ? 'pulse' : '';
- const color = colorOverride || 'var(--icon-grid-color)';
- return html``;
+ const animate = Math.round(val) > 0 ? 'pulse' : '';
+ const color = colorOverride || 'var(--neon-blue)';
+ return html``;
}
if (type === 'battery') {
- const soc = Math.min(Math.max(val, 0), 100) / 100;
- const rectHeight = 14 * soc;
- const rectY = 18 - rectHeight;
- const strokeColor = colorOverride || 'var(--icon-battery-color)';
- const rectColor = soc > 0.2 ? strokeColor : 'var(--neon-red)';
- return html``;
+ const soc = Math.min(Math.max(val, 0), 100) / 100;
+ const rectHeight = 14 * soc;
+ const rectY = 18 - rectHeight;
+ const rectColor = soc > 0.2 ? 'var(--neon-green)' : 'var(--neon-red)';
+ return html``;
}
if (type === 'house') {
- const strokeColor = colorOverride || 'var(--icon-house-color)';
- return html``;
+ const strokeColor = colorOverride || 'var(--neon-pink)';
+ return html``;
}
if (type === 'car') {
- const c = colorOverride || 'var(--icon-consumer-1-color)';
- return html``;
+ return html``;
}
if (type === 'heater') {
- const c = colorOverride || 'var(--icon-consumer-2-color)';
- return html``;
+ return html``;
}
if (type === 'pool') {
- const c = colorOverride || 'var(--icon-consumer-3-color)';
- return html``;
+ return html``;
}
return html``;
- }
+ }
- _formatPower(val) {
+ _formatPower(val) {
if (val === 0) return "0";
if (Math.abs(val) >= 1000) {
- return (val / 1000).toFixed(1) + " kW";
+ return (val / 1000).toFixed(1) + " kW";
}
return Math.round(val) + " W";
- }
+ }
- _getConsumerColor(index) {
- const style = getComputedStyle(this);
- return style.getPropertyValue(`--consumer-${index}-color`).trim() || ['#a855f7', '#f97316', '#06b6d4'][index - 1];
- }
-
- _getConsumerPipeColor(index) {
- const style = getComputedStyle(this);
- return style.getPropertyValue(`--pipe-consumer-${index}-color`).trim() || this._getConsumerColor(index);
- }
-
- // --- DOM NODE SVG GENERATOR ---
- _renderSVGPath(d, color) {
+ // --- DOM NODE SVG GENERATOR ---
+ _renderSVGPath(d, color) {
const path = document.createElementNS("http://www.w3.org/2000/svg", "path");
path.setAttribute("d", d);
path.setAttribute("class", "bracket-line");
@@ -498,29 +352,29 @@ console.log(
path.style.stroke = color;
path.style.fill = "none";
return path;
- }
+ }
- // --- SQUARE BRACKET GENERATOR ---
- _createBracketPath(startPx, widthPx, direction) {
+ // --- SQUARE BRACKET GENERATOR ---
+ _createBracketPath(startPx, widthPx, direction) {
if (widthPx < 5) return "";
-
- const r = 5;
+
+ const r = 5;
const startX = startPx;
const endX = startPx + widthPx;
-
+
let yBase, yLine;
-
+
if (direction === 'down') {
- yBase = 24;
- yLine = 4;
+ yBase = 24;
+ yLine = 4;
} else {
- yBase = 0;
- yLine = 20;
+ yBase = 0;
+ yLine = 20;
}
const height = Math.abs(yBase - yLine);
const rEff = Math.min(r, height / 2, widthPx / 2);
-
+
const yCorner = direction === 'down' ? yLine + rEff : yLine - rEff;
return `
@@ -531,103 +385,79 @@ console.log(
Q ${endX} ${yLine} ${endX} ${yCorner}
L ${endX} ${yBase}
`;
- }
+ }
- // --- RENDER COMPACT VIEW ---
- _renderCompactView(entities) {
+ // --- RENDER COMPACT VIEW ---
+ _renderCompactView(entities) {
// 1. Get Values
const getVal = (entity) => {
- const state = this.hass.states[entity];
- return state ? parseFloat(state.state) || 0 : 0;
- };
- const getValKw = (entity, isKw) => {
- return getVal(entity) * (isKw ? 1000 : 1);
+ const state = this.hass.states[entity];
+ return state ? parseFloat(state.state) || 0 : 0;
};
const solar = entities.solar ? Math.max(0, getVal(entities.solar)) : 0;
- const hasGridCombined = !!(entities.grid_combined && entities.grid_combined !== "");
- const gridCombinedVal = hasGridCombined ? getVal(entities.grid_combined) : 0;
- const gridMain = hasGridCombined ? gridCombinedVal : (entities.grid ? getVal(entities.grid) : 0);
+ const gridMain = entities.grid ? getVal(entities.grid) : 0;
const gridExportSensor = entities.grid_export ? getVal(entities.grid_export) : 0;
- let battery = entities.battery ? getVal(entities.battery) : 0;
- if (this.config.invert_battery) {
- battery *= -1;
- }
- let c1Val = entities.consumer_1 ? getValKw(entities.consumer_1, this.config.consumer_1_unit_kw === true) : 0; // EV Value
- if (this.config.invert_consumer_1) { c1Val *= -1; }
- c1Val = Math.abs(c1Val);
+ const battery = entities.battery ? getVal(entities.battery) : 0;
+ const c1Val = entities.consumer_1 ? getVal(entities.consumer_1) : 0; // EV Value
// 2. Logic Calculation
let gridImport = 0;
let gridExport = 0;
- if (hasGridCombined) {
- // COMBINED SENSOR: positive = import, negative = export
- gridImport = gridCombinedVal > 0 ? gridCombinedVal : 0;
- gridExport = gridCombinedVal < 0 ? Math.abs(gridCombinedVal) : 0;
- } else if (entities.grid_export && entities.grid_export !== "") {
- gridImport = gridMain > 0 ? gridMain : 0;
- gridExport = Math.abs(gridExportSensor);
+ if (entities.grid_export && entities.grid_export !== "") {
+ gridImport = gridMain > 0 ? gridMain : 0;
+ gridExport = Math.abs(gridExportSensor);
} else {
- gridImport = gridMain > 0 ? gridMain : 0;
- gridExport = gridMain < 0 ? Math.abs(gridMain) : 0;
+ gridImport = gridMain > 0 ? gridMain : 0;
+ gridExport = gridMain < 0 ? Math.abs(gridMain) : 0;
}
- // Check for separate battery charge/discharge sensors
- const hasBattChargeSensor = !!(entities.battery_charge && entities.battery_charge !== "");
- const hasBattDischargeSensor = !!(entities.battery_discharge && entities.battery_discharge !== "");
-
- const batteryCharge = hasBattChargeSensor ? Math.abs(getVal(entities.battery_charge)) : (battery > 0 ? battery : 0);
- const batteryDischarge = hasBattDischargeSensor ? Math.abs(getVal(entities.battery_discharge)) : (battery < 0 ? Math.abs(battery) : 0);
+ const batteryCharge = battery > 0 ? battery : 0;
+ const batteryDischarge = battery < 0 ? Math.abs(battery) : 0;
let solarToBatt = 0;
let gridToBatt = 0;
if (batteryCharge > 0) {
- const hasGridToBattSensor = !!(entities.grid_to_battery && entities.grid_to_battery !== "");
- if (hasGridToBattSensor) {
- gridToBatt = Math.abs(getVal(entities.grid_to_battery));
- solarToBatt = Math.max(0, batteryCharge - gridToBatt);
- } else {
if (solar >= batteryCharge) {
- solarToBatt = batteryCharge;
- gridToBatt = 0;
+ solarToBatt = batteryCharge;
+ gridToBatt = 0;
} else {
- solarToBatt = solar;
- gridToBatt = batteryCharge - solar;
+ solarToBatt = solar;
+ gridToBatt = batteryCharge - solar;
}
- }
}
const solarTotalToCons = Math.max(0, solar - solarToBatt - gridExport);
const gridTotalToCons = Math.max(0, gridImport - gridToBatt);
const battTotalToCons = batteryDischarge;
-
+
const totalCons = solarTotalToCons + gridTotalToCons + battTotalToCons;
-
+
// Calculate Splits
let evPower = 0;
let housePower = totalCons;
-
+
if (c1Val > 0 && totalCons > 0) {
- evPower = Math.min(c1Val, totalCons);
- housePower = totalCons - evPower;
+ evPower = Math.min(c1Val, totalCons);
+ housePower = totalCons - evPower;
}
-
+
// Calculate Total Bar Width (Flux)
// The Bar represents: Battery Discharge + Solar + Grid Import
// This MUST equal: House + EV + Export + Battery Charge
-
+
// SOURCES (for Bar Segments)
const srcBattery = batteryDischarge;
- const srcSolar = solar; // Solar includes Export + Charge + Cons
- const srcGrid = gridImport;
-
+ const srcSolar = solar; // Solar includes Export + Charge + Cons
+ const srcGrid = gridImport;
+
const totalFlux = srcBattery + srcSolar + srcGrid;
-
+
// DESTINATIONS (for Bottom Brackets)
- const destHouse = housePower;
- const destEV = evPower;
+ const destHouse = housePower;
+ const destEV = evPower;
const destExport = gridExport;
// Note: Battery Charge is also a destination (internal flow), but usually not bracketed if we only want "Consumers"
// If we don't bracket Charge, there will be a gap. We can accept that or add a Charge bracket.
@@ -635,10 +465,10 @@ console.log(
const threshold = 0.1;
const availableWidth = (this._cardWidth && this._cardWidth > 0) ? this._cardWidth : (this.offsetWidth || 400);
- const fullWidth = availableWidth - 40;
+ const fullWidth = availableWidth - 40;
if (totalFlux <= threshold) {
- return html`
${renderMainIcon('solar', solarVal, iconSolar, solarColor)}
- ${renderSecondaryOrLabel(labelSolarText, showLabelSolar, entities.secondary_solar, hasSecondarySolar)}
-
` : ''}
${hasGrid ? html`
- ${this._formatPower(solarVal)}
+ ${renderLabel(labelSolarText, showLabelSolar)}
+ ${this._formatPower(solarVal)}
this._handleClick(entities.grid_combined || entities.grid)}>
- ${renderMainIcon('grid', isGridExporting ? gridExport : gridImport, iconGrid, gridIconColor)}
- ${renderSecondaryOrLabel(labelGridText, showLabelGrid, entities.secondary_grid, hasSecondaryGrid)}
- 
-
+
+
### ✨ Funktionen
@@ -26,21 +24,9 @@ Wenn euch die custom Card gefällt, würde ich mich sehr über eine Sternebewert
- **Donut Chart**: Optionales Donut-Diagramm um das Haus-Icon, das den Energiemix zeigt.
- **Kometenschweif / Gestrichelte Linien**: Wählen Sie Ihren bevorzugten Animationsstil.
- **Zoom**: Anpassbare Größe für Ihr Dashboard.
- - **Benutzerdefinierte Farben**: Definiere benutzerdefinierte Farben für jede Quelle und jeden Verbraucher über den Editor.
- - **Hintergrundfarbe**: Aktiviere einen leicht getönten Hintergrund für die Kreise in der Standard-Ansicht.
-- **Dynamische Animationsgeschwindigkeit**: Partikelgeschwindigkeit und -dichte passen sich dem aktuellen Energiefluss an.
-- **Weitere Informationen**: Klicke auf eine beliebige Quelle/Verbraucher, um detaillierte Informationen in einem More-Info-Dialog anzuzeigen.
-- **Netz-Import/Export**: Unterstützt sowohl separate Import/Export-Entitäten als auch eine kombinierte Entität mit positiven/negativen Werten.
-- **Netz-zu-Batterie**: Optionaler direkter Sensor für den Netz-zu-Batterie-Fluss, der die Standardberechnung umgeht.
-- **Sekundäre Sensoren**: Optional können sekundäre Sensorwerte in den Hauptkreisen (z.B. Tagesertrag für Solar, aktuelle Lade-/Entladeleistung für Batterie) angezeigt werden.
- **Lokalisierung**: Vollständig übersetzt in Deutsch und Englisch.
- **Visueller Editor**: Einfache Konfiguration über die Home Assistant UI.
-[](https://www.youtube.com/watch?v=HGFBJJRWGW0
-)
-
----
-
### 🚀 Installation
### HACS (Empfohlen)
@@ -49,28 +35,25 @@ Wenn euch die custom Card gefällt, würde ich mich sehr über eine Sternebewert
[](https://my.home-assistant.io/redirect/hacs_repository/?owner=jayjojayson&repository=power-flux-card&category=plugin)
-- Das "Power Flux Card" sollte nun in HACS verfügbar sein. Klicke auf "INSTALLIEREN" ("INSTALL").
+- Das "Detailed Charts Panel" sollte nun in HACS verfügbar sein. Klicke auf "INSTALLIEREN" ("INSTALL").
- Die Ressource wird automatisch zu deiner Lovelace-Konfiguration hinzugefügt.
-
+-
#### HACS (manuell)
-1. Stelle sicher, dass HACS installiert ist.
-2. Füge dieses Repository als benutzerdefiniertes Repository in HACS hinzu.
-3. Suche nach "Power Flux Card" und installieren Sie es.
-4. Lade die Ressourcen neu, falls Sie dazu aufgefordert werden.
+1. Stellen Sie sicher, dass HACS installiert ist.
+2. Fügen Sie dieses Repository als benutzerdefiniertes Repository in HACS hinzu.
+3. Suchen Sie nach "Power Flux Card" und installieren Sie es.
+4. Laden Sie die Ressourcen neu, falls Sie dazu aufgefordert werden.
#### Manuelle Installation
-1. Lade die Datei `power-flux-card.js` von der [Releases](../../releases)-Seite herunter.
-2. Lade sie in Ihren `www/community/power-flux-card/`-Ordner in Home Assistant hoch.
-3. Füge die Ressource in Ihrer Dashboard-Konfiguration hinzu:
- - URL: `/local/community/power-flux-card/power-flux-card.js`
+1. Laden Sie die Datei `power-flux-card.js` von der [Releases](../../releases)-Seite herunter.
+2. Laden Sie sie in Ihren `www`-Ordner in Home Assistant hoch.
+3. Fügen Sie die Ressource in Ihrer Dashboard-Konfiguration hinzu:
+ - URL: `/local/power-flux-card.js`
- Typ: JavaScript Module
-
----
-
### ⚙️ Konfiguration
-Du kannst die Karte direkt über den visuellen Editor in Home Assistant konfigurieren.
+Sie können die Karte direkt über den visuellen Editor in Home Assistant konfigurieren.
**Haupt-Entitäten:**
- **Solar**: Erzeugung (W).
@@ -78,7 +61,7 @@ Du kannst die Karte direkt über den visuellen Editor in Home Assistant konfigur
- **Batterie**: Batterieleistung (W) und Ladestand (%).
**Zusätzliche Verbraucher:**
-- Du kannst bis zu 3 individuelle Verbraucher (z.B. Auto, Heizung, Pool) mit eigenen Icons und Beschriftungen hinzufügen.
+- Sie können bis zu 3 individuelle Verbraucher (z.B. Auto, Heizung, Pool) mit eigenen Icons und Beschriftungen hinzufügen.
**Optionen:**
- **Zoom**: Passen Sie die Größe der Karte an.
@@ -86,151 +69,3 @@ Du kannst die Karte direkt über den visuellen Editor in Home Assistant konfigur
- **Donut Chart**: Zeigt den Energiemix als Ring um das Haus an.
- **Kometenschweif / Gestrichelte Linie**: Ändern Sie den Stil der Flussanimation.
- **Kompakte Ansicht**: Wechseln Sie zum Balkendiagramm-Layout.
-- **Farboptionen**: Definieren Sie benutzerdefinierte Farben für jede Quelle und Verbraucher.
-- **Netz-Import/Export**: Konfigurieren Sie separate oder kombinierte Entitäten.
-- **Netz-zu-Batterie**: Optionaler direkter Sensor für den Netz-zu-Batterie-Fluss.
-- **Batterie getrennte Sensoren**: Optional separate Sensoren für Batterie-Ladung und -Entladung.
-- **Sekundäre Sensoren**: Zeigen Sie alternative Werte in den Hauptkreisen an (z.B. Tagesertrag, aktuelle Ladeleistung).
-
-
-
- ${this._renderEntitySelector(entitySelectorSchema, entities.solar, 'solar', this._localize('editor.entity'))}
+
- ${isGridExporting ? html`▲` : (isGridActive ? html`▼` : '')}
- ${this._formatPower(isGridExporting ? gridExport : gridImport)}
-
+
+ ${renderMainIcon('grid', gridImport, iconGrid, gridColor)}
+ ${renderLabel(labelGridText, showLabelGrid)}
+
` : ''}
${hasBattery ? html`
- ${this._formatPower(gridImport)}
this._handleClick(entities.battery)}>
+
`;
- }
-
- render() {
- if (!this.config || !this.hass) return html``;
-
- // SWITCH VIEW BASED ON CONFIG
- if (this.config.compact_view === true) {
- return this._renderCompactView(this.config.entities || {});
- } else {
- return this._renderStandardView(this.config.entities || {});
- }
- }
}
- customElements.define("power-flux-card", PowerFluxCard);
-})(lang_en, lang_de);
+ render() {
+ if (!this.config || !this.hass) return html``;
+
+ // SWITCH VIEW BASED ON CONFIG
+ if (this.config.compact_view === true) {
+ return this._renderCompactView(this.config.entities || {});
+ } else {
+ return this._renderStandardView(this.config.entities || {});
+ }
+ }
+}
+
+customElements.define("power-flux-card", PowerFluxCard);
window.customCards = window.customCards || [];
window.customCards.push({
diff --git a/docs/README-de.md b/docs/README-de.md
index 8f75370..71ad75d 100644
--- a/docs/README-de.md
+++ b/docs/README-de.md
@@ -9,12 +9,10 @@
# Power Flux Card
-Die ⚡Power Flux Card ist eine erweiterte, animierte Energiefluss-Karte für Home Assistant. Sie visualisiert die Energieverteilung zwischen Solar, Netz, Batterie und Verbrauchern mit wunderschönen Neon-Effekten und verschiedenen Animationen.
+Die ⚡Power Flux Card ist eine erweiterte, animierte Energiefluss-Karte für Home Assistant. Sie visualisiert die Energieverteilung zwischen Solar, Netz, Batterie und Verbrauchern mit wunderschönen Neon-Effekten und flüssigen Animationen.
-Wenn euch die custom Card gefällt, würde ich mich sehr über eine Sternebewertung ⭐ freuen. 🤗
-
-
${renderMainIcon('battery', battSoc, iconBattery)}
- ${renderSecondaryOrLabel(labelBatteryText, showLabelBattery, entities.secondary_battery, hasSecondaryBattery)}
-
` : ''}
- ${Math.round(battSoc)}%
+ ${renderLabel(labelBatteryText, showLabelBattery)}
+ ${Math.round(battSoc)}%
this._handleClick(entities.house)}>
- ${renderMainIcon('house', 0, null, this.config.color_icon_house ? 'var(--icon-house-color)' : houseDominantColor)}
+
+ ${renderMainIcon('house', 0, null, houseDominantColor)}
${renderLabel(labelHouseText, showLabelHouse)}
-
- ${renderConsumer(showC1, 'c1', 'consumer_1', labelC1, 'car', c1Val, this._getConsumerColor(1))}
- ${renderConsumer(showC2, 'c2', 'consumer_2', labelC2, 'heater', c2Val, this._getConsumerColor(2))}
- ${renderConsumer(showC3, 'c3', 'consumer_3', labelC3, 'pool', c3Val, this._getConsumerColor(3))}
+ ${renderConsumer(showC1, 'c1', 'consumer_1', labelC1, 'car', c1Val, '#a855f7')}
+ ${renderConsumer(showC2, 'c2', 'consumer_2', labelC2, 'heater', c2Val, '#f97316')}
+ ${renderConsumer(showC3, 'c3', 'consumer_3', labelC3, 'pool', c3Val, '#06b6d4')}
${this._formatPower(houseDisplay)}
+ ${this._formatPower(house)}
-
+
+
### ✨ Funktionen
@@ -26,21 +24,9 @@ Wenn euch die custom Card gefällt, würde ich mich sehr über eine Sternebewert
- **Donut Chart**: Optionales Donut-Diagramm um das Haus-Icon, das den Energiemix zeigt.
- **Kometenschweif / Gestrichelte Linien**: Wählen Sie Ihren bevorzugten Animationsstil.
- **Zoom**: Anpassbare Größe für Ihr Dashboard.
- - **Benutzerdefinierte Farben**: Definiere benutzerdefinierte Farben für jede Quelle und jeden Verbraucher über den Editor.
- - **Hintergrundfarbe**: Aktiviere einen leicht getönten Hintergrund für die Kreise in der Standard-Ansicht.
-- **Dynamische Animationsgeschwindigkeit**: Partikelgeschwindigkeit und -dichte passen sich dem aktuellen Energiefluss an.
-- **Weitere Informationen**: Klicke auf eine beliebige Quelle/Verbraucher, um detaillierte Informationen in einem More-Info-Dialog anzuzeigen.
-- **Netz-Import/Export**: Unterstützt sowohl separate Import/Export-Entitäten als auch eine kombinierte Entität mit positiven/negativen Werten.
-- **Netz-zu-Batterie**: Optionaler direkter Sensor für den Netz-zu-Batterie-Fluss, der die Standardberechnung umgeht.
-- **Sekundäre Sensoren**: Optional können sekundäre Sensorwerte in den Hauptkreisen (z.B. Tagesertrag für Solar, aktuelle Lade-/Entladeleistung für Batterie) angezeigt werden.
- **Lokalisierung**: Vollständig übersetzt in Deutsch und Englisch.
- **Visueller Editor**: Einfache Konfiguration über die Home Assistant UI.
-[](https://www.youtube.com/watch?v=HGFBJJRWGW0
-)
-
----
-
### 🚀 Installation
### HACS (Empfohlen)
@@ -49,28 +35,25 @@ Wenn euch die custom Card gefällt, würde ich mich sehr über eine Sternebewert
[](https://my.home-assistant.io/redirect/hacs_repository/?owner=jayjojayson&repository=power-flux-card&category=plugin)
-- Das "Power Flux Card" sollte nun in HACS verfügbar sein. Klicke auf "INSTALLIEREN" ("INSTALL").
+- Das "Detailed Charts Panel" sollte nun in HACS verfügbar sein. Klicke auf "INSTALLIEREN" ("INSTALL").
- Die Ressource wird automatisch zu deiner Lovelace-Konfiguration hinzugefügt.
-
+-
#### HACS (manuell)
-1. Stelle sicher, dass HACS installiert ist.
-2. Füge dieses Repository als benutzerdefiniertes Repository in HACS hinzu.
-3. Suche nach "Power Flux Card" und installieren Sie es.
-4. Lade die Ressourcen neu, falls Sie dazu aufgefordert werden.
+1. Stellen Sie sicher, dass HACS installiert ist.
+2. Fügen Sie dieses Repository als benutzerdefiniertes Repository in HACS hinzu.
+3. Suchen Sie nach "Power Flux Card" und installieren Sie es.
+4. Laden Sie die Ressourcen neu, falls Sie dazu aufgefordert werden.
#### Manuelle Installation
-1. Lade die Datei `power-flux-card.js` von der [Releases](../../releases)-Seite herunter.
-2. Lade sie in Ihren `www/community/power-flux-card/`-Ordner in Home Assistant hoch.
-3. Füge die Ressource in Ihrer Dashboard-Konfiguration hinzu:
- - URL: `/local/community/power-flux-card/power-flux-card.js`
+1. Laden Sie die Datei `power-flux-card.js` von der [Releases](../../releases)-Seite herunter.
+2. Laden Sie sie in Ihren `www`-Ordner in Home Assistant hoch.
+3. Fügen Sie die Ressource in Ihrer Dashboard-Konfiguration hinzu:
+ - URL: `/local/power-flux-card.js`
- Typ: JavaScript Module
-
----
-
### ⚙️ Konfiguration
-Du kannst die Karte direkt über den visuellen Editor in Home Assistant konfigurieren.
+Sie können die Karte direkt über den visuellen Editor in Home Assistant konfigurieren.
**Haupt-Entitäten:**
- **Solar**: Erzeugung (W).
@@ -78,7 +61,7 @@ Du kannst die Karte direkt über den visuellen Editor in Home Assistant konfigur
- **Batterie**: Batterieleistung (W) und Ladestand (%).
**Zusätzliche Verbraucher:**
-- Du kannst bis zu 3 individuelle Verbraucher (z.B. Auto, Heizung, Pool) mit eigenen Icons und Beschriftungen hinzufügen.
+- Sie können bis zu 3 individuelle Verbraucher (z.B. Auto, Heizung, Pool) mit eigenen Icons und Beschriftungen hinzufügen.
**Optionen:**
- **Zoom**: Passen Sie die Größe der Karte an.
@@ -86,151 +69,3 @@ Du kannst die Karte direkt über den visuellen Editor in Home Assistant konfigur
- **Donut Chart**: Zeigt den Energiemix als Ring um das Haus an.
- **Kometenschweif / Gestrichelte Linie**: Ändern Sie den Stil der Flussanimation.
- **Kompakte Ansicht**: Wechseln Sie zum Balkendiagramm-Layout.
-- **Farboptionen**: Definieren Sie benutzerdefinierte Farben für jede Quelle und Verbraucher.
-- **Netz-Import/Export**: Konfigurieren Sie separate oder kombinierte Entitäten.
-- **Netz-zu-Batterie**: Optionaler direkter Sensor für den Netz-zu-Batterie-Fluss.
-- **Batterie getrennte Sensoren**: Optional separate Sensoren für Batterie-Ladung und -Entladung.
-- **Sekundäre Sensoren**: Zeigen Sie alternative Werte in den Hauptkreisen an (z.B. Tagesertrag, aktuelle Ladeleistung).
-
-
-
-
\ No newline at end of file
diff --git a/docs/images/power-flux-card-ani.gif b/docs/images/power-flux-card-ani.gif
deleted file mode 100644
index cb3a364..0000000
Binary files a/docs/images/power-flux-card-ani.gif and /dev/null differ
diff --git a/docs/images/power-flux-card-compact.jpg b/docs/images/power-flux-card-compact.jpg
index 19fafd0..1c9f043 100644
Binary files a/docs/images/power-flux-card-compact.jpg and b/docs/images/power-flux-card-compact.jpg differ
diff --git a/docs/images/power-flux-card-compact2.jpg b/docs/images/power-flux-card-compact2.jpg
deleted file mode 100644
index 04dc763..0000000
Binary files a/docs/images/power-flux-card-compact2.jpg and /dev/null differ
diff --git a/src/lang-de.js b/src/lang-de.js
index 8e7845b..332556d 100644
--- a/src/lang-de.js
+++ b/src/lang-de.js
@@ -9,47 +9,12 @@ export default {
"editor.consumers_section": "Zusätzliche Verbraucher",
"editor.options_section": "Darstellung & Optionen",
"editor.flow_rate_title": "Flussraten (W) an Röhren anzeigen",
- "editor.invert_battery": "Wert umkehren (+/-)",
"editor.label_toggle": "Label im Kreis anzeigen",
"editor.compact_view": "Kompakte Ansicht (evcc)",
"editor.hide_inactive": "Inaktive Röhren ausblenden",
- "editor.entity": "Kombinierter Batterie Sensor (W)",
+ "editor.entity": "Entität (Watt)",
"editor.label": "Beschriftung",
"editor.icon": "Icon",
- "editor.back": "Zurück",
- "editor.battery_soc_label": "Ladestand (%)",
- "editor.house_total_title": "🏠 Gesamtverbrauch (optional)",
- "editor.house_sensor_label": "Sensor für Hausverbrauch (optional)",
- "editor.house_sensor_hint": "Wird benötigt, damit das Haus-Icon anklickbar ist (more-details). Ansonsten wird der Hausverbrauch berechnet.",
- "editor.consumer_1_title": "🚗 Links (Lila)",
- "editor.consumer_2_title": "♨️ Mitte (Orange)",
- "editor.consumer_3_title": "🏊 Rechts (Türkis)",
- "editor.zoom_label": "🔍 Zoom (Standard View)",
- "editor.neon_glow": "Neon Glow",
- "editor.donut_chart": "Donut Chart (Grid/Haus)",
- "editor.comet_tail": "Comet Tail Effect",
- "editor.dashed_line": "Dashed Line Effect",
- "editor.tinted_background": "Farbiger Hintergrund in Kreisen",
- "editor.colored_values": "Farbige Textwerte",
- "editor.hide_consumer_icons": "Icons unten ausblenden",
- "editor.invert_consumer_1": "Sensorwert invertieren (+/-)",
- "editor.secondary_sensor": "Zweiter Sensor (nur Anzeige)",
- "editor.grid_to_battery_sensor": "Netz-zu-Batterie Sensor (W, Optional)",
- "editor.grid_to_battery_hint": "Optional: separater Sensor für den Netz-zu-Batterie Fluss. Wenn leer, wird der Wert automatisch berechnet.",
- "editor.grid_combined_sensor": "Kombinierter Netz-Sensor (W, Optional)",
- "editor.grid_combined_hint": "Ein Sensor für Import UND Export: positiv = Import, negativ = Export. Überschreibt den kombinierten Import/Export Sensor.",
- "editor.color_picker": "Bubble",
- "editor.pipe_color": "Pipe",
- "editor.export_color": "Export",
- "editor.consumer_unit_kw": "Sensor meldet in kW",
- "editor.show_consumer_always": "Verbraucher bei null Watt anzeigen",
- "editor.battery_charge_sensor": "Batterie-Ladung Sensor (W, Optional)",
- "editor.battery_discharge_sensor": "Batterie-Entladung Sensor (W, Optional)",
- "editor.battery_separate_hint": "Optional: Separate Sensoren für Laden/Entladen. Überschreiben den Hauptsensor für die Berechnung.",
- "editor.consumer_1_hide_pipe": "Pipe bei geringer Leistung ausblenden",
- "editor.consumer_pipe_threshold": "Pipe-Schwellenwert (Watt)",
- "editor.text_color": "Text",
- "editor.icon_color": "Icon",
},
card: {
"card.label_solar": "Solar",
@@ -57,7 +22,7 @@ export default {
"card.label_battery": "Batterie",
"card.label_house": "Verbrauch",
"card.label_car": "E-Auto",
- "card.label_heater": "Heizung",
- "card.label_pool": "Pool",
+ "card.label_import": "Import",
+ "card.label_export": "Export",
}
};
diff --git a/src/lang-en.js b/src/lang-en.js
index 46ae1ca..bde372d 100644
--- a/src/lang-en.js
+++ b/src/lang-en.js
@@ -9,47 +9,12 @@ export default {
"editor.consumers_section": "Additional Consumers",
"editor.options_section": "Appearance & Options",
"editor.flow_rate_title": "Show Flow Rates (W) on pipes",
- "editor.invert_battery": "Invert Power Value (+/-)",
"editor.label_toggle": "Show Label in Bubble",
"editor.compact_view": "Compact View (evcc)",
"editor.hide_inactive": "Hide Inactive Pipes",
- "editor.entity": "Combined Battery Sensor (W)",
+ "editor.entity": "Entity (Watt)",
"editor.label": "Label",
"editor.icon": "Icon",
- "editor.back": "Back",
- "editor.battery_soc_label": "State of Charge (%)",
- "editor.house_total_title": "🏠 Total Consumption (optional)",
- "editor.house_sensor_label": "Sensor for House Consumption (optional)",
- "editor.house_sensor_hint": "Required to make the house icon clickable (more-details). Otherwise, the house consumption is calculated.",
- "editor.consumer_1_title": "🚗 Left (Purple)",
- "editor.consumer_2_title": "♨️ Center (Orange)",
- "editor.consumer_3_title": "🏊 Right (Cyan)",
- "editor.zoom_label": "🔍 Zoom (Standard View)",
- "editor.neon_glow": "Neon Glow",
- "editor.donut_chart": "Donut Chart (Grid/House)",
- "editor.comet_tail": "Comet Tail Effect",
- "editor.dashed_line": "Dashed Line Effect",
- "editor.tinted_background": "Tinted Background in Bubbles",
- "editor.colored_values": "Colored Text Values",
- "editor.hide_consumer_icons": "Hide Consumer Icons",
- "editor.invert_consumer_1": "Invert Sensor Value (+/-)",
- "editor.secondary_sensor": "Secondary Sensor (display only)",
- "editor.grid_to_battery_sensor": "Grid to Battery Sensor (W, optional)",
- "editor.grid_to_battery_hint": "Optional: separate sensor for grid-to-battery flow. If empty, the value is calculated automatically.",
- "editor.grid_combined_sensor": "Combined Grid Sensor (W, Optional)",
- "editor.grid_combined_hint": "Single sensor for import AND export: positive = import, negative = export. Overrides combined import/export sensor.",
- "editor.color_picker": "Bubble Color",
- "editor.pipe_color": "Pipe Color",
- "editor.export_color": "Export Color",
- "editor.consumer_unit_kw": "Sensor reports in kW",
- "editor.show_consumer_always": "Show Consumers at zero watts",
- "editor.battery_charge_sensor": "Battery Charge Sensor (W, Optional)",
- "editor.battery_discharge_sensor": "Battery Discharge Sensor (W, Optional)",
- "editor.battery_separate_hint": "Optional: Separate sensors for charge/discharge. Override the main sensor for calculations.",
- "editor.consumer_1_hide_pipe": "Hide pipe at low power",
- "editor.consumer_pipe_threshold": "Pipe Threshold (Watts)",
- "editor.text_color": "Text Color",
- "editor.icon_color": "Icon Color",
},
card: {
"card.label_solar": "Solar",
@@ -57,7 +22,7 @@ export default {
"card.label_battery": "Battery",
"card.label_house": "Consumption",
"card.label_car": "Car",
- "card.label_heater": "Heater",
- "card.label_pool": "Pool",
+ "card.label_import": "Import",
+ "card.label_export": "Export",
}
};
diff --git a/src/power-flux-card-editor.js b/src/power-flux-card-editor.js
index 7702902..84ed4d9 100644
--- a/src/power-flux-card-editor.js
+++ b/src/power-flux-card-editor.js
@@ -1,23 +1,14 @@
-import lang_en from "./lang-en.js";
-import lang_de from "./lang-de.js";
-
-const editorTranslations = {
- "en": lang_en.editor,
- "de": lang_de.editor
-};
-
-
const fireEvent = (node, type, detail, options) => {
- options = options || {};
- detail = detail === null || detail === undefined ? {} : detail;
- const event = new Event(type, {
- bubbles: options.bubbles === undefined ? true : options.bubbles,
- cancelable: Boolean(options.cancelable),
- composed: options.composed === undefined ? true : options.composed,
- });
- event.detail = detail;
- node.dispatchEvent(event);
- return event;
+ options = options || {};
+ detail = detail === null || detail === undefined ? {} : detail;
+ const event = new Event(type, {
+ bubbles: options.bubbles === undefined ? true : options.bubbles,
+ cancelable: Boolean(options.cancelable),
+ composed: options.composed === undefined ? true : options.composed,
+ });
+ event.detail = detail;
+ node.dispatchEvent(event);
+ return event;
};
const LitElement = customElements.get("ha-lit-element") || Object.getPrototypeOf(customElements.get("home-assistant-main"));
@@ -25,174 +16,83 @@ const html = LitElement.prototype.html;
const css = LitElement.prototype.css;
class PowerFluxCardEditor extends LitElement {
+
+ static get properties() {
+ return {
+ hass: {},
+ _config: { state: true },
+ _subView: { state: true } // Controls which sub-page is open (null = main)
+ };
+ }
- static get properties() {
- return {
- hass: {},
- _config: { state: true },
- _subView: { state: true } // Controls which sub-page is open (null = main)
- };
+ setConfig(config) {
+ this._config = config;
+ }
+
+ _localize(key) {
+ const lang = this.hass && this.hass.language ? this.hass.language : 'en';
+ const dict = editorTranslations[lang] || editorTranslations['en'];
+ return dict[key] || editorTranslations['en'][key] || key;
+ }
+
+ _valueChanged(ev) {
+ if (!this._config || !this.hass) return;
+
+ const target = ev.target;
+ const key = target.configValue || this._currentConfigValue;
+
+ let value;
+ if (target.tagName === 'HA-SWITCH') {
+ value = target.checked;
+ } else if (ev.detail && 'value' in ev.detail) {
+ value = ev.detail.value;
+ } else {
+ value = target.value;
+ }
+
+ if (value === null || value === undefined) {
+ value = "";
}
- setConfig(config) {
- this._config = config;
- }
-
- _localize(key) {
- const lang = this.hass && this.hass.language ? this.hass.language : 'en';
- const dict = editorTranslations[lang] || editorTranslations['en'];
- return dict[key] || editorTranslations['en'][key] || key;
- }
-
- _valueChanged(ev) {
- if (!this._config || !this.hass) return;
-
- const target = ev.target;
- const key = target.configValue;
-
- let value;
- if (target.tagName === 'HA-SWITCH') {
- value = target.checked;
- } else if (ev.detail && 'value' in ev.detail) {
- value = ev.detail.value;
- } else {
- value = target.value;
- }
-
- if (value === null || value === undefined) {
- value = "";
- }
-
- if (key) {
- const entityKeys = [
- 'solar', 'grid', 'grid_export', 'grid_combined',
- 'battery', 'battery_soc', 'grid_to_battery',
- 'battery_charge', 'battery_discharge',
- 'house',
- 'consumer_1', 'consumer_2', 'consumer_3',
- 'secondary_solar', 'secondary_grid', 'secondary_battery',
- 'secondary_consumer_1', 'secondary_consumer_2', 'secondary_consumer_3'
- ];
-
- let newConfig = { ...this._config };
-
- if (entityKeys.includes(key)) {
- const currentEntities = newConfig.entities || {};
- const newEntities = { ...currentEntities, [key]: value };
- newConfig.entities = newEntities;
- } else {
- newConfig[key] = value;
-
- if (key === 'show_comet_tail' && value === true) {
- newConfig.show_dashed_line = false;
- }
- if (key === 'show_dashed_line' && value === true) {
- newConfig.show_comet_tail = false;
- }
- }
-
- this._config = newConfig;
- fireEvent(this, "config-changed", { config: this._config });
- }
- }
-
- _goSubView(view) {
- this._subView = view;
- }
-
- _goBack() {
- this._subView = null;
- }
-
- _clearEntity(key) {
- const newConfig = { ...this._config };
- const currentEntities = newConfig.entities || {};
- const newEntities = { ...currentEntities, [key]: "" };
- newConfig.entities = newEntities;
- this._config = newConfig;
- fireEvent(this, "config-changed", { config: this._config });
- }
-
- _colorChanged(key, ev) {
- const newConfig = { ...this._config, [key]: ev.target.value };
- this._config = newConfig;
- fireEvent(this, "config-changed", { config: this._config });
- }
-
- _resetColor(key) {
- const newConfig = { ...this._config };
- delete newConfig[key];
- this._config = newConfig;
- fireEvent(this, "config-changed", { config: this._config });
- }
-
- _renderEntitySelector(entitySelectorSchema, value, configValue, label) {
- const val = value || "";
- return html`
- Custom Farben mit card_mod und Jinja2 Templates
- -Mit der [card_mod](https://github.com/thomasloven/lovelace-card-mod) Integration können die CSS-Variablen der Power Flux Card dynamisch per Jinja2-Templates überschrieben werden. So lassen sich Farben abhängig von Sensorwerten ändern — z.B. Solar-Icon grün bei Produktion, grau bei Stillstand. - -### Verfügbare CSS-Variablen - -| Variable | Beschreibung | -|---|---| -| `--neon-yellow` | Bubble-Farbe Solar | -| `--neon-blue` | Bubble-Farbe Grid | -| `--neon-green` | Bubble-Farbe Batterie | -| `--neon-pink` | Bubble-Farbe Haus | -| `--pipe-solar-color` | Pipe-Farbe Solar | -| `--pipe-grid-color` | Pipe-Farbe Grid | -| `--pipe-battery-color` | Pipe-Farbe Batterie | -| `--icon-solar-color` | Icon-Farbe Solar | -| `--icon-grid-color` | Icon-Farbe Grid | -| `--icon-battery-color` | Icon-Farbe Batterie | -| `--icon-house-color` | Icon-Farbe Haus | -| `--icon-consumer-1-color` | Icon-Farbe Consumer 1 | -| `--text-solar-color` | Text-Farbe Solar | -| `--text-grid-color` | Text-Farbe Grid | -| `--text-battery-color` | Text-Farbe Batterie | -| `--text-house-color` | Text-Farbe Haus | -| `--text-consumer-1-color` | Text-Farbe Consumer 1 | -| `--consumer-1-color` | Bubble-Farbe Consumer 1 | -| `--consumer-2-color` | Bubble-Farbe Consumer 2 | -| `--consumer-3-color` | Bubble-Farbe Consumer 3 | -| `--export-color` | Farbe für Export | - -### Beispiel 1: Solar-Icon — grün bei Produktion, grau bei Stillstand - -```yaml -type: custom:power-flux-card -entities: - solar: sensor.solar_power - grid: sensor.grid_power - battery: sensor.battery_power - battery_soc: sensor.battery_soc -card_mod: - style: | - :host { - {% if states('sensor.solar_power') | float > 0 %} - --icon-solar-color: #00ff88; - {% else %} - --icon-solar-color: #9e9e9e; - {% endif %} - } -``` - -### Beispiel 2: Grid-Textfarbe — rot bei Export, blau bei Import - -```yaml -type: custom:power-flux-card -entities: - solar: sensor.solar_power - grid_combined: sensor.grid_power_combined - battery: sensor.battery_power - battery_soc: sensor.battery_soc -card_mod: - style: | - :host { - {% if states('sensor.grid_power_combined') | float < 0 %} - --text-grid-color: #ff3333; - {% else %} - --text-grid-color: #3b82f6; - {% endif %} - } -``` - -### Beispiel 3: Batterie-Bubble — Farbe nach Ladestand (SoC) - -```yaml -type: custom:power-flux-card -entities: - solar: sensor.solar_power - grid: sensor.grid_power - battery: sensor.battery_power - battery_soc: sensor.battery_soc -card_mod: - style: | - :host { - {% set soc = states('sensor.battery_soc') | float %} - {% if soc > 80 %} - --neon-green: #00ff88; - {% elif soc > 30 %} - --neon-green: #f59e0b; - {% else %} - --neon-green: #ff3333; - {% endif %} - } -``` - -### Beispiel 4: Consumer-1-Pipe — sichtbar nur bei hoher Leistung, sonst transparent - -```yaml -type: custom:power-flux-card -entities: - solar: sensor.solar_power - grid: sensor.grid_power - battery: sensor.battery_power - battery_soc: sensor.battery_soc - consumer_1: sensor.wallbox_power -card_mod: - style: | - :host { - {% if states('sensor.wallbox_power') | float > 500 %} - --pipe-consumer-1-color: #a855f7; - --icon-consumer-1-color: #a855f7; - {% else %} - --pipe-consumer-1-color: rgba(168, 85, 247, 0.2); - --icon-consumer-1-color: #9e9e9e; - {% endif %} - } -``` - -### Beispiel 5: Mehrere Farben gleichzeitig — Nachtmodus (alles gedimmt wenn Solar = 0) - -```yaml -type: custom:power-flux-card -entities: - solar: sensor.solar_power - grid: sensor.grid_power - battery: sensor.battery_power - battery_soc: sensor.battery_soc - consumer_1: sensor.wallbox_power -card_mod: - style: | - :host { - {% if states('sensor.solar_power') | float == 0 %} - --icon-solar-color: #555555; - --text-solar-color: #777777; - --neon-yellow: #666633; - --pipe-solar-color: #444422; - {% endif %} - } -``` - -> **Hinweis:** card_mod muss separat über HACS installiert werden. Die Templates werden bei jedem State-Update ausgewertet, die Farben ändern sich also in Echtzeit. -
- this._clearEntity(configValue)}
- > ` : ''}
-
- `;
- }
-
- _renderColorPicker(key, label, defaultColor) {
- const currentColor = this._config[key] || defaultColor;
- const hasCustom = !!this._config[key];
- return html`
-
- this._colorChanged(key, e)}>
- ${label}
- ${hasCustom ? html` this._resetColor(key)}> ` : ''}
-
- `;
- }
-
- _renderColorPickerQuad(bubbleKey, pipeKey, textKey, iconKey, defaultColor) {
- const items = [
- { key: bubbleKey, label: this._localize('editor.color_picker'), default: defaultColor },
+ if (key) {
+ const entityKeys = [
+ 'solar', 'grid', 'grid_export',
+ 'battery', 'battery_soc',
+ 'consumer_1', 'consumer_2', 'consumer_3'
];
- if (pipeKey) items.push({ key: pipeKey, label: this._localize('editor.pipe_color'), default: defaultColor });
- items.push({ key: textKey, label: this._localize('editor.text_color'), default: defaultColor });
- items.push({ key: iconKey, label: this._localize('editor.icon_color'), default: defaultColor });
- return html`
-
- ${items.map(item => {
- const color = this._config[item.key] || item.default;
- const hasCustom = !!this._config[item.key];
- return html`
-
- `;
- }
- static get styles() {
- return css`
+ let newConfig = { ...this._config };
+
+ if (entityKeys.includes(key)) {
+ const currentEntities = newConfig.entities || {};
+ const newEntities = { ...currentEntities, [key]: value };
+ newConfig.entities = newEntities;
+ } else {
+ newConfig[key] = value;
+
+ if (key === 'show_comet_tail' && value === true) {
+ newConfig.show_dashed_line = false;
+ }
+ if (key === 'show_dashed_line' && value === true) {
+ newConfig.show_comet_tail = false;
+ }
+ }
+
+ this._config = newConfig;
+ fireEvent(this, "config-changed", { config: this._config });
+ }
+ }
+
+ _goSubView(view) {
+ this._subView = view;
+ }
+
+ _goBack() {
+ this._subView = null;
+ }
+
+ static get styles() {
+ return css`
.card-config {
display: flex;
flex-direction: column;
@@ -269,82 +169,28 @@ class PowerFluxCardEditor extends LitElement {
border-bottom: 1px solid var(--divider-color);
margin: 10px 0;
}
- .entity-picker-wrapper {
- position: relative;
- display: flex;
- align-items: center;
- gap: 4px;
- }
- .entity-picker-wrapper ha-selector {
- flex: 1;
- }
- .clear-entity-btn {
- --mdc-icon-size: 20px;
- color: var(--secondary-text-color);
- cursor: pointer;
- flex-shrink: 0;
- margin-top: -12px;
- }
- .clear-entity-btn:hover {
- color: var(--error-color, #db4437);
- }
- .color-picker-row {
- display: flex;
- align-items: center;
- gap: 12px;
- padding: 8px 0;
- }
- .color-picker-row input[type="color"] {
- -webkit-appearance: none;
- border: 2px solid var(--divider-color);
- border-radius: 50%;
- width: 30px;
- height: 30px;
- padding: 2px;
- cursor: pointer;
- background: transparent;
- }
- .color-picker-row input[type="color"]::-webkit-color-swatch-wrapper {
- padding: 0;
- }
- .color-picker-row input[type="color"]::-webkit-color-swatch {
- border: none;
- border-radius: 50%;
- }
- .color-label {
- flex: 1;
- font-size: 14px;
- }
- .color-reset-btn {
- --mdc-icon-size: 20px;
- color: var(--secondary-text-color);
- cursor: pointer;
- }
- .color-reset-btn:hover {
- color: var(--primary-color);
- }
- .color-picker-quad {
- display: flex;
- gap: 8px;
- }
- .color-picker-quad .color-picker-row {
- flex: 1;
- }
`;
- }
+ }
- // --- SUBVIEW RENDERING ---
+ // --- SUBVIEW RENDERING ---
- _renderSolarView(entities, entitySelectorSchema, textSelectorSchema, iconSelectorSchema) {
- return html`
+ _renderSolarView(entities, entitySelectorSchema, textSelectorSchema, iconSelectorSchema) {
+ return html`
- this._colorChanged(item.key, e)}>
- ${item.label}
- ${hasCustom ? html` this._resetColor(item.key)}> ` : ''}
-
- `;
- })}
-
-
${this._localize('editor.solar_section')}
${this._localize('editor.flow_rate_title')}
-
${this._localize('editor.grid_section')}
- ${this._localize('editor.grid_combined_hint')}
-
-
-
- ${this._renderEntitySelector(entitySelectorSchema, entities.grid, 'grid', this._localize('card.label_import') + " (W)")}
-
- ${this._renderEntitySelector(entitySelectorSchema, entities.grid_export, 'grid_export', this._localize('card.label_export') + " (W, Optional)")}
+ ${this._localize('editor.flow_rate_title')}
-
${this._localize('editor.battery_section')}
- ${this._localize('editor.battery_separate_hint')}
-
- ${this._renderEntitySelector(entitySelectorSchema, entities.battery_charge || "", 'battery_charge', this._localize('editor.battery_charge_sensor'))}
- ${this._renderEntitySelector(entitySelectorSchema, entities.battery_discharge || "", 'battery_discharge', this._localize('editor.battery_discharge_sensor'))}
+
- ${this._localize('editor.grid_to_battery_hint')}
-
- ${this._renderEntitySelector(entitySelectorSchema, entities.grid_to_battery || "", 'grid_to_battery', this._localize('editor.grid_to_battery_sensor'))}
-
- ${this._renderEntitySelector(entitySelectorSchema, entities.secondary_battery || "", 'secondary_battery', this._localize('editor.secondary_sensor'))}
-
- ${this._renderColorPickerQuad('color_battery', 'color_pipe_battery', 'color_text_battery', 'color_icon_battery', '#00ff88')}
${this._localize('editor.flow_rate_title')}
-
`;
- }
+ }
- _renderConsumersView(entities, entitySelectorSchema, textSelectorSchema, iconSelectorSchema) {
- return html`
+ _renderConsumersView(entities, entitySelectorSchema, textSelectorSchema, iconSelectorSchema) {
+ return html`
${this._localize('editor.invert_battery')}
-
-
${this._localize('editor.consumers_section')}
-
-
- ${this._localize('editor.house_total_title')}
- ${this._renderEntitySelector(entitySelectorSchema, entities.house || "", 'house', this._localize('editor.house_sensor_label'))}
-
- ${this._localize('editor.house_sensor_hint')}
-
-
- ${this._renderColorPickerQuad('color_house', null, 'color_text_house', 'color_icon_house', '#ff0080')}
-
-
${this._localize('editor.consumer_1_title')}
- ${this._renderEntitySelector(entitySelectorSchema, entities.consumer_1, 'consumer_1', this._localize('editor.entity'))}
+ 🚗 Links (Lila)
+
- ${this._localize('editor.invert_consumer_1')}
-
-
-
- ${this._localize('editor.consumer_1_hide_pipe')}
-
-
- ${this._config.consumer_1_hide_pipe === true ? html`
-
- ${this._localize('editor.consumer_unit_kw')}
-
-
- ${this._renderEntitySelector(entitySelectorSchema, entities.secondary_consumer_1 || "", 'secondary_consumer_1', this._localize('editor.secondary_sensor'))}
-
- ${this._renderColorPickerQuad('color_consumer_1', 'color_pipe_consumer_1', 'color_text_consumer_1', 'color_icon_consumer_1', '#a855f7')}
-
${this._localize('editor.consumer_2_title')}
- ${this._renderEntitySelector(entitySelectorSchema, entities.consumer_2, 'consumer_2', this._localize('editor.entity'))}
+ ♨️ Mitte (Orange)
+
- ${this._localize('editor.consumer_unit_kw')}
-
-
- ${this._renderEntitySelector(entitySelectorSchema, entities.secondary_consumer_2 || "", 'secondary_consumer_2', this._localize('editor.secondary_sensor'))}
-
- ${this._renderColorPickerQuad('color_consumer_2', 'color_pipe_consumer_2', 'color_text_consumer_2', 'color_icon_consumer_2', '#f97316')}
-
`;
+ }
+
+ render() {
+ if (!this.hass || !this._config) {
+ return html``;
}
- render() {
- if (!this.hass || !this._config) {
- return html``;
- }
+ const entities = this._config.entities || {};
- const entities = this._config.entities || {};
+ const entitySelectorSchema = { entity: { domain: ["sensor", "input_number"] } };
+ const textSelectorSchema = { text: {} };
+ const iconSelectorSchema = { icon: {} };
- const entitySelectorSchema = { entity: { domain: ["sensor", "input_number"] } };
- const textSelectorSchema = { text: {} };
- const iconSelectorSchema = { icon: {} };
-
- // SUBVIEW ROUTING
- if (this._subView === 'solar') return this._renderSolarView(entities, entitySelectorSchema, textSelectorSchema, iconSelectorSchema);
- if (this._subView === 'grid') return this._renderGridView(entities, entitySelectorSchema, textSelectorSchema, iconSelectorSchema);
- if (this._subView === 'battery') return this._renderBatteryView(entities, entitySelectorSchema, textSelectorSchema, iconSelectorSchema);
- if (this._subView === 'consumers') return this._renderConsumersView(entities, entitySelectorSchema, textSelectorSchema, iconSelectorSchema);
+ // SUBVIEW ROUTING
+ if (this._subView === 'solar') return this._renderSolarView(entities, entitySelectorSchema, textSelectorSchema, iconSelectorSchema);
+ if (this._subView === 'grid') return this._renderGridView(entities, entitySelectorSchema, textSelectorSchema, iconSelectorSchema);
+ if (this._subView === 'battery') return this._renderBatteryView(entities, entitySelectorSchema, textSelectorSchema, iconSelectorSchema);
+ if (this._subView === 'consumers') return this._renderConsumersView(entities, entitySelectorSchema, textSelectorSchema, iconSelectorSchema);
- // MAIN MENU VIEW
- return html`
+ // MAIN MENU VIEW
+ return html`
${this._localize('editor.consumer_3_title')}
- ${this._renderEntitySelector(entitySelectorSchema, entities.consumer_3, 'consumer_3', this._localize('editor.entity'))}
+ 🏊 Rechts (Türkis)
+
- ${this._localize('editor.consumer_unit_kw')}
-
-
- ${this._renderEntitySelector(entitySelectorSchema, entities.secondary_consumer_3 || "", 'secondary_consumer_3', this._localize('editor.secondary_sensor'))}
-
- ${this._renderColorPickerQuad('color_consumer_3', 'color_pipe_consumer_3', 'color_text_consumer_3', 'color_icon_consumer_3', '#06b6d4')}
${this._localize('editor.main_title')}
@@ -757,7 +525,7 @@ class PowerFluxCardEditor extends LitElement {
.selector=${{ number: { min: 0.5, max: 1.5, step: 0.05, mode: "slider" } }}
.value=${this._config.zoom !== undefined ? this._config.zoom : 0.9}
.configValue=${'zoom'}
- .label=${this._localize('editor.zoom_label')}
+ .label=${"🔍 Zoom (Standard View)"}
@value-changed=${this._valueChanged}
>
${this._localize('editor.neon_glow')}
+ Neon Glow
@@ -777,7 +545,7 @@ class PowerFluxCardEditor extends LitElement {
.configValue=${'show_donut_border'}
@change=${this._valueChanged}
>
-
${this._localize('editor.donut_chart')}
+ Donut Chart (Grid/Haus)
@@ -786,7 +554,7 @@ class PowerFluxCardEditor extends LitElement {
.configValue=${'show_comet_tail'}
@change=${this._valueChanged}
>
-
${this._localize('editor.comet_tail')}
+ Comet Tail Effect
@@ -795,16 +563,7 @@ class PowerFluxCardEditor extends LitElement {
.configValue=${'show_dashed_line'}
@change=${this._valueChanged}
>
-
-
- ${this._localize('editor.dashed_line')}
-
-
${this._localize('editor.tinted_background')}
+ Dashed Line Animation
@@ -813,7 +572,7 @@ class PowerFluxCardEditor extends LitElement {
.configValue=${'use_colored_values'}
@change=${this._valueChanged}
>
-
${this._localize('editor.colored_values')}
+ Farbige Textwerte
@@ -822,7 +581,7 @@ class PowerFluxCardEditor extends LitElement {
.configValue=${'hide_consumer_icons'}
@change=${this._valueChanged}
>
-
${this._localize('editor.hide_consumer_icons')}
+ Icons unten ausblenden
@@ -834,15 +593,6 @@ class PowerFluxCardEditor extends LitElement {
- ${this._localize('editor.hide_inactive')}
-
-
${this._localize('editor.show_consumer_always')}
- Waiting for data...
Waiting for data...
${text}
`;
- };
+ };
- const renderSecondaryOrLabel = (labelText, showLabel, secondaryEntity, hasSecondary) => {
- if (hasSecondary) {
- const secVal = getSecondaryVal(secondaryEntity);
- return html`${secVal}
`;
- }
- return renderLabel(labelText, showLabel);
- };
-
- const renderMainIcon = (type, val, customIcon, color = null) => {
+ const renderMainIcon = (type, val, customIcon, color = null) => {
if (customIcon) {
- const style = color ? `color: ${color};` : (type === 'solar' ? 'color: var(--icon-solar-color);' : (type === 'grid' ? 'color: var(--icon-grid-color);' : (type === 'battery' ? 'color: var(--icon-battery-color);' : (type === 'house' ? 'color: var(--icon-house-color);' : ''))));
- return html` this._handleClick(entities[configKey])}>
+
-
${iconContent}
- ${renderSecondaryOrLabel(label, true, secEntity, hasSecondary)}
-
`;
- };
+ };
- const getConsumerPipeStyle = (isActive, val) => {
+ const getConsumerPipeStyle = (isActive, val) => {
if (!isActive) return "display: none;";
return getPipeStyle(val);
- };
-
- const getConsumerAnimStyle = (isActive, val) => {
+ };
+
+ const getConsumerAnimStyle = (isActive, val) => {
if (!isActive) return "display: none;";
return getAnimStyle(val);
- };
+ };
- const pathSolarHouse = "M 50 160 Q 50 265 165 265";
- const pathSolarBatt = "M 50 70 Q 210 -20 370 70";
- const pathGridImport = "M 210 160 L 210 220";
- const pathGridExport = "M 95 115 Q 130 145 165 115";
- const pathHouseExport = "M 210 220 L 210 160";
- const exportFromSolar = solarVal > 1;
- const activeExportPath = exportFromSolar ? pathGridExport : pathHouseExport;
- const exportTextX = exportFromSolar ? '130' : '185';
- const exportTextY = exportFromSolar ? '145' : '195';
- const pathGridToBatt = "M 255 115 Q 290 145 325 115";
- const pathBattHouse = "M 370 160 Q 370 265 255 265";
- const pathHouseC1 = "M 165 265 Q 50 265 50 370";
- const pathHouseC2 = "M 210 310 L 210 370";
- const pathHouseC3 = "M 255 265 Q 370 265 370 370";
+ const pathSolarHouse = "M 50 160 Q 50 265 165 265";
+ const pathSolarBatt = "M 50 70 Q 210 -20 370 70";
+ const pathGridImport = "M 210 160 L 210 220";
+ const pathGridExport = "M 165 115 Q 130 145 95 115";
+ const pathGridToBatt = "M 255 115 Q 290 145 325 115";
+ const pathBattHouse = "M 370 160 Q 370 265 255 265";
+ const pathHouseC1 = "M 165 265 Q 50 265 50 370";
+ const pathHouseC2 = "M 210 310 L 210 370";
+ const pathHouseC3 = "M 255 265 Q 370 265 370 370";
- const houseTextStyle = this.config.color_text_house
- ? 'color: var(--text-house-color);'
- : (houseTextCol ? `color: ${houseTextCol};` : '');
- const dashArrayVal = showTail ? '30 360' : (showDashedLine ? '13 13' : '0 380');
- const strokeWidthVal = showDashedLine ? 4 : 8;
+ const houseTextStyle = houseTextCol ? `color: ${houseTextCol};` : '';
+ const dashArrayVal = showTail ? '30 360' : (showDashedLine ? '13 13' : '0 380');
+ const strokeWidthVal = showDashedLine ? 4 : 8;
- return html`
+ return html`
${this._formatPower(val)}
+ ${renderLabel(label, true)}
+ ${this._formatPower(val)}
+
${hasSolar ? html`
-
this._handleClick(entities.solar)}>
+
${renderMainIcon('solar', solarVal, iconSolar, solarColor)}
- ${renderSecondaryOrLabel(labelSolarText, showLabelSolar, entities.secondary_solar, hasSecondarySolar)}
-
` : ''}
${hasGrid ? html`
- ${this._formatPower(solarVal)}
+ ${renderLabel(labelSolarText, showLabelSolar)}
+ ${this._formatPower(solarVal)}
this._handleClick(entities.grid_combined || entities.grid)}>
- ${renderMainIcon('grid', isGridExporting ? gridExport : gridImport, iconGrid, gridIconColor)}
- ${renderSecondaryOrLabel(labelGridText, showLabelGrid, entities.secondary_grid, hasSecondaryGrid)}
-
- ${isGridExporting ? html`▲` : (isGridActive ? html`▼` : '')}
- ${this._formatPower(isGridExporting ? gridExport : gridImport)}
-
+
+ ${renderMainIcon('grid', gridImport, iconGrid, gridColor)}
+ ${renderLabel(labelGridText, showLabelGrid)}
+
` : ''}
${hasBattery ? html`
- ${this._formatPower(gridImport)}
this._handleClick(entities.battery)}>
+
`;
- }
-
- render() {
- if (!this.config || !this.hass) return html``;
-
- // SWITCH VIEW BASED ON CONFIG
- if (this.config.compact_view === true) {
- return this._renderCompactView(this.config.entities || {});
- } else {
- return this._renderStandardView(this.config.entities || {});
- }
- }
}
- customElements.define("power-flux-card", PowerFluxCard);
-})(lang_en, lang_de);
+ render() {
+ if (!this.config || !this.hass) return html``;
+
+ // SWITCH VIEW BASED ON CONFIG
+ if (this.config.compact_view === true) {
+ return this._renderCompactView(this.config.entities || {});
+ } else {
+ return this._renderStandardView(this.config.entities || {});
+ }
+ }
+}
+
+customElements.define("power-flux-card", PowerFluxCard);
window.customCards = window.customCards || [];
window.customCards.push({
${renderMainIcon('battery', battSoc, iconBattery)}
- ${renderSecondaryOrLabel(labelBatteryText, showLabelBattery, entities.secondary_battery, hasSecondaryBattery)}
-
` : ''}
- ${Math.round(battSoc)}%
+ ${renderLabel(labelBatteryText, showLabelBattery)}
+ ${Math.round(battSoc)}%
this._handleClick(entities.house)}>
- ${renderMainIcon('house', 0, null, this.config.color_icon_house ? 'var(--icon-house-color)' : houseDominantColor)}
+
+ ${renderMainIcon('house', 0, null, houseDominantColor)}
${renderLabel(labelHouseText, showLabelHouse)}
-
- ${renderConsumer(showC1, 'c1', 'consumer_1', labelC1, 'car', c1Val, this._getConsumerColor(1))}
- ${renderConsumer(showC2, 'c2', 'consumer_2', labelC2, 'heater', c2Val, this._getConsumerColor(2))}
- ${renderConsumer(showC3, 'c3', 'consumer_3', labelC3, 'pool', c3Val, this._getConsumerColor(3))}
+ ${renderConsumer(showC1, 'c1', 'consumer_1', labelC1, 'car', c1Val, '#a855f7')}
+ ${renderConsumer(showC2, 'c2', 'consumer_2', labelC2, 'heater', c2Val, '#f97316')}
+ ${renderConsumer(showC3, 'c3', 'consumer_3', labelC3, 'pool', c3Val, '#06b6d4')}
${this._formatPower(houseDisplay)}
+ ${this._formatPower(house)}