From edbb4c9c82e34e90ad15ad151901e65c2c2cfb66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Nicole?= Date: Wed, 11 Apr 2018 10:37:57 +0200 Subject: Add EndTime and Ical attributes to Event Summary: EndTime is necessary for the implementation of the calendar UI in Kube. Fixes T8482 Ical to mimic Mail's MimeMessage attribute. (Sorry for the wait, there was a good number of merge conflicts when rebasing on develop) Reviewers: cmollekopf Reviewed By: cmollekopf Tags: #sink Maniphest Tasks: T8482 Differential Revision: https://phabricator.kde.org/D12085 --- common/domain/applicationdomaintype.cpp | 2 ++ common/domain/applicationdomaintype.h | 2 ++ common/domain/event.fbs | 2 ++ common/domain/typeimplementations.cpp | 2 ++ 4 files changed, 8 insertions(+) (limited to 'common') diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp index 93b02a9..78d46ee 100644 --- a/common/domain/applicationdomaintype.cpp +++ b/common/domain/applicationdomaintype.cpp @@ -128,6 +128,8 @@ SINK_REGISTER_PROPERTY(Event, Uid); SINK_REGISTER_PROPERTY(Event, Summary); SINK_REGISTER_PROPERTY(Event, Description); SINK_REGISTER_PROPERTY(Event, StartTime); +SINK_REGISTER_PROPERTY(Event, EndTime); +SINK_REGISTER_PROPERTY(Event, Ical); SINK_REGISTER_PROPERTY(Event, Calendar); SINK_REGISTER_ENTITY(Calendar); diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h index e05acaa..43d385c 100644 --- a/common/domain/applicationdomaintype.h +++ b/common/domain/applicationdomaintype.h @@ -400,6 +400,8 @@ struct SINK_EXPORT Event : public Entity { SINK_PROPERTY(QString, Summary, summary); SINK_PROPERTY(QString, Description, description); SINK_PROPERTY(QDateTime, StartTime, startTime); + SINK_PROPERTY(QDateTime, EndTime, endTime); + SINK_PROPERTY(QByteArray, Ical, ical); SINK_REFERENCE_PROPERTY(Calendar, Calendar, calendar); }; diff --git a/common/domain/event.fbs b/common/domain/event.fbs index 68c8608..77aaef6 100644 --- a/common/domain/event.fbs +++ b/common/domain/event.fbs @@ -5,6 +5,8 @@ table Event { summary:string; description:string; startTime:string; + endTime:string; + ical:string; calendar:string; } diff --git a/common/domain/typeimplementations.cpp b/common/domain/typeimplementations.cpp index fe70d74..615c8e8 100644 --- a/common/domain/typeimplementations.cpp +++ b/common/domain/typeimplementations.cpp @@ -207,6 +207,8 @@ void TypeImplementation::configure(PropertyMapper &propertyMapper) SINK_REGISTER_SERIALIZER(propertyMapper, Event, Description, description); SINK_REGISTER_SERIALIZER(propertyMapper, Event, Uid, uid); SINK_REGISTER_SERIALIZER(propertyMapper, Event, StartTime, startTime); + SINK_REGISTER_SERIALIZER(propertyMapper, Event, EndTime, endTime); + SINK_REGISTER_SERIALIZER(propertyMapper, Event, Ical, ical); SINK_REGISTER_SERIALIZER(propertyMapper, Event, Calendar, calendar); } -- cgit v1.2.3