Merge pull request #45 from molikk/fix-power-entity-precision-display…

…-in-loads-when-entity-is-not-power fix power entity precision display in loads when entity is not power
molikk · Jul 24, 2024 · 796ec48 · 796ec48
2 parents 636b33e + 78d0e5a
commit 796ec48
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/dist/mlk-power-flow-card.js b/dist/mlk-power-flow-card.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mlk-power-flow-card",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "A customizable Home Assistant card to emulate the Sunsynk System flow that's displayed on the Inverter screen.",
   "main": "mlk-power-flow-card.js",
   "scripts": {

diff --git a/src/helpers/utils.ts b/src/helpers/utils.ts
@@ -29,13 +29,15 @@ export class Utils {
         }
     }
 
-    static convertValueNew(value: string | number, unit: UnitOfEnergyOrPower | string = '', decimal: number = 2) {
+    static convertValueNew(value: string | number, unit: UnitOfEnergyOrPower | string = '', decimal: number = 2):string {
         decimal = isNaN(decimal) ? 2 : decimal;
         const numberValue = Number(value);
         if (isNaN(numberValue)) return Number(0).toFixed(decimal);
 
         const rules = unitOfEnergyConversionRules[unit];
-        if (!rules) return `${Math.round(numberValue).toFixed(decimal)} ${unit}`;
+        if (!rules) {
+			return `${this.toNum(numberValue, decimal)} ${unit}`;
+        }
 
         if (unit === UnitOfPower.WATT && Math.abs(numberValue) < 1000) {
             return `${Math.round(numberValue)} ${unit}`;

diff --git a/src/inverters/dto/custom-entity.ts b/src/inverters/dto/custom-entity.ts
@@ -87,8 +87,8 @@ export function convertToCustomEntity(entity: any): CustomEntity {
 		},
 		toPowerString: (scale?: boolean, decimals?: number, invert?: boolean) =>
 			scale ?
-				Utils.convertValueNew(entity?.state, entity?.attributes?.unit_of_measurement, decimals || 0) :
-				`${Utils.toNum(entity?.state, 0, invert).toFixed(decimals)} ${entity?.attributes?.unit_of_measurement || ''}`,
+				Utils.convertValueNew(entity?.state, entity?.attributes?.unit_of_measurement, decimals) :
+				`${Utils.toNum(entity?.state, decimals, invert).toFixed(decimals)} ${entity?.attributes?.unit_of_measurement || ''}`,
 		toString: () => entity?.state?.toString() || '',
 		toOnOff: () => ['on', 'On', 'ON', 1, true].includes(entity?.state) ? 'on' : 'off' || 'off',
 		getUOM: () => entity?.attributes?.unit_of_measurement || '',