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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/mvc/event.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
     
    7474    QString aliasEvent("E");
    7575    QString aliasEventRoom("R");
    76     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(
     76    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(
    7777                    columnsForSelect(aliasEvent), Event::sTableName, aliasEvent, "EVENT_ROOM", aliasEventRoom));
    78     query.bindValue(":conf", conferenceId);
     78    query.bindValue(":conf_e", conferenceId);
     79    query.bindValue(":conf_r", conferenceId);
    7980    query.bindValue(":start", dayStart.toTime_t());
    8081    query.bindValue(":end", dayStart.addDays(1).toTime_t());
Note: See TracChangeset for help on using the changeset viewer.