diff --git a/aleksis/core/frontend/components/calendar/GenericCalendarFeedDetails.vue b/aleksis/core/frontend/components/calendar/GenericCalendarFeedDetails.vue index 4c890629fb1662ccfa21102194d6dbbf4f2c40df..2b6f8fa1e5833260196f97a4e939187f87c80c3f 100644 --- a/aleksis/core/frontend/components/calendar/GenericCalendarFeedDetails.vue +++ b/aleksis/core/frontend/components/calendar/GenericCalendarFeedDetails.vue @@ -1,5 +1,16 @@ <template> - <base-calendar-feed-details v-bind="$props" /> + <div> + <base-calendar-feed-details v-bind="$props" /> + <v-divider inset v-if="selectedEvent.location" /> + <v-list-item v-if="selectedEvent.location"> + <v-list-item-icon> + <v-icon color="primary">mdi-map-marker-outline</v-icon> + </v-list-item-icon> + <v-list-item-content> + {{ selectedEvent.location }} + </v-list-item-content> + </v-list-item> + </div> </template> <script> diff --git a/aleksis/core/frontend/components/calendar/calendarOverview.graphql b/aleksis/core/frontend/components/calendar/calendarOverview.graphql index 777d2f5253ab24e7c07378eaf57e033f5bee874d..7e09f896fd3601f8891ef54ca2ccb08ddc756bdc 100644 --- a/aleksis/core/frontend/components/calendar/calendarOverview.graphql +++ b/aleksis/core/frontend/components/calendar/calendarOverview.graphql @@ -12,6 +12,7 @@ query ($start: Date, $end: Date) { end color description + location uid allDay status diff --git a/aleksis/core/schema/calendar.py b/aleksis/core/schema/calendar.py index 9aa2ad53227b1a3dca1f9b6ab0f0c4a629d21fe8..e918bd0759de481d491e138f69c08e7fee6bc3d1 100644 --- a/aleksis/core/schema/calendar.py +++ b/aleksis/core/schema/calendar.py @@ -9,6 +9,7 @@ from graphene import ObjectType class CalendarEventType(ObjectType): name = graphene.String() description = graphene.String() + location = graphene.String(required=False) start = graphene.String() end = graphene.String() color = graphene.String() @@ -23,6 +24,9 @@ class CalendarEventType(ObjectType): def resolve_description(root, info, **kwargs): return root["DESCRIPTION"] + def resolve_location(root, info, **kwargs): + return root.get("LOCATION", "") + def resolve_start(root, info, **kwargs): return root["DTSTART"].dt