From 8cb5c4f196fb5ebdf54c43932c2ddb14bf22245b Mon Sep 17 00:00:00 2001 From: pavelpa Date: Thu, 28 Jan 2010 13:02:35 +0000 Subject: [PATCH] changed conditions for conflicts --- src/mvc/event.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mvc/event.cpp b/src/mvc/event.cpp index 07001f1..a65bb4b 100644 --- a/src/mvc/event.cpp +++ b/src/mvc/event.cpp @@ -73,9 +73,9 @@ QList Event::conflictEvents(int aEventId, int conferenceId) QSqlQuery query; Event event = Event::getById(aEventId,conferenceId); query.prepare(selectQuery() + "WHERE xid_conference = :conf AND ( \ - ( start <= :start1 AND ( start + duration ) >= :start2 ) \ - OR ( start >= :start3 AND ( start + duration ) <= :end1 ) \ - OR ( start <= :end2 AND ( start + duration ) >= :end3 ) ) AND favourite = 1 AND NOT id = :id ORDER BY start"); + ( start < :start1 AND ( start + duration ) > :start2 ) \ + OR ( start > :start3 AND ( start + duration ) < :end1 ) \ + OR ( start < :end2 AND ( start + duration ) > :end3 ) ) AND favourite = 1 AND NOT id = :id ORDER BY start"); query.bindValue(":conf", event.conferenceId()); query.bindValue(":start1", convertToDb(event.start(), QVariant::DateTime)); query.bindValue(":start2", convertToDb(event.start(), QVariant::DateTime)); -- 2.30.2