Skip to content
Snippets Groups Projects
Commit be3cf5a7 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch '931-events-on-last-day-of-range-to-be-fetched-are-not-fetched' into 'master'

Resolve "Events on last day of range to be fetched are not fetched"

Closes #931

See merge request !1348
parents bd0eb904 f86824bd
No related branches found
No related tags found
1 merge request!1348Resolve "Events on last day of range to be fetched are not fetched"
Pipeline #158518 canceled
...@@ -154,7 +154,7 @@ export default { ...@@ -154,7 +154,7 @@ export default {
}, },
extendedEnd() { extendedEnd() {
let extendedEnd = this.$refs.calendar.getEndOfWeek(this.range.end).date; let extendedEnd = this.$refs.calendar.getEndOfWeek(this.range.end).date;
return this.$parseISODate(extendedEnd); return this.$parseISODate(extendedEnd).endOf("day");
}, },
queryVariables() { queryVariables() {
return { return {
......
import json import json
from datetime import datetime from datetime import datetime, time
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
from django.urls import reverse from django.urls import reverse
...@@ -69,6 +69,8 @@ class CalendarType(ObjectType): ...@@ -69,6 +69,8 @@ class CalendarType(ObjectType):
if params: if params:
params = json.loads(params) params = json.loads(params)
feed = root.create_feed(info.context, params) feed = root.create_feed(info.context, params)
if end:
end = datetime.combine(end, time.max)
return feed.get_single_events(start, end) return feed.get_single_events(start, end)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment