From c45ac2847fccc6f7699330a183a7514ff4ca609a Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Fri, 3 Aug 2018 15:35:25 +0200 Subject: Fixed single day events. (That's probably the typical case) --- framework/src/domain/daylongeventmodel.cpp | 5 ++++- views/calendar/main.qml | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/framework/src/domain/daylongeventmodel.cpp b/framework/src/domain/daylongeventmodel.cpp index 1b47edda..2b288ff5 100644 --- a/framework/src/domain/daylongeventmodel.cpp +++ b/framework/src/domain/daylongeventmodel.cpp @@ -81,7 +81,10 @@ QVariant DayLongEventModel::data(const QModelIndex &idx, int role) const return dayIndex; } case Duration: - return event->getStartTime().date().daysTo(event->getEndTime().date()); + if (!event->getEndTime().isValid()) { + return 1; + } + return qMax(event->getStartTime().date().daysTo(event->getEndTime().date()), 1ll); case Color: return getColor(event->getCalendar()); } diff --git a/views/calendar/main.qml b/views/calendar/main.qml index 1e7e8eac..d27817f5 100644 --- a/views/calendar/main.qml +++ b/views/calendar/main.qml @@ -100,8 +100,7 @@ ApplicationWindow { resource: "caldavresource", summary: "Test day-long event2", description: "This is test day-long event #2", - starts: "2018-04-11T00:00:00", - ends: "2018-04-23T00:00:00", + starts: "2018-04-11", allDay: true, }, { -- cgit v1.2.3