grouping by time equation changed - beter group deviding, also according to favourites

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index d068c74ad41e78b32598174b12ccf4b80868880a..b527e4881842c33f1c3bb32abad5fae1dfc9c5ba 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -120,7 +120,10 @@ void MainWindow::importSchedule()
     {
         int confId = 1;
         // 'dayNavigator' emits signal 'dateChanged' after setting valid START:END dates
     {
         int confId = 1;
         // 'dayNavigator' emits signal 'dateChanged' after setting valid START:END dates

-        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);

     }
 }
 
     }
 }
 


@@ -172,24 +175,3 @@ void MainWindow::updateActivitiesDayView(const QDate &aDate)
     activityDayTreeView->reset();
     activityDayNavigator->show();
 }
     activityDayTreeView->reset();
     activityDayNavigator->show();
 }

-
-void MainWindow::updateView(int tabIndex)
-{
-    //TODO korinpa: change to enum or names ?
-    qDebug() << "updateView index: " << tabIndex;
-    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 4c1c483be71293b157b5fd158a5dad657d35e3dc..20e72a8e3933fdafc3b134c2d69646f7b6502b75 100644 (file)
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -22,7 +22,6 @@ private slots:
     void updateFavView();
     /*void updateFavViewComplete();*/
     void updateActivitiesDayView(const QDate &aDate);
     void updateFavView();
     /*void updateFavViewComplete();*/
     void updateActivitiesDayView(const QDate &aDate);

-    void updateView(int tabIndex);

 private:
     SqlEngine *mSqlEngine;
     ScheduleXmlParser *mXmlParser;
 private:
     SqlEngine *mSqlEngine;
     ScheduleXmlParser *mXmlParser;

diff --git a/src/mvc/eventmodel.cpp b/src/mvc/eventmodel.cpp
index d41aab85f2538ffed7e2a6f8412d7c31bf20577a..2753223117237d4d82ad6382eed8eb780a230d62 100644 (file)
--- a/src/mvc/eventmodel.cpp
+++ b/src/mvc/eventmodel.cpp
@@ -27,7 +27,7 @@ void EventModel::createTimeGroups()
     {
         QTime eventTime = mEvents.at(i).start().time();
 
     {
         QTime eventTime = mEvents.at(i).start().time();
 

-        if (nextGroupTime < eventTime)
+        if (nextGroupTime <= eventTime)

         {
             mGroups.last().mChildCount = i - mGroups.last().mFirstEventIndex;
             mGroups << EventModel::Group(QString("%1 - %2").arg(nextGroupTime.toString("HH:mm"),
         {
             mGroups.last().mChildCount = i - mGroups.last().mFirstEventIndex;
             mGroups << EventModel::Group(QString("%1 - %2").arg(nextGroupTime.toString("HH:mm"),