hoffmation-base 2.13.1 → 2.13.2

package/lib/models/persistence/EnergyCalculation.d.ts

@@ -10,6 +10,7 @@ export declare class EnergyCalculation {
     savedSelfConsume: number;
     endMs: number;
     batteryStoredKwH: number;
+    batteryLevel: number;
     constructor(startMs: number);
     static persist(obj: EnergyCalculation, endMs: number, logger: (level: LogLevel, message: string, logDebugType?: LogDebugType) => void): boolean;
 }

package/lib/models/persistence/EnergyCalculation.js

@@ -14,6 +14,8 @@ class EnergyCalculation {
         this.savedSelfConsume = 0;
         this.endMs = 0;
         this.batteryStoredKwH = 0;
+        // Battery Level in %
+        this.batteryLevel = 0.0;
     }
     static persist(obj, endMs, logger) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -32,6 +34,7 @@ class EnergyCalculation {
         obj.selfConsumedKwH = server_1.Utils.round(obj.selfConsumedKwH, 4);
         obj.drawnKwH = server_1.Utils.round(obj.drawnKwH, 4);
         obj.batteryStoredKwH = server_1.Utils.round(obj.batteryStoredKwH, 3);
+        obj.batteryLevel = server_1.Utils.round(obj.batteryLevel, 3);
         (_h = server_1.Utils.dbo) === null || _h === void 0 ? void 0 : _h.persistEnergyManager(obj);
         logger(logLevel_1.LogLevel.Info, `Persisting energy Manager Data.`);
         return true;

package/lib/server/services/dbo/postgreSqlPersist.js

@@ -327,6 +327,14 @@ BEGIN
     alter table hoffmation_schema."EnergyCalculation"
       add "batteryStoredKwH" integer;
   END IF;
+  
+  IF (SELECT COUNT(column_name) = 0
+    FROM information_schema.columns
+    WHERE table_name = 'EnergyCalculation'
+      and column_name = 'batteryLevel') Then
+    alter table hoffmation_schema."EnergyCalculation"
+      add "batteryLevel" double precision;
+  END IF;
 END
 $$;`);
         this.initialized = true;
@@ -429,9 +437,9 @@ values ('${device.id}', ${device.currentIllumination}, '${new Date().toISOString
     persistEnergyManager(calc) {
         this.query(`
 insert into hoffmation_schema."EnergyCalculation" ("startDate", "endDate", "selfConsumedKwH", "injectedKwH",
-                                                   "drawnKwH", "batteryStoredKwH")
+                                                   "drawnKwH", "batteryStoredKwH", "batteryLevel")
 values ('${new Date(calc.startMs).toISOString()}','${new Date(calc.endMs).toISOString()}',
-        ${calc.selfConsumedKwH}, ${calc.injectedKwH}, ${calc.drawnKwH}, ${calc.batteryStoredKwH});
+        ${calc.selfConsumedKwH}, ${calc.injectedKwH}, ${calc.drawnKwH}, ${calc.batteryStoredKwH}, ${calc.batteryLevel});
     `);
     }
     persistSettings(id, settings, customName) {

package/lib/server/services/victron/victron-device.js

@@ -186,8 +186,9 @@ class VictronDevice {
     }
     persist() {
         var _a;
+        this._nextPersistEntry.batteryLevel = ((_a = this.data.battery.soc) !== null && _a !== void 0 ? _a : 0) / 100;
         this._nextPersistEntry.batteryStoredKwH =
-            (((_a = this.data.battery.soc) !== null && _a !== void 0 ? _a : 0) * this.settings.batteryCapacityWattage) / 1000;
+            (this._nextPersistEntry.batteryLevel * this.settings.batteryCapacityWattage) / 1000;
         const obj = JSON.parse(JSON.stringify(this._nextPersistEntry));
         if (!models_1.EnergyCalculation.persist(obj, this._lastPersistenceCalculation, this.log.bind(this))) {
             return;