Changeset 8cb5c4f for src


Ignore:
Timestamp:
01/28/10 14:02:35 (12 years ago)
Author:
pavelpa <pavelpa@…>
Branches:
master, qt5
Children:
02a8af2
Parents:
412cef6
Message:

changed conditions for conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/mvc/event.cpp

    r412cef6 r8cb5c4f  
    7474    Event event = Event::getById(aEventId,conferenceId);
    7575    query.prepare(selectQuery() + "WHERE xid_conference = :conf AND ( \
    76            ( start <= :start1 AND ( start + duration ) >= :start2 ) \
    77         OR ( start >= :start3 AND ( start + duration ) <= :end1 ) \
    78         OR ( start <= :end2  AND ( start + duration ) >= :end3 ) ) AND favourite = 1 AND NOT id = :id ORDER BY start");
     76           ( start < :start1 AND ( start + duration ) > :start2 ) \
     77        OR ( start > :start3 AND ( start + duration ) < :end1 ) \
     78        OR ( start < :end2  AND ( start + duration ) > :end3 ) ) AND favourite = 1 AND NOT id = :id ORDER BY start");
    7979    query.bindValue(":conf", event.conferenceId());
    8080    query.bindValue(":start1", convertToDb(event.start(), QVariant::DateTime));
Note: See TracChangeset for help on using the changeset viewer.