first working version of the search

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 00ae49b6d29e7803878b04f51e41a5709cc1ff72..defed3c82fa554a0d0ee8e0059e948625a1ff925 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -70,7 +70,7 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent)
     trackTreeView->setModel(new EventModel());
     trackTreeView->setItemDelegate(new Delegate(trackTreeView));
 
     trackTreeView->setModel(new EventModel());
     trackTreeView->setItemDelegate(new Delegate(trackTreeView));
 

-    // DAY EVENTS View
+    // SEARCH EVENTS View

        searchTreeView->setHeaderHidden(true);
        searchTreeView->setRootIsDecorated(false);
        searchTreeView->setIndentation(0);
        searchTreeView->setHeaderHidden(true);
        searchTreeView->setRootIsDecorated(false);
        searchTreeView->setIndentation(0);


@@ -111,6 +111,7 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent)
         dayNavigator->setDates(aStartDate, aEndDate);
         trackDayNavigator->setDates(aStartDate, aEndDate);
         favouriteDayNavigator->setDates(aStartDate, aEndDate);
         dayNavigator->setDates(aStartDate, aEndDate);
         trackDayNavigator->setDates(aStartDate, aEndDate);
         favouriteDayNavigator->setDates(aStartDate, aEndDate);

+        searchDayNavigator->setDates(aStartDate, aEndDate);

     }
 
     connect(tabWidget, SIGNAL(currentChanged(int)), this, SLOT(updateTab(int)));
     }
 
     connect(tabWidget, SIGNAL(currentChanged(int)), this, SLOT(updateTab(int)));


@@ -274,9 +275,11 @@ void MainWindow::searchClicked()
     if( searchAbstract->isChecked() )
         columns.append( "abstract" );
 
     if( searchAbstract->isChecked() )
         columns.append( "abstract" );
 

+    searchTreeView->reset();

     if( mSqlEngine->searchEvent( confId, columns, searchEdit->text() ) > 0 ){
     if( mSqlEngine->searchEvent( confId, columns, searchEdit->text() ) > 0 ){

-        searchTreeView->setVisible(true);
-        searchDayNavigator->setVisible(true);
+        static_cast<EventModel*>(searchTreeView->model())->loadSearchResultEvents(Conference::getById(confId).start(),confId);
+        searchDayNavigator->show();
+        searchTreeView->show();

     }
 }
 
     }
 }
 

diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui
index 57d3afaa695aa880015df83ad4c39e38e2f30a9e..abde2b01482c28baabef265311a440fa271ad5fd 100644 (file)
--- a/src/gui/mainwindow.ui
+++ b/src/gui/mainwindow.ui
@@ -90,86 +90,86 @@
         </item>
        </layout>
       </widget>
         </item>
        </layout>
       </widget>

-      <widget class="QWidget" name="searchTab" >
-       <attribute name="title" >
+      <widget class="QWidget" name="searchTab">
+       <attribute name="title">

         <string>Search</string>
        </attribute>
         <string>Search</string>
        </attribute>

-       <layout class="QVBoxLayout" name="verticalLayout_3" >
-        <item>
-         <layout class="QFormLayout" name="formLayout" >
-          <property name="fieldGrowthPolicy" >
-           <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-          </property>
-          <item row="0" column="0" >
-           <widget class="QCheckBox" name="searchTitle" >
-            <property name="text" >
-             <string>Title</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1" >
-           <layout class="QHBoxLayout" name="horizontalLayout" >
-            <item>
-             <widget class="QLineEdit" name="searchEdit" >
-              <property name="enabled" >
-               <bool>true</bool>
-              </property>
-              <property name="toolTip" >
-               <string>type a keyword to search</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="searchButton" >
-              <property name="text" >
-               <string>Search</string>
-              </property>
-              <property name="checkable" >
-               <bool>false</bool>
-              </property>
-              <property name="autoDefault" >
-               <bool>false</bool>
-              </property>
-              <property name="default" >
-               <bool>true</bool>
-              </property>
-              <property name="flat" >
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item row="1" column="0" >
-           <widget class="QCheckBox" name="searchAbstract" >
-            <property name="text" >
-             <string>Abstract</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <widget class="DayNavigatorWidget" native="1" name="searchDayNavigator" >
-          <property name="maximumSize" >
-           <size>
-            <width>16777215</width>
-            <height>16777215</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="TreeView" name="searchTreeView" >
-          <property name="maximumSize" >
-           <size>
-            <width>16777215</width>
-            <height>16777215</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-       </layout>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+         <item>
+          <layout class="QFormLayout" name="formLayout">
+           <property name="fieldGrowthPolicy">
+            <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+           </property>
+           <item row="0" column="0">
+            <widget class="QCheckBox" name="searchTitle">
+             <property name="text">
+              <string>Title</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <layout class="QHBoxLayout" name="horizontalLayout">
+             <item>
+              <widget class="QLineEdit" name="searchEdit">
+               <property name="enabled">
+                <bool>true</bool>
+               </property>
+               <property name="toolTip">
+                <string>type a keyword to search</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QPushButton" name="searchButton">
+               <property name="text">
+                <string>Search</string>
+               </property>
+               <property name="checkable">
+                <bool>false</bool>
+               </property>
+               <property name="autoDefault">
+                <bool>false</bool>
+               </property>
+               <property name="default">
+                <bool>true</bool>
+               </property>
+               <property name="flat">
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item row="1" column="0">
+            <widget class="QCheckBox" name="searchAbstract">
+             <property name="text">
+              <string>Abstract</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <widget class="DayNavigatorWidget" name="searchDayNavigator" native="true">
+           <property name="maximumSize">
+            <size>
+             <width>16777215</width>
+             <height>16777215</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="TreeView" name="searchTreeView">
+           <property name="maximumSize">
+            <size>
+             <width>16777215</width>
+             <height>16777215</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+        </layout>

       </widget>
       <widget class="QWidget" name="mapTab" >
        <attribute name="title" >
       </widget>
       <widget class="QWidget" name="mapTab" >
        <attribute name="title" >

diff --git a/src/mvc/event.cpp b/src/mvc/event.cpp
index 022a8ac105bc4164229ab950062b195e281d5868..8bf984d299b2e3d9fb7ea70da44d754b198c7314 100644 (file)
--- a/src/mvc/event.cpp
+++ b/src/mvc/event.cpp
@@ -113,3 +113,20 @@ void Event::setPersons(const QStringList &persons)
     // TODO: implement
 }
 
     // TODO: implement
 }
 

+QList<Event> Event::getSearchResultByDate(const QDate& date, int conferenceId, QString orderBy)
+{
+
+    QString strQuery = QString("SELECT %1 FROM EVENT INNER JOIN VIRTUAL_EVENT USING (xid_conference, id) "
+        "INNER JOIN SEARCH_EVENT USING (xid_conference, id) ").arg( columnsForSelectJoin2T() );
+    strQuery += QString(
+        "WHERE %1.xid_conference = :conf AND %1.start >= :start AND %1.start < :end ORDER BY %1.%2").arg(sTable1Name, orderBy);
+    qDebug() << strQuery;
+    QSqlQuery query;
+    query.prepare( strQuery );
+    query.bindValue(":conf", conferenceId);
+    query.bindValue(":start", convertToDb(date, QVariant::DateTime));
+    query.bindValue(":end", convertToDb(date.addDays(1), QVariant::DateTime));
+
+    return load(query);
+}
+

diff --git a/src/mvc/event.h b/src/mvc/event.h
index 2b392dc06e3dc1c3fd4a078996d59e5ec81e2357..93ca4e31ad076f7c8e852e9ce1b646758c241d0a 100644 (file)
--- a/src/mvc/event.h
+++ b/src/mvc/event.h
@@ -27,6 +27,7 @@ public:
     static Event getById(int id, int conferenceId);
     static QList<Event> getByDate(const QDate & date, int conferenceId, QString orderBy);
     static QList<Event> getFavByDate(const QDate & date, int conferenceId); // get Favourities by Date
     static Event getById(int id, int conferenceId);
     static QList<Event> getByDate(const QDate & date, int conferenceId, QString orderBy);
     static QList<Event> getFavByDate(const QDate & date, int conferenceId); // get Favourities by Date

+    static QList<Event> getSearchResultByDate(const QDate& date, int conferenceId, QString orderBy);

 public:
     // Table 1
     int id() const { return value("id").toInt(); }
 public:
     // Table 1
     int id() const { return value("id").toInt(); }

diff --git a/src/mvc/eventmodel.cpp b/src/mvc/eventmodel.cpp
index c877f02568f912a04f0b098a1bc042f09d526d13..abd688f3092a5f3643c95e23519c8045ddfa66ee 100644 (file)
--- a/src/mvc/eventmodel.cpp
+++ b/src/mvc/eventmodel.cpp
@@ -182,6 +182,18 @@ void EventModel::loadFavEvents(const QDate &aDate, int aConferenceId)
     createTimeGroups();
 }
 
     createTimeGroups();
 }
 

+void EventModel::loadSearchResultEvents(const QDate &aDate, int aConferenceId)
+{
+    clearModel();
+    // check for existence of the conference in the DB
+    if(Conference::getAll().count())
+    {
+        qDebug() << "Loading search result Data: [" << Conference::getById(aConferenceId).title() << "] " << aDate;
+        mEvents = Event::getSearchResultByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, "start");
+    }
+    createTimeGroups();
+}
+

 void EventModel::loadEventsByTrack(const QDate &aDate, int aConferenceId)
 {
     clearModel();
 void EventModel::loadEventsByTrack(const QDate &aDate, int aConferenceId)
 {
     clearModel();

diff --git a/src/mvc/eventmodel.h b/src/mvc/eventmodel.h
index 0fdbe9b0d705ecda7986128e1424915237f7d859..c36917b554d1b2f9c40b58b4ffce7397422bc6ac 100644 (file)
--- a/src/mvc/eventmodel.h
+++ b/src/mvc/eventmodel.h
@@ -19,6 +19,7 @@ public:
     void loadEvents(const QDate &aDate, int aConferenceId); // loads Events from the DB
     void loadFavEvents(const QDate &aDate, int aConferenceId); // loads Favourite events from the DB
     void loadEventsByTrack(const QDate &aDate, int aConferenceId); // loads Events grouped by Track from the DB
     void loadEvents(const QDate &aDate, int aConferenceId); // loads Events from the DB
     void loadFavEvents(const QDate &aDate, int aConferenceId); // loads Favourite events from the DB
     void loadEventsByTrack(const QDate &aDate, int aConferenceId); // loads Events grouped by Track from the DB

+    void loadSearchResultEvents(const QDate &aDate, int aConferenceId);

     // a method to force 'EventModel' emit signal 'dataChanged()'
     // a 'view', eg. 'TreeView' listens for this signal and redraws changed items(indexes)
     void emitDataChangedSignal(const QModelIndex &aTopLeft, const QModelIndex &aBottomRight);
     // a method to force 'EventModel' emit signal 'dataChanged()'
     // a 'view', eg. 'TreeView' listens for this signal and redraws changed items(indexes)
     void emitDataChangedSignal(const QModelIndex &aTopLeft, const QModelIndex &aBottomRight);

diff --git a/src/orm/ormrecord.h b/src/orm/ormrecord.h
index ae848eab30745a33093a9fb8745ced1ded8c9848..a4923d77ab5d565a4a964456ceaff5e2be652b97 100644 (file)
--- a/src/orm/ormrecord.h
+++ b/src/orm/ormrecord.h
@@ -142,6 +142,10 @@ QList<T> OrmRecord<T>::load(QSqlQuery query)
             qDebug() << "Error: " << query.lastError().driverText() << "; Type: " << query.lastError().type();
             throw new OrmSqlException(query.lastError().text());
         }
             qDebug() << "Error: " << query.lastError().driverText() << "; Type: " << query.lastError().type();
             throw new OrmSqlException(query.lastError().text());
         }

+        else
+        {
+            qDebug() << "SQL OK";
+        }

     }
 
     QList<T> objects;
     }
 
     QList<T> objects;


@@ -149,7 +153,7 @@ QList<T> OrmRecord<T>::load(QSqlQuery query)
     {
         objects << hydrate(query.record());
     }
     {
         objects << hydrate(query.record());
     }

-
+    qDebug() << "Fetch done";

     return objects;
 }
 
     return objects;
 }
 

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index d74792b862dbf9eab4fd816de6544b8f746b18f5..c9a0e213b04478eb0ac1587f07b74620c7785a1b 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -37,8 +37,10 @@ QString SqlEngine::login(const QString &aDatabaseType, const QString &aDatabaseN
         //  - create new DB from resource, which contains empty DB with tables
         result = createTables(database);
     }
         //  - create new DB from resource, which contains empty DB with tables
         result = createTables(database);
     }

-
-    database.open();
+    else
+    {
+        database.open();
+    }

 
     //LOG_INFO(QString("Opening '%1' database '%2'").arg(aDatabaseType).arg(aDatabaseName));
 
 
     //LOG_INFO(QString("Opening '%1' database '%2'").arg(aDatabaseType).arg(aDatabaseName));
 


@@ -317,13 +319,15 @@ int SqlEngine::searchEvent(int aConferenceId, const QList<QString> &aColumns, co
     if ( !db.isValid() || !db.isOpen())
         return -1;
 
     if ( !db.isValid() || !db.isOpen())
         return -1;
 

-    QString query = QString(
-        "DROP TABLE IF EXISTS SEARCH_EVENT;"
-        "CREATE TEMP TABLE SEARCH_EVENT ( xid_conference INTEGER  NOT NULL, id INTEGER NOT NULL );"
-        "INSERT INTO SEARCH_EVENT ( xid_conference, id) "
-            "SELECT xid_conference, id FROM EVENT AS e INNER JOIN VIRTUAL_EVENT AS ve USING (xid_conference, id) "
-            "WHERE xid_conference = %1 AND (").arg( aConferenceId );

 
 

+    // DROP
+    execQuery( db, "DROP TABLE IF EXISTS SEARCH_EVENT;");
+    // CREATE
+    execQuery( db, "CREATE TABLE SEARCH_EVENT ( xid_conference INTEGER  NOT NULL, id INTEGER NOT NULL );");
+    // INSERT
+    QString query = QString("INSERT INTO SEARCH_EVENT ( xid_conference, id) "
+                "SELECT xid_conference, id FROM EVENT AS e INNER JOIN VIRTUAL_EVENT AS ve USING (xid_conference, id) "
+                "WHERE xid_conference = %1 AND (").arg( aConferenceId );

     int i = 0;
     foreach (QString str, aColumns){
         query += QString("%1 LIKE '\%%2\%' OR ").arg( aColumns.at(i++), aKeyword );
     int i = 0;
     foreach (QString str, aColumns){
         query += QString("%1 LIKE '\%%2\%' OR ").arg( aColumns.at(i++), aKeyword );


@@ -331,17 +335,23 @@ int SqlEngine::searchEvent(int aConferenceId, const QList<QString> &aColumns, co
     query.chop( QString(" OR ").length() );
     query += QString(");");
 
     query.chop( QString(" OR ").length() );
     query += QString(");");
 

-    qDebug() << "\nSQL: " << query;
+    execQuery( db, query );

 
 

-    db.exec();
+    //TODO: retun number of rows from SEARCH_EVENT
+    return 1;
+}
+
+bool SqlEngine::execQuery(QSqlDatabase &aDatabase, const QString &aQuery)
+{
+    qDebug() << "\nSQL: " << aQuery;

 
 

-    if( db.lastError().isValid() && db.lastError().number() != 0 ){
-        qDebug() << "SQL ERR: " << db.lastError().number() << ", " << db.lastError().text();
-        return 0;
+    QSqlQuery sqlQuery(aDatabase);
+    if( !sqlQuery.exec(aQuery) ){
+       qDebug() << "SQL ERR: " << sqlQuery.lastError().number() << ", " << sqlQuery.lastError().text();
+       return false;

     }
     else{
     }
     else{

-        qDebug() << "SQL OK.\n";
-        return 1;
+       qDebug() << "SQL OK.\n";
+       return true;

     }
     }

-

 }
 }

diff --git a/src/sql/sqlengine.h b/src/sql/sqlengine.h
index 110eb24e47d57d33935049c035b8c1782a48c78b..272865f9f659b331d59f0c9512da3290d9d9f826 100644 (file)
--- a/src/sql/sqlengine.h
+++ b/src/sql/sqlengine.h
@@ -24,6 +24,7 @@ class SqlEngine : public QObject
     private:
         QString login(const QString &aDatabaseType, const QString &aDatabaseName);
         bool createTables(QSqlDatabase &aDatabase);
     private:
         QString login(const QString &aDatabaseType, const QString &aDatabaseName);
         bool createTables(QSqlDatabase &aDatabase);

+        bool execQuery(QSqlDatabase &aDatabase, const QString &aQuery);

 };
 
 #endif /* SQLENGINE_H */
 };
 
 #endif /* SQLENGINE_H */