Interactive: make sure notifyByLayoutCode checks for scheduled action…

…s. (#1989) xibosignage/xibo#3086
xibosignage · Aug 17, 2023 · 9feff89 · 9feff89
1 parent 3b25f84
commit 9feff89
Showing 1 changed file with 30 additions and 2 deletions.
diff --git a/lib/Service/DisplayNotifyService.php b/lib/Service/DisplayNotifyService.php
@@ -1,8 +1,8 @@
 <?php
 /*
- * Copyright (c) 2022 Xibo Signage Ltd
+ * Copyright (C) 2022-2023 Xibo Signage Ltd
  *
- * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Xibo - Digital Signage - https://xibosignage.com
  *
  * This file is part of Xibo.
  *
@@ -723,6 +723,34 @@ public function notifyByLayoutCode($code)
                   )
               )
             UNION
+            SELECT DISTINCT display.displayId,
+                schedule.eventId,
+                schedule.fromDt,
+                schedule.toDt,
+                schedule.recurrence_type AS recurrenceType,
+                schedule.recurrence_detail AS recurrenceDetail,
+                schedule.recurrence_range AS recurrenceRange,
+                schedule.recurrenceRepeatsOn,
+                schedule.lastRecurrenceWatermark,
+                schedule.dayPartId
+            FROM `schedule`
+                     INNER JOIN `lkscheduledisplaygroup`
+                        ON `lkscheduledisplaygroup`.eventId = `schedule`.eventId
+                     INNER JOIN `lkdgdg`
+                        ON `lkdgdg`.parentId = `lkscheduledisplaygroup`.displayGroupId
+                     INNER JOIN `lkdisplaydg`
+                        ON lkdisplaydg.DisplayGroupID = `lkdgdg`.childId
+                     INNER JOIN `display`
+                        ON lkdisplaydg.DisplayID = display.displayID
+            WHERE schedule.actionLayoutCode = :code 
+              AND (
+                  (`schedule`.FromDT < :toDt AND IFNULL(`schedule`.toDt, `schedule`.fromDt) > :fromDt)
+                  OR `schedule`.recurrence_range >= :fromDt 
+                  OR (
+                    IFNULL(`schedule`.recurrence_range, 0) = 0 AND IFNULL(`schedule`.recurrence_type, \'\') <> \'\'
+                  )
+              ) 
+            UNION
             SELECT DISTINCT display.DisplayID,
                 0 AS eventId, 
                 0 AS fromDt,