Calculate indentation

3 files changed, 26 insertions, 5 deletions

diff --git a/framework/src/domain/perioddayeventmodel.cpp b/framework/src/domain/perioddayeventmodel.cpp
index 4463e252..39cc1bc3 100644
--- a/framework/src/domain/perioddayeventmodel.cpp
+++ b/framework/src/domain/perioddayeventmodel.cpp
@@ -183,11 +183,29 @@ QVariant PeriodDayEventModel::data(const QModelIndex &id, int role) const
             case Events: {
                 auto result = QVariantList{};
 
+                QMap<QTime, int> sorted;
                 for (int i = 0; i < partitionedEvents[day].size(); ++i) {
-                    auto eventId = index(i, 0, id);
+                    const auto eventId = index(i, 0, id);
+                    sorted.insert(data(eventId, StartTime).toDateTime().time(), i);
+                }
+
+                QMap<QTime, int> indentationStack;
+                for (auto it = sorted.begin(); it != sorted.end(); it++) {
+                    auto eventId = index(it.value(), 0, id);
                     SinkTrace() << "Appending event:" << data(eventId, Summary);
 
-                    auto startTime = data(eventId, StartTime).toDateTime().time();
+                    const auto startTime = data(eventId, StartTime).toDateTime().time();
+
+                    //Remove all dates before startTime
+                    for (auto it = indentationStack.begin(); it != indentationStack.end();) {
+                        if (it.key() < startTime) {
+                            it = indentationStack.erase(it);
+                        } else {
+                            ++it;
+                        }
+                    }
+                    const int indentation = indentationStack.size();
+                    indentationStack.insert(data(eventId, EndTime).toDateTime().time(), 0);
 
                     result.append(QVariantMap{
                         {"text", data(eventId, Summary)},
@@ -195,7 +213,7 @@ QVariant PeriodDayEventModel::data(const QModelIndex &id, int role) const
                         {"starts", startTime.hour() + startTime.minute() / 60.},
                         {"duration", data(eventId, Duration)},
                         {"color", data(eventId, Color)},
-                        {"indention", 0},
+                        {"indentation", indentation},
                     });
                 }
 
@@ -218,6 +236,8 @@ QVariant PeriodDayEventModel::data(const QModelIndex &id, int role) const
                 return event->getDescription();
             case StartTime:
                 return event->getStartTime();
+            case EndTime:
+                return event->getEndTime();
             case Duration: {
                 auto start = event->getStartTime();
                 auto end   = event->getEndTime();
diff --git a/framework/src/domain/perioddayeventmodel.h b/framework/src/domain/perioddayeventmodel.h
index a0410e2e..2eaa7f1c 100644
--- a/framework/src/domain/perioddayeventmodel.h
+++ b/framework/src/domain/perioddayeventmodel.h
@@ -98,6 +98,7 @@ public:
         Summary,
         Description,
         StartTime,
+        EndTime,
         Duration,
         Color
     };
diff --git a/views/calendar/qml/WeekView.qml b/views/calendar/qml/WeekView.qml
index 08c56e5a..9366becc 100644
--- a/views/calendar/qml/WeekView.qml
+++ b/views/calendar/qml/WeekView.qml
@@ -260,10 +260,10 @@ FocusScope {
                                     rightMargin: Kube.Units.smallSpacing
                                 }
                                 radius: 2
-                                width: root.dayWidth - Kube.Units.smallSpacing * 2 - Kube.Units.gridUnit * model.modelData.indention
+                                width: root.dayWidth - Kube.Units.smallSpacing * 2 - Kube.Units.gridUnit * model.modelData.indentation
                                 height: Math.max(root.hourHeight * 0.5, root.hourHeight * model.modelData.duration)
                                 y: root.hourHeight * model.modelData.starts
-                                x: Kube.Units.gridUnit * model.modelData.indention
+                                x: Kube.Units.gridUnit * model.modelData.indentation
 
                                 color: model.modelData.color
                                 opacity: 0.8