Changeset fbc1646

Timestamp:

01/18/10 18:15:45 (13 years ago)

Author:

korrco <korrco@…>

Branches:

master, qt5

Children:

a35aa83

Parents:

28d9e28

Message:

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

Location:

src

Files:

• gui/mainwindow.cpp (modified) (6 diffs)
• gui/mainwindow.h (modified) (1 diff)
• mvc/eventmodel.cpp (modified) (1 diff)
• orm/ormrecord.h (modified) (1 diff)

src/gui/mainwindow.cpp

@@ -37 +37 @@
     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
@@ -54 +54 @@
     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
@@ -63 +72 @@
 
     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()));*/
 }
 
@@ -138 +153 @@
     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()
 {
@@ -146 +164 @@
     updateDayView(Conference::getById(confId).start());
 }
+*/
 
 void MainWindow::updateActivitiesDayView(const QDate &aDate)
@@ -157 +176 @@
 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();

src/gui/mainwindow.h

@@ -21 +21 @@
     void updateDayView(const QDate &aDate);
     void updateFavView();
-    void updateFavViewComplete();
+    /*void updateFavViewComplete();*/
     void updateActivitiesDayView(const QDate &aDate);
     void updateView(int tabIndex);

src/mvc/eventmodel.cpp

@@ -186 +186 @@
     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();
 }

src/orm/ormrecord.h

@@ -140 +140 @@
         if (!query.exec())
         {
+            qDebug() << "Error: " << query.lastError().driverText() << "; Type: " << query.lastError().type();
             throw new OrmSqlException(query.lastError().text());
         }