Changeset 3a09de6 in confclerk_git for src/mvc

Timestamp:

04/16/13 22:52:25 (10 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

e619be9

Parents:

097e1f4

Message:

Alarms are reported via QSystemTray now (see ticket #46).

Location:

src/mvc

Files:

• event.cpp (modified) (1 diff)
• event.h (modified) (1 diff)
• treeview.cpp (modified) (1 diff)

src/mvc/event.cpp

@@ -95 +95 @@
 
 
+QList<Event> Event::getImminentAlarmEvents(int maxSecToAlarm, int 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));
+    return load(query);
+}
+
+
 QList<Event> Event::getFavByDate(const QDate& date, int conferenceId)
 {

src/mvc/event.h

@@ -50 +50 @@
     static QList<Event> getByDateAndRoom(const QDate& date, int conferenceId);
     static QList<Event> conflictEvents(int aEventId, int conferenceId);
+    static QList<Event> getImminentAlarmEvents(int maxSecToAlarm, int conferenceId);
 public:
     int id() const { return value("id").toInt(); }

src/mvc/treeview.cpp

@@ -111 +111 @@
                     // add alarm to the 'alarmd'
                     Alarm alarm;
-                    alarm.addAlarm(event.conferenceId(), event.id(), event.title(),event.start().addSecs(PRE_EVENT_ALARM_SEC));
+                    alarm.addAlarm(event.conferenceId(), event.id(), event.title(),event.start().addSecs(-AppSettings::preEventAlarmSec()));
 #endif /* MAEMO */
                 }