Changeset 7b3cd0e in confclerk_git for src/mvc/event.cpp

Timestamp:

01/20/17 21:46:55 (6 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

ec7fa22

Parents:

ea8416e

Message:

Event favourite is now tristate in the code now and the corresponding buttons are tristate as well.

File:

• src/mvc/event.cpp (modified) (3 diffs)

src/mvc/event.cpp

@@ -91 +91 @@
            ( start >= :s1 AND ( start + duration ) < :e1 ) \
         OR ( ( start + duration ) > :s2 AND start < :e2 ) ) \
-        AND favourite = 1 AND NOT id = :id ORDER BY start, duration");
+        AND favourite >= 1 AND NOT id = :id ORDER BY start, duration");
     query.bindValue(":conf", event.conferenceId());
     query.bindValue(":s1", convertToDb(event.start(), QVariant::DateTime));
@@ -117 +117 @@
     QDateTime dayStart(date, conference.dayChangeTime(), Qt::UTC);
     QSqlQuery query;
-    query.prepare(selectQuery() + QString("WHERE xid_conference = :conf AND start >= :start AND start < :end AND favourite = 1 ORDER BY start, duration"));
+    query.prepare(selectQuery() + QString("WHERE xid_conference = :conf AND start >= :start AND start < :end AND favourite >= 1 ORDER BY start, duration"));
     query.bindValue(":conf", conferenceId);
     query.bindValue(":start", dayStart.toTime_t());
@@ -195 +195 @@
 bool Event::hasTimeConflict() const
 {
-    if(!isFavourite()) // if it's not favourite, it can't have time-conflict
+    if(favourite() == Favourite_no) // if it's not favourite, it can't have time-conflict
         return false;
 
-    return conflictEvents(id(),conferenceId()).count() > 0 ? true : false;
+    return conflictEvents(id(),conferenceId()).count() > 0;
+}
+
+void Event::cycleFavourite() {
+    switch (favourite()) {
+        case Favourite_no: setFavourite(Favourite_strong); break;
+        case Favourite_strong: setFavourite(Favourite_weak); break;
+        case Favourite_weak: setFavourite(Favourite_no); break;
+    }
 }