From afc9c27a06f5546148e1fa28858b724964939586 Mon Sep 17 00:00:00 2001
From: Holger Trampe <htrampe@gmail.com>
Date: Fri, 14 Aug 2020 10:46:16 +0200
Subject: [PATCH] Bugs

---
 areas/__pycache__/__init__.cpython-38.pyc     | Bin 152 -> 153 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 163 -> 164 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 157 -> 158 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 168 -> 169 bytes
 dasettings/views.py                           | 598 +++++++++---------
 .../__pycache__/__init__.cpython-38.pyc       | Bin 162 -> 163 bytes
 .../__pycache__/settings.cpython-38.pyc       | Bin 4083 -> 4084 bytes
 .../__pycache__/urls.cpython-38.pyc           | Bin 2582 -> 2583 bytes
 .../__pycache__/views.cpython-38.pyc          | Bin 354 -> 355 bytes
 message/__pycache__/__init__.cpython-38.pyc   | Bin 154 -> 155 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 165 -> 166 bytes
 news/__pycache__/__init__.cpython-38.pyc      | Bin 151 -> 152 bytes
 news/models.py                                |  10 +-
 news/views.py                                 |  50 +-
 .../__pycache__/__init__.cpython-38.pyc       | Bin 168 -> 169 bytes
 orga/__pycache__/__init__.cpython-38.pyc      | Bin 151 -> 152 bytes
 orga/__pycache__/admin.cpython-38.pyc         | Bin 192 -> 193 bytes
 orga/__pycache__/apps.cpython-38.pyc          | Bin 367 -> 368 bytes
 orga/__pycache__/models.cpython-38.pyc        | Bin 189 -> 190 bytes
 orga/__pycache__/urls.cpython-38.pyc          | Bin 403 -> 404 bytes
 orga/__pycache__/views.cpython-38.pyc         | Bin 3510 -> 3511 bytes
 organizer/__pycache__/__init__.cpython-38.pyc | Bin 156 -> 157 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 167 -> 168 bytes
 standards/__pycache__/__init__.cpython-38.pyc | Bin 156 -> 157 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 169 -> 170 bytes
 .../__pycache__/counter_tag.cpython-38.pyc    | Bin 15849 -> 15937 bytes
 standards/templatetags/counter_tag.py         |   5 +-
 tasks/__pycache__/__init__.cpython-38.pyc     | Bin 152 -> 153 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 161 -> 162 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 172 -> 173 bytes
 users/__pycache__/__init__.cpython-38.pyc     | Bin 152 -> 153 bytes
 users/templates/users/base.html               |   2 +-
 users/templates/users/searchres.html          |  24 +-
 33 files changed, 345 insertions(+), 344 deletions(-)

diff --git a/areas/__pycache__/__init__.cpython-38.pyc b/areas/__pycache__/__init__.cpython-38.pyc
index 3b12d3e60bd4b11394d0017f6e007ef01878b8a7..68d63ecd0d8b5a61e97768cce46d7263b27b69cd 100644
GIT binary patch
delta 75
zcmbQiIFpe(l$V!_0SH`Kj3;v2nAka6#e^2878S>2<maTP#<=7sm*%GCl@!OgdxpfM
cWTt19B<7?hrUQjai((RsQWJ|~CRWJ-03h)gqyPW_

delta 74
zcmbQqID?Tpl$V!_0SMBTiB9CUF}Bsu$j?pH&nPKM%q>XOcgfE#%}vcKN!54v4AD=?
bOwTMy%t=j52MU!I=_eMYCKl^Ytd;`+9M~8G

diff --git a/cloud/migrations/__pycache__/__init__.cpython-38.pyc b/cloud/migrations/__pycache__/__init__.cpython-38.pyc
index cd4f67657a551a1d1a8d17db47a1a4e248bd8d12..751a18e54d4c1bdb2a5db5708e16a8b877af8d67 100644
GIT binary patch
delta 113
zcmZ3?xP*~Al$V!_0SH`Kj3;v2#Ckeg#e^2878S>2<maTP#<=7sm*%GCl@!OgdxpfM
zWTt19B<7?hrUQjai(-;<@=H@<ax>G55=%1k^NM5Q<1_OzOXB183My}L*yQG?l;)(`
LF#?VM46*|N2nZ#H

delta 85
zcmZ3&xR{YUl$V!_0SMBTiB9CUvGdT+$j?pH&nPKM%q>XOcgfE#%}vcKN!54v4AD=?
mOwTMy%t=j52MU!I=_lvpm!|0FW~LV<mSpDV73)uIlLG)wx*V|p

diff --git a/dasettings/__pycache__/__init__.cpython-38.pyc b/dasettings/__pycache__/__init__.cpython-38.pyc
index 91a913dafd45d098216183fb4b2f1affef467a91..551679f11910bbd18c8c4c03a782ff2e68272e1c 100644
GIT binary patch
delta 80
zcmbQsIFFG#l$V!_0SH`Kj3;v2SUNjf#e^2878S>2<maTP#<=7sm*%GCl@!OgdxpfM
hWTt19B<7?hrUQjai(*m|i&INVGV{`lV<y(i0RX8x8s`82

delta 79
zcmbQoIG2$-l$V!_0SMBTiB9CUv2fDQ$j?pH&nPKM%q>XOcgfE#%}vcKN!54v4AD=?
gOwTMy%t=j52MU!I>8B(Xr<Rmt=A{?wPi&9_0HVbjMgRZ+

diff --git a/dasettings/migrations/__pycache__/__init__.cpython-38.pyc b/dasettings/migrations/__pycache__/__init__.cpython-38.pyc
index e66e7ab57a85310473b027cfbedb58bf26ae5c19..992ddbf05a947a4b6c9d28ec1b5ee11747016d49 100644
GIT binary patch
delta 91
zcmZ3%xRQ}Ol$V!_0SH`Kj3;v2xcE6+#e^2878S>2<maTP#<=7sm*%GCl@!OgdxpfM
sWTt19B<7?hrUQjai(*m|i&INVGV{`lV{$XoixNvR^Ye;hCU(gI0Q;*Sw*UYD

delta 90
zcmZ3<xPp;8l$V!_0SMBTiB9CUarV{E$j?pH&nPKM%q>XOcgfE#%}vcKN!54v4AD=?
rOwTMy%t=j52MU!I>8B(Xr<Rmt=A{?w=VqoCC6;97=N0Qu?3M!n?Oz`0

diff --git a/dasettings/views.py b/dasettings/views.py
index fa3e558..d7dbbb0 100644
--- a/dasettings/views.py
+++ b/dasettings/views.py
@@ -15,7 +15,7 @@ from django.template.loader import render_to_string
 from users.usersforms import UsersPermForm
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.views.generic import CreateView
-from users.models import Profile
+from users.models import Profile, UserNotifications, UserTime
 from areas.models import Areas
 from tasks.models import Tasks
 import webcolors
@@ -51,8 +51,8 @@ def checkForGroupName(request, newgroupname):
 @login_required
 def getAllForms(request, context):
 	# USERFORMS
-	userform = UsersSelfChangeForm(instance=request.user)		
-	passwordform = PasswordChangeForm(request.user)				
+	userform = UsersSelfChangeForm(instance=request.user)
+	passwordform = PasswordChangeForm(request.user)
 	context.update({'userform' : userform})
 	context.update({'passwordform' : passwordform})
 
@@ -62,7 +62,7 @@ def getAllForms(request, context):
 	context.update({'notificationforms_standard' : notificationforms_standard})
 
 	notificationforms_news = UsersNotificationFormNews(instance=request.user.usernotifications)
-	context.update({'notificationforms_news' : notificationforms_news})		
+	context.update({'notificationforms_news' : notificationforms_news})
 
 	notificationforms_files = UsersNotificationFormFiles(instance=request.user.usernotifications)
 	context.update({'notificationforms_files' : notificationforms_files})
@@ -74,42 +74,42 @@ def getAllForms(request, context):
 	context.update({'notificationforms_messages' : notificationforms_messages})
 
 	notificationforms_chat = UsersNotificationFormChat(instance=request.user.usernotifications)
-	context.update({'notificationforms_chat' : notificationforms_chat})	
+	context.update({'notificationforms_chat' : notificationforms_chat})
 
 	notificationforms_abtime = UsersNotificationFormAbTime(instance=request.user.usernotifications)
-	context.update({'notificationforms_abtime' : notificationforms_abtime})	
+	context.update({'notificationforms_abtime' : notificationforms_abtime})
 
 	notificationforms_groups = UsersNotificationFormGroups(instance=request.user.usernotifications)
-	context.update({'notificationforms_groups' : notificationforms_groups})		
+	context.update({'notificationforms_groups' : notificationforms_groups})
 
 	notificationforms_agn = UsersNotificationFormAgn(instance=request.user.usernotifications)
-	context.update({'notificationforms_agn' : notificationforms_agn})		
-	
+	context.update({'notificationforms_agn' : notificationforms_agn})
+
 	notificationforms_task = UsersNotificationFormTasks(instance=request.user.usernotifications)
-	context.update({'notificationforms_task' : notificationforms_task})		
-	
-	
-	
+	context.update({'notificationforms_task' : notificationforms_task})
+
+
+
 	# AGENCY UPDATE FORMS
 	agencyform = AgencyUpdateForm(instance=request.user.profile.agency)
-	context.update({'agencyform' : agencyform})		
+	context.update({'agencyform' : agencyform})
 
 	#PERMS
 	perms = AgencyGroupPerms()
-	context.update({'perms' : perms})		
+	context.update({'perms' : perms})
 
 	#MODULFORMS
 	modulform = AgencyModulsForm(instance=request.user.profile.agency)
-	context.update({'modulform' : modulform})	
+	context.update({'modulform' : modulform})
 
 	#MODULSETTUNGS
 	#Modulsettings ORGANIGRAMM
 	modsettings_organigramm = AgencyOrganigrammForm(instance=request.user.profile.agency)
-	context.update({'modsettings_organigramm' : modsettings_organigramm})		
+	context.update({'modsettings_organigramm' : modsettings_organigramm})
 
 	#Modulsettings ABWESENHEIT- UND ZEITERFASSUNG
 	#modsettings_tm = AgencyTimeManagement(instance=request.user.profile.agency)
-	#context.update({'modsettings_tm' : modsettings_tm})			
+	#context.update({'modsettings_tm' : modsettings_tm})
 	context.update({"modsettings_tm_abcat" : AbsenceReason.objects.filter(agency=request.user.profile.agency).order_by("name") })
 
 
@@ -127,7 +127,7 @@ def DASettings(request):
 
 	# CHECK FOR EVERY USER YEAR-DATA
 	uina = User.objects.filter(profile__agency=request.user.profile.agency)
-	today = date.today()	
+	today = date.today()
 	for u in uina:
 
 		# NO YEARS FOUND
@@ -136,7 +136,7 @@ def DASettings(request):
 			UserYearAbsenceInfo(agency=request.user.profile.agency, user=u, year=today.year).save()
 			UserYearAbsenceInfo(agency=request.user.profile.agency, user=u, year=today.year+1).save()
 			UserYearAbsenceInfo(agency=request.user.profile.agency, user=u, year=today.year+2).save()
-	
+
 	# CREATE DATE FOR YEAR PLUS 2
 	#elif len(UserYearAbsenceInfo.objects.filter(agency=user.profile.agency, year=today.year+2)) == 0:
 	#	uina = User.objects.filter(profile__agency=user.profile.agency)
@@ -144,10 +144,10 @@ def DASettings(request):
 	#		for u in uina:
 	#			UserYearAbsenceInfo(agency=user.profile.agency, user=u, year=today.year+2).save()
 
-		
 
 
-	context = {			
+
+	context = {
 			'active_link' : 'dasettings',
 			'baseurl' : settings.BASE_URL
 		}
@@ -167,7 +167,7 @@ def DASettings(request):
 	# LOAD AREAS
 	agencyareas = Areas.objects.filter(agency__pk=request.user.profile.agency.pk).order_by('areaorder')
 	context.update({"agencyareas" : agencyareas})
-	
+
 	# LOAD AGENCYNETWORKS
 	#agencynetworks = AgencyNetwork.objects.filter(creator_agency=request.user.profile.agency) | AgencyNetwork.objects.filter(adminagencys__in=[request.user.profile.agency.pk]) | AgencyNetwork.objects.filter(members__in=[request.user.profile.agency.pk])  | AgencyNetwork.objects.filter(sharemembers__in=[request.user.profile.agency.pk])
 
@@ -178,70 +178,70 @@ def DASettings(request):
 
 	for a in agencynetworks_all:
 		if request.user.profile.agency in a.adminagencys.all() or request.user.profile.agency in a.members.all() or request.user.profile.agency in a.sharemembers.all():
-			agencynetworks.append(a)			
+			agencynetworks.append(a)
 
 	context.update({"agencynetworks" : agencynetworks})
 
 	# LOAD TASKS
 	alltasks = Tasks.objects.filter(agency__pk=request.user.profile.agency.pk).order_by('name')
 	context.update({"alltasks" : alltasks})
-	
-	if request.method == 'POST' and request.POST.get("settings_area") == "profil":		
-		return SettingsProfilManagement(request, context)		
-	elif request.method == 'POST' and request.POST.get("settings_area") == "agency":	
-		return SettingsAgency(request, context)	
-	elif request.method == 'POST' and request.POST.get("settings_area") == "moduls":	
-		return SettingsAgencyModuls(request, context)	
-			
 
-		
+	if request.method == 'POST' and request.POST.get("settings_area") == "profil":
+		return SettingsProfilManagement(request, context)
+	elif request.method == 'POST' and request.POST.get("settings_area") == "agency":
+		return SettingsAgency(request, context)
+	elif request.method == 'POST' and request.POST.get("settings_area") == "moduls":
+		return SettingsAgencyModuls(request, context)
+
+
+
 	# Returning the data from database for normal-loading Settings
-	else:		
-		# DEFAULT DATA FORM-INFOS 
+	else:
+		# DEFAULT DATA FORM-INFOS
 		# Hier müssen alle Standard-Formulare rein, damit die Seite Settings
 		# generell geladen werden kann.
 		# PROFILE FORMS
-		userform = UsersSelfChangeForm(instance=request.user)		
-		passwordform = PasswordChangeForm(request.user)				
+		userform = UsersSelfChangeForm(instance=request.user)
+		passwordform = PasswordChangeForm(request.user)
 		context.update({'userform' : userform})
 		context.update({'passwordform' : passwordform})
 
 		############################### NOTIFIFORMS START ##########################################
 		notificationforms_standard = UsersNotificationFormStandard(instance=request.user.usernotifications)
-		context.update({'notificationforms_standard' : notificationforms_standard})		
+		context.update({'notificationforms_standard' : notificationforms_standard})
 
 		notificationforms_news = UsersNotificationFormNews(instance=request.user.usernotifications)
-		context.update({'notificationforms_news' : notificationforms_news})		
+		context.update({'notificationforms_news' : notificationforms_news})
 
 		notificationforms_files = UsersNotificationFormFiles(instance=request.user.usernotifications)
-		context.update({'notificationforms_files' : notificationforms_files})		
+		context.update({'notificationforms_files' : notificationforms_files})
 
 		notificationforms_organizer = UsersNotificationFormOrganizer(instance=request.user.usernotifications)
 		context.update({'notificationforms_organizer' : notificationforms_organizer})
 
 		notificationforms_messages = UsersNotificationFormMessages(instance=request.user.usernotifications)
-		context.update({'notificationforms_messages' : notificationforms_messages})	
+		context.update({'notificationforms_messages' : notificationforms_messages})
 
 		notificationforms_chat = UsersNotificationFormChat(instance=request.user.usernotifications)
-		context.update({'notificationforms_chat' : notificationforms_chat})		
+		context.update({'notificationforms_chat' : notificationforms_chat})
 
 		notificationforms_abtime = UsersNotificationFormAbTime(instance=request.user.usernotifications)
-		context.update({'notificationforms_abtime' : notificationforms_abtime})	
+		context.update({'notificationforms_abtime' : notificationforms_abtime})
 
 		notificationforms_groups = UsersNotificationFormGroups(instance=request.user.usernotifications)
-		context.update({'notificationforms_groups' : notificationforms_groups})		
+		context.update({'notificationforms_groups' : notificationforms_groups})
 
 		notificationforms_agn = UsersNotificationFormAgn(instance=request.user.usernotifications)
 		context.update({'notificationforms_agn' : notificationforms_agn})
 
 		notificationforms_task = UsersNotificationFormTasks(instance=request.user.usernotifications)
-		context.update({'notificationforms_task' : notificationforms_task})			
+		context.update({'notificationforms_task' : notificationforms_task})
 		############################### NOTIFIFORMS END ############################################
 
 		# AGENCY UPDATE FORMS
 		agencyform = AgencyUpdateForm(instance=request.user.profile.agency)
-		context.update({'agencyform' : agencyform})		
-		
+		context.update({'agencyform' : agencyform})
+
 	return render(request, 'dasettings/settings.html', context)
 
 '''
@@ -252,19 +252,19 @@ Hier werden die Agenturinfos ink. Agenturcropper für das Agenturbild angepasst.
 
 '''
 @login_required
-def SettingsAgency(request, context):	
-	if request.POST.get("form_type") == "agencyform":		
+def SettingsAgency(request, context):
+	if request.POST.get("form_type") == "agencyform":
 		agencyform = AgencyUpdateForm(request.POST, instance=request.user.profile.agency)
 		if agencyform.is_valid():
-			if 'agencypic' in request.FILES:							
+			if 'agencypic' in request.FILES:
 				request.user.profile.agency.agencypic = request.FILES['agencypic']
 			agencyform.save()
 			context['agencyform'] = AgencyUpdateForm(instance=request.user.profile.agency)
-			messages.success(request, f'Agenturdaten aktualisiert!')	
+			messages.success(request, f'Agenturdaten aktualisiert!')
 			return render(request, 'dasettings/settings.html', context)
 		else:
-			messages.success(request, f'Daten falsch eingegeben!')	
-			context['agencyform'] = AgencyUpdateForm(instance=request.user.profile.agency)		
+			messages.success(request, f'Daten falsch eingegeben!')
+			context['agencyform'] = AgencyUpdateForm(instance=request.user.profile.agency)
 			return render(request, 'dasettings/settings.html', context)
 
 from django.db.models import F, Func, Value
@@ -279,9 +279,9 @@ def FreeDaysManagemenet(request, initload=0):
 		return render(request, 'dasettings/freedays_management.html', context)
 	else:
 		context = {
-			'active_link' : 'dasettings',					
-			'freedays' : FreeDays.objects.filter(agency=request.user.profile.agency).order_by("-day")			
-		}		
+			'active_link' : 'dasettings',
+			'freedays' : FreeDays.objects.filter(agency=request.user.profile.agency).order_by("-day")
+		}
 		return render(request, 'dasettings/freedays_management.html', context)
 
 @login_required
@@ -290,11 +290,11 @@ def FreeDayAdd(request):
 		freedayform = AddFreeDayForm(request.POST, instance=request.user.profile.agency)
 		if freedayform.is_valid():
 
-			fd = FreeDays(agency=request.user.profile.agency, day=freedayform.cleaned_data['day'], year=freedayform.cleaned_data['day'].year, name=freedayform.cleaned_data['name']).save()			
+			fd = FreeDays(agency=request.user.profile.agency, day=freedayform.cleaned_data['day'], year=freedayform.cleaned_data['day'].year, name=freedayform.cleaned_data['name']).save()
 
 			messages.success(request, f'Freier Tag hinzugefügt')
 			context = {
-				"active_link" : "dasettings",				
+				"active_link" : "dasettings",
 			}
 			return redirect("tm-managemenetfreedays")
 		else:
@@ -302,18 +302,18 @@ def FreeDayAdd(request):
 			return redirect("tm-managemenetfreedays")
 	else:
 		context = {
-			"active_link" : "dasettings",				
+			"active_link" : "dasettings",
 			"form" : AddFreeDayForm()
 		}
 		return render(request, 'dasettings/freedays_add.html', context)
 
-	
+
 class FreeDayDeleteView(LoginRequiredMixin, DeleteView):
 	model = FreeDays
-	success_url = reverse_lazy('tm-managemenetfreedays')	
-	template_name = 'dasettings/freedays_confirm_delete.html'	
-	
-	def delete(self, request, *args, **kwargs):		
+	success_url = reverse_lazy('tm-managemenetfreedays')
+	template_name = 'dasettings/freedays_confirm_delete.html'
+
+	def delete(self, request, *args, **kwargs):
 		response = super(FreeDayDeleteView, self).delete(request, *args, **kwargs)
 		messages.success(request, f'Freier Tag wurde gelöscht!')
 		return response
@@ -326,19 +326,19 @@ class FreeDayDeleteView(LoginRequiredMixin, DeleteView):
 
 class AbsenceReasonDeleteView(LoginRequiredMixin, DeleteView):
 	model = AbsenceReason
-	success_url = reverse_lazy('dasettings')	
-	template_name = 'dasettings/absencereason_confirm_delete.html'	
-	
-	def delete(self, request, *args, **kwargs):		
+	success_url = reverse_lazy('dasettings')
+	template_name = 'dasettings/absencereason_confirm_delete.html'
+
+	def delete(self, request, *args, **kwargs):
 		try:
 			response = super(AbsenceReasonDeleteView, self).delete(request, *args, **kwargs)
 			messages.success(request, f'Abwesenheitskategorie wurde gelöscht!')
 			return response
 		except:
-			
+
 			messages.success(request, f'Abwesenheitskategorie kann nicht gelöscht werden, da Abwesenheiten eingetragen wurden.')
-			return redirect('dasettings') 
-		
+			return redirect('dasettings')
+
 
 	def get_context_data(self, **kwargs):
 		context = super(AbsenceReasonDeleteView, self).get_context_data(**kwargs)
@@ -349,36 +349,36 @@ class AbsenceReasonAddView(LoginRequiredMixin, CreateView):
 	model = AbsenceReason
 	success_url = reverse_lazy('dasettings')
 	form_class = AbsenceReasonForm
-	template_name = 'dasettings/absencereason_add.html'	
-	
+	template_name = 'dasettings/absencereason_add.html'
+
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 		context.update({'active_link' : 'dasettings'})
 		return context
-	
-	def form_valid(self, form):	
+
+	def form_valid(self, form):
 		# Send message to the site
 		messages.success(self.request, f'Abwesenheitskategorie angelegt!')
-		form.instance.color = form.cleaned_data["rgb_color"]				
+		form.instance.color = form.cleaned_data["rgb_color"]
 		# SAVE OBJECTS TO SIGNALE!
 		form.instance.agency = self.request.user.profile.agency
 		return super().form_valid(form)
 
 class AbsenceReasonUpdateView(LoginRequiredMixin, UpdateView):
-	model = AbsenceReason	
+	model = AbsenceReason
 	template_name = 'dasettings/absencereason_update.html'
-	success_url = reverse_lazy('dasettings')	
+	success_url = reverse_lazy('dasettings')
 	form_class = AbsenceReasonForm
-	
-	def form_valid(self, form):	
-		# Send message to the site				
+
+	def form_valid(self, form):
+		# Send message to the site
 		messages.success(self.request, f'Abwesenheitskategorie aktualisiert!')
-		self.object.color = form.cleaned_data["rgb_color"]		
-		self.object.save()		
+		self.object.color = form.cleaned_data["rgb_color"]
+		self.object.save()
 		return super().form_valid(form)
 
 	def get_context_data(self, **kwargs):
-		context = super(AbsenceReasonUpdateView, self).get_context_data(**kwargs)		
+		context = super(AbsenceReasonUpdateView, self).get_context_data(**kwargs)
 		context['active_link'] = 'dasettings'
 		return context
 
@@ -389,7 +389,7 @@ def SettingsAgencyModuls(request, context):
 		if agencymoduleform.is_valid():
 
 			agencymoduleform.save()
-			
+
 			# Check, if Timemanagement is deactivate, to deactivate Zeiterfassung
 			if(request.user.profile.agency.module_timemanagement == False):
 				ag = request.user.profile.agency
@@ -404,7 +404,7 @@ def SettingsAgencyModuls(request, context):
 
 			if(request.user.profile.agency.module_timemanagement and len(temp_freedays) == 0):
 				messages.success(request, f'Moduleinstellungen aktualisiert! Bitte prüfen Sie Ihre Feiertagseinstellungen')
-				return redirect('tm-initload', 1)				
+				return redirect('tm-initload', 1)
 			else:
 				context['modulform'] = AgencyModulsForm(instance=request.user.profile.agency)
 				messages.success(request, f'Moduleinstellungen aktualisiert!')
@@ -429,22 +429,22 @@ def SettingsProfilManagement(request, context):
 	if request.POST.get("form_type") == "userform":
 		userform = UsersSelfChangeForm(request.POST, instance=request.user)
 		if userform.is_valid():
-			usert = User.objects.get(pk=request.user.pk)			
-			userform.save()					
-			usert.username = userform.cleaned_data.get("email")			
-			usert.email = userform.cleaned_data.get("email")			
+			usert = User.objects.get(pk=request.user.pk)
+			userform.save()
+			usert.username = userform.cleaned_data.get("email")
+			usert.email = userform.cleaned_data.get("email")
 			usert.save()
 			messages.success(request, f'E-Mailadresse aktualisiert!')
 			passwordform = PasswordChangeForm(request.user)
-			context['userform'] = userform			
+			context['userform'] = userform
 			context['passwordform'] = passwordform
 			return render(request, 'dasettings/settings.html', context)
 		else:
-			messages.success(request, f'Keine E-Mailadresse eingegeben oder E-Mail bereits vorhanden!')	
+			messages.success(request, f'Keine E-Mailadresse eingegeben oder E-Mail bereits vorhanden!')
 			passwordform = PasswordChangeForm(request.user)
 			userform = UsersSelfChangeForm(instance=request.user)
-			context['userform'] = userform			
-			context['passwordform'] = passwordform		
+			context['userform'] = userform
+			context['passwordform'] = passwordform
 			return render(request, 'dasettings/settings.html', context)
 	# PASSWORDFORM
 	elif request.POST.get("form_type") == "passwordform":
@@ -453,16 +453,16 @@ def SettingsProfilManagement(request, context):
 			passwordform.save()
 			update_session_auth_hash(request, request.user)
 			userform = UsersSelfChangeForm(instance=request.user)
-			context['userform'] = userform			
+			context['userform'] = userform
 			context['passwordform'] = passwordform
-			messages.success(request, f'Passwort aktualisiert!')	
+			messages.success(request, f'Passwort aktualisiert!')
 			return render(request, 'dasettings/settings.html', context)
 		else:
-			messages.success(request, f'Passwort falsch eingegeben!')	
+			messages.success(request, f'Passwort falsch eingegeben!')
 			passwordform = PasswordChangeForm(request.user)
 			userform = UsersSelfChangeForm(instance=request.user)
-			context['userform'] = userform			
-			context['passwordform'] = passwordform			
+			context['userform'] = userform
+			context['passwordform'] = passwordform
 			return render(request, 'dasettings/settings.html', context)
 
 @login_required
@@ -473,28 +473,28 @@ def SettingsAjaxRouter(request):
 	'''
 	if request.method == 'GET' and request.GET['action'] == "update_notifications" :
 		success = False
-		new_stat = request.GET['new_stat']		
-		field_to_change = getattr(request.user.profile, request.GET['fieldname'])		
-		if(field_to_change or not field_to_change):						
-			if(new_stat == "1"):				
+		new_stat = request.GET['new_stat']
+		field_to_change = getattr(request.user.profile, request.GET['fieldname'])
+		if(field_to_change or not field_to_change):
+			if(new_stat == "1"):
 				setattr(request.user.profile, request.GET['fieldname'], True)
 			else:
-				setattr(request.user.profile, request.GET['fieldname'], False)		
-		request.user.profile.save()		
+				setattr(request.user.profile, request.GET['fieldname'], False)
+		request.user.profile.save()
 		success = True
 	'''
 	if request.method == 'GET' and request.GET['action'] == "update_notifications" :
 		success = False
-		new_stat = request.GET['new_stat']		
-		field_to_change = getattr(request.user.usernotifications, request.GET['fieldname'])		
-		if(field_to_change or not field_to_change):						
-			if(new_stat == "1"):				
+		new_stat = request.GET['new_stat']
+		field_to_change = getattr(request.user.usernotifications, request.GET['fieldname'])
+		if(field_to_change or not field_to_change):
+			if(new_stat == "1"):
 				setattr(request.user.usernotifications, request.GET['fieldname'], True)
 			else:
-				setattr(request.user.usernotifications, request.GET['fieldname'], False)		
-		request.user.usernotifications.save()		
+				setattr(request.user.usernotifications, request.GET['fieldname'], False)
+		request.user.usernotifications.save()
 		success = True
-	# UPDATE TOOLTUP	
+	# UPDATE TOOLTUP
 	elif request.method == 'GET' and request.GET['action'] == "change_showtooltips" :
 		newtooltipvalue = False
 		user = User.objects.get(pk=request.user.pk, profile__agency=request.user.profile.agency)
@@ -512,22 +512,22 @@ def SettingsAjaxRouter(request):
 		job_value = request.GET['newvalue']
 		tempjob = AgencyJob.objects.get(pk=job_id, agency=request.user.profile.agency)
 		tempjob.name = job_value
-		tempjob.save()		
+		tempjob.save()
 		success = True
 	# DELETE AGENVY JOB FUNC - RETURN ONLY NAME FOR CONFIRM
 	elif request.method == 'GET' and request.GET['action'] == "get_agencyfunc" :
 		job_id = request.GET['id']
-		tempjob = AgencyJob.objects.get(pk=job_id, agency=request.user.profile.agency)				
+		tempjob = AgencyJob.objects.get(pk=job_id, agency=request.user.profile.agency)
 		data = {"funcname" : tempjob.name}
 		success = True
 	# DELETE FINAL AGECY JOB
 	elif request.method == 'GET' and request.GET['action'] == "delete_agencyfunc" :
 		job_id = request.GET['id']
-		tempjob = AgencyJob.objects.get(pk=job_id, agency=request.user.profile.agency)				
+		tempjob = AgencyJob.objects.get(pk=job_id, agency=request.user.profile.agency)
 		tempjob.delete()
 		success = True
-	elif request.method == 'GET' and request.GET['action'] == "add_agencyfunc" :		
-		tempjob = AgencyJob(name="", agency=request.user.profile.agency)			
+	elif request.method == 'GET' and request.GET['action'] == "add_agencyfunc" :
+		tempjob = AgencyJob(name="", agency=request.user.profile.agency)
 		tempjob.save()
 		data = {"new_id" : tempjob.pk}
 		success = True
@@ -546,7 +546,7 @@ def SettingsAjaxRouter(request):
 		group = AgencyGroup.objects.get(pk=request.GET['id'], agency=request.user.profile.agency)
 		data = {"groupname" : group.agencygroupname}
 		success = True
-	elif request.method == 'GET' and request.GET['action'] == "add_group" :		
+	elif request.method == 'GET' and request.GET['action'] == "add_group" :
 		if(checkForGroupName(request, request.GET['newvalue'])):
 			tempgroup = Group(name=str(request.user.profile.agency.pk) + "_" + randomString(8))
 			tempgroup.save()
@@ -561,8 +561,8 @@ def SettingsAjaxRouter(request):
 		group_to_del = groupag.group
 		group_to_del.delete()
 		success = True
-	# PERMISSIONS ON GROUP!	
-	elif request.method == 'GET' and request.GET['action'] == "change_perm_group" :		
+	# PERMISSIONS ON GROUP!
+	elif request.method == 'GET' and request.GET['action'] == "change_perm_group" :
 		success = True
 		group_id = request.GET['id']
 		perm_name = request.GET['perm']
@@ -571,57 +571,57 @@ def SettingsAjaxRouter(request):
 		# CHECK IF REQUESTED USER IS IN THIS AGENCY
 		if(request.user.profile.agency.pk == aggroup.agency.pk):
 			if(val == "true"):
-				tempperm = Permission.objects.get(codename=perm_name)	
-				aggroup.group.permissions.add(tempperm)				
-			else:				
-				tempperm = Permission.objects.get(codename=perm_name)	
+				tempperm = Permission.objects.get(codename=perm_name)
+				aggroup.group.permissions.add(tempperm)
+			else:
+				tempperm = Permission.objects.get(codename=perm_name)
 				aggroup.group.permissions.remove(tempperm)
 		else:
-			success = False			
+			success = False
 	# REMOVE USER FROM GROUP
-	elif request.method == 'GET' and request.GET['action'] == "remove_user_from_group" :		
+	elif request.method == 'GET' and request.GET['action'] == "remove_user_from_group" :
 		success = True
 		groupid = request.GET['groupid']
 		userid = request.GET['userid']
 		aggroup = AgencyGroup.objects.get(pk=groupid, agency=request.user.profile.agency)
 		usertoremove = User.objects.get(pk=userid, profile__agency=request.user.profile.agency)
-		# CHECK IF REQUESTED USER IS IN THIS AGENCY		
+		# CHECK IF REQUESTED USER IS IN THIS AGENCY
 		if(request.user.profile.agency.pk == aggroup.agency.pk):
 			if aggroup.group in usertoremove.groups.all():
-				aggroup.group.user_set.remove(usertoremove)	
-			
+				aggroup.group.user_set.remove(usertoremove)
+
 			data = {"userid" : usertoremove.pk, "groupid" : aggroup.pk, "user_fname" : usertoremove.first_name, "user_lname" : usertoremove.last_name}
 		else:
-			success = False			
+			success = False
 	# ADD USER TO GROUP
-	elif request.method == 'GET' and request.GET['action'] == "add_user_to_group" :		
+	elif request.method == 'GET' and request.GET['action'] == "add_user_to_group" :
 		success = True
 		groupid = request.GET['groupid']
 		userid = request.GET['userid']
 		aggroup = AgencyGroup.objects.get(pk=groupid, agency=request.user.profile.agency)
-		usertoadd = User.objects.get(pk=userid, profile__agency=request.user.profile.agency)		
+		usertoadd = User.objects.get(pk=userid, profile__agency=request.user.profile.agency)
 		# CHECK IF REQUESTED USER IS IN THIS AGENCY
 		if(request.user.profile.agency.pk == aggroup.agency.pk):
-			aggroup.group.user_set.add(usertoadd)				
+			aggroup.group.user_set.add(usertoadd)
 			data = {"userid" : usertoadd.pk, "groupid" : aggroup.pk, "user_fname" : usertoadd.first_name, "user_lname" : usertoadd.last_name}
 		else:
-			success = False	
+			success = False
 	# AREA
 	# AREANAMEN HOLEN
 	elif request.method == 'GET' and request.GET['action'] == "get_areaname" :
 		area = Areas.objects.get(pk=request.GET['id'], agency=request.user.profile.agency)
 		data = {"areaname" : area.name, "areacolor" : area.color}
-		success = True		
+		success = True
 	# ARENAMEN UPDATE
 	elif request.method == 'GET' and request.GET['action'] == "update_areaname" :
 		area = Areas.objects.get(pk=request.GET['id'], agency=request.user.profile.agency)
 		area.name = request.GET['newvalue']
-		area.color = request.GET['color']		
+		area.color = request.GET['color']
 		area.save()
 		data = {"newvalue" : area.name, "color" : area.color}
-		success = True	
+		success = True
 	# ADD AREA
-	elif request.method == 'GET' and request.GET['action'] == "add_area" :		
+	elif request.method == 'GET' and request.GET['action'] == "add_area" :
 		area = Areas(created_area_by=request.user, agency=request.user.profile.agency, name=request.GET["newvalue"], color=request.GET['color'])
 		area.save()
 		success = True
@@ -638,13 +638,13 @@ def SettingsAjaxRouter(request):
 				s.save()
 
 			tasks = Tasks.objects.filter(agency=request.user.profile.agency, area=todelarea).delete()
-			todelarea.delete()		
-			success = True	
+			todelarea.delete()
+			success = True
 		else:
-			success = False			
+			success = False
 
 	# ADD TASK
-	elif request.method == 'GET' and request.GET['action'] == "add_task" :		
+	elif request.method == 'GET' and request.GET['action'] == "add_task" :
 		task = Tasks(created_area_by=request.user, area=Areas.objects.get(pk=request.GET['areaid']), agency=request.user.profile.agency, name=request.GET["newvalue"])
 		task.save()
 		taskcreator_fullname = task.created_area_by.first_name + " " + task.created_area_by.last_name
@@ -653,7 +653,7 @@ def SettingsAjaxRouter(request):
 	# TASKNAME VISIBLE UND USERS HOLEN
 	elif request.method == 'GET' and request.GET['action'] == "get_taskname" :
 		task = Tasks.objects.get(pk=request.GET['id'], agency=request.user.profile.agency)
-		# User still in Area		
+		# User still in Area
 		# Get all Users from same Agency which are NOT in context_added_users
 		added_users = task.usersfield.all()
 		addus = {}
@@ -671,10 +671,10 @@ def SettingsAjaxRouter(request):
 			posus.update({ k : {"fullname" : us.first_name + " " + us.last_name, "userid" : us.pk}})
 			k += 1
 		data = {"taskname" : task.name, "visible" : task.visible, "added_users" : addus, "addedl" : i, "possl" : k, "possible_users" : posus, "taskarea" : task.area.pk}
-		success = True	
+		success = True
 	# REMOVE Task
-	elif request.method == 'GET' and request.GET['action'] == "remove_task" :		
-		
+	elif request.method == 'GET' and request.GET['action'] == "remove_task" :
+
 		todeltask = Tasks.objects.get(pk=request.GET['id'], agency=request.user.profile.agency)
 		# REMOVE STANDARDS AREA
 		tempstandards = Standards.objects.filter(agency=request.user.profile.agency, task=todeltask)
@@ -683,24 +683,24 @@ def SettingsAjaxRouter(request):
 				s.task = None
 				s.public = False
 				s.save()
-			todeltask.delete()		
-			success = True	
+			todeltask.delete()
+			success = True
 		else:
-			success = False	
+			success = False
 		#success = True
 	# UPDATE TASK VISIBLE
-	elif request.method == 'GET' and request.GET['action'] == "update_visible_taskname" :		
+	elif request.method == 'GET' and request.GET['action'] == "update_visible_taskname" :
 		task = Tasks.objects.get(pk=request.GET['id'], agency=request.user.profile.agency)
 		if(task.visible):
 			task.visible = False;
 		else:
 			task.visible = True;
 		task.save()
-		success = True			
+		success = True
 	# UPDATE TASKNAME
-	elif request.method == 'GET' and request.GET['action'] == "change_taskname" :		
+	elif request.method == 'GET' and request.GET['action'] == "change_taskname" :
 		task = Tasks.objects.get(pk=request.GET['id'])
-		task.name = request.GET["newvalue"] 
+		task.name = request.GET["newvalue"]
 		data = {"newvalue" : task.name}
 		newareaid = request.GET["newareaid"]
 		standardsmoved = False
@@ -713,12 +713,12 @@ def SettingsAjaxRouter(request):
 		data = {"newvalue" : task.name, "smoved" : standardsmoved}
 		success = True
 	# UPDATE USER MAIL
-	elif request.method == 'GET' and request.GET['action'] == "update_usermail" :				
+	elif request.method == 'GET' and request.GET['action'] == "update_usermail" :
 		tempuser = User.objects.get(pk=request.GET['userid'])
 		if(request.user.profile.agency == tempuser.profile.agency and request.user.has_perm('users.usermanager')):
 			tempmail = tempuser.email
 			regex = '^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$'
-			if(re.search(regex,request.GET['newmail'])): 				
+			if(re.search(regex,request.GET['newmail'])):
 				newmail = request.GET['newmail']
 				usertest = User.objects.filter(email=newmail)
 				if(len(usertest) > 0):
@@ -735,11 +735,11 @@ def SettingsAjaxRouter(request):
 		else:
 			success = False
 	# UPDATE USERNAME
-	elif request.method == 'GET' and request.GET['action'] == "update_usernames" :				
+	elif request.method == 'GET' and request.GET['action'] == "update_usernames" :
 		tempuser = User.objects.get(pk=request.GET['userid'])
 		if(request.user.profile.agency == tempuser.profile.agency and request.user.has_perm('users.usermanager')):
 			regex = '^[a-zA-Z0-9_.-üöäÜÖÄ ]+$'
-			if(re.search(regex,request.GET['new_first_name']) and re.search(regex,request.GET['new_last_name'])): 		
+			if(re.search(regex,request.GET['new_first_name']) and re.search(regex,request.GET['new_last_name'])):
 				tempuser.first_name = request.GET['new_first_name']
 				tempuser.last_name = request.GET['new_last_name']
 				tempuser.save()
@@ -752,29 +752,29 @@ def SettingsAjaxRouter(request):
 			data = {"userfullname" : tempuser.first_name + " " + tempuser.last_name}
 			success = False
 	# UPDATE FREEDAYS
-	elif request.method == 'GET' and request.GET['action'] == "initloadfreedays" :				
+	elif request.method == 'GET' and request.GET['action'] == "initloadfreedays" :
 		if(request.user.has_perm('users.modulesconfig')):
 			temp_freedays = FreeDays.objects.filter(agency=request.user.profile.agency)
 
-			if(len(temp_freedays) == 0):				
-				tempdays_thisyear = loadingFreeDays(request.user.profile.agency.plz, date.today().year)	
-				tempdays_lastyear = loadingFreeDays(request.user.profile.agency.plz, date.today().year - 1)	
-				tempdays_nextyear = loadingFreeDays(request.user.profile.agency.plz, date.today().year + 1)	
-				
+			if(len(temp_freedays) == 0):
+				tempdays_thisyear = loadingFreeDays(request.user.profile.agency.plz, date.today().year)
+				tempdays_lastyear = loadingFreeDays(request.user.profile.agency.plz, date.today().year - 1)
+				tempdays_nextyear = loadingFreeDays(request.user.profile.agency.plz, date.today().year + 1)
+
 				if(tempdays_thisyear != False):
 
-					for k in tempdays_lastyear.keys():		
+					for k in tempdays_lastyear.keys():
 						tempdate = tempdays_lastyear[k]["datum"].split("-")
 						FreeDays(agency=request.user.profile.agency, name=k, day=datetime.datetime(int(tempdate[0]),int(tempdate[1]),int(tempdate[2])), year=date.today().year-1).save()
 
-					for k in tempdays_thisyear.keys():		
+					for k in tempdays_thisyear.keys():
 						tempdate = tempdays_thisyear[k]["datum"].split("-")
 						FreeDays(agency=request.user.profile.agency, name=k, day=datetime.datetime(int(tempdate[0]),int(tempdate[1]),int(tempdate[2])), year=date.today().year).save()
-					
-					for k in tempdays_nextyear.keys():		
+
+					for k in tempdays_nextyear.keys():
 						tempdate = tempdays_nextyear[k]["datum"].split("-")
 						FreeDays(agency=request.user.profile.agency, name=k, day=datetime.datetime(int(tempdate[0]),int(tempdate[1]),int(tempdate[2])), year=date.today().year+1).save()
-					messages.success(request, f'Feiertage erfolgreich gespeichert!')				
+					messages.success(request, f'Feiertage erfolgreich gespeichert!')
 					success = True
 				else:
 					success = False
@@ -783,45 +783,45 @@ def SettingsAjaxRouter(request):
 			success = False
 
 	# LOAD MULTIPLE FREEDAYS
-	elif request.method == 'GET' and request.GET['action'] == "initloadfreedaysmulti" :				
+	elif request.method == 'GET' and request.GET['action'] == "initloadfreedaysmulti" :
 		if(request.user.has_perm('users.modulesconfig')):
-						
+
 			#tempdays_year = False
 			if(request.GET["land"] == "true"):
 				tempdays_year = loadingFreeDaysMulti(request.user.profile.agency.plz, request.GET["year"], True)
-				
-				
+
+
 				if(tempdays_year != False):
 					for k in tempdays_year.keys():
 						tempdate = tempdays_year[k].split("-")
 						FreeDays(agency=request.user.profile.agency, name=k, day=datetime.datetime(int(tempdate[0]),int(tempdate[1]),int(tempdate[2])), year=int(request.GET["year"])).save()
-					
-					messages.success(request, f'Feiertage erfolgreich gespeichert!')					
+
+					messages.success(request, f'Feiertage erfolgreich gespeichert!')
 					success = True
 				else:
 					success = False
 
 			else:
 				tempdays_year = loadingFreeDaysMulti(request.user.profile.agency.plz, request.GET["year"], False)
-			
+
 				if(tempdays_year != False):
-					for k in tempdays_year.keys():		
+					for k in tempdays_year.keys():
 						tempdate = tempdays_year[k]["datum"].split("-")
 						FreeDays(agency=request.user.profile.agency, name=k, day=datetime.datetime(int(tempdate[0]),int(tempdate[1]),int(tempdate[2])), year=int(request.GET["year"])).save()
-					
-					messages.success(request, f'Feiertage erfolgreich gespeichert!')					
+
+					messages.success(request, f'Feiertage erfolgreich gespeichert!')
 					success = True
 				else:
-					success = False			
+					success = False
 		else:
 			data = {"userfullname" : tempuser.first_name + " " + tempuser.last_name}
 			success = False
 
 	# DELETE ALL FREE DAYS
-	elif request.method == 'GET' and request.GET['action'] == "delallfreedays" :	
+	elif request.method == 'GET' and request.GET['action'] == "delallfreedays" :
 		if(request.user.has_perm('users.modulesconfig')):
-			FreeDays.objects.filter(agency=request.user.profile.agency).delete()			
-			messages.success(request, f'Feiertage erfolgreich entfernt!')	
+			FreeDays.objects.filter(agency=request.user.profile.agency).delete()
+			messages.success(request, f'Feiertage erfolgreich entfernt!')
 			success = True
 		else:
 			data = {"userfullname" : tempuser.first_name + " " + tempuser.last_name}
@@ -829,13 +829,13 @@ def SettingsAjaxRouter(request):
 		#return render(request, 'dasettings/change_absence_yeardata.html', context)
 
 	# HOLIDAYS UPDATE
-	elif request.method == 'GET' and request.GET['action'] == "update_holidays" :	
+	elif request.method == 'GET' and request.GET['action'] == "update_holidays" :
 		context = {
 			"user_years" : UserYearAbsenceInfo.objects.filter(user=User.objects.get(pk=request.GET["userid"])),
-		}	
-		return render(request, 'dasettings/change_absence_yeardata.html', context)	
+		}
+		return render(request, 'dasettings/change_absence_yeardata.html', context)
 	# UPDATE HOLIDAYS SAVE
-	elif request.method == 'GET' and request.GET['action'] == "update_holidays_save" :	
+	elif request.method == 'GET' and request.GET['action'] == "update_holidays_save" :
 		# GET ELEMENTS
 		newHolidayData = request.GET["new_data_info"].split("___")
 		# EVERY ELEMENT GET ID AND SAVE NEW DAY-INFO
@@ -850,38 +850,38 @@ def SettingsAjaxRouter(request):
 					temp_year.days = ele_elements[1]
 				elif(ele_type == "rest"):
 					temp_year.restdays = ele_elements[1]
-				temp_year.save()			
+				temp_year.save()
 		context = {
 			"user_years" : UserYearAbsenceInfo.objects.filter(user=User.objects.get(pk=request.GET["userid"])),
-		}	
+		}
 		return render(request, 'dasettings/data_absence_yeardata.html', context)
 
 
 	else:
 		success = False
-	return JsonResponse({"success" : success, "data" : data})	
+	return JsonResponse({"success" : success, "data" : data})
 
 
 def loadingFreeDays(plz, year):
 	# Getting land
 	file_path = os.path.join(settings.STATIC_ROOT, 'users/extra/plz_short.csv')
-	
+
 	land = False
 
-	with open(file_path, 'rt') as csvfile:		
-		filecsv = csv.reader(csvfile, delimiter=';')		
+	with open(file_path, 'rt') as csvfile:
+		filecsv = csv.reader(csvfile, delimiter=';')
 		for row in filecsv:
 
 			if str(row[1]) == str(plz):
 				land = row[6]
 				break;
-	
+
 
 
 	if(land != False):
 		URL = "https://feiertage-api.de/api/"
 		PARAMS = {'jahr':year,'nur_land':land}
-		r = requests.get(url = URL, params = PARAMS)		
+		r = requests.get(url = URL, params = PARAMS)
 		return r.json()
 	else:
 		return False
@@ -890,27 +890,27 @@ def loadingFreeDays(plz, year):
 def loadingFreeDaysMulti(plz, year, onlyland):
 	# Getting land
 	file_path = os.path.join(settings.STATIC_ROOT, 'users/extra/plz_short.csv')
-	
+
 	if(onlyland == False):
 
 		land = False
 
-		with open(file_path, 'rt') as csvfile:		
-			filecsv = csv.reader(csvfile, delimiter=';')		
+		with open(file_path, 'rt') as csvfile:
+			filecsv = csv.reader(csvfile, delimiter=';')
 			for row in filecsv:
 
 				if str(row[1]) == str(plz):
 					land = row[6]
 					break;
-		
+
 		URL = "https://feiertage-api.de/api/"
 		PARAMS = {'jahr':year,'nur_land':land}
-		r = requests.get(url = URL, params = PARAMS)		
+		r = requests.get(url = URL, params = PARAMS)
 		return r.json()
 	elif(onlyland == True):
 		URL = "https://feiertage-api.de/api/"
 		PARAMS = {'jahr':year,'nur_daten':1}
-		r = requests.get(url = URL, params = PARAMS)		
+		r = requests.get(url = URL, params = PARAMS)
 		return r.json()
 	else:
 		return False
@@ -923,36 +923,36 @@ def loadingFreeDaysMulti(plz, year, onlyland):
 
 '''
 @login_required
-def UserProfileUpdate(request, pk, newuser=0):	
+def UserProfileUpdate(request, pk, newuser=0):
 	usertochange = User.objects.get(pk=pk)
 	user_fullname = usertochange.first_name + " " + usertochange.last_name
-	parentuser = ""		
+	parentuser = ""
 	if(usertochange.profile.parent != None):
 		parentuser = usertochange.profile.parent.pk
 
 	if request.method == 'POST':
-		if 'image' in request.FILES:							
-			usertochange.profile.image = request.FILES['image']	
+		if 'image' in request.FILES:
+			usertochange.profile.image = request.FILES['image']
 		formtosave = False
-		
+
 		if(request.POST["form_type"] == "profileform"):
 
-			formtosave = UserProfileForm(request.POST, instance=usertochange.profile)		
-			
-			if formtosave.is_valid():	
+			formtosave = UserProfileForm(request.POST, instance=usertochange.profile)
+
+			if formtosave.is_valid():
 				try:
 					usertochange.profile.parent = User.objects.get(pk=request.POST['usertoparent'], profile__agency=request.user.profile.agency)
-					usertochange.save()		
+					usertochange.save()
 				except Exception as e:
 					usertochange.profile.parent = None
-					usertochange.save()	
-				
+					usertochange.save()
+
 				formtosave.save()
 				messages.success(request, f'Profil gespeichert!')
 				return redirect('dasettings')
 			else:
 				messages.success(request, f'Fehlerhafte Eingabe!')
-				context = {			
+				context = {
 					'active_link' : 'dasettings',
 					'user_fullname' : user_fullname,
 					'first_name' : usertochange.first_name,
@@ -972,10 +972,10 @@ def UserProfileUpdate(request, pk, newuser=0):
 
 			formtosave = UserTimeForm(request.POST, instance=UserTime.objects.get(user=usertochange))
 			if(formtosave.is_valid()):
-				# CHECK IF HOLIDAYS_LOOSE IS CORRECT	
-				if(not re.match(r"^([1-9]{1}|0[0-9]{1}|1[0-9]{1}|2[0-9]{1}|3[0-1]{1}).([1-9]{1}|0[0-9]{1}|1[0-2]{1}).$", formtosave.cleaned_data["loose_holidedate"])):				
+				# CHECK IF HOLIDAYS_LOOSE IS CORRECT
+				if(not re.match(r"^([1-9]{1}|0[0-9]{1}|1[0-9]{1}|2[0-9]{1}|3[0-1]{1}).([1-9]{1}|0[0-9]{1}|1[0-2]{1}).$", formtosave.cleaned_data["loose_holidedate"])):
 					messages.success(request, f'Fehlerhafte Eingabe! Das Verfallsdatum der Urlaubstage ist ungültig oder das Format wurde nicht beachtet (TAG.MONAT.).')
-					context = {			
+					context = {
 						'active_link' : 'dasettings',
 						'user_fullname' : user_fullname,
 						'first_name' : usertochange.first_name,
@@ -1001,7 +1001,7 @@ def UserProfileUpdate(request, pk, newuser=0):
 						return redirect('dasettings')
 					except:
 						messages.success(request, f'Fehlerhafte Eingabe! Das Verfallsdatum der Urlaubstage ist ungültig!')
-						context = {			
+						context = {
 							'active_link' : 'dasettings',
 							'user_fullname' : user_fullname,
 							'first_name' : usertochange.first_name,
@@ -1019,7 +1019,7 @@ def UserProfileUpdate(request, pk, newuser=0):
 						return render(request, 'dasettings/user_usprof.html', context)
 			else:
 				messages.success(request, f'Fehlerhafte Eingabe! Das Verfallsdatum muss im Format TAG.MONAT. sein und existieren!')
-				context = {			
+				context = {
 					'active_link' : 'dasettings',
 					'user_fullname' : user_fullname,
 					'first_name' : usertochange.first_name,
@@ -1035,8 +1035,8 @@ def UserProfileUpdate(request, pk, newuser=0):
 					'usertoparent' : User.objects.filter(profile__agency__pk=usertochange.profile.agency.pk, profile__visible=True)
 				}
 				return render(request, 'dasettings/user_usprof.html', context)
-			
-	else:		
+
+	else:
 		usertime = ""
 		try:
 			usertime = UserTimeForm(instance=UserTime.objects.get(user=usertochange))
@@ -1046,11 +1046,11 @@ def UserProfileUpdate(request, pk, newuser=0):
 			usertime = UserTimeForm(instance=UserTime.objects.get(user=usertochange))
 
 
-		context = {			
+		context = {
 				'active_link' : 'dasettings',
 				'user_fullname' : user_fullname,
 				'usertime_form' : UserTimeForm(instance=UserTime.objects.get(user=usertochange)),
-				'user_years' : UserYearAbsenceInfo.objects.filter(user=usertochange),					
+				'user_years' : UserYearAbsenceInfo.objects.filter(user=usertochange),
 				'first_name' : usertochange.first_name,
 				'last_name' : usertochange.last_name,
 				'newuser' : newuser,
@@ -1070,7 +1070,7 @@ def UserChangeMain(request, pk):
 	usertochange = User.objects.get(pk=pk, profile__agency=request.user.profile.agency)
 	user_fullname = usertochange.first_name + " " + usertochange.last_name
 	if request.method == 'POST':
-		formtosave = UserNewUserForm(request.POST, instance=usertochange)		
+		formtosave = UserNewUserForm(request.POST, instance=usertochange)
 		if formtosave.is_valid():
 			formtosave.save()
 			formtosave.save()
@@ -1078,14 +1078,14 @@ def UserChangeMain(request, pk):
 			return redirect('dasettings')
 		else:
 			messages.success(request, f'Fehlerhafte Eingabe! Mailadresse bereits vorhanden!')
-			context = {			
+			context = {
 				'active_link' : 'dasettings',
 				'user_fullname' : user_fullname,
 				'userform' : UserNewUserForm(request.POST, instance=usertochange),
 					}
 			return render(request, 'dasettings/user_changemaindata.html', context)
 	else:
-		context = {			
+		context = {
 			'active_link' : 'dasettings',
 			'user_fullname' : user_fullname,
 			'userform' : UserNewUserForm(instance=usertochange),
@@ -1095,52 +1095,54 @@ def UserChangeMain(request, pk):
 # Method for first User-Creation-Step
 @login_required
 def NewUserFirstStep(request):
+    context = {
+        'active_link' : 'dasettings'
+    }
+    if request.method == 'POST':
+        newuserform = UserNewUserForm(request.POST)
+        if newuserform.is_valid():
+            if(request.POST.get("sendmailnewuser")):
+                msg_html = render_to_string('users/register_mail.html', {'username': newuserform.cleaned_data.get('first_name') + " " + newuserform.cleaned_data.get('last_name')})
+                send_mail(request.user.profile.agency.name + ' Account', 'Hallo ' + newuserform.cleaned_data.get('first_name') + ' ' + newuserform.cleaned_data.get('last_name') + '! Bitte setzen sie sich auf https://digitale-agentur.com/password-reset/ ein Passwort.','noreply@digitale-agentur.com',[newuserform.cleaned_data.get('email')],html_message=msg_html,fail_silently=True)
+            newuser = newuserform.save(commit=False)
+            newuser.username = newuser.email
+            newprofile = Profile(agency=request.user.profile.agency, parent=None)
+            newprofile.save()
+            newuser.profile = newprofile
+            newuser.save()
 
-	context = {			
-			'active_link' : 'dasettings'
-		}
+            # USERTIME
+            user_time = UserTime(user=newuser)
+            user_time.save()
+            # USER NOTIFICATIONS
+            user_notifications = UserNotifications(user=newuser)
+            user_notifications.save()
 
-	if request.method == 'POST':	
-		newuserform = UserNewUserForm(request.POST)
-		if newuserform.is_valid():
-			if(request.POST.get("sendmailnewuser")):	
-				msg_html = render_to_string('users/register_mail.html', {'username': newuserform.cleaned_data.get('first_name') + " " + newuserform.cleaned_data.get('last_name')})		
-				send_mail(
-				    request.user.profile.agency.name + ' Account',
-				    'Hallo ' + newuserform.cleaned_data.get('first_name') + ' ' + newuserform.cleaned_data.get('last_name') + '! Bitte setzen sie sich auf https://digitale-agentur.com/password-reset/ ein Passwort.',
-				    'noreply@digitale-agentur.com',
-				    [newuserform.cleaned_data.get('email')],
-				    html_message=msg_html,
-				    fail_silently=True,
-				)		
-			newuser = newuserform.save(commit=False)
-			newuser.username = newuser.email
-			newprofile = Profile(agency=request.user.profile.agency, parent=None)
-			newprofile.save()
-			newuser.profile = newprofile
-			newuser.save()			
-			newuser_id = newuser.id			
-			messages.success(request, f'Benutzer angelegt!')
-			today = date.today()	
-			UserYearAbsenceInfo(agency=request.user.profile.agency, user=newuser, year=today.year).save()
-			UserYearAbsenceInfo(agency=request.user.profile.agency, user=newuser, year=today.year+1).save()
-			UserYearAbsenceInfo(agency=request.user.profile.agency, user=newuser, year=today.year+2).save()
+            newuser.usernotifications = user_notifications
+            newuser.usertime = user_time
 
-			getadmingroup = AgencyGroup.objects.filter(savefordel=True, is_admin=False, agency=request.user.profile.agency)
-			for g in getadmingroup:
-				g.group.user_set.add(newuser)
-			return redirect('/dasettings/usprof/'+str(newuser_id)+'/1')
-		else:
-			messages.success(request, f'Daten falsch eingegeben!')	
-			context['newuserform'] = UserNewUserForm(request.POST)		
-			return render(request, 'dasettings/user_newuser_step1.html', context)
-		
-	# Returning the data from database for normal-loading Settings
-	else:		
-		newuserform = UserNewUserForm()		
-		context.update({'newuserform' : newuserform})
-		
-	return render(request, 'dasettings/user_newuser_step1.html', context)
+
+            newuser_id = newuser.id
+            messages.success(request, f'Benutzer angelegt!')
+            today = date.today()
+            UserYearAbsenceInfo(agency=request.user.profile.agency, user=newuser, year=today.year).save()
+            UserYearAbsenceInfo(agency=request.user.profile.agency, user=newuser, year=today.year+1).save()
+            UserYearAbsenceInfo(agency=request.user.profile.agency, user=newuser, year=today.year+2).save()
+
+            getadmingroup = AgencyGroup.objects.filter(savefordel=True, is_admin=False, agency=request.user.profile.agency)
+            for g in getadmingroup:
+                g.group.user_set.add(newuser)
+            return redirect('/dasettings/usprof/'+str(newuser_id)+'/1')
+        else:
+            messages.success(request, f'Daten falsch eingegeben!')
+            context['newuserform'] = UserNewUserForm(request.POST)
+            return render(request, 'dasettings/user_newuser_step1.html', context)
+
+        # Returning the data from database for normal-loading Settings
+    else:
+        newuserform = UserNewUserForm()
+        context.update({'newuserform' : newuserform})
+    return render(request, 'dasettings/user_newuser_step1.html', context)
 
 
 # NEUER AGENTURVERBUND
@@ -1152,10 +1154,10 @@ def AddAgencyNetwork(request):
 			newagn_object = AgencyNetwork(name=newagn.cleaned_data.get("name"), publicjoin=newagn.cleaned_data.get("publicjoin"), creator=request.user, creator_agency=request.user.profile.agency, networkid=randomString(20))
 			newagn_object.save()
 			newagn_object.adminagencys.add(request.user.profile.agency)
-			messages.success(request, f'Agenturverbund ' + newagn_object.name + ' angelegt!')	
+			messages.success(request, f'Agenturverbund ' + newagn_object.name + ' angelegt!')
 			return redirect('dasettings')
 	else:
-		context = {			
+		context = {
 			'active_link' : 'dasettings',
 			'form' : AgencyNetworkForm(),
 				}
@@ -1171,10 +1173,10 @@ def UpdateAgencyNetwork(request, pk):
 			agn.publicjoin= formdata.cleaned_data.get("publicjoin")
 			agn.save()
 			#newagn_object.adminagencys.add(request.user.profile.agency)
-			messages.success(request, f'Agenturverbund ' + agn.name + ' aktualisiert!')	
+			messages.success(request, f'Agenturverbund ' + agn.name + ' aktualisiert!')
 			return redirect('dasettings')
 	else:
-		context = {			
+		context = {
 			'active_link' : 'dasettings',
 			'form' : AgencyNetworkForm(instance=AgencyNetwork.objects.get(pk=pk)),
 				}
@@ -1183,16 +1185,16 @@ def UpdateAgencyNetwork(request, pk):
 @login_required
 def DelAgencyNetwork(request, pk):
 	agn = AgencyNetwork.objects.get(pk=pk)
-	if request.method == 'POST':				
+	if request.method == 'POST':
 		if request.user.profile.agency in agn.adminagencys.all():
 			agn.delete()
-			messages.success(request, f'Agenturverbund erfolgreich gelöscht!')	
+			messages.success(request, f'Agenturverbund erfolgreich gelöscht!')
 			return redirect('dasettings')
 		else:
-			messages.success(request, f'Sie dürfen diesen Agenturverbund nicht löschen!')	
+			messages.success(request, f'Sie dürfen diesen Agenturverbund nicht löschen!')
 			return redirect('dasettings')
 	else:
-		context = {			
+		context = {
 			'active_link' : 'dasettings',
 			'agn' : agn
 				}
@@ -1203,10 +1205,10 @@ def AddMyAgencyToAgn(request, networkid):
 	agn = AgencyNetwork.objects.filter(networkid=networkid)
 
 	if len(agn) == 0:
-		messages.info(request, f'Agenturverbund nicht gefunden!')	
-		return redirect('dasettings')	
+		messages.info(request, f'Agenturverbund nicht gefunden!')
+		return redirect('dasettings')
 	else:
-		context = {			
+		context = {
 				'active_link' : 'dasettings',
 				'agn' : list(agn)[0]
 					}
@@ -1236,13 +1238,13 @@ def JoinAGN(request, pk):
 	if IsAgencyInAgNetwork(request.user.profile.agency.pk, pk):
 		messages.success(request, f'Ihre Agentur ist bereits in diesem Verbund!')
 	else:
-		agn = AgencyNetwork.objects.get(pk=pk)		
+		agn = AgencyNetwork.objects.get(pk=pk)
 		if(agn.publicjoin):
 			messages.success(request, f'Verbund erfolgreich beigetreten!')
 			agn.members.add(request.user.profile.agency)
 
 			# Benachrichtigung senden, dass eine neue Agentur dem Verbund beitreten will. DIe Info geht an alle administrativen Agenturen.
-			for adminagencys in agn.adminagencys.all():			
+			for adminagencys in agn.adminagencys.all():
 				usersofagency = Users.objects.filter(profile__agency=adminagencys)
 
 				for u in usersofagency:
@@ -1258,14 +1260,14 @@ def JoinAGN(request, pk):
 							channel_layer = channels.layers.get_channel_layer()
 							async_to_sync(channel_layer.group_send)("user_" + str(u.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Agenturverbund | Eine neue Agentur ist dem Verbund " + agn.name + " beigetreten."})
 		else:
-			
-			# STATUS 
+
+			# STATUS
 			# 1 WANTED AG ASKED TO TARGET NETWORK
 			agnp = AgencyNetworkPreperation(target_network=AgencyNetwork.objects.get(pk=pk), wanted_agency=request.user.profile.agency, status=1)
 			agnp.save()
 
 			# Benachrichtigung senden, dass eine neue Agentur dem Verbund beitreten will. DIe Info geht an alle administrativen Agenturen.
-			for adminagencys in agn.adminagencys.all():			
+			for adminagencys in agn.adminagencys.all():
 				usersofagency = Users.objects.filter(profile__agency=adminagencys)
 
 				for u in usersofagency:
@@ -1291,23 +1293,23 @@ def ManageAgInAgn(request, pk):
 	agn = AgencyNetwork.objects.filter(pk=pk)
 
 	if len(agn) == 0:
-		messages.info(request, f'Agenturverband nicht gefunden!')	
-		return redirect('dasettings')	
+		messages.info(request, f'Agenturverband nicht gefunden!')
+		return redirect('dasettings')
 	else:
 
 		network = list(agn)[0]
-		
+
 		allagofagn = []
 		for a in network.members.all():
 			allagofagn.append(a)
 
 		for a in network.sharemembers.all():
 			allagofagn.append(a)
-		
+
 		for a in network.adminagencys.all():
-			allagofagn.append(a)		
-		
-		context = {			
+			allagofagn.append(a)
+
+		context = {
 				'active_link' : 'dasettings',
 				'agn' : list(agn)[0],
 				'outstanding': AgencyNetworkPreperation.objects.filter(target_network=list(agn)[0])	,
@@ -1319,22 +1321,22 @@ def ManageAgInAgn(request, pk):
 def AddAgToNetwork(request, network, targetag, aginvpk):
 
 	if IsAgencyInAgNetwork(Agency.objects.get(pk=targetag).pk, network):
-		messages.info(request, f'Sie sind bereits im Agenturverbund!')	
+		messages.info(request, f'Sie sind bereits im Agenturverbund!')
 		return redirect('dasettings')
 	else:
 
-		messages.info(request, f'Einladung angenommen!')	
+		messages.info(request, f'Einladung angenommen!')
 		agn = AgencyNetwork.objects.get(pk=network)
 
 		agn.members.add(Agency.objects.get(pk=targetag))
 		AgencyNetworkPreperation.objects.get(pk=aginvpk).delete()
 
-		return redirect('managagn', network)			
+		return redirect('managagn', network)
 
 @login_required
 def DelAgInv(request, pk):
 	AgencyNetworkPreperation.objects.get(pk=pk).delete()
-	messages.info(request, f'Einladung abgelehnt!')	
+	messages.info(request, f'Einladung abgelehnt!')
 	return redirect('dasettings')
 
 @login_required
@@ -1355,7 +1357,7 @@ def AgencyNetworkAjaxSettings(request):
 			agencynetwork.sharemembers.remove(agency)
 			success = True
 
-		# Benachrichtigung senden, dass eine neue Agentur dem Verbund beitreten will. DIe Info geht an alle administrativen Agenturen.		
+		# Benachrichtigung senden, dass eine neue Agentur dem Verbund beitreten will. DIe Info geht an alle administrativen Agenturen.
 		usersofagency = Users.objects.filter(profile__agency=agency)
 		for u in usersofagency:
 			if u.has_perm('users.agencynetwork') and u.has_perm('users.agencynetwork'):
@@ -1374,7 +1376,7 @@ def AgencyNetworkAjaxSettings(request):
 		AgencyNetworkPreperation.objects.get(pk=request.GET['agn_inv']).delete()
 		success = True
 	elif request.method == 'GET' and request.GET['action'] == "changeagrights":
-		agency = Agency.objects.get(pk=request.GET['agency']) 
+		agency = Agency.objects.get(pk=request.GET['agency'])
 		agn = AgencyNetwork.objects.get(pk=request.GET['agnid'])
 		if(agency != None and agn != None):
 			agn.members.remove(agency)
@@ -1406,7 +1408,7 @@ def AgencyNetworkAjaxSettings(request):
 	return JsonResponse(data)
 
 @login_required
-def ModSettingsOrga(request):	
+def ModSettingsOrga(request):
 	if request.method == 'GET' and request.user.has_perm("users.modulesconfig"):
 		if(request.GET['dynorga'] == "true"):
 			ag = request.user.profile.agency
@@ -1423,7 +1425,7 @@ def ModSettingsOrga(request):
 
 @login_required
 def ModSettingsTm(request):
-	return JsonResponse({})	
+	return JsonResponse({})
 	'''
 	if request.method == 'GET' and request.user.has_perm("users.modulesconfig"):
 		if(request.GET['aze'] == "true"):
diff --git a/digitaleagentur/__pycache__/__init__.cpython-38.pyc b/digitaleagentur/__pycache__/__init__.cpython-38.pyc
index 3df1199407afca46d5c2b843baa30f36db3dd05f..8f5ab13c0165f17b16ee0020d90500f3154295a2 100644
GIT binary patch
delta 112
zcmZ3)xR{YUl$V!_0SH`Kj3;v2#CSMc#e^2878S>2<maTP#<=7sm*%GCl@!OgdxpfM
vWTt19B<7?hrUQjai!k`{@tJv<CGqik1(mlrY;yBcN^?@}7=fmL23Y|B+fyYA

delta 111
zcmZ3?xQLNEl$V!_0SMBTiB9CUiFVh|$j?pH&nPKM%q>XOcgfE#%}vcKN!54v4AD=?
uOwTMy%t=j52MU!IVesSQGxIV_;^XxSDsOSv<mRW8=A_y&0uBERvH<|WN+f9j

diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc
index a4c28921f198f92ac52ee193653177deca91183c..e97313d44e68ef5a7daa04b71cb3ef886b850e05 100644
GIT binary patch
delta 112
zcmew?|3#iJl$V!_0SH`KjN=)_H}Yw5@!w+2$S*D_)?_MT2TDY3cIQfGvGZ`YiU}=F
xEh>)5$j?bnjd96OF3nBND=Cg~_Y8?i$xP2INz6%2Oa}^;7Gdx=zvkm$1OOObB!mC}

delta 111
zcmew&|5=_dl$V!_0SMBTiN>poZRFG9;*Vm@$S*D_)?_MT2TI)9?9P?WV(YG-k)NBY
wpHWhjm|Kvl?~<Qgnwy$elB)0S8KR$(nVwman3I~A4iqXa!r*Uy!^go003H4$2mk;8

diff --git a/digitaleagentur/__pycache__/urls.cpython-38.pyc b/digitaleagentur/__pycache__/urls.cpython-38.pyc
index 0e2666de86f59875f4ff4164081a16086c7d221d..6646c23ea12a04000bd1c407bccf47614b2774e9 100644
GIT binary patch
delta 89
zcmbOxGF^l>l$V!_0SH`KjN{*I<W1tVb8)tc2`x@7Dvrs>&q+^>ami0E%}vcKDUNaX
b42em}OwTMy%t=j52MU!IVeluf;miU6*jyhf

delta 88
zcmbO(GEIaxl$V!_0SMBTiN+t=$eYAz>#U!VpPQ<mQBstcTac>nlAm3go0?aWs_*U@
aqMwqPo>`KZlbV<g6e=yk;7?x5nFRpDi5_17

diff --git a/digitaleagentur/__pycache__/views.cpython-38.pyc b/digitaleagentur/__pycache__/views.cpython-38.pyc
index 6f1462b2616afab2b196898d3fbf9bc2e9f8bb49..40b283e4586320ae18418a64e82c1b57908dffa7 100644
GIT binary patch
delta 87
zcmaFF^q7e^l$V!_0SH`KjN_{&@~*OTb+(ELElw>ej>*W+Nl%S&$xklLP0cGQj&b)4
ZiAl*!&n!vINli=#3Y8XN@F#xB0|3QrAB_M2

delta 86
zcmaFN^oWT!l$V!_0SMBTiN=>t<XvU!qMwnUo2s8tQk0lmkgD&JpIw@pnpcvl@9r6*
YpOTrLS(2EOnwSn0DlNj`PyCt(0J};a=>Px#

diff --git a/message/__pycache__/__init__.cpython-38.pyc b/message/__pycache__/__init__.cpython-38.pyc
index 412fdf63886955ae7efc5a9f77c10862ca3b3849..d3687b259e140fad227a303e194a2c582d3f4464 100644
GIT binary patch
delta 77
zcmbQmIGd3>l$V!_0SH`Kj3;v2m^nCG#e^2878S>2<maTP#<=7sm*%GCl@!OgdxpfM
cWTt19B<7?hrUQjai(+z9i;IEmn29xV09HO3hX4Qo

delta 76
zcmbQuIE#@xl$V!_0SMBTiB9CUF}2sv$j?pH&nPKM%q>XOcgfE#%}vcKN!54v4AD=?
bOwTMy%t=j52MU!I>F1^v7X#V)6KmxFQ8O6k

diff --git a/message/migrations/__pycache__/__init__.cpython-38.pyc b/message/migrations/__pycache__/__init__.cpython-38.pyc
index daae7aa9db1bcc6185625934b06be6445f5c8550..d987d496003e69f43b2efd4f7c016d15e3532303 100644
GIT binary patch
delta 88
zcmZ3=xQvlIl$V!_0SH`Kj3;v2IC?u<#e^2878S>2<maTP#<=7sm*%GCl@!OgdxpfM
nWTt19B<7?hrUQjai(+z9i;IEmnB2_tqQsKS{Ji3riS2R#nJXSw

delta 87
zcmZ3+xRjAQl$V!_0SMBTiB9CUaq!a5$j?pH&nPKM%q>XOcgfE#%}vcKN!54v4AD=?
mOwTMy%t=j52MU!I>F1^v7X#V)xtZxji6xo&dByq@JLCY2N*##+

diff --git a/news/__pycache__/__init__.cpython-38.pyc b/news/__pycache__/__init__.cpython-38.pyc
index a38a98c1892de0590b641108674a3036f6794666..32a487fdf69404d6b50145e8f48b4c886ab9ef65 100644
GIT binary patch
delta 74
zcmbQvID?Tpl$V!_0SMe!j3;v27~48q#e^2878S>2<maTP#<=7sm*%GCl@!OgdxpfM
bWTt19B<7?hrUQjai(>Lp%Zp<sR>}bY2o)Gn

delta 73
zcmbQiIGvF@l$V!_0SMBTiB9CUF|yIm$j?pH&nPKM%q>XOcgfE#%}vcKN!54v4AD=?
aOwTMy%t=j52MU!I>F1@E7wb=~k^=w)I2W$~

diff --git a/news/models.py b/news/models.py
index 4bf8dd4..4db2990 100644
--- a/news/models.py
+++ b/news/models.py
@@ -13,22 +13,22 @@ class News(models.Model):
 	name = models.CharField(max_length=200, blank=False, default="")
 	#content = RichTextUploadingField(blank=True, verbose_name='Inhalt')
 	content = models.TextField(blank=True, verbose_name='Inhalt', default="")
-	
+
 	created_by = models.ForeignKey(User, on_delete=models.SET_NULL, null=True)
 	created_date = models.DateTimeField(default=timezone.now, blank=True)
-	
+
 	go_online_on = models.DateTimeField(default=timezone.now, blank=True)
 	# Default date plus two weeks
-	go_offline_on = models.DateTimeField(default=timezone.now()+timedelta(days=14), blank=True)
+	go_offline_on = models.DateTimeField(default=timezone.now()+timedelta(days=14), blank=True, null=True)
 
 	last_modified_by = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, related_name='news_mod_by', default=None)
 	last_modified_on = models.DateTimeField(default=timezone.now, blank=True)
 
 	agnotify = models.BooleanField(default=True)
-	
+
 	def __str__(self):
 		return f'{self.name}'
 
 	# Hier Path für Templates des Models mit Parametern
 	def get_absolute_url(self):
-		return reverse('news-update', kwargs={'pk':self.pk})
\ No newline at end of file
+		return reverse('news-update', kwargs={'pk':self.pk})
diff --git a/news/views.py b/news/views.py
index 78365d1..40b52e0 100644
--- a/news/views.py
+++ b/news/views.py
@@ -16,8 +16,8 @@ class NewsManagement(LoginRequiredMixin, ListView):
 	# Adding active_link
 	# Loading only user same agency
 	# Change context and return for template-data
-	def get_context_data(self, **kwargs):		
-		filterdate = timezone.now()		
+	def get_context_data(self, **kwargs):
+		filterdate = timezone.now()
 		news = News.objects.filter(agency__pk=self.request.user.profile.agency.pk).filter(go_online_on__lt=filterdate).filter(go_offline_on__gt=filterdate).order_by('-created_date')
 		news_arch = News.objects.filter(agency__pk=self.request.user.profile.agency.pk).filter(go_offline_on__lt=filterdate).order_by('-created_date')
 
@@ -28,7 +28,7 @@ class NewsManagement(LoginRequiredMixin, ListView):
 		return context
 '''
 class NewsAddNews(LoginRequiredMixin, CreateView):
-	model = News	
+	model = News
 	fields = ['name', 'content','go_online_on', 'go_offline_on']
 	success_url = '/dashboard/news/'
 '''
@@ -37,18 +37,18 @@ def NewsAdd(request):
 	if request.method == 'POST':
 		normalForm = NewsAddNews(request.POST, instance=request.user)
 		#editorForm = NewsAddNewsEditor(request.POST, instance=request.user)
-		
+
 		#if editorForm.is_valid() and normalForm.is_valid():
 		if normalForm.is_valid():
 			normalForm.agency = request.user.profile.agency
 			normalForm.created_by = request.user
 			normalForm.last_modified_by = request.user
 			normalForm.save()
-			#editorForm.save()	
-			new_news = News()			
+			#editorForm.save()
+			new_news = News()
 			new_news.agency = request.user.profile.agency
 			new_news.created_by = request.user
-			
+
 			new_news.last_modified_by = request.user
 			new_news.created_date = datetime.now()
 			new_news.last_modified_on = datetime.now()
@@ -57,15 +57,15 @@ def NewsAdd(request):
 			new_news.content = normalForm.cleaned_data['content']
 			new_news.go_online_on = normalForm.cleaned_data['go_online_on']
 			new_news.go_offline_on = normalForm.cleaned_data['go_offline_on']
-			
+
 			new_news.save()
-			messages.success(request, f'News gespeichert!')			
-			return redirect('users-dashboard')	
-		
+			messages.success(request, f'News gespeichert!')
+			return redirect('users-dashboard')
+
 	else:
 		normalForm = NewsAddNews(instance=request.user)
 		#editorForm = NewsAddNewsEditor(instance=request.user)
-		
+
 
 	context = {
 		'normalForm' : normalForm,
@@ -80,23 +80,23 @@ def NewsUpdate(request, id):
 	if request.method == 'POST':
 		normalForm = NewsAddNews(request.POST, instance=news)
 		#editorForm = NewsAddNewsEditor(request.POST, instance=news)
-		
+
 		if normalForm.is_valid():
-			news = News.objects.get(pk=id, agency=request.user.profile.agency)	
+			news = News.objects.get(pk=id, agency=request.user.profile.agency)
 			news.last_modified_by = request.user
 			news.last_modified_on = datetime.now()
 			news.go_online_on = normalForm.cleaned_data['go_online_on']
 			news.go_offline_on = normalForm.cleaned_data['go_offline_on']
 			news.name = normalForm.cleaned_data['name']
-			news.content = normalForm.cleaned_data['content']			
+			news.content = normalForm.cleaned_data['content']
 			news.save()
-			messages.success(request, f'News aktualisiert!')			
-			return redirect('/news')		
+			messages.success(request, f'News aktualisiert!')
+			return redirect('/news')
 
 	else:
 		normalForm = NewsAddNews(instance=news)
 		#editorForm = NewsAddNewsEditor(instance=news)
-		
+
 
 	context = {
 		'normalForm' : normalForm,
@@ -109,20 +109,20 @@ def NewsUpdate(request, id):
 class NewsDeleteView(LoginRequiredMixin, DeleteView):
 	model = News
 	success_url = '/news'
-	template_name = 'news/news_confirm_delete.html'	
+	template_name = 'news/news_confirm_delete.html'
 
 	def get_context_data(self, **kwargs):
-		context = super(NewsDeleteView, self).get_context_data(**kwargs)		
+		context = super(NewsDeleteView, self).get_context_data(**kwargs)
 		context['active_link'] = 'newsmanagement'
 		return context
 
-	
+
 @login_required
 def NewsSingle(request, pk):
-	news = News.objects.get(pk=pk, agency=request.user.profile.agency)	
+	news = News.objects.get(pk=pk, agency=request.user.profile.agency)
 	context = {
 		'active_link':'dashboard',
 		'news' : news
-	}			
-	
-	return render(request, 'news/news_single.html', context)
\ No newline at end of file
+	}
+
+	return render(request, 'news/news_single.html', context)
diff --git a/notificsys/migrations/__pycache__/__init__.cpython-38.pyc b/notificsys/migrations/__pycache__/__init__.cpython-38.pyc
index b974de7fef4cc9fdc375d277f812e0d7aac9cc9f..794917d950e47ebf75269a8aa0647236b9668dea 100644
GIT binary patch
delta 91
zcmZ3%xRQ}Ol$V!_0SMe!j3;v2xcE6+#e^2878S>2<maTP#<=7sm*%GCl@!OgdxpfM
sWTt19B<7?hrUQjai(>NfOES|klZz{hV{$XoixNvR^Ye;hCU(gI0R74z%>V!Z

delta 90
zcmZ3<xPp;8l$V!_0SMBTiB9CUarV{E$j?pH&nPKM%q>XOcgfE#%}vcKN!54v4AD=?
rOwTMy%t=j52MU!I>F4E_WTs^%7grYR=VqoCC6;97=N0Qu?3M!n?=T+z

diff --git a/orga/__pycache__/__init__.cpython-38.pyc b/orga/__pycache__/__init__.cpython-38.pyc
index fd7c630488bf06f8cdb59170a4ba5bb5be69f443..f88666b6cee9e3e52da113614f655cede8ad0d37 100644
GIT binary patch
delta 74
zcmbQvID?Tpl$V!_0SMe!j3;v27~48q#e^2878S>2<maTP#<=7sm*%GCl@!OgdxpfM
bWTt19B<7?hrUQjai(>MN(i3AQR>}bY2fi3R

delta 73
zcmbQiIGvF@l$V!_0SMBTiB9CUF|yIm$j?pH&nPKM%q>XOcgfE#%}vcKN!54v4AD=?
aOwTMy%t=j52MU!I>E{=vC+bhEk^=w(;TM|#

diff --git a/orga/__pycache__/admin.cpython-38.pyc b/orga/__pycache__/admin.cpython-38.pyc
index 32acd7c7f2b1c20bfb4581916086708a3c0f2165..e569895789238e00783f436e049fed3bf3e8b412 100644
GIT binary patch
delta 100
zcmX@Wc#x4dl$V!_0SMe!jN_dq@}~J&Ia|eq7N-^!$7JN^q^HKX<R_QrrskCt$GCfj
y#H3`VXO<-9q$Z{Vg-VNJ@{7_FV-izxGxPKcDsOSv<mRW8=A_y&0!{o3G8O<OBp^fp

delta 99
zcmX@ecz}^Nl$V!_0SMBTiN@Pc<W2Ln)X&JzP1VmRDN4*ONY!`A&o0eP%_~XOclQj@
xPsvQrEJ@5sO-u(0l@{se7o{iaC#K|P=IIqw-r}&y%}*)KNws4H8u%GxDgY4{AD#dJ

diff --git a/orga/__pycache__/apps.cpython-38.pyc b/orga/__pycache__/apps.cpython-38.pyc
index 4c17580ae9ad84f9a848530b382d3a8c89b53e83..0c3f74658cea1cd209791e5911d32ccf4a676133 100644
GIT binary patch
delta 77
zcmaFQ^nr;tl$V!_0SMe!jN>CF@?JEybhe5KElw>ej>*W+Nl%S&$xklLP0cGQj&b)4
eiAl*!&n!vINli=#3Y8Yc<QJtU#!MDqj0XUu!x|O<

delta 76
zcmeys^qz?~l$V!_0SMBTiN*&{<h^KQp`VeTo2s8tQk0lmkgD&JpIw@pnpcvl@9r6*
dpOTrLS(2EOnwSn0DlO8_FG^3;pDf524*;HL8E*gp

diff --git a/orga/__pycache__/models.cpython-38.pyc b/orga/__pycache__/models.cpython-38.pyc
index e3c3be7c0c01aa9d3185b84463334f194d829e4f..c8a3917eeab9ca88b48cd1f4c08ac164db1e07f5 100644
GIT binary patch
delta 76
zcmdnXxQ~%Hl$V!_0SMe!jN@%4@+KKuJ6pws7N-^!$7JN^q^HKX<R_QrrskCt$GCfj
d#H3`VXO<-9q$Z{Vg-VNJ@{7_FV<s+?0RT_58FBys

delta 100
zcmdnTxR;SPl$V!_0SMBTiN;$_<W2Ik($C1xP1VmRDN4*ONY!`A&o0eP%_~XOclQj@
xPsvQrEJ@5sO-u(0l@{se7o{ia=jNxR<`nA{RNmsS0kTVTQtcRlCVmDP3ji@NAPWEh

diff --git a/orga/__pycache__/urls.cpython-38.pyc b/orga/__pycache__/urls.cpython-38.pyc
index 6d35242cc7d3cd3356fb4fa37eb26760697f8826..e9b9f8c3b8a984818a3868267b36b94843cfaa0b 100644
GIT binary patch
delta 79
zcmbQtJcXGrl$V!_0SMe!jN@4uH}dH-8e2MB#e^2878S>2<maTP#<=7sm*%GCl@!Og
gdxpfMWTt19B<7?hrUQjai(>MN(i3AQ=QFAR07i%yvj6}9

delta 78
zcmbQjJeip<l$V!_0SMBTiN^n6*vO~PXk?+Ek)NBYpHWhjm|Kvl?~<Qgnwy$elB)0S
f8KR$(nVwman3I~A4iqXa($6nSPt>1Wz^DQMea#sI

diff --git a/orga/__pycache__/views.cpython-38.pyc b/orga/__pycache__/views.cpython-38.pyc
index 00b61164bef06bf9d03500d4319e10f34160c0b5..ffcbdad5d420eea4f87dbe0d14b9208a1089b9b6 100644
GIT binary patch
delta 80
zcmdlcy<M6wl$V!_0SMe!jN?^AHu7mP8(TSB#e^2878S>2<maTP#<=7sm*%GCl@!Og
hdxpfMWTt19B<7?hrUQjai(>MN(i3AgXEFP50RWI88K?jN

delta 79
zcmdlky-k`gl$V!_0SMBTiN;q7Z{*WrHnP;u$j?pH&nPKM%q>XOcgfE#%}vcKN!54v
g4AD=?OwTMy%t=j52MU!I>E{=vC+cs`X7=F%0HDknS^xk5

diff --git a/organizer/__pycache__/__init__.cpython-38.pyc b/organizer/__pycache__/__init__.cpython-38.pyc
index 91f910073ac3c0b7db347eb2ed980bdd180d1995..b17aa84f8588417576b329e9d88a6af9388087d5 100644
GIT binary patch
delta 79
zcmbQkIG2$-l$V!_0SMe!j3;v2SU5Rb#e^2878S>2<maTP#<=7sm*%GCl@!OgdxpfM
gWTt19B<7?hrUQjai(>MN(i8JCt5S<%Cf3OT0FBrhegFUf

delta 78
zcmbQsIERrtl$V!_0SMBTiB9CUF?ZC@$j?pH&nPKM%q>XOcgfE#%}vcKN!54v4AD=?
fOwTMy%t=j52MU!I>E{=vC+1~Vr55Q=td|1-hnX4N

diff --git a/organizer/migrations/__pycache__/__init__.cpython-38.pyc b/organizer/migrations/__pycache__/__init__.cpython-38.pyc
index 6372da3193fba57abca395d69f67126677fb29ae..3803d6911e8ffcd4bac96ebc0848dac80f1cbbaa 100644
GIT binary patch
delta 90
zcmZ3^xPp;8l$V!_0SMe!j3;v2IQu$V#e^2878S>2<maTP#<=7sm*%GCl@!OgdxpfM
rWTt19B<7?hrUQjai(>MN(i8JCt5S<%ax>G55=%1k^NM38cFF+&+oT^(

delta 89
zcmZ3%xSWwYl$V!_0SMBTiB9CUaq`j6$j?pH&nPKM%q>XOcgfE#%}vcKN!54v4AD=?
qOwTMy%t=j52MU!I>E{=vC+1~Vr55SuW~LV<mSpDV73)vzk^=zEgdTqY

diff --git a/standards/__pycache__/__init__.cpython-38.pyc b/standards/__pycache__/__init__.cpython-38.pyc
index eae63dc0b86af5d959f00801f57b7ed54a1cc039..3e2f839a564b208bfe07844b3774f6cc9d1eb75f 100644
GIT binary patch
delta 79
zcmbQkIG2$-l$V!_0SMe!j3;v2SU5Rb#e^2878S>2<maTP#<=7sm*%GCl@!OgdxpfM
gWTt19B<7?hrUQjai(-mP67y0Li&BbXCf3OT0F99vaR2}S

delta 78
zcmbQsIERrtl$V!_0SMBTiB9CUF?ZC@$j?pH&nPKM%q>XOcgfE#%}vcKN!54v4AD=?
fOwTMy%t=j52MU!I=@*wI=A|SSr4;K=td|1-hf*2O

diff --git a/standards/templatetags/__pycache__/__init__.cpython-38.pyc b/standards/templatetags/__pycache__/__init__.cpython-38.pyc
index fb4baf6514e6a5cc6dbb2e69290f6c0860578750..25883cd728bff86dafe50aabf0b29ce0d55871e0 100644
GIT binary patch
delta 92
zcmZ3<xQdZGl$V!_0SMe!j3;v2xcWO=#e^2878S>2<maTP#<=7sm*%GCl@!OgdxpfM
tWTt19B<7?hrUQjai(-mP67y0Li&BbXN>XzRauQ2YOA^zIV<vXX0RSCYAQ=Dv

delta 91
zcmZ3*xRQ}Ol$V!_0SMBTiB9CUaq-j7$j?pH&nPKM%q>XOcgfE#%}vcKN!54v4AD=?
sOwTMy%t=j52MU!I=@*wI=A|SSr4;Lzq~;dnB$lL>B&HYZPwbHc01fLON&o-=

diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index 5cc09d75aa7507daa955a2196ad25b0067b692d8..e6341fbea118f769f3dbecdbc0ee73647bc78ec0 100644
GIT binary patch
delta 3350
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

delta 3373
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
CWfRZ<

diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py
index afd28ed..ba57844 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -427,15 +427,16 @@ def isfreedayname(user, daytocheck):
 # RETURN ALL ABSENCE ELEMENTS FOR THAT DAY
 @register.simple_tag
 def getabscenceday(loggeduser, user, daytocheck):
-
 	returnstat = False
 	if(loggeduser.has_perm("users.absencemanager")):
 		absencedays = Absence.objects.filter(confirm_status=0, agency=user.profile.agency, user=user, start=daytocheck) | (Absence.objects.filter(confirm_status=0, agency=user.profile.agency, user=user, start__lt=daytocheck) & Absence.objects.filter(confirm_status=0, agency=user.profile.agency, user=user, end__gt=daytocheck)) | Absence.objects.filter(confirm_status=0, agency=user.profile.agency, user=user, end=daytocheck)
 	else:
-		absencedays = (Absence.objects.filter(agency=user.profile.agency, user=loggeduser, confirm_status=1) | Absence.objects.filter(agency=user.profile.agency, user=user, confirm_status=0)) & (Absence.objects.filter(agency=user.profile.agency, user=user, start=daytocheck) | (Absence.objects.filter(agency=user.profile.agency, user=user, start__lt=daytocheck, confirm_status=0) & Absence.objects.filter(agency=user.profile.agency, user=user, end__gt=daytocheck)) | Absence.objects.filter(agency=user.profile.agency, user=user, end=daytocheck, confirm_status=0) )
+		absencedays = (Absence.objects.filter(agency=user.profile.agency, user=loggeduser, confirm_status=1) | Absence.objects.filter(agency=user.profile.agency, user=user, confirm_status=0)) & (Absence.objects.filter(agency=user.profile.agency, user=user, start=daytocheck) | (Absence.objects.filter(agency=user.profile.agency, user=user, start__lt=daytocheck, confirm_status=0) & Absence.objects.filter(agency=user.profile.agency, user=user, end__gt=daytocheck)) | Absence.objects.filter(agency=user.profile.agency, user=user, end=daytocheck, confirm_status=0))  | ((Absence.objects.filter(agency=user.profile.agency, user=user, start__lt=daytocheck, confirm_status=1) & Absence.objects.filter(agency=user.profile.agency, user=user, end__gt=daytocheck)) | Absence.objects.filter(agency=user.profile.agency, user=user, end=daytocheck, confirm_status=1))
 	if(len(absencedays) > 0):
 		returnstat = list(absencedays)[0]
 
+	print(absencedays)
+
 	return returnstat
 
 @register.simple_tag
diff --git a/tasks/__pycache__/__init__.cpython-38.pyc b/tasks/__pycache__/__init__.cpython-38.pyc
index fb8105065d9a9b883e1396697737193451411c16..7b9ccb40a1aa987c27947244120dfda048806765 100644
GIT binary patch
delta 75
zcmbQiIFpe(l$V!_0SMe!j3;v2nAka6#e^2878S>2<maTP#<=7sm*%GCl@!OgdxpfM
cWTt19B<7?hrUQjai(*O=i?fSkCRWJ-03q-gzW@LL

delta 74
zcmbQqID?Tpl$V!_0SMBTiB9CUF}Bsu$j?pH&nPKM%q>XOcgfE#%}vcKN!54v4AD=?
bOwTMy%t=j52MU!I>6auHXBX>Ftd;`+9hn#%

diff --git a/timemanagement/__pycache__/__init__.cpython-38.pyc b/timemanagement/__pycache__/__init__.cpython-38.pyc
index 1c4eb9544ede2aa5d7b74de767da0a10fe2c9dff..62070bde123dd7c9498d8f758add41adb3e8f10c 100644
GIT binary patch
delta 111
zcmZ3;xQLNEl$V!_0SMe!j3;v2M7uj%#e^2878S>2<maTP#<=7sm*%GCl@!OgdxpfM
zWTt19B<7?hrUQjai(*PLb5nB@^MG8Cnwa?b%)HE!_;|g7%3B;Zx%nxjIjMGxK*K+S
GYybeV86=wk

delta 110
zcmZ3)xR8-Ml$V!_0SMBTiB9CUiE`7=$j?pH&nPKM%q>XOcgfE#%}vcKN!54v4AD=?
zOwTMy%t=j52MU!I>6c{YrsgK*0l6SG`tk9Zd6^~g@p=W7w>WHa^HWN5QtcRlW`71*
F005XLBlrLS

diff --git a/timemanagement/migrations/__pycache__/__init__.cpython-38.pyc b/timemanagement/migrations/__pycache__/__init__.cpython-38.pyc
index 3f62c362bcbf0822b4352d183634ccc4992cee7a..e6a8acc4720ef8d1b92a28cd681469a0b9b924a4 100644
GIT binary patch
delta 95
zcmZ3(xR#MSl$V!_0SMe!j3;v2cmz3H#e^2878S>2<maTP#<=7sm*%GCl@!OgdxpfM
sWTt19B<7?hrUQjai(*PLb5nB@^MG8CnwZ?o^rFO)%>2CKn2CLI0D~7HVgLXD

delta 94
zcmZ3>xQ3BCl$V!_0SMBTiB9CUaSznb$j?pH&nPKM%q>XOcgfE#%}vcKN!54v4AD=?
rOwTMy%t=j52MU!I>6c{YrsgK*0l6SG`nj3uMTsSu`FX|q6Z_==a+M&H

diff --git a/users/__pycache__/__init__.cpython-38.pyc b/users/__pycache__/__init__.cpython-38.pyc
index 8a2e35a6acafaea4deccf6a856bb40bf262df0d3..23656421f68fa925bc218f1bc8f57f54b455a2b6 100644
GIT binary patch
delta 75
zcmbQiIFpe(l$V!_0SMe!j3;v2nAka6#e^2878S>2<maTP#<=7sm*%GCl@!OgdxpfM
ZWTt19B<7?hrUQjai(*Q_DkoOS0RSRV7|Q?v

delta 74
zcmbQqID?Tpl$V!_0SMBTiB9CUF}Bsu$j?pH&nPKM%q>XOcgfE#%}vcKN!54v4AD=?
bOwTMy%t=j52MU!I>6aF#78UDHtd;`+9r_q4

diff --git a/users/templates/users/base.html b/users/templates/users/base.html
index 3d572d9..50c4860 100644
--- a/users/templates/users/base.html
+++ b/users/templates/users/base.html
@@ -239,7 +239,7 @@
 
       <div style="" class="sidebar-heading ">
         <!--<span style="float: left"><small>poweder by&nbsp;</small><img src="{% static 'users/img/VVE-Logo.png' %}" width="27%" class="mb-2"></span>-->
-        <img src="{% static 'users/img/VVE-Logo.png' %}" width="27%" class="mb-2">
+        <a href="https://www.myvve.de/" target="_blank"><img src="{% static 'users/img/VVE-Logo.png' %}" width="27%" class="mb-2"></a>
         <br />
         <a style="color: #999; text-decoration: none;" href="{% url 'datenschutzda' %}">Datenschutz</a><br />
         <a style="color: #999; text-decoration: none;" href="{% url 'impressumda' %}">Impressum</a>
diff --git a/users/templates/users/searchres.html b/users/templates/users/searchres.html
index 3376a76..03febfe 100644
--- a/users/templates/users/searchres.html
+++ b/users/templates/users/searchres.html
@@ -84,7 +84,7 @@
   <h4>Passwörter</h4>
   {% if res_pass|length > 0 %}
     {% for s in res_pass %}
-    <i class="fas fa-key"></i>&nbsp;&nbsp;<a  onclick="javascript:$('#infos_searchres_pass_{{s.pk}}').modal('toggle');" href="#\"><b>{{s.name}}</b></a><br /><br />    
+    <i class="fas fa-key"></i>&nbsp;&nbsp;<a  onclick="javascript:$('#infos_searchres_pass_{{s.pk}}').modal('toggle');" href="#\"><b>{{s.name}}</b></a><br /><br />
     {% endfor %}
   {% else %}
     <p>Keine Ergebnisse in Passwörtern</p>
@@ -101,10 +101,10 @@
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
-      <div class="modal-body">      
+      <div class="modal-body">
             {% if agc.personname|length > 0 %}
               Ansprechpartner: {{agc.personname}}<br/>
-            {% endif %} 
+            {% endif %}
             {% if agc.mail|length > 0 %}
               E-Mailadresse: <a href="mailto:{{agc.mail}}">{{agc.mail}}</a><br />
             {% endif %}
@@ -121,7 +121,7 @@
               Anmerkungen: {{agc.desc}}<br />
             {% endif %}
       </div>
-      <div class="modal-footer">        
+      <div class="modal-footer">
         <button type="button" class="btn btn-success" data-dismiss="modal">Schließen</button>
       </div>
     </div>
@@ -129,8 +129,6 @@
 </div>
 {% endfor %}
 
-
-
 {% for pass in res_pass %}
 <div class="modal fade " id="infos_searchres_pass_{{pass.pk}}"  tabindex="-1" role="dialog" data-backdrop="static" aria-hidden="true">
   <div class="modal-dialog " role="document">
@@ -141,30 +139,30 @@
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
-      <div class="modal-body">      
+      <div class="modal-body">
            {% setbool False %}
 
           {% for passgroup in pass.visibleby.all %}
-            {% if user|has_group:passgroup.group.name %} 
+            {% if user|has_group:passgroup.group.name %}
               {% setbool True %}
             {% endif %}
-          {% endfor %}        
+          {% endfor %}
 
           {% if pass.visibleby.all|length == 0 %}
-            {% setbool True %}          
+            {% setbool True %}
           {% endif %}
-          
+
           {% getbool as groupchecker %}
 
           {% if groupchecker %}
             Name: <b>{{pass.name }}</b><br />
             Benutzername: <b/>{{pass.agpass_username }}</b><br />
-            Passwort: <b/>{{pass.agpass_username }}</b><br />
+            Passwort: <b/>{{pass.compass }}</b><br />
           {% else %}
           Sie dürfen keine Informationen dieses Passwortes einsehen.
           {% endif %}
       </div>
-      <div class="modal-footer">        
+      <div class="modal-footer">
         <button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
       </div>
     </div>