search update

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index ec6fc0e88262013017e00ae5da5066049ffc1f10..43ae8b29c2a389d9b69bf3f37e8ed6eed7176c6c 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -121,6 +121,7 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent)
     connect(nowTreeView, SIGNAL(requestForWarning(const QModelIndex &)), SLOT(displayWarning(const QModelIndex &)));
     // event search button clicked
     connect(searchButton, SIGNAL(clicked()), SLOT(searchClicked()));
     connect(nowTreeView, SIGNAL(requestForWarning(const QModelIndex &)), SLOT(displayWarning(const QModelIndex &)));
     // event search button clicked
     connect(searchButton, SIGNAL(clicked()), SLOT(searchClicked()));

+    connect(searchAgainButton, SIGNAL(clicked()), SLOT(searchAgainClicked()));

     // event conference map button clicked
     connect(showMapButton, SIGNAL(clicked()), SLOT(conferenceMapClicked()));
     //
     // event conference map button clicked
     connect(showMapButton, SIGNAL(clicked()), SLOT(conferenceMapClicked()));
     //


@@ -150,7 +151,8 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent)
     }
 
     searchTreeView->hide();
     }
 
     searchTreeView->hide();

-    searchDayNavigator->hide();
+    searchVerticalWidget->hide();
+    searchHead->show();

 
     // open dialog for given Event ID
     // this is used in case Alarm Dialog request application to start
 
     // open dialog for given Event ID
     // this is used in case Alarm Dialog request application to start


@@ -232,12 +234,15 @@ void MainWindow::updateSearchView(const QDate &aDate)
     searchTreeView->reset();
     int eventsCount = static_cast<EventModel*>(searchTreeView->model())->loadSearchResultEvents(aDate,AppSettings::confId());
     if( eventsCount ){
     searchTreeView->reset();
     int eventsCount = static_cast<EventModel*>(searchTreeView->model())->loadSearchResultEvents(aDate,AppSettings::confId());
     if( eventsCount ){

-        searchDayNavigator->show();
+        searchVerticalWidget->show();
+        searchAgainButton->show();

         searchTreeView->show();
         searchTreeView->show();

+        searchHead->hide();

     }
     else{
         searchTreeView->hide();
     }
     else{
         searchTreeView->hide();

-        searchDayNavigator->hide();
+        searchVerticalWidget->hide();
+        searchHead->show();

     }
 }
 
     }
 }
 


@@ -293,6 +298,12 @@ void MainWindow::searchClicked()
     updateSearchView( Conference::getById(AppSettings::confId()).start() );
 }
 
     updateSearchView( Conference::getById(AppSettings::confId()).start() );
 }
 

+void MainWindow::searchAgainClicked()
+{
+    searchHead->show();
+    searchAgainButton->hide();
+}
+

 void MainWindow::conferenceMapClicked()
 {
 
 void MainWindow::conferenceMapClicked()
 {
 

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index af0b5e7dc3c7308ed3cd8b45bd8d4526ba5ac8ac..8e311c2527caf19cdb7c7ce215c1224cfee42952 100644 (file)
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -27,6 +27,7 @@ private slots:
     void displayMap(const QModelIndex &aIndex);
     void displayWarning(const QModelIndex &aIndex);
     void searchClicked();
     void displayMap(const QModelIndex &aIndex);
     void displayWarning(const QModelIndex &aIndex);
     void searchClicked();

+       void searchAgainClicked();

     void conferenceMapClicked();
     void tabHasChanged(int aIndex);
     void eventHasChanged(int aEventId);
     void conferenceMapClicked();
     void tabHasChanged(int aIndex);
     void eventHasChanged(int aEventId);

diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui
index a5e7d6a8f605be2ecf0bd63664194292d88d0c80..9abb7e4a96fa5eafdc7543ed6f3f40965645e598 100644 (file)
--- a/src/gui/mainwindow.ui
+++ b/src/gui/mainwindow.ui
@@ -118,83 +118,98 @@
         </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" >
+       <layout class="QHBoxLayout" name="horizontalLayout_1">

         <item>
         <item>

-         <layout class="QFormLayout" name="searchHeadLayout" >
-          <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>
+         <widget class="QWidget" name="searchVerticalWidget" native="true">
+          <layout class="QVBoxLayout" name="searchDayNavigatorVerticalLayout">
+           <item>
+            <widget class="QToolButton" name="searchAgainButton">
+             <property name="text">
+              <string>Search again</string>
+             </property>
+             <property name="toolButtonStyle">
+              <enum>Qt::ToolButtonTextOnly</enum>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="DayNavigatorWidget" name="searchDayNavigator" native="true">
+             <property name="maximumSize">
+              <size>
+               <width>16777215</width>
+               <height>16777215</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>

         </item>
         <item>
         </item>
         <item>

-         <layout class="QHBoxLayout" name="searchDayNavigatorHorizontalLayout" >
+         <layout class="QVBoxLayout" name="verticalLayout_3">

           <item>
           <item>

-           <spacer name="horizontalSpacer_2" >
-            <property name="orientation" >
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0" >
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
+           <widget class="QWidget" name="searchHead" native="true">
+            <layout class="QFormLayout" name="searchHeadLayout">
+             <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>true</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>
+           </widget>

           </item>
           <item>
           </item>
           <item>

-           <widget class="DayNavigatorWidget" native="1" name="searchDayNavigator" >
-            <property name="maximumSize" >
+           <widget class="TreeView" name="searchTreeView">
+            <property name="maximumSize">

              <size>
               <width>16777215</width>
               <height>16777215</height>
              <size>
               <width>16777215</width>
               <height>16777215</height>


@@ -202,31 +217,8 @@
             </property>
            </widget>
           </item>
             </property>
            </widget>
           </item>

-          <item>
-           <spacer name="horizontalSpacer" >
-            <property name="orientation" >
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0" >
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>

          </layout>
         </item>
          </layout>
         </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="conferenceTab" >
        </layout>
       </widget>
      <widget class="QWidget" name="conferenceTab" >

diff --git a/src/mvc/event.cpp b/src/mvc/event.cpp
index 9a605767acbcc0d6f82c6f77e22df5f682cd34b9..2685fb4cd84140d5f09a0a0210ab7ef9980fa411 100644 (file)
--- a/src/mvc/event.cpp
+++ b/src/mvc/event.cpp
@@ -127,12 +127,27 @@ QList<Event> Event::getSearchResultByDate(const QDate& date, int conferenceId, Q
     QString strQuery = QString("SELECT %1 FROM EVENT INNER JOIN SEARCH_EVENT USING (xid_conference, id) ").arg(columnsForSelect());
     strQuery += QString("WHERE xid_conference = :conf AND start >= :start AND start < :end ORDER BY %1").arg(orderBy);
     qDebug() << strQuery;
     QString strQuery = QString("SELECT %1 FROM EVENT INNER JOIN SEARCH_EVENT USING (xid_conference, id) ").arg(columnsForSelect());
     strQuery += QString("WHERE xid_conference = :conf AND start >= :start AND start < :end ORDER BY %1").arg(orderBy);
     qDebug() << strQuery;

+    QList<Event> list;

     QSqlQuery query;
     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);
+    try{
+        if( !query.prepare( strQuery ) ){
+            qDebug() << "QSqlQuery.prepare error";
+            throw OrmSqlException( query.lastError().text() );
+        }
+
+        query.bindValue(":conf", conferenceId);
+        query.bindValue(":start", convertToDb(date, QVariant::DateTime));
+        query.bindValue(":end", convertToDb(date.addDays(1), QVariant::DateTime));
+
+        list = load(query);
+    }
+    catch(OrmException &e)
+    {
+        qDebug() << "getSearchResultByDate error: " << e.text();
+    }
+    catch(...){
+        qDebug() << "getSearchResultByDate failed ...";
+    }
+    return list;

 }
 
 }
 

diff --git a/src/orm/ormrecord.h b/src/orm/ormrecord.h
index d25553bd99f4128748303e7d2fb843c65ce8047d..ef074edf3945f9f9b2709a92eb2b3f4ae4de7db3 100644 (file)
--- a/src/orm/ormrecord.h
+++ b/src/orm/ormrecord.h
@@ -19,14 +19,14 @@ private:
     QString mText;
 };
 
     QString mText;
 };
 

-class OrmNoObjectException : OrmException
+class OrmNoObjectException : public OrmException

 {
 public:
     OrmNoObjectException() : OrmException("No object exception"){};
     ~OrmNoObjectException(){};
 };
 
 {
 public:
     OrmNoObjectException() : OrmException("No object exception"){};
     ~OrmNoObjectException(){};
 };
 

-class OrmSqlException : OrmException
+class OrmSqlException : public OrmException

 {
 public:
     OrmSqlException(const QString& text) : OrmException( QString("Sql error: ") + text ) {};
 {
 public:
     OrmSqlException(const QString& text) : OrmException( QString("Sql error: ") + text ) {};

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index 335359a0264cf82a4a0b5d7e53d1a7bf925673ac..b48e49dc950c57b1fddeb10b2ff2b248936964a4 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -232,7 +232,7 @@ bool SqlEngine::createTables(QSqlDatabase &aDatabase)
 
         query.exec("CREATE TABLE CONFERENCE ( \
             id INTEGER PRIMARY KEY  AUTOINCREMENT  NOT NULL , \
 
         query.exec("CREATE TABLE CONFERENCE ( \
             id INTEGER PRIMARY KEY  AUTOINCREMENT  NOT NULL , \

-            title VARCHAR NOT NULL , \
+            title VARCHAR UNIQUE NOT NULL , \

             subtitle VARCHAR, \
             venue VARCHAR, \
             city VARCHAR NOT NULL , \
             subtitle VARCHAR, \
             venue VARCHAR, \
             city VARCHAR NOT NULL , \


@@ -248,12 +248,12 @@ bool SqlEngine::createTables(QSqlDatabase &aDatabase)
 
         query.exec("CREATE TABLE ROOM ( \
             id INTEGER PRIMARY KEY  AUTOINCREMENT  NOT NULL , \
 
         query.exec("CREATE TABLE ROOM ( \
             id INTEGER PRIMARY KEY  AUTOINCREMENT  NOT NULL , \

-            name VARCHAR NOT NULL , \
+            name VARCHAR UNIQUE NOT NULL , \

             picture VARCHAR NOT NULL)");
 
         query.exec("CREATE TABLE PERSON ( \
             id INTEGER PRIMARY KEY  NOT NULL , \
             picture VARCHAR NOT NULL)");
 
         query.exec("CREATE TABLE PERSON ( \
             id INTEGER PRIMARY KEY  NOT NULL , \

-            name VARCHAR NOT NULL)");
+            name VARCHAR UNIQUE NOT NULL)");

 
         query.exec("CREATE TABLE EVENT ( \
             xid_conference INTEGER  NOT NULL, \
 
         query.exec("CREATE TABLE EVENT ( \
             xid_conference INTEGER  NOT NULL, \


@@ -277,14 +277,16 @@ bool SqlEngine::createTables(QSqlDatabase &aDatabase)
             xid_conference INTEGER NOT NULL , \
             xid_event INTEGER NOT NULL , \
             xid_person INTEGER NOT NULL, \
             xid_conference INTEGER NOT NULL , \
             xid_event INTEGER NOT NULL , \
             xid_person INTEGER NOT NULL, \

-            FOREIGN KEY(xid_conference, xid_event) REFERENCES EVENT(xid_conference, id), \
+            FOREIGN KEY(xid_conference) REFERENCES CONFERENCE(id), \
+            FOREIGN KEY(xid_event) REFERENCES EVENT(id), \

             FOREIGN KEY(xid_person) REFERENCES PERSON(id))");
 
         query.exec("CREATE TABLE EVENT_ROOM ( \
             xid_conference INTEGER NOT NULL , \
             xid_event INTEGER NOT NULL , \
             xid_room INTEGER NOT NULL, \
             FOREIGN KEY(xid_person) REFERENCES PERSON(id))");
 
         query.exec("CREATE TABLE EVENT_ROOM ( \
             xid_conference INTEGER NOT NULL , \
             xid_event INTEGER NOT NULL , \
             xid_room INTEGER NOT NULL, \

-            FOREIGN KEY(xid_conference, xid_event) REFERENCES EVENT(xid_conference, id), \
+            FOREIGN KEY(xid_conference) REFERENCES CONFERENCE(id), \
+            FOREIGN KEY(xid_event) REFERENCES EVENT(id), \

             FOREIGN KEY(xid_room) REFERENCES ROOM(id))");
 
         query.exec("CREATE TABLE LINK ( \
             FOREIGN KEY(xid_room) REFERENCES ROOM(id))");
 
         query.exec("CREATE TABLE LINK ( \


@@ -293,7 +295,8 @@ bool SqlEngine::createTables(QSqlDatabase &aDatabase)
             xid_event INTEGER NOT NULL, \
             name VARCHAR, \
             url VARCHAR NOT NULL, \
             xid_event INTEGER NOT NULL, \
             name VARCHAR, \
             url VARCHAR NOT NULL, \

-            FOREIGN KEY(xid_conference, xid_event) REFERENCES EVENT(xid_conference, id))");
+            FOREIGN KEY(xid_conference) REFERENCES CONFERENCE(id), \
+            FOREIGN KEY(xid_event) REFERENCES EVENT(id)");

     }
     else
     {
     }
     else
     {


@@ -314,7 +317,7 @@ int SqlEngine::searchEvent(int aConferenceId, const QList<QString> &aColumns, co
     // DROP
     execQuery( db, "DROP TABLE IF EXISTS SEARCH_EVENT;");
     // CREATE
     // 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 );");
+    execQuery( db, "CREATE TEMP 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 "
     // INSERT
     QString query = QString("INSERT INTO SEARCH_EVENT ( xid_conference, id) "
                 "SELECT xid_conference, id FROM EVENT "