Changeset 54b69e2 in confclerk_git for src/mvc/event.cpp

Timestamp:

01/13/15 23:27:16 (8 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

ebe26af

Parents:

4b6ae6b

Message:

Merged changes from trunk. It still compiles successfully. :-)

File:

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

src/mvc/event.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
@@ -74 +74 @@
     QString aliasEvent("E");
     QString aliasEventRoom("R");
-    query.prepare(QString("SELECT %1 FROM %2 %3, %4 %5 WHERE %3.xid_conference = :conf AND %3.start >= :start AND %3.start < :end AND %3.id = R.xid_event ORDER BY %5.xid_room, %3.start, %3.duration").arg(
+    query.prepare(QString("SELECT %1 FROM %2 %3, %4 %5 WHERE %3.xid_conference = :conf_e AND %5.xid_conference = :conf_r AND %3.start >= :start AND %3.start < :end AND %3.id = %5.xid_event ORDER BY %5.xid_room, %3.start, %3.duration").arg(
                     columnsForSelect(aliasEvent), Event::sTableName, aliasEvent, "EVENT_ROOM", aliasEventRoom));
-    query.bindValue(":conf", conferenceId);
+    query.bindValue(":conf_e", conferenceId);
+    query.bindValue(":conf_r", conferenceId);
     query.bindValue(":start", dayStart.toTime_t());
     query.bindValue(":end", dayStart.addDays(1).toTime_t());