Changeset 1343ea4 for src/mvc/event.cpp

Timestamp:

01/20/17 23:04:17 (6 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

81d87d7

Parents:

ec7fa22

Message:

Now the conflict severity is drawn.

File:

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

src/mvc/event.cpp

@@ -193 +193 @@
 }
 
-bool Event::hasTimeConflict() const
-{
-    if(favourite() == Favourite_no) // if it's not favourite, it can't have time-conflict
-        return false;
-
-    return conflictEvents(id(),conferenceId()).count() > 0;
+Favourite Event::timeConflict() const {
+    if (favourite() == Favourite_no) // if it's not favourite, it can't have time-conflict
+        return Favourite_no;
+
+    QList<Event> events = conflictEvents(id(),conferenceId());
+
+    // find "strongest" conflict
+    Favourite f = Favourite_no;
+    for (int i = 0; i != events.size(); ++i) {
+        switch (events[i].favourite()) {
+        case Favourite_strong: f = Favourite_strong; break;
+        case Favourite_weak: if (f == Favourite_no) f = Favourite_weak; break;
+        case Favourite_no: break;
+        }
+    }
+    return f;
+
 }