From 046d40594df347f190916a095972fa412fb33401 Mon Sep 17 00:00:00 2001
From: ttrabatt <tiziano.trabattoni@outlook.com>
Date: Sat, 1 Feb 2025 18:33:28 +0100
Subject: [PATCH] Corrected issue with dont_disturb_nightime ignored flag

---
 .../homeassistant/motion_light_dual_ng.yaml        | 14 ++++++++++----
 .../homeassistant/motion_light_trix_ng.yaml        | 14 ++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/blueprints/automation/homeassistant/motion_light_dual_ng.yaml b/blueprints/automation/homeassistant/motion_light_dual_ng.yaml
index 7fd19e8..5f16a66 100644
--- a/blueprints/automation/homeassistant/motion_light_dual_ng.yaml
+++ b/blueprints/automation/homeassistant/motion_light_dual_ng.yaml
@@ -109,8 +109,11 @@ actions:
                         before_offset: "+01:00:00"
                 then:
                   - if:
-                      - condition: template
-                        value_template: "{{ dont_disturb_flag }}"
+                      - and:
+                          - condition: template
+                            value_template: "{{ dont_disturb_flag }}"
+                          - condition: template
+                            value_template: "{{ states('binary_sensor.dont_disturb_nighttime') }}"
                     then:
                       - action: light.turn_on
                         target: !input light_target
@@ -125,8 +128,11 @@ actions:
                           color_temp_kelvin: 2500
             else: # Always active
               - if:
-                  - condition: template
-                    value_template: "{{ dont_disturb_flag }}"
+                  - and:
+                      - condition: template
+                        value_template: "{{ dont_disturb_flag }}"
+                      - condition: template
+                        value_template: "{{ states('binary_sensor.dont_disturb_nighttime') }}"
                 then:
                   - action: light.turn_on
                     target: !input light_target
diff --git a/blueprints/automation/homeassistant/motion_light_trix_ng.yaml b/blueprints/automation/homeassistant/motion_light_trix_ng.yaml
index 18b8b84..4852403 100644
--- a/blueprints/automation/homeassistant/motion_light_trix_ng.yaml
+++ b/blueprints/automation/homeassistant/motion_light_trix_ng.yaml
@@ -129,8 +129,11 @@ actions:
                         before_offset: "+01:00:00"
                 then:
                   - if:
-                      - condition: template
-                        value_template: "{{ dont_disturb_flag }}"
+                      - and:
+                          - condition: template
+                            value_template: "{{ dont_disturb_flag }}"
+                          - condition: template
+                            value_template: "{{ states('binary_sensor.dont_disturb_nighttime') }}"
                     then:
                       - action: light.turn_on
                         target: !input light_target
@@ -145,8 +148,11 @@ actions:
                           color_temp_kelvin: 2500
             else: # Always active
               - if:
-                  - condition: template
-                    value_template: "{{ dont_disturb_flag }}"
+                  - and:
+                      - condition: template
+                        value_template: "{{ dont_disturb_flag }}"
+                      - condition: template
+                        value_template: "{{ states('binary_sensor.dont_disturb_nighttime') }}"
                 then:
                   - action: light.turn_on
                     target: !input light_target