hoffmation-base 1.0.16 → 1.0.17

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

@@ -20,13 +20,13 @@ class MongoPersistance {
         if (!this.isMongoAllowedAndReady()) {
             return;
         }
-        const dataPoint = new models_1.TemperaturDataPoint(heater.info.customName, heater.iTemperatur, heater.desiredTemperatur, heater.iLevel, heater.humidity, new Date());
+        const dataPoint = new models_1.TemperaturDataPoint(heater.info.customName, heater.iTemperature, heater.desiredTemperature, heater.iLevel, heater.humidity, new Date());
         log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `Persisting Temperatur Data for ${heater.info.customName}`);
         (_a = this.TemperatureHistoryCollection) === null || _a === void 0 ? void 0 : _a.insertOne(dataPoint).catch((r) => {
             MongoPersistance.handleReject(r, 'TemperatureHistoryCollection.insertOne');
         });
         // Needs to be duplicated as the object "dataPoint" is an document now
-        const heatGroupDataPoint = new models_1.TemperaturDataPoint(heater.info.customName, heater.iTemperatur, heater.desiredTemperatur, heater.iLevel, heater.humidity, new Date());
+        const heatGroupDataPoint = new models_1.TemperaturDataPoint(heater.info.customName, heater.iTemperature, heater.desiredTemperature, heater.iLevel, heater.humidity, new Date());
         (_b = this.HeatGroupCollection) === null || _b === void 0 ? void 0 : _b.updateOne({ name: dataPoint.name }, { $set: heatGroupDataPoint }, { upsert: true }).catch((r) => {
             MongoPersistance.handleReject(r, 'HeatGroupCollection.updateOne');
         });

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

@@ -24,17 +24,17 @@ values ('${room.roomName}',${room.settings.etage})
         log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `Persisting Temperatur Data for ${heater.info.customName}`);
         this.query(`
 insert into hoffmation_schema."TemperaturData" ("date", humidity, "istTemperatur", level, name, "sollTemperatur")
-values ('${new Date().toISOString()}',${heater.humidity},${heater.iTemperatur},${heater.iLevel},'${heater.info.customName}',${heater.desiredTemperatur});`);
+values ('${new Date().toISOString()}',${heater.humidity},${heater.iTemperature},${heater.iLevel},'${heater.info.customName}',${heater.desiredTemperature});`);
         this.query(`
 insert into hoffmation_schema."HeatGroupCollection" ("date", humidity, "istTemperatur", level, name, "sollTemperatur")
-values ('${new Date().toISOString()}',${heater.humidity},${heater.iTemperatur},${heater.iLevel},'${heater.info.customName}',${heater.desiredTemperatur})
+values ('${new Date().toISOString()}',${heater.humidity},${heater.iTemperature},${heater.iLevel},'${heater.info.customName}',${heater.desiredTemperature})
     ON CONFLICT (name)
     DO UPDATE SET
         "date" = '${new Date().toISOString()}',
         humidity = ${heater.humidity},
-        "istTemperatur" = ${heater.iTemperatur},
+        "istTemperatur" = ${heater.iTemperature},
         level = ${heater.iLevel},
-        "sollTemperatur" = ${heater.desiredTemperatur}
+        "sollTemperatur" = ${heater.desiredTemperature}
 ;
     `);
     }

package/lib/server/services/weather/weather-service.d.ts

@@ -31,7 +31,7 @@ export declare class WeatherService {
     static playWeatherInfo(sonosDevice: OwnSonosDevice, volume?: number, short?: boolean, retries?: number): void;
     static processHourlyWeather(): void;
     static getCurrentTemp(): number;
-    static isOutsideWarmer(currentTemperatur: number): boolean;
+    static isOutsideWarmer(currentTemperature: number): boolean;
     static weatherRolloPosition(normalPos: number, desiredTemperatur: number, currentTemperatur: number): number;
     static getCurrentCloudiness(): number;
     private static getRainNextMinutes;

package/lib/server/services/weather/weather-service.js

@@ -110,14 +110,14 @@ class WeatherService {
         }
         return wData.current.temp;
     }
-    static isOutsideWarmer(currentTemperatur) {
+    static isOutsideWarmer(currentTemperature) {
         const wData = WeatherService.lastResponse;
         if (wData === undefined || wData.current === undefined) {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `WeatherService.isOutsideWarmer(): There are no data yet`);
             return false;
         }
-        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `isOutsideWarmer(${currentTemperatur}) --> Aktuelle Temperatur: ${wData.current.temp}`);
-        return currentTemperatur < wData.current.temp;
+        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `isOutsideWarmer(${currentTemperature}) --> Aktuelle Temperatur: ${wData.current.temp}`);
+        return currentTemperature < wData.current.temp;
     }
     static weatherRolloPosition(normalPos, desiredTemperatur, currentTemperatur) {
         let result = normalPos;