temp commit for search tab

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 241cf9f3e99b411b94a686bde00f97b885e57f7b..977baea90f1fc1e5f5c8706f1442be8bde90af86 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -70,15 +70,27 @@ MainWindow::MainWindow(QWidget *parent)
     actTreeView->setModel(new EventModel());
     actTreeView->setItemDelegate(new Delegate(actTreeView));
 
+    // DAY EVENTS View
+       searchTreeView->setHeaderHidden(true);
+       searchTreeView->setRootIsDecorated(false);
+       searchTreeView->setIndentation(0);
+       searchTreeView->setAnimated(true);
+       searchTreeView->setModel(new EventModel());
+       searchTreeView->setItemDelegate(new Delegate(searchTreeView));
+       searchTreeView->setVisible(false);
+       searchDayNavigator->setVisible(false);
     // event clicked
     connect(dayTreeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &)));
     connect(favTreeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &)));
     connect(actTreeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &)));
+    connect(searchTreeView, SIGNAL(doubleClicked(const QModelIndex &)), SLOT(itemDoubleClicked(const QModelIndex &)));
     // request for map to be displayed
     connect(dayTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
     connect(favTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
     connect(actTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
-
+    connect(searchTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
+    // event search button clicked
+    connect(searchButton, SIGNAL(clicked()), SLOT(searchClicked()));
 
     // TESTING: load some 'fav' data
     if(Conference::getAll().count()) // no conference(s) in the DB
@@ -240,3 +252,19 @@ void MainWindow::displayMap(const QModelIndex &aIndex)
     MapWindow window(map,roomName,this);
     window.exec();
 }
+
+void MainWindow::searchClicked()
+{
+    QList<QString> columns;
+
+    if( searchTitle->isChecked() )
+        columns.append( "title" );
+    if( searchAbstract->isChecked() )
+        columns.append( "abstract" );
+
+    if( mSqlEngine->searchEvent( confId, columns, searchEdit->text() ) > 0 ){
+        searchTreeView->setVisible(true);
+        searchDayNavigator->setVisible(true);
+    }
+}
+

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index 59cadf03c7ee0a6d1b095fb5aff60d40045c4be7..c4b74660e03ee89162d2364781b9d160ebbeb03a 100644 (file)
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -24,6 +24,7 @@ private slots:
     void updateFavouritesDayView(const QDate &aDate);
     void itemClicked(const QModelIndex &aIndex);
     void displayMap(const QModelIndex &aIndex);
+    void searchClicked();
 private:
     SqlEngine *mSqlEngine;
     ScheduleXmlParser *mXmlParser;

diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui
index 024a1a3a2e48f15ba006511d485c41c015e64cbe..c2df896ad88db443a2eda0a5bfd1ce659e5d8e59 100644 (file)
--- a/src/gui/mainwindow.ui
+++ b/src/gui/mainwindow.ui
@@ -90,13 +90,89 @@
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="searchTab" >
-       <attribute name="title" >
+      <widget class="QWidget" name="searchTab">
+       <attribute name="title">
         <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" 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 class="QWidget" name="mapTab">
+       <attribute name="title">
         <string>Map</string>
        </attribute>
       </widget>

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index e135f43f8790f1e40a6f63882b53709e6b0d1cc5..9150bb0c8b7c2fc426f806598237acce674cf981 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -289,3 +289,38 @@ bool SqlEngine::createTables(QSqlDatabase &aDatabase)
     return result;
 }
 
+int SqlEngine::searchEvent(int aConferenceId, const QList<QString> &aColumns, const QString &aKeyword)
+{
+    QSqlDatabase db = QSqlDatabase::database();
+
+    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 );
+
+    int i = 0;
+    foreach (QString str, aColumns){
+        query += QString("%1 LIKE '\%%2\%' OR ").arg( aColumns.at(i++), aKeyword );
+    }
+    query.chop( QString(" OR ").length() );
+    query += QString(");");
+
+    qDebug() << "\nSQL: " << query;
+
+    db.exec();
+
+    if( db.lastError().isValid() && db.lastError().number() != 0 ){
+        qDebug() << "SQL ERR: " << db.lastError().number() << ", " << db.lastError().text();
+        return 0;
+    }
+    else{
+        qDebug() << "SQL OK.\n";
+        return 1;
+    }
+
+}

diff --git a/src/sql/sqlengine.h b/src/sql/sqlengine.h
index afad5ae19c37f03f5cb12a8ae798683afe4be91c..110eb24e47d57d33935049c035b8c1782a48c78b 100644 (file)
--- a/src/sql/sqlengine.h
+++ b/src/sql/sqlengine.h
@@ -18,6 +18,9 @@ class SqlEngine : public QObject
         void addPersonToDB(QHash<QString,QString> &aPerson);
         void addLinkToDB(QHash<QString,QString> &aLink);
         void addRoomToDB(QHash<QString,QString> &aRoom);
+
+        // search Events for ....
+        int searchEvent(int conferenceId, const QList<QString> &columns, const QString &keyword);
     private:
         QString login(const QString &aDatabaseType, const QString &aDatabaseName);
         bool createTables(QSqlDatabase &aDatabase);