diff --git a/users/views.py b/users/views.py index a0f51d0..17bdeed 100644 --- a/users/views.py +++ b/users/views.py @@ -133,58 +133,60 @@ def getICSFileAll(request, ag): def getICSFileEx(request, code, ag): - try: - agency = Agency.objects.get(pk=ag) + #try: + agency = Agency.objects.get(pk=ag) - if agency != None and agency.agencycal_publicstatus == 1 and code == agency.agencycalurl: - c = Calendar() - absencedays = Absence.objects.filter(agency=ag) - for ab in absencedays: - 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 - e.allday = True - c.events.add(e) - return HttpResponse(c, content_type='text/calendar') - else: - realm = "" - response = HttpResponse() - response.status_code = 401 - return response - except: + if agency != None and agency.agencycal_publicstatus == 1 and code == agency.agencycalurl: + c = Calendar() + absencedays = Absence.objects.filter(agency=ag) + for ab in absencedays: + 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 + e.allday = True + c.events.add(e) + return HttpResponse(c, content_type='text/calendar') + else: + print("AG NICHT GEFUNDEN!") realm = "" response = HttpResponse() response.status_code = 401 return response + #except: + # realm = "" + # response = HttpResponse() + # response.status_code = 401 + # return response def getICSFileExAll(request, code, ag): - try: - agency = Agency.objects.get(pk=ag) - if agency != None and agency.agencycal_publicstatus == 1 and code == agency.agencycalurl_all: - c = Calendar() - absencedays = Absence.objects.filter(agency=ag) - for ab in absencedays: - 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 - e.allday = True - c.events.add(e) - return HttpResponse(c, content_type='text/calendar') - else: - realm = "" - response = HttpResponse() - response.status_code = 401 - return response - except: + #try: + agency = Agency.objects.get(pk=ag) + if agency != None and agency.agencycal_publicstatus == 1 and code == agency.agencycalurl_all: + c = Calendar() + absencedays = Absence.objects.filter(agency=ag) + for ab in absencedays: + 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 + e.allday = True + c.events.add(e) + return HttpResponse(c, content_type='text/calendar') + else: + print("AG NICHT GEFUNDEN!") realm = "" response = HttpResponse() response.status_code = 401 return response + #except: + # realm = "" + # response = HttpResponse() + # response.status_code = 401 + # return response