diff --git a/users/views.py b/users/views.py index a52bf27..124a515 100644 --- a/users/views.py +++ b/users/views.py @@ -86,8 +86,12 @@ def getICSFile(request, ag): e.name = ab.user.first_name + " " + ab.user.last_name + " abwesend" e.uid = "da-ab-" + str(ab.pk) - e.begin = ab.start - e.end = ab.end + if ab.start < ab.end: + e.begin = ab.start + e.end = ab.end + else: + e.begin = ab.start + e.end = ab.start + timedelta(minutes=1) e.allday = True c.events.add(e) @@ -119,8 +123,14 @@ def getICSFileAll(request, ag): e = Event() e.name = ab.user.first_name + " " + ab.user.last_name + " | " + ab.reason.name e.uid = "da-ab-" + str(ab.pk) - e.begin = ab.start - e.end = ab.end + + if ab.start < ab.end: + e.begin = ab.start + e.end = ab.end + else: + e.begin = ab.start + e.end = ab.start + timedelta(minutes=1) + e.allday = True c.events.add(e) return HttpResponse(c, content_type='text/calendar') @@ -151,8 +161,13 @@ def getICSFileEx(request, code, ag): e = Event() e.name = ab.user.first_name + " " + ab.user.last_name + " abwesend " e.uid = "da-ab-" + str(ab.pk) - e.begin = ab.start - e.end = ab.end + + if ab.start < ab.end: + e.begin = ab.start + e.end = ab.end + else: + e.begin = ab.start + e.end = ab.start + timedelta(minutes=1) #e.allday = True c.events.add(e) return HttpResponse(c, content_type='text/calendar') @@ -190,8 +205,12 @@ def getICSFileExAll(request, code, ag): e = Event() e.name = ab.user.first_name + " " + ab.user.last_name + " | " + ab.reason.name e.uid = "da-ab-" + str(ab.pk) - e.begin = ab.start - e.end = ab.end + if ab.start < ab.end: + e.begin = ab.start + e.end = ab.end + else: + e.begin = ab.start + e.end = ab.start + timedelta(minutes=1) e.allday = True c.events.add(e) return HttpResponse(c, content_type='text/calendar')