activities tab implemented - need to fit gui, functionality works fine

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index eab5120e2fac8c942f682e00e19f248742c61154..d068c74ad41e78b32598174b12ccf4b80868880a 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -36,7 +36,7 @@ MainWindow::MainWindow(QWidget *parent)
 
     connect(dayNavigator, SIGNAL(dateChanged(const QDate &)), SLOT(updateDayView(const QDate &)));
     connect(activityDayNavigator, SIGNAL(dateChanged(const QDate &)), SLOT(updateActivitiesDayView(const QDate &)));
-    connect(tabWidget, SIGNAL(currentChanged(int)), SLOT(updateView(int)));
+    //connect(tabWidget, SIGNAL(currentChanged(int)), SLOT(updateView(int)));
 
     // DAY EVENTS View
     dayTreeView->setHeaderHidden(true);
@@ -53,6 +53,15 @@ MainWindow::MainWindow(QWidget *parent)
     favTreeView->setAnimated(true);
     favTreeView->setModel(new EventModel());
     favTreeView->setItemDelegate(new Delegate(favTreeView));
+
+    //ACTIVITIES View
+    activityDayTreeView->setHeaderHidden(true);
+    activityDayTreeView->setRootIsDecorated(false);
+    activityDayTreeView->setIndentation(0);
+    activityDayTreeView->setAnimated(true);
+    activityDayTreeView->setModel(new EventModel());
+    activityDayTreeView->setItemDelegate(new Delegate(activityDayTreeView));
+
     // TESTING: load some 'fav' data
     if(Conference::getAll().count()) // no conference(s) in the DB
     {
@@ -62,15 +71,21 @@ MainWindow::MainWindow(QWidget *parent)
     }
 
     if(!Conference::getAll().count()) // no conference(s) in the DB
+    {
         dayNavigator->hide(); // hide DayNavigatorWidget
+        activityDayNavigator->hide();
+    }
     else
     {
         int confId = 1;
-        dayNavigator->setDates(Conference::getById(confId).start(),Conference::getById(confId).end());
+        QDate aStartDate = Conference::getById(confId).start();
+        QDate aEndDate = Conference::getById(confId).end();
+        dayNavigator->setDates(aStartDate, aEndDate);
+        activityDayNavigator->setDates(aStartDate, aEndDate);
     }
-
     connect(static_cast<EventModel*>(dayTreeView->model()), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), SLOT(updateFavView()));
-    connect(static_cast<EventModel*>(favTreeView->model()), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), SLOT(updateFavViewComplete()));
+    connect(static_cast<EventModel*>(favTreeView->model()), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), SLOT(updateFavView()));
+/*    connect(static_cast<EventModel*>(favTreeView->model()), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), SLOT(updateFavViewComplete()));*/
 }
 
 MainWindow::~MainWindow()
@@ -137,14 +152,18 @@ void MainWindow::updateFavView()
     static_cast<EventModel*>(favTreeView->model())->loadFavEvents(Conference::getById(confId).start(),confId);
     favTreeView->reset(); //Necessary reset:
                         //  if favourite event unselected as favourite is the only one in its time, and reset is not produced, crashed
+
+    dayNavigator->show();
 }
 
+/*
 void MainWindow::updateFavViewComplete()
 {
     int confId = 1;
     updateFavView();
     updateDayView(Conference::getById(confId).start());
 }
+*/
 
 void MainWindow::updateActivitiesDayView(const QDate &aDate)
 {
@@ -156,9 +175,18 @@ void MainWindow::updateActivitiesDayView(const QDate &aDate)
 
 void MainWindow::updateView(int tabIndex)
 {
-    //TODO korinpa: skraslit ! aj pre ine taby
+    //TODO korinpa: change to enum or names ?
     qDebug() << "updateView index: " << tabIndex;
-    if (tabIndex == 2)
+    if (tabIndex == 0)
+    {
+        QDate date = dayNavigator->getCurrentDate();
+        updateDayView(date);
+    }
+    else if (tabIndex == 1)
+    {
+        updateFavView();
+    }
+    else if (tabIndex == 2)
     {
         QDate date = activityDayNavigator->getCurrentDate();
         updateActivitiesDayView(date);

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index eae7f5eb144de7a100004790a00ad4c581fd4b2f..4c1c483be71293b157b5fd158a5dad657d35e3dc 100644 (file)
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -20,7 +20,7 @@ private slots:
     void aboutApp();
     void updateDayView(const QDate &aDate);
     void updateFavView();
-    void updateFavViewComplete();
+    /*void updateFavViewComplete();*/
     void updateActivitiesDayView(const QDate &aDate);
     void updateView(int tabIndex);
 private:

diff --git a/src/mvc/eventmodel.cpp b/src/mvc/eventmodel.cpp
index 1c0d295e877bdb6316a2db65a58746043f4c58e7..d41aab85f2538ffed7e2a6f8412d7c31bf20577a 100644 (file)
--- a/src/mvc/eventmodel.cpp
+++ b/src/mvc/eventmodel.cpp
@@ -185,10 +185,10 @@ void EventModel::loadEventsByActivities(const QDate &aDate, int aConferenceId)
 {
     clearModel();
     if(Conference::getAll().count())
-        {
-            qDebug() << "Loading Conference Data (by Activities): [" << Conference::getById(aConferenceId).title() << "] " << aDate;
-            mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId);
-        }
+    {
+        qDebug() << "Loading Conference Data (by Activities): [" << Conference::getById(aConferenceId).title() << "] " << aDate;
+        mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId);
+    }
     createActivityGroups();
 }
 

diff --git a/src/orm/ormrecord.h b/src/orm/ormrecord.h
index 35900758e29dcb273749fc84c9e7863d8f80d118..ae848eab30745a33093a9fb8745ced1ded8c9848 100644 (file)
--- a/src/orm/ormrecord.h
+++ b/src/orm/ormrecord.h
@@ -139,6 +139,7 @@ QList<T> OrmRecord<T>::load(QSqlQuery query)
     {
         if (!query.exec())
         {
+            qDebug() << "Error: " << query.lastError().driverText() << "; Type: " << query.lastError().type();
             throw new OrmSqlException(query.lastError().text());
         }
     }