Changeset 31d8a4c

Timestamp:

07/28/21 23:42:45 (10 months ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master

Children:

ffb6be7

Parents:

e4dcafe

Message:

Adjust alarm logic to include UTC offset or displayTimeShift.

File:

• src/mvc/event.cpp (modified) (1 diff)

src/mvc/event.cpp

@@ -104 +104 @@
 
 QList<Event> Event::getImminentAlarmEvents(int maxSecToAlarm, int conferenceId) {
+    Conference conference = Conference::getById(conferenceId);
     QSqlQuery query;
     query.prepare(selectQuery() + "WHERE xid_conference = :conf AND (start < :start AND alarm = 1) ORDER BY start, duration");
     query.bindValue(":conf", conferenceId);
-    query.bindValue(":start", convertToDb(QDateTime::currentDateTime().addSecs(maxSecToAlarm), QVariant::DateTime));
+    QDateTime start;
+    if (conference.hasUtcOffset()) {
+        start = QDateTime::currentDateTimeUtc().addSecs(conference.utcOffset() * 60);
+    } else {
+        start = QDateTime::currentDateTime();
+        if (conference.hasDisplayTimeShift()) start = start.addSecs(conference.displayTimeShift() * 60);
+    }
+    start = start.addSecs(maxSecToAlarm);
+    query.bindValue(":start", convertToDb(start, QVariant::DateTime));
     return load(query);
 }