${grid.has
- ? gridElement(this, {
+ ? gridElement(this, this._config, {
entities,
grid,
templatesObj,
@@ -577,7 +614,7 @@ export class PowerFlowCardPlus extends LitElement {
? html`
- ${battery.has ? batteryElement(this, { battery, entities }) : html`
`}
+ ${battery.has ? batteryElement(this, this._config, { battery, entities }) : html`
`}
${individualFieldLeftBottom
? individualLeftBottomElement(this, this.hass, this._config, {
displayState: getIndividualDisplayState(individualFieldLeftBottom),
diff --git a/src/states/raw/base.ts b/src/states/raw/base.ts
index ea46bd5..06128bb 100644
--- a/src/states/raw/base.ts
+++ b/src/states/raw/base.ts
@@ -14,7 +14,7 @@ export const getSecondaryState = (hass: HomeAssistant, config: PowerFlowCardPlus
const entityObj = hass.states[entity];
const secondaryState = entityObj.state;
- if (isNumberValue(secondaryState)) return Math.abs(Number(secondaryState));
+ if (isNumberValue(secondaryState)) return Number(secondaryState);
return secondaryState;
};
diff --git a/src/states/raw/individual/getIndividualObject.ts b/src/states/raw/individual/getIndividualObject.ts
index 021ae95..2aecd6c 100644
--- a/src/states/raw/individual/getIndividualObject.ts
+++ b/src/states/raw/individual/getIndividualObject.ts
@@ -28,6 +28,7 @@ const fallbackIndividualObject: IndividualObject = {
unit: null,
unit_white_space: false,
displayZero: false,
+ accept_negative: false,
displayZeroTolerance: 0,
decimals: null,
},
@@ -57,6 +58,7 @@ export type IndividualObject = {
unit: string | null;
unit_white_space: boolean;
displayZero: boolean;
+ accept_negative: boolean;
displayZeroTolerance: number;
decimals: number | null;
};
@@ -94,6 +96,7 @@ export const getIndividualObject = (hass: HomeAssistant, field: IndividualDevice
template: field?.secondary_info?.template || null,
has: field?.secondary_info?.entity !== undefined,
state: getIndividualSecondaryState(hass, field) || null,
+ accept_negative: field?.secondary_info?.accept_negative || false,
icon: field?.secondary_info?.icon || null,
unit: field?.secondary_info?.unit_of_measurement || null,
unit_white_space: field?.secondary_info?.unit_white_space || false,
diff --git a/src/states/raw/individual/index.ts b/src/states/raw/individual/index.ts
index 6f80fb9..77fe7f7 100644
--- a/src/states/raw/individual/index.ts
+++ b/src/states/raw/individual/index.ts
@@ -20,7 +20,7 @@ export const getIndividualSecondaryState = (hass: HomeAssistant, field: Individu
const entityObj = getEntityStateObj(hass, field?.secondary_info?.entity);
const secondaryState = entityObj?.state;
- if (isNumberValue(secondaryState)) return Math.abs(Number(secondaryState));
+ if (isNumberValue(secondaryState)) return Number(secondaryState);
return secondaryState;
};
diff --git a/src/style/all.ts b/src/style/all.ts
index 206848c..98df42d 100644
--- a/src/style/all.ts
+++ b/src/style/all.ts
@@ -223,47 +223,33 @@ export const allDynamicStyles = (
if (individual?.some((ind) => ind.has)) {
const getStylesForIndividual = (field: IndividualDeviceType, index: number) => {
const colors = ["#d0cc5b", "#964cb5", "#b54c9d", "#5bd0cc"];
- const getFieldName = (index: number) => {
- switch (index) {
- case 0:
- return "left-top";
- case 1:
- return "left-bottom";
- case 2:
- return "right-top";
- case 3:
- return "right-bottom";
- default:
- return "left-top";
- }
- };
+ const fieldNames: string[] = ["left-top", "left-bottom", "right-top", "right-bottom"];
- const fieldName = getFieldName(index);
+ const fieldName = fieldNames?.[index] || "left-top";
let individualColor = field?.color;
if (typeof individualColor === "object") individualColor = convertColorListToHex(individualColor);
main.style.setProperty(`--individual-${fieldName}-color`, individualColor || colors[index] || "#d0cc5b");
- // Individual 1
-
- if (individual?.[index] !== undefined) {
- main.style.setProperty(
- `--icon-individual-${fieldName}-color`,
- field?.color_icon !== false ? `var(--individual-${fieldName}-color)` : `var(--primary-text-color)`
- );
- main.style.setProperty(
- `--text-individual-${fieldName}-color`,
- field?.color_value ? `var(--individual-${fieldName}-color)` : `var(--primary-text-color)`
- );
- main.style.setProperty(
- `--secondary-text-individual-${fieldName}-color`,
- field?.secondary_info?.color_value ? `var(--individual-${fieldName}-color)` : `var(--primary-text-color)`
- );
- }
+ main.style.setProperty(
+ `--icon-individual-${fieldName}-color`,
+ field?.color_icon !== false ? `var(--individual-${fieldName}-color)` : `var(--primary-text-color)`
+ );
+ main.style.setProperty(
+ `--text-individual-${fieldName}-color`,
+ field?.color_value ? `var(--individual-${fieldName}-color)` : `var(--primary-text-color)`
+ );
+ main.style.setProperty(
+ `--secondary-text-individual-${fieldName}-color`,
+ field?.secondary_info?.color_value ? `var(--individual-${fieldName}-color)` : `var(--primary-text-color)`
+ );
};
+ let individualIndex = 0;
individual.forEach((_, index) => {
- getStylesForIndividual(entities.individual[index], index);
+ if (!individual[index].has) return;
+ getStylesForIndividual(entities.individual[index], individualIndex);
+ individualIndex++;
});
}
};
diff --git a/src/template/ha-websocket.ts b/src/template/ha-websocket.ts
index e08bee3..de06532 100644
--- a/src/template/ha-websocket.ts
+++ b/src/template/ha-websocket.ts
@@ -1,28 +1,28 @@
import { UnsubscribeFunc } from "home-assistant-js-websocket";
interface TemplateListeners {
- all: boolean;
- domains: string[];
- entities: string[];
- time: boolean;
+ all: boolean;
+ domains: string[];
+ entities: string[];
+ time: boolean;
}
export interface RenderTemplateResult {
- result: string;
- listeners: TemplateListeners;
+ result: string;
+ listeners: TemplateListeners;
}
export const subscribeRenderTemplate = (
- conn: any,
- onChange: (result: RenderTemplateResult) => void,
- params: {
- template: string;
- entity_ids?: string | string[];
- variables?: Record
;
- timeout?: number;
- strict?: boolean;
- }
+ conn: any,
+ onChange: (result: RenderTemplateResult) => void,
+ params: {
+ template: string;
+ entity_ids?: string | string[];
+ variables?: Record;
+ timeout?: number;
+ strict?: boolean;
+ }
): Promise =>
- conn.subscribeMessage((msg: RenderTemplateResult) => onChange(msg), {
- type: "render_template",
- ...params,
- });
+ conn.subscribeMessage((msg: RenderTemplateResult) => onChange(msg), {
+ type: "render_template",
+ ...params,
+ });
diff --git a/src/type.ts b/src/type.ts
index 66b82e1..97d240e 100644
--- a/src/type.ts
+++ b/src/type.ts
@@ -14,6 +14,7 @@ export type SecondaryInfoType = {
display_zero_tolerance?: number;
color_value?: boolean | "production" | "consumption";
template?: string;
+ accept_negative?: boolean;
decimals?: number;
};
@@ -130,8 +131,12 @@ export type GridObject = {
icon?: string;
unit?: string;
unit_white_space?: boolean;
+ accept_negative?: boolean;
color?: {
type?: boolean | "production" | "consumption";
};
};
-};
\ No newline at end of file
+};
+
+export type OfflineStr = "unavailable" | "unknown";
+export const offlineStr = ["unavailable", "unknown"];
diff --git a/src/ui-editor/schema/_schema-base.ts b/src/ui-editor/schema/_schema-base.ts
index bd380af..599ef4d 100644
--- a/src/ui-editor/schema/_schema-base.ts
+++ b/src/ui-editor/schema/_schema-base.ts
@@ -77,6 +77,7 @@ export const secondaryInfoSchema = [
{ name: "color_value", label: "Color Value", selector: { boolean: {} } },
{ name: "unit_white_space", label: "Unit White Space", selector: { boolean: {} } },
{ name: "display_zero", label: "Display Zero", selector: { boolean: {} } },
+ { name: "accept_negative", label: "Accept Negative", selector: { boolean: {} } },
{ name: "display_zero_tolerance", label: "Display Zero Tolerance", selector: { number: { mode: "box", min: 0, max: 1000000, step: 0.1 } } },
],
},
diff --git a/src/ui-editor/types/config-page.ts b/src/ui-editor/types/config-page.ts
index 0bd45ea..cb26cab 100644
--- a/src/ui-editor/types/config-page.ts
+++ b/src/ui-editor/types/config-page.ts
@@ -1,3 +1,3 @@
import { ConfigEntities } from "../../power-flow-card-plus-config";
-export type ConfigPage = keyof ConfigEntities | "advanced" | null;
\ No newline at end of file
+export type ConfigPage = keyof ConfigEntities | "advanced" | null;
diff --git a/src/ui-editor/utils/sortable.ondemand.ts b/src/ui-editor/utils/sortable.ondemand.ts
index a33f39d..be00922 100644
--- a/src/ui-editor/utils/sortable.ondemand.ts
+++ b/src/ui-editor/utils/sortable.ondemand.ts
@@ -1,9 +1,7 @@
let loaded: typeof import("./sortable").default;
export type { SortableInstance } from "./sortable";
-export const loadSortable = async (): Promise<
- typeof import("./sortable").default
-> => {
+export const loadSortable = async (): Promise => {
if (!loaded) {
loaded = (await import("./sortable")).default;
}
diff --git a/src/ui-editor/utils/sortable.ts b/src/ui-editor/utils/sortable.ts
index 32514c4..e679089 100644
--- a/src/ui-editor/utils/sortable.ts
+++ b/src/ui-editor/utils/sortable.ts
@@ -1,8 +1,5 @@
import Sortable from "sortablejs";
-import SortableCore, {
- OnSpill,
- AutoScroll,
-} from "sortablejs/modular/sortable.core.esm";
+import SortableCore, { OnSpill, AutoScroll } from "sortablejs/modular/sortable.core.esm";
SortableCore.mount(OnSpill, new AutoScroll());
diff --git a/src/utils/computeIndividualPosition.ts b/src/utils/computeIndividualPosition.ts
index 650cc72..e2c0ba9 100644
--- a/src/utils/computeIndividualPosition.ts
+++ b/src/utils/computeIndividualPosition.ts
@@ -2,7 +2,7 @@ import { PowerFlowCardPlusConfig } from "../power-flow-card-plus-config";
import { IndividualObject } from "../states/raw/individual/getIndividualObject";
const filterUnusedIndividualObjs = (individualObjs: IndividualObject[]): IndividualObject[] => {
- const cloneIndividualObjs = structuredClone(individualObjs);
+ const cloneIndividualObjs = JSON.parse(JSON.stringify(individualObjs)) as IndividualObject[];
const individualObjsWithHas = cloneIndividualObjs.filter((i) => i?.has);
return individualObjsWithHas;
};
@@ -60,4 +60,4 @@ export const checkHasRightIndividual = (config: PowerFlowCardPlusConfig, individ
!!getTopRightIndividual(config, individualObjs) || !!getBottomRightIndividual(config, individualObjs);
export const checkHasBottomIndividual = (config: PowerFlowCardPlusConfig, individualObjs: IndividualObject[]): boolean =>
- !!getBottomLeftIndividual(config, individualObjs) || !!getBottomRightIndividual(config, individualObjs);
\ No newline at end of file
+ !!getBottomLeftIndividual(config, individualObjs) || !!getBottomRightIndividual(config, individualObjs);
diff --git a/src/utils/displayNonFossilState.ts b/src/utils/displayNonFossilState.ts
index 0a60658..f171c70 100644
--- a/src/utils/displayNonFossilState.ts
+++ b/src/utils/displayNonFossilState.ts
@@ -36,15 +36,13 @@ export const displayNonFossilState = (
nonFossilFuelWatts = 0;
}
}
- result = displayValue(hass, nonFossilFuelWatts, undefined, unitWhiteSpace);
- } else {
- let nonFossilFuelPercentage: number = 100 - (getEntityState(hass, entityFossil) ?? 0);
- if (displayZeroTolerance) {
- if (nonFossilFuelPercentage < displayZeroTolerance) {
- nonFossilFuelPercentage = 0;
- }
+ return displayValue(hass, nonFossilFuelWatts, undefined, unitWhiteSpace, 0, undefined, config.watt_threshold);
+ }
+ let nonFossilFuelPercentage: number = 100 - (getEntityState(hass, entityFossil) ?? 0);
+ if (displayZeroTolerance) {
+ if (nonFossilFuelPercentage < displayZeroTolerance) {
+ nonFossilFuelPercentage = 0;
}
- result = displayValue(hass, nonFossilFuelPercentage, unitOfMeasurement, unitWhiteSpace, 0);
}
- return result;
+ return displayValue(hass, nonFossilFuelPercentage, undefined, unitWhiteSpace, 0, undefined, config.watt_threshold);
};
diff --git a/src/utils/displayValue.ts b/src/utils/displayValue.ts
index 263226f..c511730 100644
--- a/src/utils/displayValue.ts
+++ b/src/utils/displayValue.ts
@@ -6,14 +6,21 @@ export const displayValue = (
value: number | string | null,
unit?: string | undefined,
unitWhiteSpace?: boolean | undefined,
- decimals?: number | undefined
+ decimals?: number | undefined,
+ accept_negative?: boolean | undefined,
+ watt_threshold: number | undefined = 1000
): string => {
if (value === null) return "0";
if (!isNumberValue(value)) return value.toString();
const valueInNumber = Number(value);
- const isKW = unit === undefined && valueInNumber >= 1000;
- const v = formatNumber(isKW ? round(valueInNumber / 1000, decimals ?? 2) : round(valueInNumber, decimals ?? 0), hass.locale);
+
+ const isKW = unit === undefined && valueInNumber >= watt_threshold;
+
+ const transformValue = (v: number) => (!accept_negative ? Math.abs(v) : v);
+
+ const v = formatNumber(transformValue(isKW ? round(valueInNumber / 1000, decimals ?? 2) : round(valueInNumber, decimals ?? 0)), hass.locale);
+
return `${v}${unitWhiteSpace === false ? "" : " "}${unit || (isKW ? "kW" : "W")}`;
};
diff --git a/src/utils/get-default-config.ts b/src/utils/get-default-config.ts
index e5c8322..17828d4 100644
--- a/src/utils/get-default-config.ts
+++ b/src/utils/get-default-config.ts
@@ -16,7 +16,7 @@ export const defaultValues = {
transparency: 50,
grey_color: [189, 189, 189],
},
-}
+};
export function getDefaultConfig(hass: HomeAssistant): object {
function checkStrings(entiyId: string, testStrings: string[]): boolean {
diff --git a/src/utils/register-custom-card.ts b/src/utils/register-custom-card.ts
index e80507f..b8d4758 100644
--- a/src/utils/register-custom-card.ts
+++ b/src/utils/register-custom-card.ts
@@ -1,17 +1,17 @@
interface RegisterCardParams {
- type: string;
- name: string;
- description: string;
+ type: string;
+ name: string;
+ description: string;
}
export function registerCustomCard(params: RegisterCardParams) {
- const windowWithCards = window as unknown as Window & {
- customCards: unknown[];
- };
- windowWithCards.customCards = windowWithCards.customCards || [];
+ const windowWithCards = window as unknown as Window & {
+ customCards: unknown[];
+ };
+ windowWithCards.customCards = windowWithCards.customCards || [];
- windowWithCards.customCards.push({
- ...params,
- preview: true,
- documentationURL: `https://github.com/flixlix/power-flow-card-plus`,
- });
+ windowWithCards.customCards.push({
+ ...params,
+ preview: true,
+ documentationURL: `https://github.com/flixlix/power-flow-card-plus`,
+ });
}
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 5758e6f..9b4cbcf 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -1,8 +1,5 @@
/* eslint-disable no-redeclare */
-export const round = (value: number, decimalPlaces: number): number =>
- Number(
- `${Math.round(Number(`${value}e${decimalPlaces}`))}e-${decimalPlaces}`
- );
+export const round = (value: number, decimalPlaces: number): number => Number(`${Math.round(Number(`${value}e${decimalPlaces}`))}e-${decimalPlaces}`);
/**
* @license
@@ -25,16 +22,11 @@ export function coerceNumber(value: any, fallbackValue = 0) {
return isNumberValue(value) ? Number(value) : fallbackValue;
}
-export function coerceStringArray(
- value: any,
- separator: string | RegExp = /\s+/
-): string[] {
+export function coerceStringArray(value: any, separator: string | RegExp = /\s+/): string[] {
const result: string[] = [];
if (value != null) {
- const sourceValues = Array.isArray(value)
- ? value
- : `${value}`.split(separator);
+ const sourceValues = Array.isArray(value) ? value : `${value}`.split(separator);
for (const sourceValue of sourceValues) {
const trimmedString = `${sourceValue}`.trim();
if (trimmedString) {