hoffmation-base 2.22.7 → 2.22.8

package/lib/models/rooms/RoomSettings/RoomSettingsController.d.ts

@@ -26,6 +26,7 @@ export declare class RoomSettingsController implements iRoomDefaultSettings {
     get sonnenAufgangLampenDelay(): number;
     get roomIsAlwaysDark(): boolean;
     get radioUrl(): string;
+    get includeLampsInNormalMovementLightning(): boolean;
     get room(): RoomBase | undefined;
     toJSON(): Partial<RoomSettingsController>;
     private onSettingChange;

package/lib/models/rooms/RoomSettings/RoomSettingsController.js

@@ -77,6 +77,9 @@ class RoomSettingsController {
     get radioUrl() {
         return this._settingsContainer.radioUrl;
     }
+    get includeLampsInNormalMovementLightning() {
+        return this._settingsContainer.includeLampsInNormalMovementLightning;
+    }
     get room() {
         if (!this.roomName) {
             return undefined;

package/lib/models/rooms/RoomSettings/iRoomDefaultSettings.d.ts

@@ -24,4 +24,5 @@ export interface iRoomDefaultSettings {
     readonly movementResetTimer: number;
     readonly lightIfNoWindows: boolean;
     readonly ambientLightAfterSunset: boolean;
+    readonly includeLampsInNormalMovementLightning: boolean;
 }

package/lib/models/rooms/RoomSettings/roomSettings.d.ts

@@ -18,5 +18,6 @@ export declare class RoomSettings extends ObjectSettings {
     sonnenUntergangRolloDelay: number;
     sonnenUntergangLampenDelay: number;
     sonnenUntergangRollos: boolean;
+    includeLampsInNormalMovementLightning: boolean;
     fromPartialObject(_obj: Partial<RoomSettings>): void;
 }

package/lib/models/rooms/RoomSettings/roomSettings.js

@@ -24,9 +24,10 @@ class RoomSettings extends objectSettings_1.ObjectSettings {
         this.sonnenUntergangRolloDelay = server_1.SettingsService.settings.roomDefault.sonnenUntergangRolloDelay;
         this.sonnenUntergangLampenDelay = server_1.SettingsService.settings.roomDefault.sonnenUntergangLampenDelay;
         this.sonnenUntergangRollos = server_1.SettingsService.settings.roomDefault.sonnenUntergangRollos;
+        this.includeLampsInNormalMovementLightning = server_1.SettingsService.settings.roomDefault.includeLampsInNormalMovementLightning;
     }
     fromPartialObject(_obj) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
         this.ambientLightAfterSunset = (_a = _obj.ambientLightAfterSunset) !== null && _a !== void 0 ? _a : this.ambientLightAfterSunset;
         this.lichtSonnenAufgangAus = (_b = _obj.lichtSonnenAufgangAus) !== null && _b !== void 0 ? _b : this.lichtSonnenAufgangAus;
         this.radioUrl = (_c = _obj.radioUrl) !== null && _c !== void 0 ? _c : this.radioUrl;
@@ -45,6 +46,8 @@ class RoomSettings extends objectSettings_1.ObjectSettings {
         this.sonnenUntergangRolloDelay = (_q = _obj.sonnenUntergangRolloDelay) !== null && _q !== void 0 ? _q : this.sonnenUntergangRolloDelay;
         this.sonnenUntergangLampenDelay = (_r = _obj.sonnenUntergangLampenDelay) !== null && _r !== void 0 ? _r : this.sonnenUntergangLampenDelay;
         this.sonnenUntergangRollos = (_s = _obj.sonnenUntergangRollos) !== null && _s !== void 0 ? _s : this.sonnenUntergangRollos;
+        this.includeLampsInNormalMovementLightning =
+            (_t = _obj.includeLampsInNormalMovementLightning) !== null && _t !== void 0 ? _t : this.includeLampsInNormalMovementLightning;
         super.fromPartialObject(_obj);
     }
 }

package/lib/server/devices/groups/lightGroup.js

@@ -100,7 +100,7 @@ class LightGroup extends base_group_1.BaseGroup {
             this.log(models_1.LogLevel.Trace, `Set outlets time based for time "${models_1.TimeOfDay[time]}"`);
             resultSteckdosen = darkOutside;
         }
-        if (activatedGroups === 0) {
+        if (activatedGroups === 0 || this.getRoom().settings.includeLampsInNormalMovementLightning) {
             this.log(models_1.LogLevel.Trace, `Set Lamps time based for time "${models_1.TimeOfDay[time]}"`);
             resultLampen = darkOutside;
         }

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

@@ -65,6 +65,7 @@ class SettingsService {
                 sonnenUntergangRolloAdditionalOffsetPerCloudiness: 0.25,
                 lightIfNoWindows: false,
                 ambientLightAfterSunset: false,
+                includeLampsInNormalMovementLightning: false,
             },
             timeSettings: {
                 nightStart: {

package/lib/server/services/utils/utils.js

@@ -126,6 +126,7 @@ class Utils {
                 sonnenUntergangRolloAdditionalOffsetPerCloudiness: 0.25,
                 lightIfNoWindows: false,
                 ambientLightAfterSunset: false,
+                includeLampsInNormalMovementLightning: false,
             },
         });
         Translation_1.Res.initialize(settings_service_1.SettingsService.settings.translationSettings);