From 77ab97f54a6ee4d60e29b215d3f7fbdfd90765e1 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Sat, 31 Oct 2020 11:34:46 +0100
Subject: [PATCH] Standardsafarbug und Feiertage Bug

---
 .../templates/standards/standards_add.html    |  4 ++-
 users/signals.py                              | 27 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/standards/templates/standards/standards_add.html b/standards/templates/standards/standards_add.html
index a9bef2a..efe8327 100644
--- a/standards/templates/standards/standards_add.html
+++ b/standards/templates/standards/standards_add.html
@@ -705,7 +705,9 @@
 <script type="text/javascript">
 var ua = window.navigator.userAgent;
 var isIE = /MSIE|Trident/.test(ua);
-if ( isIE ) {
+var isSafari = /Safari/.test(ua);
+
+if ( isIE || isSafari) {
   //IE specific code goes here
     setInterval(function()
   {
diff --git a/users/signals.py b/users/signals.py
index 904b8dd..29cc7ac 100644
--- a/users/signals.py
+++ b/users/signals.py
@@ -90,15 +90,40 @@ def checkDefaultAbsenceReasons(sender, user, request, **kwargs):
 		
 	today = date.today()	
 
-	# FREEDAYS LADEN
+	# FREEDAYS LADEN Zwei Jahre
 	if len(FreeDays.objects.filter(agency=user.profile.agency, year=today.year+2)) == 0:
 		tempdays = loadingFreeDays(user.profile.agency.plz, today.year+2)
 		if(tempdays != False):
 			for k in tempdays.keys():		
 				tempdate = tempdays[k]["datum"].split("-")
 				FreeDays(agency=user.profile.agency, name=k, day=datetime.datetime(int(tempdate[0]),int(tempdate[1]),int(tempdate[2])), year=date.today().year+2).save()
+
+	# FREEDAYS LADEN DIese Jahr
+	if len(FreeDays.objects.filter(agency=user.profile.agency, year=today.year+1)) == 0:
+		tempdays = loadingFreeDays(user.profile.agency.plz, today.year+1)
+		if(tempdays != False):
+			for k in tempdays.keys():		
+				tempdate = tempdays[k]["datum"].split("-")
+				FreeDays(agency=user.profile.agency, name=k, day=datetime.datetime(int(tempdate[0]),int(tempdate[1]),int(tempdate[2])), year=date.today().year+1).save()
 	
 	# CHECK FOR YEARS
+	# FREEDAYS LADEN LETZTES JAHR
+	if len(FreeDays.objects.filter(agency=user.profile.agency, year=today.year-1)) == 0:
+		tempdays = loadingFreeDays(user.profile.agency.plz, today.year-1)
+		if(tempdays != False):
+			for k in tempdays.keys():		
+				tempdate = tempdays[k]["datum"].split("-")
+				FreeDays(agency=user.profile.agency, name=k, day=datetime.datetime(int(tempdate[0]),int(tempdate[1]),int(tempdate[2])), year=date.today().year-1).save()
+
+	# FREEDAYS LADEN
+	if len(FreeDays.objects.filter(agency=user.profile.agency, year=today.year)) == 0:
+		tempdays = loadingFreeDays(user.profile.agency.plz, today.year)
+		if(tempdays != False):
+			for k in tempdays.keys():		
+				tempdate = tempdays[k]["datum"].split("-")
+				FreeDays(agency=user.profile.agency, name=k, day=datetime.datetime(int(tempdate[0]),int(tempdate[1]),int(tempdate[2])), year=date.today().year).save()
+
+
 
 	# NO YEARS FOUND
 	if len(UserYearAbsenceInfo.objects.filter(agency=user.profile.agency)) == 0: