Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KItinerary
Commits
505a3b69
Commit
505a3b69
authored
Apr 26, 2021
by
Volker Krause
Browse files
Add the full venue address to the iCal description for event reservations
parent
49434965
Changes
3
Hide whitespace changes
Inline
Side-by-side
autotests/calendarhandlerdata/event.ics
View file @
505a3b69
...
...
@@ -20,6 +20,7 @@ UID:KIT-1234567890-1b22236a-21ff-4885-8c99-b3b2bbca062c
LAST-MODIFIED:20171227T111649Z
SUMMARY:Akademy 2019
LOCATION:University of Milano-Bicocca
DESCRIPTION:PIAZZA DELL'ATENEO NUOVO\, 1\n20126 MILAN\n\nITALY\n
DTSTART;TZID=Europe/Rome:20190907T093000
DTEND;TZID=Europe/Rome:20190713T163000
TRANSP:OPAQUE
...
...
autotests/calendarhandlerdata/eventreservation.ics
View file @
505a3b69
...
...
@@ -29,7 +29,7 @@ X-KDE-KITINERARY-RESERVATION:[{"@context":"http://schema.org"\,"@type":
CREATED:20171227T111649Z
UID:KIT-1234567890-1b22236a-21ff-4885-8c99-b3b2bbca062c
LAST-MODIFIED:20171227T111649Z
DESCRIPTION:Dr Konqui\nBooking reference: 42\nKatie Dragon\nBooking reference: 42
DESCRIPTION:
PIAZZA DELL'ATENEO NUOVO\, 1\n20126 MILAN\n\nITALY\n\n
Dr Konqui\nBooking reference: 42\nKatie Dragon\nBooking reference: 42
SUMMARY:Akademy 2019
LOCATION:University of Milano-Bicocca
DTSTART;TZID=Europe/Rome:20190907T093000
...
...
src/lib/calendarhandler.cpp
View file @
505a3b69
...
...
@@ -404,6 +404,8 @@ static void fillEvent(const KItinerary::Event &ev, const KCalendarCore::Event::P
event
->
addAlarm
(
alarm
);
}
}
event
->
setDescription
(
formatAddress
(
location
.
address
())
+
QLatin1Char
(
'\n'
));
}
static
void
fillEventReservation
(
const
QVector
<
QVariant
>
&
reservations
,
const
KCalendarCore
::
Event
::
Ptr
&
event
)
...
...
@@ -411,7 +413,7 @@ static void fillEventReservation(const QVector<QVariant> &reservations, const KC
const
auto
ev
=
reservations
.
at
(
0
).
value
<
EventReservation
>
().
reservationFor
().
value
<
KItinerary
::
Event
>
();
fillEvent
(
ev
,
event
);
QStringList
desc
;
QStringList
desc
=
{
event
->
description
()
}
;
for
(
const
auto
&
r
:
reservations
)
{
const
auto
reservation
=
r
.
value
<
EventReservation
>
();
const
auto
person
=
reservation
.
underName
().
value
<
KItinerary
::
Person
>
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment