From b63c458df40e2acb6b5c24cf10e953bd1793ceba Mon Sep 17 00:00:00 2001
From: Holger Trampe <htrampe@gmail.com>
Date: Mon, 20 Jul 2020 16:58:44 +0200
Subject: [PATCH] Bugs gefixed, Zeiterfassung vorbereitet

---
 areas/__pycache__/__init__.cpython-38.pyc     | Bin 154 -> 152 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 165 -> 163 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 159 -> 157 bytes
 dasettings/forms.py                           | 181 +++++++-------
 .../__pycache__/__init__.cpython-38.pyc       | Bin 170 -> 168 bytes
 .../dasettings/notifications_content.html     |  72 +++---
 .../templates/dasettings/user_usprof.html     | 230 +++++++++---------
 .../__pycache__/__init__.cpython-38.pyc       | Bin 164 -> 162 bytes
 .../__pycache__/settings.cpython-38.pyc       | Bin 4085 -> 4083 bytes
 .../__pycache__/urls.cpython-38.pyc           | Bin 2584 -> 2582 bytes
 .../__pycache__/views.cpython-38.pyc          | Bin 356 -> 354 bytes
 message/__pycache__/__init__.cpython-38.pyc   | Bin 156 -> 154 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 167 -> 165 bytes
 news/__pycache__/__init__.cpython-38.pyc      | Bin 153 -> 151 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 170 -> 168 bytes
 orga/__pycache__/__init__.cpython-38.pyc      | Bin 153 -> 151 bytes
 orga/__pycache__/admin.cpython-38.pyc         | Bin 194 -> 192 bytes
 orga/__pycache__/apps.cpython-38.pyc          | Bin 369 -> 367 bytes
 orga/__pycache__/models.cpython-38.pyc        | Bin 191 -> 189 bytes
 orga/__pycache__/urls.cpython-38.pyc          | Bin 405 -> 403 bytes
 orga/__pycache__/views.cpython-38.pyc         | Bin 3512 -> 3510 bytes
 organizer/__pycache__/__init__.cpython-38.pyc | Bin 158 -> 156 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 169 -> 167 bytes
 standards/__pycache__/__init__.cpython-38.pyc | Bin 158 -> 156 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 171 -> 169 bytes
 .../__pycache__/counter_tag.cpython-38.pyc    | Bin 15307 -> 15305 bytes
 tasks/__pycache__/__init__.cpython-38.pyc     | Bin 154 -> 152 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 163 -> 161 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 174 -> 172 bytes
 .../timemanagement/rendered_confirmform.html  |  11 +-
 .../templates/timemanagement/tm_ab_all.html   |  41 ++--
 users/__pycache__/__init__.cpython-38.pyc     | Bin 154 -> 152 bytes
 32 files changed, 268 insertions(+), 267 deletions(-)

diff --git a/areas/__pycache__/__init__.cpython-38.pyc b/areas/__pycache__/__init__.cpython-38.pyc
index d64b760a4764463097c04a58ad7173303a6a1259..3b12d3e60bd4b11394d0017f6e007ef01878b8a7 100644
GIT binary patch
delta 75
zcmbQmID?TVl$V!_0SMBTiN;Ulu{O5V&&bbB)z2s?O3W=t)pyCyF3nBND@oON_YBcb
c$xP2INz6%2Oa}^;7U?Gzr6v~ZPppvx05&TaWdHyG

delta 77
zcmbQiIE#@dl$V!_0SF8Z?2enrV{K~hY!wq)oLW>I6Pj0)nwS&glAm0fo0?Zr9OLd8
d5|fgdo>`KZlbV<g6e=x>Nd&4Xj+s~`2LPKG8jSz|

diff --git a/cloud/migrations/__pycache__/__init__.cpython-38.pyc b/cloud/migrations/__pycache__/__init__.cpython-38.pyc
index 53af3fcbb63048e2dc3f3529596684db9ea9a21a..cd4f67657a551a1d1a8d17db47a1a4e248bd8d12 100644
GIT binary patch
delta 86
zcmZ3=xR{YAl$V!_0SMBTiN;Ulv9|Nj&&bbB)z2s?O3W=t)pyCyF3nBND@oON_YBcb
n$xP2INz6%2Oa}^;7U?JF<d>%C=VqoCC6;97=N0QuY?lK7Y)%~$

delta 115
zcmZ3?xRjA6l$V!_0SF8Z?2enrV;$$^Y!wq)oLW>I6Pj0)nwS&glAm0fo0?Zr9OLd8
z5|fgdo>`KZlbV<g6e=x>NzTbHO^M0POfO0-$;{6yj){-Y%*!l^kJl@xyv1RYo1ape
NlWNBZwBR$y768j7CvN}%

diff --git a/dasettings/__pycache__/__init__.cpython-38.pyc b/dasettings/__pycache__/__init__.cpython-38.pyc
index c707045ebf9408173654bc6274176fcffefc7ebe..91a913dafd45d098216183fb4b2f1affef467a91 100644
GIT binary patch
delta 80
zcmbQwIG2$pl$V!_0SMBTiN;Ulv9@s1&&bbB)z2s?O3W=t)pyCyF3nBND@oON_YBcb
h$xP2INz6%2Oa}^;7U`!X7N?e!Wagz8>rZTy0|34U8mIsO

delta 82
zcmbQsIG>Rxl$V!_0SF8Z?2enrV{PT)Y!wq)oLW>I6Pj0)nwS&glAm0fo0?Zr9OLd8
j5|fgdo>`KZlbV<g6e=x>Nl7eDEh)*&OD~R@ST6?vEgT%s

diff --git a/dasettings/forms.py b/dasettings/forms.py
index e1a5f61..cac4780 100644
--- a/dasettings/forms.py
+++ b/dasettings/forms.py
@@ -31,7 +31,7 @@ class UsersSelfChangeForm(forms.ModelForm):
 	email = forms.EmailField()
 
 	class Meta:
-		model = User		
+		model = User
 		fields = ['email']
 
 # Form für die Benachrichtigungseinstellungen
@@ -45,7 +45,7 @@ class UsersNotificationForm(forms.ModelForm):
 			#"user_standard_public_mail" : "Veröffentlichung meiner Standards",
 			"agency_new_standard_mail" : "Neue Agentur-Standards",
 			'add_new_group_mail' : "Gruppenmitgliedschaften",
-			'add_task_mail' : "Tätigkeitsbereich",	
+			'add_task_mail' : "Tätigkeitsbereich",
 			'user_messages_mail' : "Mitteilungen"
 		}
 		#fields = ['news_mail', 'news_push', 'user_standard_public_mail', 'user_standard_public_push', 'agency_new_standard_mail', 'agency_new_standard_push', 'add_new_group_mail', 'add_new_group_push', 'add_task_mail', 'add_task_push', 'user_messages_mail', 'user_messages_push']
@@ -53,7 +53,7 @@ class UsersNotificationForm(forms.ModelForm):
 '''
 # Form für die Benachrichtigungseinstellungen STANDARDS
 class UsersNotificationFormStandard(forms.ModelForm):
-	
+
 	class Meta:
 		model = UserNotifications
 		labels = {
@@ -61,9 +61,9 @@ class UsersNotificationFormStandard(forms.ModelForm):
 			"standard_update_mail" : "Standard verändert",
 			"standard_delete_mail" : "Standard gelöscht",
 			"standard_created_unpub_mail" : "Neuer, unveröffentlichter Standard"
-			
+
 		}
-		fields = [	
+		fields = [
 			'standard_created_mail',
 			'standard_created_push',
 			'standard_update_mail',
@@ -71,87 +71,87 @@ class UsersNotificationFormStandard(forms.ModelForm):
 			'standard_delete_mail',
 			'standard_delete_push',
 			'standard_created_unpub_mail',
-			'standard_created_unpub_push',			
+			'standard_created_unpub_push',
 		]
 
 
 # Form für die Benachrichtigungseinstellungen NEWS
 class UsersNotificationFormNews(forms.ModelForm):
-	
+
 	class Meta:
 		model = UserNotifications
 		labels = {
-			"news_created_mail" : "Neuer Agenturnews",		
-			
+			"news_created_mail" : "Neuer Agenturnews",
+
 		}
-		fields = [	
-			'news_created_mail',	
-			'news_created_push',	
+		fields = [
+			'news_created_mail',
+			'news_created_push',
 		]
 
 # Form für die Benachrichtigungseinstellungen MESSAGES
 class UsersNotificationFormMessages(forms.ModelForm):
-	
+
 	class Meta:
 		model = UserNotifications
 		labels = {
-			"message_received_mail" : "Neuer Mitteilung",		
-			
+			"message_received_mail" : "Neuer Mitteilung",
+
 		}
-		fields = [	
-			'message_received_mail',	
-			'message_received_push',	
+		fields = [
+			'message_received_mail',
+			'message_received_push',
 		]
 
 # Form für die Benachrichtigungseinstellungen CHAT
 class UsersNotificationFormChat(forms.ModelForm):
-	
+
 	class Meta:
 		model = UserNotifications
 		labels = {
-			"chat_received_mail" : "Verpasste Chatnachrichten",		
-			"chat_room_activity_mail" : "Raumaktivitäten",		
-			
+			"chat_received_mail" : "Verpasste Chatnachrichten",
+			"chat_room_activity_mail" : "Raumaktivitäten",
+
 		}
-		fields = [	
-			'chat_received_mail',	
+		fields = [
+			'chat_received_mail',
 			'chat_received_push',
-			'chat_room_activity_mail',	
-			'chat_room_activity_push',	
+			'chat_room_activity_mail',
+			'chat_room_activity_push',
 		]
 
 # Form für die Benachrichtigungseinstellungen FILES
 class UsersNotificationFormFiles(forms.ModelForm):
-	
+
 	class Meta:
 		model = UserNotifications
 		labels = {
-			"filedir_created_mail" : "Datei/Ordner erstellt",		
-			"filedir_update_mail" : "Datei/Ordner aktualisiert",		
-			"filedir_delete_mail" : "Datei/Ordner gelöscht",		
-			
+			"filedir_created_mail" : "Datei/Ordner erstellt",
+			"filedir_update_mail" : "Datei/Ordner aktualisiert",
+			"filedir_delete_mail" : "Datei/Ordner gelöscht",
+
 		}
-		fields = [	
-			'filedir_created_mail',	
-			'filedir_created_push',	
-			'filedir_update_mail',	
-			'filedir_update_push',	
-			'filedir_delete_mail',	
-			'filedir_delete_push',	
+		fields = [
+			'filedir_created_mail',
+			'filedir_created_push',
+			'filedir_update_mail',
+			'filedir_update_push',
+			'filedir_delete_mail',
+			'filedir_delete_push',
 		]
 
 # Form für die Benachrichtigungseinstellungen ABSENCE AND TIME
 class UsersNotificationFormAbTime(forms.ModelForm):
-	
+
 	class Meta:
 		model = UserNotifications
 		labels = {
-			"absence_created_mail" : "Anfrage erstellt",		
-			"absence_user_is_rep_mail" : "Als Vertreter eingesetzt",		
-			"absence_user_is_rep_reminder_mail" : "Erinnerung für Vertretung",		
-			"time_data_changed_mail" : "Abwesenheit bearbeitet",	
+			"absence_created_mail" : "Anfrage erstellt",
+			"absence_user_is_rep_mail" : "Als Vertreter eingesetzt",
+			"absence_user_is_rep_reminder_mail" : "Erinnerung für Vertretung",
+			"time_data_changed_mail" : "Abwesenheit bearbeitet",
 		}
-		fields = [	
+		fields = [
 			'absence_created_mail',
 			'absence_created_push',
 			'absence_user_is_rep_mail',
@@ -164,51 +164,51 @@ class UsersNotificationFormAbTime(forms.ModelForm):
 
 # Form für die Benachrichtigungseinstellungen GRUPPEN
 class UsersNotificationFormGroups(forms.ModelForm):
-	
+
 	class Meta:
 		model = UserNotifications
 		labels = {
-			"group_activity_mail" : "Mitgliedschaftsänderung",		
-			"group_rights_mail" : "Rechteänderung",				
-			
+			"group_activity_mail" : "Mitgliedschaftsänderung",
+			"group_rights_mail" : "Rechteänderung",
+
 		}
-		fields = [	
-			'group_activity_mail',	
-			'group_activity_push',	
-			'group_rights_mail',	
+		fields = [
+			'group_activity_mail',
+			'group_activity_push',
+			'group_rights_mail',
 			'group_rights_push',
 		]
 
 # Form für die Benachrichtigungseinstellungen Tätigkeitsbereiche
 class UsersNotificationFormTasks(forms.ModelForm):
-	
+
 	class Meta:
 		model = UserNotifications
 		labels = {
-			"task_activity_mail" : "Tätigkeiten",			
-			
+			"task_activity_mail" : "Tätigkeiten",
+
 		}
-		fields = [	
-			'task_activity_mail',	
+		fields = [
+			'task_activity_mail',
 			'task_activity_push',
 		]
 
 # Form für die Benachrichtigungseinstellungen GRUPPEN
 class UsersNotificationFormAgn(forms.ModelForm):
-	
+
 	class Meta:
 		model = UserNotifications
 		labels = {
-			"agn_standard_created_mail" : "Neuer Standard",		
-			"agn_standard_copied_mail" : "Standard wurde übernommen",	
-			"agn_standard_comment_mail" : "Kommentar zu Standard aus meiner Agentur",	
-			"agn_standard_comment_react_mail" : "Reaktion zu meinem Kommentar",	
-			"agn_own_change_mail" : "Änderungen meiner Agenturverbunde",	
+			"agn_standard_created_mail" : "Neuer Standard",
+			"agn_standard_copied_mail" : "Standard wurde übernommen",
+			"agn_standard_comment_mail" : "Kommentar zu Standard aus meiner Agentur",
+			"agn_standard_comment_react_mail" : "Reaktion zu meinem Kommentar",
+			"agn_own_change_mail" : "Änderungen meiner Agenturverbunde",
 			"agn_other_change_mail" : "Änderung anderer Agenturverbunde",
 		}
-		fields = [	
-			'agn_standard_created_mail',	
-			'agn_standard_created_push',	
+		fields = [
+			'agn_standard_created_mail',
+			'agn_standard_created_push',
 			'agn_standard_copied_mail',
 			'agn_standard_copied_push',
 			'agn_standard_comment_mail',
@@ -223,21 +223,21 @@ class UsersNotificationFormAgn(forms.ModelForm):
 
 
 class UsersNotificationFormOrganizer(forms.ModelForm):
-	
+
 	class Meta:
 		model = UserNotifications
 		labels = {
-			"ql_created_mail" : "Quicklink erstellt",		
-			"ql_update_mail" : "Quicklink aktualisiert",		
+			"ql_created_mail" : "Quicklink erstellt",
+			"ql_update_mail" : "Quicklink aktualisiert",
 			"ql_delete_mail" : "Quicklink gelöscht",
-			"contact_created_mail" : "Kontakt erstellt",		
-			"contact_update_mail" : "Kontakt aktualisiert",		
-			"contact_delete_mail" : "Kontakt gelöscht",			
-			"password_created_mail" : "Passwort erstellt",		
-			"password_update_mail" : "Passwort aktualisiert",		
-			"password_delete_mail" : "Passwort gelöscht",			
+			"contact_created_mail" : "Kontakt erstellt",
+			"contact_update_mail" : "Kontakt aktualisiert",
+			"contact_delete_mail" : "Kontakt gelöscht",
+			"password_created_mail" : "Passwort erstellt",
+			"password_update_mail" : "Passwort aktualisiert",
+			"password_delete_mail" : "Passwort gelöscht",
 		}
-		fields = [	
+		fields = [
 			'ql_created_mail',
 			'ql_created_push',
 			'ql_update_mail',
@@ -280,17 +280,17 @@ class UserTimeForm(forms.ModelForm):
 		fields = ["startdate", "usetime", "usetime_start", "wd_mo", "wd_tu", "wd_we", "wd_th", "wd_fr", "wd_sa", "wd_so", "loose_holidedate"]
 		widgets = {
 			"startdate" : DatePickerInput(options={"format":'DD.MM.YYYY', "locale":'de'}),
-			"usetime_start" : DatePickerInput(options={"format":'DD.MM.YYYY', "locale":'de'}) 
+			"usetime_start" : DatePickerInput(options={"format":'DD.MM.YYYY', "locale":'de'})
 		}
 
-	def __init__(self, *args, **kwargs):		
+	def __init__(self, *args, **kwargs):
 		super().__init__(*args, **kwargs)
 		self.fields['startdate'].required = True
 		self.fields['usetime_start'].required = False
 		self.fields['usetime'].required = False
-		self.fields['usetime'].widget.attrs['readonly'] = True
-		self.fields['usetime_start'].widget.attrs['readonly'] = True
-	
+		#self.fields['usetime'].widget.attrs['readonly'] = True
+		#self.fields['usetime_start'].widget.attrs['readonly'] = True
+
 
 # PERMISSION GROUPS FORM
 class AgencyGroupPerms(forms.Form):
@@ -303,11 +303,11 @@ class AgencyGroupPerms(forms.Form):
 
 		@param: user
 		- User ist der aufgerufene User!
-	'''	
-	def __init__(self, *args, **kwargs):		
+	'''
+	def __init__(self, *args, **kwargs):
 		super().__init__(*args, **kwargs)
 		temprof = AgencyGroup
-		for ele in temprof._meta.permissions:			
+		for ele in temprof._meta.permissions:
 			self.fields[ele[0]] = forms.BooleanField(required=False, initial=False, help_text=(ele[1]))
 
 # LOADING ALL MODUL-OPTIONS
@@ -367,16 +367,16 @@ class UserProfileForm(forms.ModelForm):
 			"phoneland" : "Festnetznummer",
 			"image": "Profilbild",
 			"func" : "Agenturfunktion",
-			"compfunc" : "Tätigkeit"					
+			"compfunc" : "Tätigkeit"
 		}
 		widgets = {"parent" : forms.HiddenInput()}
 		fields = ["parent", "func", "compfunc", "visible", "phoneland", "phonemobile", "phone_public", "persnumber", "image" ]
 
 	def __init__(self, *args, **kwargs):
-		super().__init__(*args, **kwargs)		
+		super().__init__(*args, **kwargs)
 		self.fields['func'].queryset = AgencyJob.objects.filter(agency__pk=self.instance.agency.pk)
 
-	def save(self):		
+	def save(self):
 		photo = super(UserProfileForm, self).save()
 		try:
 			x = self.cleaned_data.get('x')
@@ -386,12 +386,12 @@ class UserProfileForm(forms.ModelForm):
 			rotation = self.cleaned_data.get('rotation')
 			image = Image.open(photo.image)
 			rotatet_image = image.rotate(rotation, expand=True)
-			cropped_image = rotatet_image.crop((x, y, w+x, h+y))			
+			cropped_image = rotatet_image.crop((x, y, w+x, h+y))
 			resized_image = cropped_image.resize((416, 416), Image.ANTIALIAS)
 			resized_image.save(photo.image.path)
 			return photo
 		except:
-			print("no photo")	
+			print("no photo")
 
 
 class AbsenceReasonForm(forms.ModelForm):
@@ -405,6 +405,5 @@ class AbsenceReasonForm(forms.ModelForm):
 			"need_confirm" : "Muss bestätigt werden",
 			"need_rep" : "Muss vertreten werden",
 			"is_holiday" : "Geht vom Urlaub ab"
-		}		
+		}
 		fields = ["name", "need_confirm", "need_rep", "is_holiday", "rgb_color"]
-
diff --git a/dasettings/migrations/__pycache__/__init__.cpython-38.pyc b/dasettings/migrations/__pycache__/__init__.cpython-38.pyc
index 2bdc2eca1d2c28902ec23f71cd6d17c88054d8b7..e66e7ab57a85310473b027cfbedb58bf26ae5c19 100644
GIT binary patch
delta 91
zcmZ3*xPp-<l$V!_0SMBTiN;Ulv3B;=&&bbB)z2s?O3W=t)pyCyF3nBND@oON_YBcb
s$xP2INz6%2Oa}^;7U`!X7N?e!Wagz8>*r>s7bTWt=I0gbPwbHc01WXTO8@`>

delta 93
zcmZ3%xQdY{l$V!_0SF8Z?2enrW9{niY!wq)oLW>I6Pj0)nwS&glAm0fo0?Zr9OLd8
u5|fgdo>`KZlbV<g6e=x>Nl7eDEh)*&OD~Se%}g&!EXmBzD~_4iB?kbM(IKD!

diff --git a/dasettings/templates/dasettings/notifications_content.html b/dasettings/templates/dasettings/notifications_content.html
index 0028242..27542cb 100644
--- a/dasettings/templates/dasettings/notifications_content.html
+++ b/dasettings/templates/dasettings/notifications_content.html
@@ -8,7 +8,7 @@
     <div class="card-header" id="notification_standards_acc">
       <h5 class="mb-0">
         <button class="btn btn-link" data-toggle="collapse" data-target="#notification_standards" aria-expanded="true" aria-controls="notification_standards">
-          Standards
+          <i class="fas fa-chevron-down"></i>&nbsp;&nbsp;&nbsp;Standards
         </button>
       </h5>
     </div>
@@ -20,13 +20,13 @@
 		    <tr>
 		      <th scope="col">Benachrichtigung</th>
 		      <th scope="col">E-Mail</th>
-		      <th scope="col">Push</th>      
+		      <th scope="col">Push</th>
 		    </tr>
 		  </thead>
 		  <tbody>
 			{% for formfield in notificationforms_standard %}
 				{% if forloop.counter|divisibleby:2 %}
-						<td>{{formfield}}</td>				
+						<td>{{formfield}}</td>
 					</tr>
 				{% else %}
 					<tr>
@@ -45,7 +45,7 @@
     <div class="card-header" id="notification_news_acc">
       <h5 class="mb-0">
         <button class="btn btn-link" data-toggle="collapse" data-target="#notification_news" aria-expanded="true" aria-controls="notification_news">
-          News
+          <i class="fas fa-chevron-down"></i>&nbsp;&nbsp;&nbsp;News
         </button>
       </h5>
     </div>
@@ -57,13 +57,13 @@
 		    <tr>
 		      <th scope="col">Benachrichtigung</th>
 		      <th scope="col">E-Mail</th>
-		      <th scope="col">Push</th>      
+		      <th scope="col">Push</th>
 		    </tr>
 		  </thead>
 		  <tbody>
 			{% for formfield in notificationforms_news %}
 				{% if forloop.counter|divisibleby:2 %}
-						<td>{{formfield}}</td>				
+						<td>{{formfield}}</td>
 					</tr>
 				{% else %}
 					<tr>
@@ -83,7 +83,7 @@
     <div class="card-header" id="notification_groups_acc">
       <h5 class="mb-0">
         <button class="btn btn-link" data-toggle="collapse" data-target="#notification_groups" aria-expanded="true" aria-controls="notification_groups">
-          Gruppen
+          <i class="fas fa-chevron-down"></i>&nbsp;&nbsp;&nbsp;Gruppen
         </button>
       </h5>
     </div>
@@ -95,13 +95,13 @@
 		    <tr>
 		      <th scope="col">Benachrichtigung</th>
 		      <th scope="col">E-Mail</th>
-		      <th scope="col">Push</th>      
+		      <th scope="col">Push</th>
 		    </tr>
 		  </thead>
 		  <tbody>
 			{% for formfield in notificationforms_groups %}
 				{% if forloop.counter|divisibleby:2 %}
-						<td>{{formfield}}</td>				
+						<td>{{formfield}}</td>
 					</tr>
 				{% else %}
 					<tr>
@@ -120,7 +120,7 @@
     <div class="card-header" id="notification_task_acc">
       <h5 class="mb-0">
         <button class="btn btn-link" data-toggle="collapse" data-target="#notification_task" aria-expanded="true" aria-controls="notification_task">
-          Tätigkeiten
+          <i class="fas fa-chevron-down"></i>&nbsp;&nbsp;&nbsp;Tätigkeiten
         </button>
       </h5>
     </div>
@@ -132,13 +132,13 @@
 		    <tr>
 		      <th scope="col">Benachrichtigung</th>
 		      <th scope="col">E-Mail</th>
-		      <th scope="col">Push</th>      
+		      <th scope="col">Push</th>
 		    </tr>
 		  </thead>
 		  <tbody>
 			{% for formfield in notificationforms_task %}
 				{% if forloop.counter|divisibleby:2 %}
-						<td>{{formfield}}</td>				
+						<td>{{formfield}}</td>
 					</tr>
 				{% else %}
 					<tr>
@@ -159,7 +159,7 @@
     <div class="card-header" id="notification_files_acc">
       <h5 class="mb-0">
         <button class="btn btn-link" data-toggle="collapse" data-target="#notification_files" aria-expanded="true" aria-controls="notification_files">
-          Dateien und Ordner
+          <i class="fas fa-chevron-down"></i>&nbsp;&nbsp;&nbsp;Dateien und Ordner
         </button>
       </h5>
     </div>
@@ -171,13 +171,13 @@
 		    <tr>
 		      <th scope="col">Benachrichtigung</th>
 		      <th scope="col">E-Mail</th>
-		      <th scope="col">Push</th>      
+		      <th scope="col">Push</th>
 		    </tr>
 		  </thead>
 		  <tbody>
 			{% for formfield in notificationforms_files %}
 				{% if forloop.counter|divisibleby:2 %}
-						<td>{{formfield}}</td>				
+						<td>{{formfield}}</td>
 					</tr>
 				{% else %}
 					<tr>
@@ -196,7 +196,7 @@
     <div class="card-header" id="notification_organizer_acc">
       <h5 class="mb-0">
         <button class="btn btn-link" data-toggle="collapse" data-target="#notification_organizer" aria-expanded="true" aria-controls="notification_organizer">
-          Organizer
+          <i class="fas fa-chevron-down"></i>&nbsp;&nbsp;&nbsp;Organizer
         </button>
       </h5>
     </div>
@@ -208,13 +208,13 @@
 		    <tr>
 		      <th scope="col">Benachrichtigung</th>
 		      <th scope="col">E-Mail</th>
-		      <th scope="col">Push</th>      
+		      <th scope="col">Push</th>
 		    </tr>
 		  </thead>
 		  <tbody>
 			{% for formfield in notificationforms_organizer %}
 				{% if forloop.counter|divisibleby:2 %}
-						<td>{{formfield}}</td>				
+						<td>{{formfield}}</td>
 					</tr>
 				{% else %}
 					<tr>
@@ -233,7 +233,7 @@
     <div class="card-header" id="notification_messages_acc">
       <h5 class="mb-0">
         <button class="btn btn-link" data-toggle="collapse" data-target="#notification_messages" aria-expanded="true" aria-controls="notification_messages">
-          Mitteilungen
+          <i class="fas fa-chevron-down"></i>&nbsp;&nbsp;&nbsp;Mitteilungen
         </button>
       </h5>
     </div>
@@ -245,13 +245,13 @@
 		    <tr>
 		      <th scope="col">Benachrichtigung</th>
 		      <th scope="col">E-Mail</th>
-		      <th scope="col">Push</th>      
+		      <th scope="col">Push</th>
 		    </tr>
 		  </thead>
 		  <tbody>
 			{% for formfield in notificationforms_messages %}
 				{% if forloop.counter|divisibleby:2 %}
-						<td>{{formfield}}</td>				
+						<td>{{formfield}}</td>
 					</tr>
 				{% else %}
 					<tr>
@@ -270,7 +270,7 @@
     <div class="card-header" id="notification_chat_acc">
       <h5 class="mb-0">
         <button class="btn btn-link" data-toggle="collapse" data-target="#notification_chat" aria-expanded="true" aria-controls="notification_chat">
-          Chat
+          <i class="fas fa-chevron-down"></i>&nbsp;&nbsp;&nbsp;Chat
         </button>
       </h5>
     </div>
@@ -282,13 +282,13 @@
 		    <tr>
 		      <th scope="col">Benachrichtigung</th>
 		      <th scope="col">E-Mail</th>
-		      <th scope="col">Push</th>      
+		      <th scope="col">Push</th>
 		    </tr>
 		  </thead>
 		  <tbody>
 			{% for formfield in notificationforms_chat %}
 				{% if forloop.counter|divisibleby:2 %}
-						<td>{{formfield}}</td>				
+						<td>{{formfield}}</td>
 					</tr>
 				{% else %}
 					<tr>
@@ -307,7 +307,7 @@
     <div class="card-header" id="notification_abtime_acc">
       <h5 class="mb-0">
         <button class="btn btn-link" data-toggle="collapse" data-target="#notification_abtime" aria-expanded="true" aria-controls="notification_abtime">
-          Abwesenheits- und Zeiterfassung
+          <i class="fas fa-chevron-down"></i>&nbsp;&nbsp;&nbsp;Abwesenheits- und Zeiterfassung
         </button>
       </h5>
     </div>
@@ -319,13 +319,13 @@
 		    <tr>
 		      <th scope="col">Benachrichtigung</th>
 		      <th scope="col">E-Mail</th>
-		      <th scope="col">Push</th>      
+		      <th scope="col">Push</th>
 		    </tr>
 		  </thead>
 		  <tbody>
 			{% for formfield in notificationforms_abtime %}
 				{% if forloop.counter|divisibleby:2 %}
-						<td>{{formfield}}</td>				
+						<td>{{formfield}}</td>
 					</tr>
 				{% else %}
 					<tr>
@@ -345,7 +345,7 @@
     <div class="card-header" id="notification_agn_acc">
       <h5 class="mb-0">
         <button class="btn btn-link" data-toggle="collapse" data-target="#notification_agn" aria-expanded="true" aria-controls="notification_agn">
-          Agenturverbund
+          <i class="fas fa-chevron-down"></i>&nbsp;&nbsp;&nbsp;Agenturverbund
         </button>
       </h5>
     </div>
@@ -357,13 +357,13 @@
 		    <tr>
 		      <th scope="col">Benachrichtigung</th>
 		      <th scope="col">E-Mail</th>
-		      <th scope="col">Push</th>      
+		      <th scope="col">Push</th>
 		    </tr>
 		  </thead>
 		  <tbody>
 			{% for formfield in notificationforms_agn %}
 				{% if forloop.counter|divisibleby:2 %}
-						<td>{{formfield}}</td>				
+						<td>{{formfield}}</td>
 					</tr>
 				{% else %}
 					<tr>
@@ -387,7 +387,7 @@
 	    	new_stat = 0;
 	    	if($(this).prop("checked")){
 	    		new_stat = 	1;
-	    	}    	
+	    	}
 	        $.ajax(
 		    {
 		        type: "GET",
@@ -397,15 +397,15 @@
 		        	fieldname : ele,
 		        	new_stat : new_stat
 		        },
-		        success: function( data ) 
-		        {		        	
+		        success: function( data )
+		        {
 		        	console.log(data);
 		        	if(data['success']){
-		        		$('#notchange_done').toast('show');	
+		        		$('#notchange_done').toast('show');
 		        	}
 		        	else{
 		        		$('#notchange_err').toast('show');
-		        	}	        	
+		        	}
 			    }
 		     });
 	    }
@@ -418,4 +418,4 @@
         });
     })
 
-</script>
\ No newline at end of file
+</script>
diff --git a/dasettings/templates/dasettings/user_usprof.html b/dasettings/templates/dasettings/user_usprof.html
index 65588c0..6f512b6 100644
--- a/dasettings/templates/dasettings/user_usprof.html
+++ b/dasettings/templates/dasettings/user_usprof.html
@@ -11,13 +11,13 @@
   <!-- Then put toasts within -->
   <div id="notchange_done" class="toast alert-success" role="alert" aria-live="assertive" aria-atomic="true">
     <div class="toast-header">
-      <strong class="mr-auto">Gespeichert</strong>      
+      <strong class="mr-auto">Gespeichert</strong>
       <!--<button type="button" class="ml-2 mb-1 close" data-dismiss="toast" aria-label="Close">
         <span aria-hidden="true">&times;</span>
       </button>-->
     </div>
-    <div class="toast-body">    	
-  		<div id="toast_savecontent">Änderungen wurden gespeichert.</div>    	
+    <div class="toast-body">
+  		<div id="toast_savecontent">Änderungen wurden gespeichert.</div>
     </div>
   </div>
 </div>
@@ -25,14 +25,14 @@
   <!-- Then put toasts within -->
   <div id="notchange_err" class="toast alert-danger" role="alert" aria-live="assertive" aria-atomic="true">
     <div class="toast-header">
-      <strong class="mr-auto">Fehler aufgetreten</strong> 
-      <!--     
+      <strong class="mr-auto">Fehler aufgetreten</strong>
+      <!--
       <button type="button" class="ml-2 mb-1 close" data-dismiss="toast" aria-label="Close">
         <span aria-hidden="true">&times;</span>
       </button>
     -->
     </div>
-    <div class="toast-body">    	
+    <div class="toast-body">
   		<div id="toast_errcontent">Bitte kontaktieren Sie den Support.</div>
     </div>
   </div>
@@ -41,11 +41,11 @@
 
 <div class="content-section col-10">
   <h3>Mitarbeiter <span id="user_title_fullname">{{user_fullname}}</span> &nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Geben Sie hier die Profildaten für den Mitarbeiter ein." class="far fa-question-circle"></i></small></h3>
-  <hr>  
-  {% if newuser == 1 %}  
+  <hr>
+  {% if newuser == 1 %}
 <div class="progress mb-3" style="max-height: 15px;">
   <div class="progress-bar" role="progressbar" style="width: 80%; " aria-valuenow="80" aria-valuemin="0" aria-valuemax="100">Schritt 2: Profildaten festlegen</div>
-</div>  
+</div>
 	{% endif %}
 <div class="media">
 	<img class="img-profile" style="width: 15%;" src="{{ imagelink }}">
@@ -83,14 +83,14 @@
 
       <form method="POST"  enctype="multipart/form-data" name="profileform_basic">
         <input type="hidden" name="userprof_formtype" value="profileform">
-        <div class="mt-2">  
-        <h5>Gruppen&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Legen Sie fest, in welchen Gruppen der neue Mitarbeiter sein soll. Standardmäßig sind alle Mitarbeiter in der Gruppe Mitarbeiter (wenn diese nicht umbenannt worden ist)." class="far fa-question-circle"></i></small></h5>    
+        <div class="mt-2">
+        <h5>Gruppen&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Legen Sie fest, in welchen Gruppen der neue Mitarbeiter sein soll. Standardmäßig sind alle Mitarbeiter in der Gruppe Mitarbeiter (wenn diese nicht umbenannt worden ist)." class="far fa-question-circle"></i></small></h5>
         <div class="row">
           <div class="col-4">
         {% for g in agencygroups %}
-          {% if forloop.counter|divisibleby:6 %} 
+          {% if forloop.counter|divisibleby:6 %}
           </div><div class="col-4">
-          <div class="custom-control custom-checkbox mb-2">              
+          <div class="custom-control custom-checkbox mb-2">
             {% if vieweduser|useringroupbyid:g.group.name %}
             <input type="checkbox" class="custom-control-input" name="group_{{g.pk}}" id="group_{{g.pk}}" onchange="javascript:updateUser({{vieweduser}}, {{g.pk}}, this.checked)" checked="true">
             {% else %}
@@ -99,7 +99,7 @@
           <label class="custom-control-label" for="group_{{g.pk}}" >{{g.agencygroupname}}</label>
           </div>
           {% else %}
-          <div class="custom-control custom-checkbox mb-2">              
+          <div class="custom-control custom-checkbox mb-2">
             {% if vieweduser|useringroupbyid:g.group.name %}
             <input type="checkbox" class="custom-control-input" name="group_{{g.pk}}" id="group_{{g.pk}}" onchange="javascript:updateUser({{vieweduser}}, {{g.pk}}, this.checked)" checked="true">
             {% else %}
@@ -112,7 +112,7 @@
           </div></div>
         </div>
         <hr>
-        <div class="mt-2">    
+        <div class="mt-2">
         <h5>Übergeordneter Mitarbeiter&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Legen Sie fest, welche Mitarbeiter über diesen im Organigramm steht. Ist die Einstellung leer, wir" class="far fa-question-circle"></i></small></h5>
         <select name="usertoparent" id="usertoparent" class="select form-control col-4">
           <option value="">---------</option>
@@ -132,7 +132,7 @@
       	<div class="col-6">
         <input type="hidden" name="form_type" value="profileform">
         {% for field in profileform %}
-          {% if forloop.counter|divisibleby:6 %} 
+          {% if forloop.counter|divisibleby:6 %}
               </div>
               <div class="col-6">
               {{field|as_crispy_field}}
@@ -141,30 +141,30 @@
           {% endif %}
         {% endfor %}
       	</div>
-        </div>      	
-    	  <hr>	  		  	
-        {% if newuser == 1 %}  
+        </div>
+    	  <hr>
+        {% if newuser == 1 %}
         <a class="btn" href="{% url 'dasettings' %} ">Profil später bearbeiten</a>
         {% else %}
         <a class="btn" href="{% url 'dasettings' %} ">Abbrechen</a>
         {% endif%}
-    	 
-        {% if newuser == 1 %}  
+
+        {% if newuser == 1 %}
     		<button type="submit" class="btn btn-primary" style="float: right">Profilerstellung abschließen</button>
     		{% else %}
     		<button type="submit" name="submitprof" class="btn btn-primary" style="float: right">Profildaten aktualisieren</button>
     		{% endif %}
-    	  	
-      </form>      
+
+      </form>
     </div>
     <div class="tab-pane fade" id="contract" role="tabpanel" aria-labelledby="contract-tab">
 
-      
-      <div class="col-9 mt-2" style="margin-left: -10px;">        
+
+      <div class="col-9 mt-2" style="margin-left: -10px;">
       <form method="POST"  enctype="multipart/form-data" name="usertime_basic">
         {% csrf_token %}
-        <input type="hidden" name="form_type" value="contract">     
-        <h5>Zeiterfassung&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Legen Sie fest, ob dieser Mitarbeit seine Arbeitszeit erfassen soll." class="far fa-question-circle"></i></small></h5>           
+        <input type="hidden" name="form_type" value="contract">
+        <h5>Zeiterfassung&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Legen Sie fest, ob dieser Mitarbeit seine Arbeitszeit erfassen soll." class="far fa-question-circle"></i></small></h5>
         <div class="row">
           <div class="col-3">
             {{usertime_form.usetime|as_crispy_field}}
@@ -173,18 +173,18 @@
             {{usertime_form.usetime_start|as_crispy_field}}
           </div>
         </div>
-
+        <!--
         <script type="text/javascript">
           $(document).ready(function(){
             $("#id_usetime").prop("disabled", true);
           })
         </script>
+        -->
 
-
-        <h5>Arbeitszeiten&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Legen Sie fest, an welchen Tagen dieser Mitarbeiter wie viele Stunden arbeitet." class="far fa-question-circle"></i></small></h5>           
-        <div class="table-responsive">          
+        <h5>Arbeitszeiten&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Legen Sie fest, an welchen Tagen dieser Mitarbeiter wie viele Stunden arbeitet." class="far fa-question-circle"></i></small></h5>
+        <div class="table-responsive">
           <table class="table">
-           <tr>            
+           <tr>
             <td>{{usertime_form.wd_mo|as_crispy_field}}</td>
             <td>{{usertime_form.wd_tu|as_crispy_field}}</td>
             <td>{{usertime_form.wd_we|as_crispy_field}}</td>
@@ -198,61 +198,61 @@
         <hr style="margin-top: -20px;">
       <div class="col-12" >
         <div class="col-4" style="margin-left: -10px;">
-          <h5 class="mt-1">Urlaub&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Legen Sie fest, wie viel Urlaub dieser Mitarbeiter im Jahr hat." class="far fa-question-circle"></i></small></h5>  
-        </div>         
-          {{usertime_form.media}}        
-          <div class="row col-12">                    
+          <h5 class="mt-1">Urlaub&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Legen Sie fest, wie viel Urlaub dieser Mitarbeiter im Jahr hat." class="far fa-question-circle"></i></small></h5>
+        </div>
+          {{usertime_form.media}}
+          <div class="row col-12">
             <div class="col-5">
-              {{usertime_form.startdate|as_crispy_field}}         
+              {{usertime_form.startdate|as_crispy_field}}
             </div>
             <div class="col-5">
-              {{usertime_form.loose_holidedate|as_crispy_field}}       
+              {{usertime_form.loose_holidedate|as_crispy_field}}
             </div>
-          </div>        
+          </div>
         <h5 class="mt-2 mb-1">Urlaub Jahresübersicht&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Hier sehen Sie die aktuelle Jahresübersicht des Mitarbeiters. Beachten Sie das Format beim manuellen anpassen: XX,0 oder XX,5!" class="far fa-question-circle"></i></small>
           <button type="button" id="changeHolidayData" style="float: right" class="btn btn-secondary btn-sm" onclick="javascript:loadUpdateTableHolidays()" data-toggle="tooltip" data-placement="top" title="Passen Sie die Urlaubstage und Resturlaubstage manuell an."><small><i class="fas fa-pen"></i></small></button>
           <button type="button" id="changeHolidayDataSave" style="float: right; display: none" class="btn  btn-primary btn-sm" onclick="javascript:saveUpdateTableHolidays()" data-toggle="tooltip" data-placement="top" title="Urlaub- und Resttage speichern."><small><i class="fas fa-check"></i></small></button>
-        </h5> 
+        </h5>
       <div id="year_overview">
         <table class="table table-hover">
-        <thead>                    
-          <tr> 
+        <thead>
+          <tr>
             <th scope="col">Jahr</th>
-            {% for ab_info in user_years.all %}           
+            {% for ab_info in user_years.all %}
               <th scope="">{{ab_info.year}}</th>
-            {% endfor %}      
+            {% endfor %}
           </tr>
         </thead>
         <tbody>
           <tr>
             <th scope="row">Urlaub</th>
-            {% for ab_info in user_years.all %}           
+            {% for ab_info in user_years.all %}
               <td class="readytochange_holiday_rest" id="holiday_{{ab_info.pk}}">{{ab_info.days}}</td>
-            {% endfor %}      
+            {% endfor %}
           </tr>
           <tr>
             <th scope="row">Genommener Urlaub</th>
-            {% for ab_info in user_years.all %}           
+            {% for ab_info in user_years.all %}
               <td>{{ab_info.days_inuse}}</td>
-            {% endfor %}      
+            {% endfor %}
           </tr>
           <tr>
             <th scope="row">Resturlaub aus Vorjahr</th>
-            {% for ab_info in user_years.all %}           
+            {% for ab_info in user_years.all %}
               {% if forloop.counter0 > 0 %}
               <td class="readytochange_holiday_rest" id="rest_holiday_{{ab_info.pk}}">{{ab_info.restdays}}</td>
               {% else %}
               <td>&nbsp;</td>
               {% endif %}
-            {% endfor %}      
+            {% endfor %}
           </tr>
         </tbody>
         </table>
       </div>
-      </div>      
+      </div>
       <div class="col-12">
         <hr>
-      <button type="submit"  class="btn btn-primary" style="float: right">Vertragsdaten aktualisieren</button>        
+      <button type="submit"  class="btn btn-primary" style="float: right">Vertragsdaten aktualisieren</button>
       <a class="btn" href="{% url 'dasettings' %} ">Abbrechen</a>
     </div>
     </form>
@@ -275,25 +275,25 @@
         <h4 class="modal-title">Bereich bestimmen</h4>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close" onclick="clearImgField()">
           <span aria-hidden="true">&times;</span>
-        </button>        
+        </button>
       </div>
       <div class="modal-body" id="imgmodbody">
         <img src="" id="imagemod" style="max-width: 100%; max-height: 100%;">
       </div>
       <div class="modal-footer">
         <div class="btn-group pull-left" role="group">
-          <button type="button" class="btn btn-default js-zoom-in">        
-            <i class="fas fa-search-plus"></i>    
+          <button type="button" class="btn btn-default js-zoom-in">
+            <i class="fas fa-search-plus"></i>
           </button>
           <button type="button" class="btn btn-default js-zoom-out">
             <i class="fas fa-search-minus"></i>
-          </button>          
+          </button>
           <button type="button" class="btn btn-default js-rot-left">
-              <i class="fas fa-undo-alt"></i>           
+              <i class="fas fa-undo-alt"></i>
           </button>
           <button type="button" class="btn btn-default js-rot-right">
-              <i class="fas fa-redo-alt"></i>           
-          </button>         
+              <i class="fas fa-redo-alt"></i>
+          </button>
         </div>
         <button type="button" class="btn btn-default" data-dismiss="modal" onclick="clearImgField()">Abbrechen</button>
         <button type="button" class="btn btn-primary js-crop-and-upload">Ausschneiden</button>
@@ -314,8 +314,8 @@ function loadUpdateTableHolidays(){
           action : "update_holidays",
           userid: {{vieweduser}}
         },
-        success: function( data ) 
-        {           
+        success: function( data )
+        {
             $("#year_overview").html(data);
             $("#changeHolidayDataSave").show();
             $("#changeHolidayData").hide();
@@ -327,9 +327,9 @@ function saveUpdateTableHolidays(){
   var new_data_arr = ""
   new_data = $(".readytochange_holiday");
   for(i = 0; i < new_data.length; i++){
-    tempele = new_data[i]["id"];    
+    tempele = new_data[i]["id"];
     new_data_arr = new_data_arr + tempele + "__" + $("#" + tempele).val().replace(",", ".") + "___";
-  }  
+  }
 
   $.ajax(
     {
@@ -340,8 +340,8 @@ function saveUpdateTableHolidays(){
           new_data_info : new_data_arr,
           userid: {{vieweduser}}
         },
-        success: function( data ) 
-        {           
+        success: function( data )
+        {
           $("#year_overview").html(data);
           $("#changeHolidayDataSave").hide();
           $("#changeHolidayData").show();
@@ -368,16 +368,16 @@ function updateNewMail(){
         url: "/dasettings/ajax",
         data:{
           action : "update_usermail",
-          newmail : newmail,          
+          newmail : newmail,
           userid: {{vieweduser}}
         },
-        success: function( data ) 
-        {           
-          if(data['success']){   
-            $('#notchange_done').toast('show');     
-            $("#toast_savecontent").html("E-Mailadresse aktualisiert");            
+        success: function( data )
+        {
+          if(data['success']){
+            $('#notchange_done').toast('show');
+            $("#toast_savecontent").html("E-Mailadresse aktualisiert");
           }
-          else{             
+          else{
             $('#notchange_err').toast('show');
             $("#toast_errcontent").html("E-Mailadresse nicht aktualisiert! Valide Daten eingeben oder E-Mailadresse ist bereits vorhanden.");
             $("#user_email").html(data["data"]["mail"]);
@@ -392,27 +392,27 @@ function ChangeName(){
   $("#changenamebutton").hide();
 }
 
-function updateNewNames(){  
+function updateNewNames(){
   $.ajax(
     {
         type: "GET",
         url: "/dasettings/ajax",
         data:{
           action : "update_usernames",
-          new_first_name : $("#user_first_name").val(),          
+          new_first_name : $("#user_first_name").val(),
           new_last_name : $("#user_last_name").val(),
           userid: {{vieweduser}}
         },
-        success: function( data ) 
-        {           
-          if(data['success']){   
-            $('#notchange_done').toast('show');     
+        success: function( data )
+        {
+          if(data['success']){
+            $('#notchange_done').toast('show');
             $("#toast_savecontent").html("Vor- und Nachname aktualisiert");
             $("#user_fullname").html(data["data"]["userfullname"]);
             $("#user_title_fullname").html(data["data"]["userfullname"]);
             $("#changenamebutton").show();
           }
-          else{             
+          else{
             $('#notchange_err').toast('show');
             $("#toast_errcontent").html("Vor- und Nachname konnte nicht aktualisiert werden!");
             $("#user_fullname").html(data["data"]["userfullname"]);
@@ -427,14 +427,14 @@ function showMainUserForm(){
   $("#changeMainUserData").modal("toggle");
 }
 
-$(document).ready(function(){    	
+$(document).ready(function(){
 
     $(".toast").toast({
             autohide: true,
             delay : 3000
         });
 
-    $('#profil-user').tab('show');         
+    $('#profil-user').tab('show');
 });
 
 function updateUser(userid, groupid, newvalue){
@@ -443,7 +443,7 @@ function updateUser(userid, groupid, newvalue){
   }
   else{
     removeUserFromGroup(userid, groupid);
-  }  
+  }
 }
 
 function removeUserFromGroup(userid, groupid){
@@ -456,13 +456,13 @@ function removeUserFromGroup(userid, groupid){
           groupid : groupid,
           userid: userid
         },
-        success: function( data ) 
-        {           
-        	if(data['success']){	 
-        		$('#notchange_done').toast('show'); 		
+        success: function( data )
+        {
+        	if(data['success']){
+        		$('#notchange_done').toast('show');
         		$("#toast_savecontent").html("Mitarbeiter erfolgreich aus der Gruppe entfernt!");
         	}
-        	else{	        		
+        	else{
         		$('#notchange_err').toast('show');
         		$("#toast_errcontent").html("Mitarbeiter konnte nicht entfernt werden!");
         	}
@@ -476,17 +476,17 @@ function removeUserFromGroup(userid, groupid){
       {
           type: "GET",
           url: "/dashboard/sendpassmail",
-          data:{             
+          data:{
              userid : id
           },
-          success: function( data ) 
-          { 
-            $("#mailsend").fadeIn().delay(4000).fadeOut();            
+          success: function( data )
+          {
+            $("#mailsend").fadeIn().delay(4000).fadeOut();
         }
-       }); 
+       });
   }
 
-function addUserToGroup(userid, groupid){	
+function addUserToGroup(userid, groupid){
 	$.ajax(
     {
         type: "GET",
@@ -496,13 +496,13 @@ function addUserToGroup(userid, groupid){
           groupid : groupid,
           userid: userid,
         },
-        success: function( data ) 
-        {       
-        	if(data['success']){	 
-        		$('#notchange_done').toast('show'); 				        		
+        success: function( data )
+        {
+        	if(data['success']){
+        		$('#notchange_done').toast('show');
         		$("#toast_savecontent").html("Mitarbeiter erfolgreich der Gruppe hinzugefügt!");
         	}
-        	else{	        		
+        	else{
         		$('#notchange_err').toast('show');
         		$("#toast_errcontent").html("Mitarbeiter konnte nicht hinzugefügt werden!");
         	}
@@ -517,17 +517,17 @@ function addUserToGroup(userid, groupid){
     $("#id_height").val(416);
     $("#id_rotation").val(0);
 
-    function clearImgField(){      
+    function clearImgField(){
       $("#id_image").val("");
     }
-    
-      
+
+
       /* SCRIPT TO OPEN THE MODAL WITH THE PREVIEW */
-      $("#id_image").change(function () {        
-        if (this.files && this.files[0]) {          
+      $("#id_image").change(function () {
+        if (this.files && this.files[0]) {
           var reader = new FileReader();
           reader.onload = function (e) {
-            $("#imagemod").attr("src", e.target.result);     
+            $("#imagemod").attr("src", e.target.result);
             $("#modalCrop").modal("show");
           }
           reader.readAsDataURL(this.files[0]);
@@ -537,18 +537,18 @@ function addUserToGroup(userid, groupid){
       var cropBoxData;
       var canvasData;
       var $image = $("#imagemod");
-      $("#modalCrop").on("shown.bs.modal", function () {  
+      $("#modalCrop").on("shown.bs.modal", function () {
         $image.cropper({
-          viewMode: 3,          
-          aspectRatio: 1/1,   
+          viewMode: 3,
+          aspectRatio: 1/1,
           strict: false,
           cropBoxMovable: true,
-          cropBoxResizable: true, 
+          cropBoxResizable: true,
           minCropBoxWidth: 300,
-          minCropBoxHeight: 300,                
+          minCropBoxHeight: 300,
           ready: function () {
             $image.cropper("setCanvasData", canvasData);
-            $image.cropper("setCropBoxData", cropBoxData);            
+            $image.cropper("setCropBoxData", cropBoxData);
           }
         });
         $("#imgmodbody").css({
@@ -577,16 +577,16 @@ function addUserToGroup(userid, groupid){
         $image.cropper("rotate", -90);
       });
       /* SCRIPT TO COLLECT THE DATA AND POST TO THE SERVER */
-      $(".js-crop-and-upload").click(function () {        
-        var cropData = $image.cropper("getData");                
+      $(".js-crop-and-upload").click(function () {
+        var cropData = $image.cropper("getData");
         $("#id_x").val(cropData["x"]);
         $("#id_y").val(cropData["y"]);
         $("#id_height").val(cropData["height"]);
         $("#id_width").val(cropData["width"]);
-        $("#id_rotation").val(cropData["rotate"]);  
-        $("#id_image").attr("src", $image);                 
+        $("#id_rotation").val(cropData["rotate"]);
+        $("#id_image").attr("src", $image);
         $("#modalCrop").modal('toggle');
       });
 
 </script>
-{% endblock content %}
\ No newline at end of file
+{% endblock content %}
diff --git a/digitaleagentur/__pycache__/__init__.cpython-38.pyc b/digitaleagentur/__pycache__/__init__.cpython-38.pyc
index 180498d4cc46f69706bf0f9c088dfbb7855dffea..3df1199407afca46d5c2b843baa30f36db3dd05f 100644
GIT binary patch
delta 85
zcmZ3&xQLM_l$V!_0SMBTiN;Ulv9@*B&&bbB)z2s?O3W=t)pyCyF3nBND@oON_YBcb
X$xP2INz6%2Oa}^;7Gdxww#fkiPj(!{

delta 114
zcmZ3)xP*}>l$V!_0SF8Z?2enrV;$@1Y!wq)oLW>I6Pj0)nwS&glAm0fo0?Zr9OLd8
x5|fgdo>`KZlbV<g6e=yk;K#>j=4F<|$LkeT-r}&y%}*)KNws4Hn*SMO2>_gsCiDOR

diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc
index 35bd5805816b5e6cc3d1957975e806b1bec22f39..a4c28921f198f92ac52ee193653177deca91183c 100644
GIT binary patch
delta 107
zcmew=|5=_dl$V!_0SMBTiN>poZRE4yV!XB4ohz2bT@NT)1R{R9>u2QWrs`*u6eZ>s
qr0TomXP4%t=9Q%CyL*P{r(~vQmL%q+CZ+?0N{cY~o8R(rFaiLTi6Wi=

delta 109
zcmew?|5ctZl$V!_0SL_QUx{NB-^gdd#Td2Oohz2bQx_;&1R{QUI$Onr7N-^!$Asn;
sr6%UYxa237=BDPA6vw!GhQy>~re~HU=A<U31BFV9F!-Ba^Kmc&00#;rT>t<8

diff --git a/digitaleagentur/__pycache__/urls.cpython-38.pyc b/digitaleagentur/__pycache__/urls.cpython-38.pyc
index fd0c252751e6592a8c722fca213040056d341fad..0e2666de86f59875f4ff4164081a16086c7d221d 100644
GIT binary patch
delta 88
zcmbOsGEIaxl$V!_0SMBTiN+t=$eYAz>#U!VpPQ<mQBstcTac>nlAm3go0?aWs_*U@
aqMwqPo>`KZlbV<g6e=yk;7?x1nFRpD<Q`!F

delta 90
zcmbOxGDCznl$V!_0SKh;Ux|COkvECc-qqPECbT%Us5mAxuP8M!C&nc|ximL5ucSD}
c-7_R6B{My<Brzv7F&!vWT7<!$yoNIi09d#n)&Kwi

diff --git a/digitaleagentur/__pycache__/views.cpython-38.pyc b/digitaleagentur/__pycache__/views.cpython-38.pyc
index aaae98e99764b858530860b32e73d66bf3cc15be..6f1462b2616afab2b196898d3fbf9bc2e9f8bb49 100644
GIT binary patch
delta 86
zcmaFD^oWT!l$V!_0SMBTiN=>t<XvU!qMwnUo2s8tQk0lmkgD&JpIw@pnpcvl@9r6*
YpOTrLS(2EOnwSn0DlNj`PyCh#0K1|d>i_@%

delta 88
zcmaFF^n{5wl$V!_0SF8Z?2fCN$h*qk&Dkm@v^ce>I3_f&C^a!B#w9<wG&eP`q&UXi
aGbAP@Gd;5;F()-K9Vk><gu$QqB@X~N{2>+q

diff --git a/message/__pycache__/__init__.cpython-38.pyc b/message/__pycache__/__init__.cpython-38.pyc
index 36336ee86a1ca662970ceffd0712b70046c914a3..412fdf63886955ae7efc5a9f77c10862ca3b3849 100644
GIT binary patch
delta 77
zcmbQkIE#@dl$V!_0SMBTiN;Ulu{O2W&&bbB)z2s?O3W=t)pyCyF3nBND@oON_YBcb
c$xP2INz6%2Oa}^;7U}1v78e8A`V;Hq0BcMcNB{r;

delta 79
zcmbQmIERrZl$V!_0SF8Z?2enrV{Pu}Y!wq)oLW>I6Pj0)nwS&glAm0fo0?Zr9OLd8
f5|fgdo>`KZlbV<g6e=x>$xSUT2C`!&*2n<>)I%F^

diff --git a/message/migrations/__pycache__/__init__.cpython-38.pyc b/message/migrations/__pycache__/__init__.cpython-38.pyc
index 34398ee02473fcbc82b6fb4978550c7684731a5d..daae7aa9db1bcc6185625934b06be6445f5c8550 100644
GIT binary patch
delta 88
zcmZ3^xRjA6l$V!_0SMBTiN;Ulv3Bs%&&bbB)z2s?O3W=t)pyCyF3nBND@oON_YBcb
n$xP2INz6%2Oa}^;7U}1v78e8A`nj3uMTsSu`FX|q6FcPqs-zw3

delta 90
zcmZ3=xSWwEl$V!_0SF8Z?2enrW9{VQY!wq)oLW>I6Pj0)nwS&glAm0fo0?Zr9OLd8
q5|fgdo>`KZlbV<g6e=x>$xSUT2C`#vGt-L_OEUBGieo0W%K-o^gdjiw

diff --git a/news/__pycache__/__init__.cpython-38.pyc b/news/__pycache__/__init__.cpython-38.pyc
index 6f253af8c65962b231d98a229c56217245634547..a38a98c1892de0590b641108674a3036f6794666 100644
GIT binary patch
delta 74
zcmbQqIGvFvl$V!_0SMBTiN;Ulu{N^N&&bbB)z2s?O3W=t)pyCyF3nBND@oON_YBcb
b$xP2INz6%2Oa}^;7U}1umKW<!td;`+9Vi$P

delta 76
zcmbQvIFpell$V!_0SF8Z?2enrV{KyRY!wq)oLW>I6Pj0)nwS&glAm0fo0?Zr9OLd8
d5|fgdo>`KZlbV<g6e=x>$xAISj+s~~2LON&8aV&}

diff --git a/notificsys/migrations/__pycache__/__init__.cpython-38.pyc b/notificsys/migrations/__pycache__/__init__.cpython-38.pyc
index 1636376dcc1d18936b82ea7c785fab5dafa803a8..b974de7fef4cc9fdc375d277f812e0d7aac9cc9f 100644
GIT binary patch
delta 91
zcmZ3*xPp-<l$V!_0SMBTiN;Ulv3B;=&&bbB)z2s?O3W=t)pyCyF3nBND@oON_YBcb
s$xP2INz6%2Oa}^;7U}2Zmt>}8CKp#0>*r>s7bTWt=I0gbPwbHc01m<*U;qFB

delta 93
zcmZ3%xQdY{l$V!_0SF8Z?2enrW9{niY!wq)oLW>I6Pj0)nwS&glAm0fo0?Zr9OLd8
u5|fgdo>`KZlbV<g6e=x>$;&UvOv_9zt}Kqp%}g&!EXmBzD~_4iB?kbOq9L^a

diff --git a/orga/__pycache__/__init__.cpython-38.pyc b/orga/__pycache__/__init__.cpython-38.pyc
index 906abc928fd836b1fb1bb5fd805113aacdb8cb94..fd7c630488bf06f8cdb59170a4ba5bb5be69f443 100644
GIT binary patch
delta 74
zcmbQqIGvFvl$V!_0SMBTiN;Ulu{N^N&&bbB)z2s?O3W=t)pyCyF3nBND@oON_YBcb
b$xP2INz6%2Oa}^;7U|~~r6=l7td;`+9MKp3

delta 76
zcmbQvIFpell$V!_0SF8Z?2enrV{KyRY!wq)oLW>I6Pj0)nwS&glAm0fo0?Zr9OLd8
d5|fgdo>`KZlbV<g6e=x>$uCMzjG0&|2LOM$8YKV#

diff --git a/orga/__pycache__/admin.cpython-38.pyc b/orga/__pycache__/admin.cpython-38.pyc
index e087457441bef06081a18b409fc14f97c564f604..32acd7c7f2b1c20bfb4581916086708a3c0f2165 100644
GIT binary patch
delta 99
zcmX@acz}^Nl$V!_0SMBTiN@Pc<W2Ln)X&JzP1VmRDN4*ONY!`A&o0eP%_~XOclQj@
xPsvQrEJ@5sO-u(0l@{se7o{iaC#K|P=IIqw-r}&y%}*)KNws4H8u%GxDgY6AAD;jK

delta 101
zcmX@Wc!-fVl$V!_0SF8Z?2dDq$eZSG?Q9hjTAW%`921&Xl$w|m<C33Tnwy$eQXJ#%
z84{C{nVwman3I~A4iqXaipeiZPmD=S$<55uE2zB1VUwGmQks)$#|Sj?Gss*3tA-)W

diff --git a/orga/__pycache__/apps.cpython-38.pyc b/orga/__pycache__/apps.cpython-38.pyc
index 750f3104766c3eefd65690348659f2d57fa92267..4c17580ae9ad84f9a848530b382d3a8c89b53e83 100644
GIT binary patch
delta 76
zcmey!^qz?~l$V!_0SMBTiN*&{<h^KQp`VeTo2s8tQk0lmkgD&JpIw@pnpcvl@9r6*
dpOTrLS(2EOnwSn0DlO8_FG^3;pDe@}4*;IF8F2sr

delta 78
zcmaFQ^pS}-l$V!_0SF8Z?2e0=$a~Sm%GoL=v^ce>I3_f&C^a!B#w9<wG&eP`q&UXi
fGbAP@Gd;5;F()-K9Vk><6q8?+o)|M(fH58b2*Dek

diff --git a/orga/__pycache__/models.cpython-38.pyc b/orga/__pycache__/models.cpython-38.pyc
index 8898bd65aacbd6221011690fd3552dd875807209..e3c3be7c0c01aa9d3185b84463334f194d829e4f 100644
GIT binary patch
delta 100
zcmdnbxR;SPl$V!_0SMBTiN;$_<W2Ik($C1xP1VmRDN4*ONY!`A&o0eP%_~XOclQj@
xPsvQrEJ@5sO-u(0l@{se7o{ia=jNxR<`nA{RNmsS0kTVTQtcRlCVmDP3ji^cAPfKi

delta 77
zcmdnXxSx?Xl$V!_0SF8Z?2faU$eUzh<7^cZTAW%`921&Xl$w|m<C33Tnwy$eQXJ#%
e84{C{nVwman3I~A4iqXaipeiZPmGzkPzC_8EE@U%

diff --git a/orga/__pycache__/urls.cpython-38.pyc b/orga/__pycache__/urls.cpython-38.pyc
index 72ffb1791605233921d21a5e7cf0190f8d6765e6..6d35242cc7d3cd3356fb4fa37eb26760697f8826 100644
GIT binary patch
delta 78
zcmbQrJeip<l$V!_0SMBTiN^n6*vO~PXk?+Ek)NBYpHWhjm|Kvl?~<Qgnwy$elB)0S
f8KR$(nVwman3I~A4iqXa($6nSPt>1W$fyDUejXVG

delta 80
zcmbQtJe8R*l$V!_0SF8Z?2cn)+{mZTXkz7T6%$&VT2vepnpc#Xm=oiYpIn-onpaXB
h<L(&}laiU9S(2EOnwSn0DlLl1FG^30nViq40syN_8an_0

diff --git a/orga/__pycache__/views.cpython-38.pyc b/orga/__pycache__/views.cpython-38.pyc
index f05a2701159698f21f5bae20d9e73c0fea9ab865..00b61164bef06bf9d03500d4319e10f34160c0b5 100644
GIT binary patch
delta 79
zcmdlXy-k`gl$V!_0SMBTiN;q7Z{*WrHnP;u$j?pH&nPKM%q>XOcgfE#%}vcKN!54v
g4AD=?OwTMy%t=j52MU!I>E{=vC+cs`VfNty0HGflTmS$7

delta 81
zcmdlcy+fKWl$V!_0SF8Z?2c0r*~q8GY+~(f6%$&VT2vepnpc#Xm=oiYpIn-onpaXB
i<L(&}laiU9S(2EOnwSn0DlLl1FG^30*__4f!vz5M6B{r9

diff --git a/organizer/__pycache__/__init__.cpython-38.pyc b/organizer/__pycache__/__init__.cpython-38.pyc
index 7cd8ba79b0fd17faad11191c9b0a1f01769dad49..91f910073ac3c0b7db347eb2ed980bdd180d1995 100644
GIT binary patch
delta 79
zcmbQoIERrZl$V!_0SMBTiN;Ulu{L+q&&bbB)z2s?O3W=t)pyCyF3nBND@oON_YBcb
g$xP2INz6%2Oa}^;7U|~~r6=ZPR;3o{Pi&9_0HSyrJ^%m!

delta 81
zcmbQkIFFGhl$V!_0SF8Z?2enrV{Pf|Y!wq)oLW>I6Pj0)nwS&glAm0fo0?Zr9OLd8
i5|fgdo>`KZlbV<g6e=x>$uCMz%*(7wEsB{~CkFrzh#Y1B

diff --git a/organizer/migrations/__pycache__/__init__.cpython-38.pyc b/organizer/migrations/__pycache__/__init__.cpython-38.pyc
index e687b78204a13c91e801d193ad4f7aca33a3bd45..6372da3193fba57abca395d69f67126677fb29ae 100644
GIT binary patch
delta 90
zcmZ3<xSWwEl$V!_0SMBTiN;Ulv3By&&&bbB)z2s?O3W=t)pyCyF3nBND@oON_YBcb
r$xP2INz6%2Oa}^;7U|~~r6=ZPR;3o{=VqoCC6;97=N0Qu?3M!n?4%yy

delta 92
zcmZ3^xRQ}4l$V!_0SF8Z?2enrW9{PSY!wq)oLW>I6Pj0)nwS&glAm0fo0?Zr9OLd8
t5|fgdo>`KZlbV<g6e=x>$uCMz%*(7wEsDv_OfO0-$;{6yj+xjg2LN)8AvOR2

diff --git a/standards/__pycache__/__init__.cpython-38.pyc b/standards/__pycache__/__init__.cpython-38.pyc
index 0c77154895e62fdf6813f3b864fc1296a34e5fed..eae63dc0b86af5d959f00801f57b7ed54a1cc039 100644
GIT binary patch
delta 79
zcmbQoIERrZl$V!_0SMBTiN;Ulu{L+q&&bbB)z2s?O3W=t)pyCyF3nBND@oON_YBcb
g$xP2INz6%2Oa}^;7U>t4B<7_g7Nr#HPi&9_0HQG(F#rGn

delta 81
zcmbQkIFFGhl$V!_0SF8Z?2enrV{Pf|Y!wq)oLW>I6Pj0)nwS&glAm0fo0?Zr9OLd8
i5|fgdo>`KZlbV<g6e=x>DK1IOOGzwBDUO*~CkFrzK^$2C

diff --git a/standards/templatetags/__pycache__/__init__.cpython-38.pyc b/standards/templatetags/__pycache__/__init__.cpython-38.pyc
index 9b279e296d381689eca327b1e4c5453e1229f515..fb4baf6514e6a5cc6dbb2e69290f6c0860578750 100644
GIT binary patch
delta 92
zcmZ3@xRQ}4l$V!_0SMBTiN;Ulv3Bv(&&bbB)z2s?O3W=t)pyCyF3nBND@oON_YBcb
t$xP2INz6%2Oa}^;7U>t4B<7_g7Nr#Hm!#$v<Rq4)mL#SZ>rd>J0{|`2AFKcX

delta 94
zcmZ3<xSEkCl$V!_0SF8Z?2enrW9=5;Y!wq)oLW>I6Pj0)nwS&glAm0fo0?Zr9OLd8
v5|fgdo>`KZlbV<g6e=x>DK1IOOGzwBDUK;g%`M1DEJ-a%OfQa^*ewSDxDX-%

diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index 747c3fc25e5f2280ba045c95ed4ace642e577275..5142079f388ad7a200d7b577a565b53393549ee7 100644
GIT binary patch
delta 201
zcmX?IezKe|l$V!_0SMBTiN=dNZ{$;DbqUnZ$j?pH&nPKM%q>XOcgfE#%}vcKN!54v
z4AD=?OwTMy%t=j52MU!I=@*wI=A|SSr4;Lzq~;dnB$lL>B&HYZZ?0r*&}WRA{L5rI
z<HOC9Oz$!>zMEWNzJ&4pWKoNB#!r)LEi8c2+bpz|q6FY(=;h|8q~;VCaRVJx!~-ID
kfkf0~W=mDZsLh&|)r{N^L89+K#HYyyY!aJ~Td^<#0DyEuR{#J2

delta 176
zcmX?Ee!845l$V!_0SLs8vBl4J-N>iP>K5#56%$&VT2vepnpc#Xm=oiYpIn-onpaXB
z<L(&}laiU9S(2EOnwSn0DlLjBE=kNwNi0e!jwwmaEyzhMNi9iCFOJz<&f1{Qcx&<x
zlj)3)Hcv3U%gFeCa-R7T#t)N)Ez%i3Pp-DG07`GM&<2tZEEIqwqope2t<CC|)r{Pa
VfKDoU4<bHK)?<^{eAJ4C5dc(=L5TnW

diff --git a/tasks/__pycache__/__init__.cpython-38.pyc b/tasks/__pycache__/__init__.cpython-38.pyc
index c4a0bd7c01500f8d1766ae281a7dd282c10bebae..fb8105065d9a9b883e1396697737193451411c16 100644
GIT binary patch
delta 75
zcmbQmID?TVl$V!_0SMBTiN;Ulu{O5V&&bbB)z2s?O3W=t)pyCyF3nBND@oON_YBcb
c$xP2INz6%2Oa}^;7U`EH7H1dhPppvx05<Fxe*gdg

delta 77
zcmbQiIE#@dl$V!_0SF8Z?2enrV{K~hY!wq)oLW>I6Pj0)nwS&glAm0fo0?Zr9OLd8
e5|fgdo>`KZlbV<g6e=x>DM>8OE{>U4B?kbT*&3$+

diff --git a/timemanagement/__pycache__/__init__.cpython-38.pyc b/timemanagement/__pycache__/__init__.cpython-38.pyc
index 64ff8c1717c285971c94f17e59eddce162010fa1..1c4eb9544ede2aa5d7b74de767da0a10fe2c9dff 100644
GIT binary patch
delta 111
zcmZ3?xR8-2l$V!_0SMBTiN;Ulv5s=n&&bbB)z2s?O3W=t)pyCyF3nBND@oON_YBcb
z$xP2INz6%2Oa}^;7U`E{=BDN*<^j1NHTv=KnR%Hd@$q^EmA5!-a`RJ4b5iXXfrftu
G*#H2)E+kn1

delta 113
zcmZ3;xR{YAl$V!_0SF8Z?2enrV;$q+Y!wq)oLW>I6Pj0)nwS&glAm0fo0?Zr9OLd8
z5|fgdo>`KZlbV<g6e=x>Dap)D%}vY$azSch;^Q;(GE3s)^$IF)aoFVMr<CTT+A#u+
I{|vGN0C5E-g8%>k

diff --git a/timemanagement/migrations/__pycache__/__init__.cpython-38.pyc b/timemanagement/migrations/__pycache__/__init__.cpython-38.pyc
index e7f3b56e3a24935cfbc5f38b5baffd6a1170b180..3f62c362bcbf0822b4352d183634ccc4992cee7a 100644
GIT binary patch
delta 95
zcmZ3-xQ3A@l$V!_0SMBTiN;Ulv33vC&&bbB)z2s?O3W=t)pyCyF3nBND@oON_YBcb
t$xP2INz6%2Oa}^;7U`E{=BDN*<^j1NHTt=k=|zbpnfZCe`V%L}0RWSvAoTzM

delta 97
zcmZ3(xQ>x0l$V!_0SF8Z?2enrW9=F2Y!wq)oLW>I6Pj0)nwS&glAm0fo0?Zr9OLd8
v5|fgdo>`KZlbV<g6e=x>Dap)D%}vY$azSchax>G55=%1k^NM38_Q?SNBc~%u

diff --git a/timemanagement/templates/timemanagement/rendered_confirmform.html b/timemanagement/templates/timemanagement/rendered_confirmform.html
index af48b51..fc653d1 100644
--- a/timemanagement/templates/timemanagement/rendered_confirmform.html
+++ b/timemanagement/templates/timemanagement/rendered_confirmform.html
@@ -10,12 +10,13 @@
 Von: {{absence.start|date:"d.m Y"}}<br />
 Bis: {{absence.end|date:"d.m Y"}}<br />
 Grund: {{absence.reason.name}}<br />
+Vertreter: {{absence.representator.first_name}} {{absence.representator.last_name}}<br />
 Informationen: {{absence.info}}<br />
 <hr>
 <h5>Übersicht Urlaubstage wenn Anfrage genehmigt</h5>
 <table class="table table-sm">
   <tbody>
-    <tr>                  
+    <tr>
       <td>Gewünschte Tage</td>
       <td>{{absence.holidays_normal|addition:absence.holidays_rest|addition:absence.holidays_normal_next|addition:absence.holidays_rest_next}}</td>
     </tr>
@@ -26,13 +27,13 @@ Informationen: {{absence.info}}<br />
     <tr>
       <td>Resturlaub {{timeinfo_nextyear.year}}</td>
       <td>{{timeinfo_nextyear.restdays|addition:timeinfo_nextyear.days|sub:timeinfo_nextyear.days_inuse|addition:absence.holidays_rest_next}}</td>
-    </tr>         
+    </tr>
   </tbody>
 </table>
 {% if other_absences_string != False %}
 <div id="otherholidays">
     <hr>
-  <h5>Andere Abwesenheiten in diesem Zeitraum</h5>  
+  <h5>Andere Abwesenheiten in diesem Zeitraum</h5>
   {% for ele in other_absences_string %}
     {{ele}}<br />
   {% endfor %}
@@ -41,7 +42,7 @@ Informationen: {{absence.info}}<br />
 {% endif %}
 <form method="POST">
   <input type="hidden" name="form_type" value="confirmform">
-  {% csrf_token %}  
+  {% csrf_token %}
   {{confirmform|crispy}}
 </div>
 <div class="modal-footer">
@@ -59,4 +60,4 @@ Informationen: {{absence.info}}<br />
 <h5>Abwesenheit für {{absence.user.first_name}} {{absence.user.last_name}} annehmen/ablehnen</h5>
 <hr>
 Diese Daten dürfen Sie nicht abrufen.
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/timemanagement/templates/timemanagement/tm_ab_all.html b/timemanagement/templates/timemanagement/tm_ab_all.html
index 4818540..d297673 100644
--- a/timemanagement/templates/timemanagement/tm_ab_all.html
+++ b/timemanagement/templates/timemanagement/tm_ab_all.html
@@ -7,10 +7,10 @@
           <th scope="col">Nachname</th>
           <th scope="col">Start</th>
           <th scope="col">Ende</th>
-          <th scope="col">Grund</th> 
-          <th scope="col">Info</th>  
-          <th scope="col">Status</th>   
-          <th scope="col">&nbsp;</th>               
+          <th scope="col">Grund</th>
+          <th scope="col">Info</th>
+          <th scope="col">Status</th>
+          <th scope="col">&nbsp;</th>
         </tr>
         </thead>
         <tbody id="">
@@ -20,17 +20,18 @@
              <td>{{abday.user.last_name}}</td>
              <td>{{abday.start|date:"d.M Y"}}</td>
              <td>{{abday.end|date:"d.M Y"}}</td>
-             <td>{{abday.reason.name}}</td>  
+             <td>{{abday.reason.name}}</td>
              <td>{{abday.info}}</td>
-             <td>{% if abday.confirm_status == 0 %} Genehmigt {% elif abday.confirm_status == 1 %} Beantragt {% else %} Abgelehnt {% endif %}</td>    
-             <td style="float: right;">
-              <button type="button " class="btn btn-secondary btn-sm mr-1" onclick="javascript:changeAbsence({{abday.pk}})"><i class="fas fa-pen"></i></button>
-              <button type="button " class="btn btn-secondary btn-sm" onclick="javascript:$('#confirm-delete_{{abday.pk}}').modal('toggle')"><i class="fas fa-trash"></i></button>
-             </td>           
+             <td>{% if abday.confirm_status == 0 %} Genehmigt {% elif abday.confirm_status == 1 %} Beantragt {% else %} Abgelehnt {% endif %}</td>
+             <td style="float: right !important; min-width: 100%">
+              <button type="button" style="float: right; margin-left: 2px;" class="btn btn-secondary btn-sm" onclick="javascript:$('#confirm-delete_{{abday.pk}}').modal('toggle')"><i class="fas fa-trash"></i></button>
+              <button type="button " style="float: right" class="btn btn-secondary btn-sm mr-1" onclick="javascript:changeAbsence({{abday.pk}})"><i class="fas fa-pen"></i></button>
+              
+             </td>
           </tr>
-        {% endfor %}   
-        </tbody>  
-      </table>     
+        {% endfor %}
+        </tbody>
+      </table>
     </div>
 </div>
 <script type="text/javascript">
@@ -41,7 +42,7 @@
   }
 
   $(document).ready(function(){
-  
+
   $('#table_allabsences').DataTable({
       "language": {
         "search" : "Suche",
@@ -60,7 +61,7 @@
         "className" : "btn-danger"
       }
     });
-  
+
 });
 </script>
 {% for ab in allabsences %}
@@ -76,7 +77,7 @@
             <div class="modal-footer">
                 <button class="btn btn-primary" id="ab_{{ab.pk}}" >Löschen</button>
                 <button type="button" class="btn" data-dismiss="modal">Abbrechen</button>
-                
+
             </div>
         </div>
     </div>
@@ -91,11 +92,11 @@
             action : "remove_absence",
             ab: {{ab.pk}},
           },
-          success: function( data ) 
-          {  
+          success: function( data )
+          {
             location.href = "{% url 'tma-management' activemonth activeyear %}"
           }
-       });    
+       });
 });
 </script>
-{% endfor %}
\ No newline at end of file
+{% endfor %}
diff --git a/users/__pycache__/__init__.cpython-38.pyc b/users/__pycache__/__init__.cpython-38.pyc
index 9325e9699f9a677a6297ac5cb8c4c1d1a1d35851..8a2e35a6acafaea4deccf6a856bb40bf262df0d3 100644
GIT binary patch
delta 75
zcmbQmID?TVl$V!_0SMBTiN;Ulu{O5V&&bbB)z2s?O3W=t)pyCyF3nBND@oON_YBcb
c$xP2INz6%2Oa}^;7U`E3rxq3KPppvx05?q-ivR!s

delta 77
zcmbQiIE#@dl$V!_0SF8Z?2enrV{K~hY!wq)oLW>I6Pj0)nwS&glAm0fo0?Zr9OLd8
b5|fgdo>`KZlbV<g6e=x>DFrK?SS1GloH`n_