A calendar filter

10 files changed, 123 insertions, 8 deletions

diff --git a/framework/qml/CheckBox.qml b/framework/qml/CheckBox.qml
index 17654536..ce4df209 100644
--- a/framework/qml/CheckBox.qml
+++ b/framework/qml/CheckBox.qml
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.7
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates 2.2 as T
 import org.kube.framework 1.0 as Kube
 
 T.CheckBox {
diff --git a/framework/src/domain/daylongeventmodel.cpp b/framework/src/domain/daylongeventmodel.cpp
index 7775310b..53b50652 100644
--- a/framework/src/domain/daylongeventmodel.cpp
+++ b/framework/src/domain/daylongeventmodel.cpp
@@ -99,6 +99,10 @@ bool DayLongEventModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourc
     auto idx   = sourceModel()->index(sourceRow, 0, sourceParent);
     auto event = idx.data(Sink::Store::DomainObjectRole).value<Event::Ptr>();
 
+    if (!mCalendarFilter.contains(event->getCalendar())) {
+        return false;
+    }
+
     auto eventStart = event->getStartTime().date();
     auto eventEnd   = event->getEndTime().date();
 
@@ -141,3 +145,14 @@ void DayLongEventModel::setPeriodLength(int length)
     mPeriodLength = length;
     invalidateFilter();
 }
+
+QSet<QByteArray> DayLongEventModel::calendarFilter() const
+{
+    return mCalendarFilter;
+}
+
+void DayLongEventModel::setCalendarFilter(const QSet<QByteArray> &filter)
+{
+    mCalendarFilter = filter;
+    invalidateFilter();
+}
diff --git a/framework/src/domain/daylongeventmodel.h b/framework/src/domain/daylongeventmodel.h
index 12827bef..cd7f4e4b 100644
--- a/framework/src/domain/daylongeventmodel.h
+++ b/framework/src/domain/daylongeventmodel.h
@@ -35,6 +35,7 @@ class KUBE_EXPORT DayLongEventModel : public QSortFilterProxyModel
 
     Q_PROPERTY(QVariant start READ periodStart WRITE setPeriodStart)
     Q_PROPERTY(int length READ periodLength WRITE setPeriodLength)
+    Q_PROPERTY(QSet<QByteArray> calendarFilter READ calendarFilter WRITE setCalendarFilter)
 
 public:
     using Event = Sink::ApplicationDomain::Event;
@@ -64,11 +65,15 @@ public:
     int periodLength() const;
     void setPeriodLength(int);
 
+    QSet<QByteArray> calendarFilter() const;
+    void setCalendarFilter(const QSet<QByteArray> &);
+
 private:
     QByteArray getColor(const QByteArray &calendar) const;
 
     QSharedPointer<QAbstractItemModel> mModel;
     QSharedPointer<EntityCacheInterface> mCalendarCache;
+    QSet<QByteArray> mCalendarFilter;
 
     QDate mPeriodStart;
     int mPeriodLength = 7;
diff --git a/framework/src/domain/perioddayeventmodel.cpp b/framework/src/domain/perioddayeventmodel.cpp
index ed853129..149c0fcb 100644
--- a/framework/src/domain/perioddayeventmodel.cpp
+++ b/framework/src/domain/perioddayeventmodel.cpp
@@ -83,6 +83,9 @@ void PeriodDayEventModel::partitionData()
             SinkWarning() << "Invalid date in the eventModel, ignoring...";
             continue;
         }
+        if (!mCalendarFilter.contains(event->getCalendar())) {
+            continue;
+        }
 
         int bucket = bucketOf(eventDate);
         SinkTrace() << "Adding event:" << event->getSummary() << "in bucket #" << bucket;
@@ -322,3 +325,14 @@ void PeriodDayEventModel::setPeriodLength(int length)
     mPeriodLength = length;
     updateQuery();
 }
+
+QSet<QByteArray> PeriodDayEventModel::calendarFilter() const
+{
+    return mCalendarFilter;
+}
+
+void PeriodDayEventModel::setCalendarFilter(const QSet<QByteArray> &filter)
+{
+    mCalendarFilter = filter;
+    updateQuery();
+}
diff --git a/framework/src/domain/perioddayeventmodel.h b/framework/src/domain/perioddayeventmodel.h
index 2d1d0177..2f53486c 100644
--- a/framework/src/domain/perioddayeventmodel.h
+++ b/framework/src/domain/perioddayeventmodel.h
@@ -86,6 +86,7 @@ class KUBE_EXPORT PeriodDayEventModel : public QAbstractItemModel
 
     Q_PROPERTY(QVariant start READ periodStart WRITE setPeriodStart)
     Q_PROPERTY(int length READ periodLength WRITE setPeriodLength)
+    Q_PROPERTY(QSet<QByteArray> calendarFilter READ calendarFilter WRITE setCalendarFilter)
 
 public:
     using Event = Sink::ApplicationDomain::Event;
@@ -122,6 +123,9 @@ public:
     int periodLength() const;
     void setPeriodLength(int);
 
+    QSet<QByteArray> calendarFilter() const;
+    void setCalendarFilter(const QSet<QByteArray> &);
+
 private:
     void updateQuery();
     void partitionData();
@@ -137,6 +141,7 @@ private:
     QSharedPointer<QAbstractItemModel> eventModel;
     QVector<QList<QSharedPointer<Event>>> partitionedEvents;
     QSharedPointer<EntityCacheInterface> mCalendarCache;
+    QSet<QByteArray> mCalendarFilter;
 
     static const constexpr quintptr DAY_ID = std::numeric_limits<quintptr>::max();
 };
diff --git a/framework/src/entitymodel.cpp b/framework/src/entitymodel.cpp
index 5a79fdf2..e2a4ea2d 100644
--- a/framework/src/entitymodel.cpp
+++ b/framework/src/entitymodel.cpp
@@ -36,7 +36,7 @@ EntityModel::~EntityModel()
 
 }
 
-QHash< int, QByteArray > EntityModel::roleNames() const
+QHash<int, QByteArray> EntityModel::roleNames() const
 {
     return mRoleNames;
 }
@@ -152,3 +152,48 @@ QVariantMap EntityModel::data(int row) const
     }
     return map;
 }
+
+
+CheckableEntityModel::CheckableEntityModel(QObject *parent) : EntityModel(parent)
+{
+}
+
+CheckableEntityModel::~CheckableEntityModel()
+{
+
+}
+
+QHash<int, QByteArray > CheckableEntityModel::roleNames() const
+{
+    auto roleNames = EntityModel::roleNames();
+    roleNames.insert(Qt::CheckStateRole, "checked");
+    return roleNames;
+}
+
+QVariant CheckableEntityModel::data(const QModelIndex &index, int role) const
+{
+    if (role == Qt::CheckStateRole) {
+        const auto identifier = EntityModel::data(index, Qt::UserRole + 1).toByteArray();
+        return mCheckedEntities.contains(identifier);
+    }
+    return EntityModel::data(index, role);
+}
+
+bool CheckableEntityModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+    if (role == Qt::CheckStateRole) {
+        const auto identifier = EntityModel::data(index, Qt::UserRole + 1).toByteArray();
+        if (value.toBool()) {
+            mCheckedEntities.insert(identifier);
+        } else {
+            mCheckedEntities.remove(identifier);
+        }
+        emit checkedEntitiesChanged();
+    }
+    return EntityModel::setData(index, value, role);
+}
+
+QSet<QByteArray> CheckableEntityModel::checkedEntities() const
+{
+    return mCheckedEntities;
+}
diff --git a/framework/src/entitymodel.h b/framework/src/entitymodel.h
index add66d78..e8c294a0 100644
--- a/framework/src/entitymodel.h
+++ b/framework/src/entitymodel.h
@@ -21,6 +21,8 @@
 #include "kube_export.h"
 #include <QSharedPointer>
 #include <QSortFilterProxyModel>
+#include <QSet>
+#include <QByteArray>
 
 namespace Sink {
     class Query;
@@ -43,13 +45,12 @@ public:
         SuccessStatus,
     };
     Q_ENUMS(Status)
-
     EntityModel(QObject *parent = Q_NULLPTR);
-    ~EntityModel();
+    virtual ~EntityModel();
 
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
-    QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
+    virtual QHash<int, QByteArray> roleNames() const override;
 
     void setAccountId(const QString &);
     QString accountId() const;
@@ -74,3 +75,26 @@ private:
     QString mAccountId;
     QString mType;
 };
+
+
+class KUBE_EXPORT CheckableEntityModel : public EntityModel {
+
+    Q_OBJECT
+
+    Q_PROPERTY (QSet<QByteArray> checkedEntities READ checkedEntities NOTIFY checkedEntitiesChanged)
+public:
+    CheckableEntityModel(QObject *parent = Q_NULLPTR);
+    virtual ~CheckableEntityModel();
+
+    QHash<int, QByteArray> roleNames() const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
+
+    QSet<QByteArray> checkedEntities() const;
+
+signals:
+    void checkedEntitiesChanged();
+
+private:
+    QSet<QByteArray> mCheckedEntities;
+};
diff --git a/framework/src/frameworkplugin.cpp b/framework/src/frameworkplugin.cpp
index 5fc4eb27..f0261206 100644
--- a/framework/src/frameworkplugin.cpp
+++ b/framework/src/frameworkplugin.cpp
@@ -174,6 +174,7 @@ void FrameworkPlugin::registerTypes (const char *uri)
     qmlRegisterType<TextDocumentHandler>(uri, 1, 0, "TextDocumentHandler");
     qmlRegisterType<LogModel>(uri, 1, 0, "LogModel");
     qmlRegisterType<EntityModel>(uri, 1, 0, "EntityModel");
+    qmlRegisterType<CheckableEntityModel>(uri, 1, 0, "CheckableEntityModel");
 
     qmlRegisterType<AccountFactory>(uri, 1, 0, "AccountFactory");
     qmlRegisterType<AccountsModel>(uri, 1, 0, "AccountsModel");
diff --git a/views/calendar/qml/View.qml b/views/calendar/qml/View.qml
index 3fc5d021..ac446b88 100644
--- a/views/calendar/qml/View.qml
+++ b/views/calendar/qml/View.qml
@@ -120,7 +120,8 @@ RowLayout {
                 }
                 spacing: Kube.Units.smallSpacing
                 Repeater {
-                    model: Kube.EntityModel {
+                    model: Kube.CheckableEntityModel {
+                        id: calendarModel
                         type: "calendar"
                         roles: ["name", "color"]
                     }
@@ -131,7 +132,8 @@ RowLayout {
                             spacing: Kube.Units.smallSpacing
                             Kube.CheckBox {
                                 opacity: 0.9
-                                checked: true
+                                checked: model.checked
+                                onToggled: model.checked = checked
                             }
                             Kube.Label {
                                 text: model.name
@@ -158,5 +160,6 @@ RowLayout {
         Layout.fillWidth: true
         currentDate: root.currentDate
         startDate: root.selectedDate
+        calendarFilter: calendarModel.checkedEntities
     }
 }
diff --git a/views/calendar/qml/WeekView.qml b/views/calendar/qml/WeekView.qml
index 980ec432..2d16b772 100644
--- a/views/calendar/qml/WeekView.qml
+++ b/views/calendar/qml/WeekView.qml
@@ -30,6 +30,7 @@ FocusScope {
     property var hourHeight: Kube.Units.gridUnit * 2
     property date currentDate
     property date startDate: currentDate
+    property var calendarFilter
 
     Item {
         anchors {
@@ -94,6 +95,7 @@ FocusScope {
                 model: Kube.DayLongEventModel {
                     start: root.startDate
                     length: root.daysToShow
+                    calendarFilter: root.calendarFilter
                 }
 
                 delegate: Item {
@@ -181,6 +183,7 @@ FocusScope {
                     model: Kube.PeriodDayEventModel {
                         start: root.startDate
                         length: root.daysToShow
+                        calendarFilter: root.calendarFilter
                     }
                     delegate: Rectangle {
                         id: dayDelegate