X-Git-Url: https://git.toastfreeware.priv.at/toast/confclerk.git/blobdiff_plain/33b5c34473575252a9c841eb00d921f4af6a578c..07ae23af712746b964906f0f1e785bdb13201399:/src/gui/tabcontainer.cpp

diff --git a/src/gui/tabcontainer.cpp b/src/gui/tabcontainer.cpp
index 3d3cc7b..f2e3fff 100644
--- a/src/gui/tabcontainer.cpp
+++ b/src/gui/tabcontainer.cpp
@@ -4,13 +4,7 @@
 #include <QMessageBox>
 #include <QTimer>
 
-#include <sqlengine.h>
-#include <appsettings.h>
-
-#include <conference.h>
-
 #include <treeview.h>
-#include <eventmodel.h>
 #include <delegate.h>
 
 #include "eventdialog.h"
@@ -18,13 +12,9 @@
 
 TabContainer::TabContainer(QWidget *aParent)
     : QWidget(aParent)
-    , mType(EContainerTypeNone)
 {
     setupUi(this);
 
-    searchAgainButton->hide();
-    searchHead->hide();
-
     treeView->setHeaderHidden(true);
     treeView->setRootIsDecorated(false);
     treeView->setIndentation(0);
@@ -39,9 +29,6 @@ TabContainer::TabContainer(QWidget *aParent)
     connect(treeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
     connect(treeView, SIGNAL(requestForWarning(const QModelIndex &)), SLOT(displayWarning(const QModelIndex &)));
 
-    connect(searchButton, SIGNAL(clicked()), SLOT(searchClicked()));
-    connect(searchAgainButton, SIGNAL(clicked()), SLOT(searchAgainClicked()));
-
     if(!Conference::getAll().count()) // no conference(s) in the DB
     {
         dayNavigator->hide(); // hide DayNavigatorWidget
@@ -54,79 +41,11 @@ TabContainer::TabContainer(QWidget *aParent)
     }
 }
 
-void TabContainer::setType(TabContainer::Type aType)
-{
-    mType = aType;
-
-    if(aType == EContainerTypeNow)
-    {
-        QTimer *timer = new QTimer( this );
-        connect( timer, SIGNAL(timeout()), SLOT(timerUpdateTreeView()) );
-        timer->start( 30000); // 30 seconds timer
-    }
-    if(aType == EContainerTypeSearch)
-    {
-        searchHead->show();
-    }
-}
-
 void TabContainer::updateTreeView(const QDate &aDate)
 {
-    switch(mType)
-    {
-        case EContainerTypeDay:
-            {
-                static_cast<EventModel*>(treeView->model())->loadEvents(aDate,AppSettings::confId());
-            }
-            break;
-        case EContainerTypeFavs:
-            {
-                static_cast<EventModel*>(treeView->model())->loadFavEvents(aDate,AppSettings::confId());
-            }
-            break;
-        case EContainerTypeTracks:
-            {
-                static_cast<EventModel*>(treeView->model())->loadEventsByTrack(aDate, AppSettings::confId());
-            }
-            break;
-        case EContainerTypeRooms:
-            {
-                static_cast<EventModel*>(treeView->model())->loadEventsByRoom(aDate, AppSettings::confId());
-            }
-            break;
-        case EContainerTypeNow:
-            {
-                static_cast<EventModel*>(treeView->model())->loadNowEvents(AppSettings::confId());
-                treeView->setAllExpanded(true);
-            }
-            break;
-        case EContainerTypeSearch:
-            {
-                treeView->reset();
-                int eventsCount = static_cast<EventModel*>(treeView->model())->loadSearchResultEvents(aDate,AppSettings::confId());
-                if( eventsCount ||
-                        dayNavigator->getCurrentDate() != Conference::getById(AppSettings::confId()).start() ){
-                    searchAgainButton->show();
-                    dayNavigator->show();
-                    treeView->show();
-                    searchHead->hide();
-                }
-                else{
-                    treeView->hide();
-                    searchAgainButton->hide();
-                    dayNavigator->hide();
-                    searchHead->show();
-                }
-            }
-            break;
-        case EContainerTypeNone:
-        default:
-            {
-                qDebug() << "Container type not specified";
-            }
-    }
-    treeView->reset();
     dayNavigator->show();
+    loadEvents( aDate, AppSettings::confId() );
+    treeView->reset();
 }
 
 void TabContainer::itemClicked(const QModelIndex &aIndex)
@@ -174,26 +93,7 @@ void TabContainer::displayWarning(const QModelIndex &aIndex)
 
 void TabContainer::updateTreeViewModel(int aEventId)
 {
-    switch(mType)
-    {
-        case EContainerTypeFavs:
-            {
-                // requires special handling
-                // we need to reload favourites, because some favourite could be deleted
-                //static_cast<EventModel*>(favTreeView->model())->updateModel(aEventId);
-                QDate aStartDate = Conference::getById(AppSettings::confId()).start();
-                QDate aEndDate = Conference::getById(AppSettings::confId()).end();
-                dayNavigator->setDates(aStartDate, aEndDate);
-                updateTreeView( Conference::getById(AppSettings::confId()).start() );
-            }
-            break;
-        case EContainerTypeDay:
-        case EContainerTypeNone:
-        default:
-            {
-                static_cast<EventModel*>(treeView->model())->updateModel(aEventId);
-            }
-    }
+    static_cast<EventModel*>(treeView->model())->updateModel(aEventId);
 }
 
 void TabContainer::setDates(const QDate &aStart, const QDate &aEnd)
@@ -201,50 +101,5 @@ void TabContainer::setDates(const QDate &aStart, const QDate &aEnd)
     dayNavigator->setDates(aStart, aEnd);
 }
 
-void TabContainer::timerUpdateTreeView()
-{
-    if(mType == EContainerTypeNow)
-    {
-        updateTreeView(QDate());
-    }
-}
 
-void TabContainer::searchClicked()
-{
-    if(mType == EContainerTypeSearch)
-    {
-        QHash<QString,QString> columns;
-
-        if( searchTitle->isChecked() )
-            columns.insertMulti("EVENT", "title");
-        if( searchAbstract->isChecked() )
-            columns.insertMulti("EVENT", "abstract");
-        if( searchTag->isChecked() )
-            columns.insertMulti("EVENT", "tag");
-        if( searchSpeaker->isChecked() )
-            columns["PERSON"] = "name";
-        if( searchRoom->isChecked() )
-            columns["ROOM"] = "name";
-
-        QString keyword = searchEdit->text().replace( QString("%"), QString("\\%") );
-        qDebug() << "\nKeyword to search: " << keyword;
-        SqlEngine::searchEvent( AppSettings::confId(), columns, keyword );
-
-        QDate startDate = Conference::getById(AppSettings::confId()).start();
-        QDate endDate = Conference::getById(AppSettings::confId()).end();
-        dayNavigator->setDates(startDate, endDate);
-        updateTreeView( Conference::getById(AppSettings::confId()).start() );
-    }
-}
-
-void TabContainer::searchAgainClicked()
-{
-    if(mType == EContainerTypeSearch)
-    {
-        searchHead->show();
-        searchAgainButton->hide();
-        dayNavigator->hide();
-        treeView->hide();
-    }
-}