From ea33eaaffd8d91a0cc56cc3a53a0ebad4e554910 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Wed, 12 Feb 2020 21:07:10 +0100
Subject: [PATCH] =?UTF-8?q?Struktur=20inkl.=20Bereiche=20und=20T=C3=A4tigk?=
 =?UTF-8?q?eiten=20sowie=20Benachrichtigungen=20f=C3=BCr=20T=C3=A4tigkeite?=
 =?UTF-8?q?n=20fertig?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tasks/__pycache__/forms.cpython-38.pyc        | Bin 1168 -> 1137 bytes
 tasks/__pycache__/urls.cpython-38.pyc         | Bin 902 -> 794 bytes
 tasks/__pycache__/views.cpython-38.pyc        | Bin 5097 -> 4651 bytes
 tasks/forms.py                                |   3 +-
 tasks/templates/tasks/tasks_add.html          |   6 +-
 .../templates/tasks/tasks_confirm_delete.html |   2 +-
 tasks/templates/tasks/tasks_update.html       |   2 +-
 tasks/urls.py                                 |   3 +-
 tasks/views.py                                |  30 +++-----
 users/__pycache__/models.cpython-38.pyc       | Bin 4929 -> 4987 bytes
 users/__pycache__/signals.cpython-38.pyc      | Bin 2934 -> 3852 bytes
 users/models.py                               |   5 ++
 users/signals.py                              |  70 ++++++++++++++++--
 users/templates/users/base.html               |  21 +-----
 14 files changed, 87 insertions(+), 55 deletions(-)

diff --git a/tasks/__pycache__/forms.cpython-38.pyc b/tasks/__pycache__/forms.cpython-38.pyc
index bfae0d89b8971670f818dab4b25371d5003d4dd5..1457d82efdf7bf7536ac401f21f25c0e67fe317b 100644
GIT binary patch
delta 318
zcmbQh`H_P+l$V!_0SK;&yTtiz<mF)GVgd3TfVfy~vOJ@>$Q<S<))dwhwiNbs<|wul
zj$j5&&dGj^j+5syN+~hlV#!O)O})jESd^N0i@hwfI5R0HwTJ_#y@(S;a7})~=*cDs
zVhT<+X7Ul@0WvulS(um@f$%RIYmxBe$xNk;oRc}3eHaBMhcT-tiU5_YWW2>0AD^6)
zSX>+*Uj)`K1TsVdNC-}z&8*|g4dQ}KE8+za!XN@9dy5yUFF7?Q2c{QnfD%Xv*c5gk
uiw%g2L4M_6;^Ukw!s4d~aV1C*+`d~JHo5sJr8%i~j3DJ8fAKJaArk<$*gJm!

delta 335
zcmey!F@cjel$V!_0SNTgyofE{$jiaV#R}v(0CBO_WO+t$i4@j3EK#f}Y$@z194VaX
zEKzJJT)_;Q+>^Z+9r<qYIHeXRXB4GoCY9!;Pwr-v(q*~Dl9!m9dW$8oC^hjGOA1i_
z7JFG{ab{9ZY7r;U+#-;DMcg2QXYz4IPc~r?Q+To%laB}=kjcTw!o<V~hJV=DibN-u
zFqJZLO@77X!zeV_oLNOt45(-&<1Nnk_~e|#;^O%DBCrV}AY-I}gwW&~W*rM&5Eo=#
z5kH6!1rZ?GTf9(x$*DOxFuh;{R6t5ZCO=>n0b2K!*-sDRFpwzRf?FImx%nxjIjMGx
OK=EP@Ai={3hD-p5phuek

diff --git a/tasks/__pycache__/urls.cpython-38.pyc b/tasks/__pycache__/urls.cpython-38.pyc
index fbe82ce7cef7ecd9195e5803c01f6a6d65984713..bc61e6e895c3cf993fcb8a708e487d3a0c930d11 100644
GIT binary patch
delta 298
zcmZo;pT(vf%FD~e00g{(E^z_O3=EG!9Av-&<TwCv@v4d1w)Kn*DJ&^WIo!F-QOt}C
zsf;OXsq882&5WrWSv)BmDV)8G&5S8rDcrrxKsg?$9OnX_g$zJ(UZ^-9RGbSc&JPtA
zNM+9AO%Vj~(pjSTQiOsTG=*P+9HYs2i=`m3Bx5o=qZuRfWPe5jt}2eil$4Uh;%xoN
zjf|24A|Ph5KA4OL%1qwKC@#he=ITNff(*$^%uSsvz?8tqKe>>pknz^!*GzhB!ay5}
egeS{0`-=$ynLLa<i~@`zj67^Ij1oY|_Xhxr20}al

delta 396
zcmbQm*2b<K%FD~e00jDLUc~-pW?*;>;vfS~AjbiSi%(6|wyn?Qj^buyNMT7~%Hhdn
zj$&qHNM%f6OJz@CZ)Qy8$l^`mNa5^dY-UX1O5yHh2Fme3<v4+Iyihqls2o33j%xw$
zLI$870jRhjRGb?sE(8@9P8DX(;!6<$ano6&_)|oK88pQv-f|XVxy2unSe#w#o0ylF
zo|>DQS29_S(ZJ{yLzP%*acWVqUI|DxJ{K-sB@GtQM;D*m$SAHX02b9nsMch>#gdnp
zn_9(@n34jL)Sq0yD8^sK3sDFaoV<=Pfl**GKT{!R5hzTHxEUBGH!|t5iGVmFleaSY
aOMsX>j6942j1r7IY%+{8Kw5&4?>7Kj4rO})

diff --git a/tasks/__pycache__/views.cpython-38.pyc b/tasks/__pycache__/views.cpython-38.pyc
index 518a912161de7409b44bda88f32e2da80061a356..454878c273cec4e90acb7a5d728b96f18981faae 100644
GIT binary patch
delta 1789
zcmah~&2Jk;6!+Tu;n-`(*(BssX#y>+l`2V7LTMY36cxf(BDGKzQp9TOomgwH*Y2C$
zG@w*D5OK?)9d2+$qEW@EH?Bw=D^46n;t$}^9=XDMvmuTw5MJ%i<M-aoy!pM~8~<_k
z$?5W~QmK%^kF|XL^B)HvmM67e9?pJq$@)s)99_%!CBM9%@yjg7if9=_OTS-1O9d@`
zXc_khd}lwiIpGg}l&KDhy!N}et=}4`%=;c^aU4W-KHu_!NIcb72Be;F2312EJn1k1
z=aDfqB`sk062@Z~#yk$QQs*q(l4kS12X!viavR17IvlZLw0v3gYH_g5+%Slmve4b6
znuC`xN>=JDc5Ce@W;?O#d$A|Yq=Vn=FbCrp0235t9Yw$-nWhL%5xk5rBAy%j{mBpx
zKmPgqIH)&S5Q{I(iSbbip(Lf%f%aAqGHH5s7S+BGkIl(NwSQr&4J~)u3j_Z!t9Fz+
znR<7c#bqYNpXRK1mRk^4tW)cBNR<GPPnKM_7J8i5SQxr)nxjforL3}bFs_6zw-NH1
zPEXc0Yy%weofT+<!pt9x%WS84sKM(PlN1q79O`j?YEN42yA4*0xy&JTibPn#FlqWM
zWHFO^<h2--(FCs|RIQXpB17s_qLfk`GEe4#@lHF!Dqp1uJ@j6o`S@}rInB{VHL==v
z=h|j}?C~aVc@fgtVo?m!6q%M(Ws?$f8m+x+Qppy?uYDJTIr7dEED#VWaDiYEL6&0H
z>Vzl+SDlAaNf&*MMvB=UdWi+vQDu8fuLVmYEIdMT|0=9rCY4l;l(khHgR0`OP+*K~
zJuFbjve+p$ZYC7it;e+2j1yE24;aKVxa=|MpjIS-DRIF0e_57Pb4|?IOJx&BIee+w
zd|TYJFPwXz$9)aGQP|BiiVeF_YLpwMpF7YR{kvITAItd0f%d@IHN-Rf{N5#;cc{t1
zBaypqDstEDG_n7DpZPBJF~=CQ({$Y+lI2dD^WbjCQV-1F5~_$YpUNxntCbTpQPt84
zy+NbP1f)<|NcbKuy%n&~mpLyCK_|0`-4^4G(Pj25O*uzCi|y3H#Aj8r+u?AAJcg3h
zrcK#mmM;B-HJaE{5=!SCe0c@I%AhibvIX&?G`IJkqFSM4NLfHF2p0)d@u?2~qpVd7
zq0@3I@R73qX<hQwGz9f|`fd3)ZTMXr162htGdv1%nT28Tb!E<ci#%_OpDHuXZ5n<;
z@F_x7ha2K~g$-|zMfF0L>Gwo^U}o<F@~A%OPJN$jbj86jzp5_qA=;#l+Ki=%w;SHq
z@Cuo7A&Y=mgMNgnomS|kita$rh8r|2-fu$_{|hL4*re#|8LTU;iK4Su`HT$R4m>5+
zoe}MhV9r%5K-WffQvBe&Sf_r3RRXe}n4qT8jVSZWt+t<p>`fw&lUQtxo@s@)R?%$T
J8F3uv%-=Psi6j63

delta 2239
zcmaJ@O^g&p6z=NZ+4*PK0Ty<bL4Mp8To6QDSzu8KXm(ekEQe8So2i<~^!EH%-NVmj
z$R5~))0&X-$N`QU4KeX#G$HZk!FceXsl<3N9=sSm=-Kybh8;2iXHu`L->Z7>)%U)7
zGoS7I<N54TCX>|Q^ZD<8U-_<hH#<&#zI*V~w-UF_@{aQw&Cu+cMzhRd4rs<elcRai
z<Ux}H%}&s4p#{(sKr;fGU34oQUDL|rwD_LpZoB*MFRLZ+&$Ke3T3KgC*}S7w2_;lt
zOO&lUnyHm-SZT=IB|ln@7W}4PV-41fD+Ckke@u8<Fj6q0IS{dSTMI~4>yl5%Ej`u)
zBQU#KU<G#I1c_jTl67)FN%aS0^_J1q@29BIHK=(H6h!Ol5Ybw6iA+MUX62^mwU?#Y
z^czg(Voam4nTD&&lwXPK*O(X9o6CK>*Q$EGt!`RcQK!wg%-2}#Ra(uM-H1Kv$39O(
zqLMnTs{yOTk+iGzFouN=XCHT16ic%c;cJ_>z`~^6^C)#lCeh-QaqsF)X?NP-jJc*X
zBNkSry?ov0wMaVsP<%T?5nt<zGh;9*z=#qcG?LXPNuI2fhH#x8PSbTn$vQH_al6cT
zUM2LSsKUa~^Y|3#dg1`iTof1rPZnWO62uf=Stao!S#s>d3Og~QpIP7&V010M10MV^
z2${pU)fR7fy#w%ZG~u!ho$tl@J`^gB3af%01>K~`8jZ7j8=8wCT%+d}6Xwr>*f5@O
zuphNUUU21J@vE`6y0YbLr&{x`vXbAdv5?i`J#La`!7iPsQ>m~h8YIRi(bsM?ChE;7
z_L~(TNQE<~2lae-LV;8+GO12>%@6Cee;jF|YA6$%zY5-_#6RZ2G5!L2KZxQG3dEGZ
z2tr)6cE5oKS0zz9_%yygts00e9xuY}P!0U*X)A5<!{QsOPL7BJ_Ii<*z`8-yV<pjt
zKzwgcuJWB=kp>i}2kI$&wJAUYR2_vE1r9$BGuP?CjD?dXl2DZlr_7fL&Z2g!35-^|
zhAJ=zd(cOu+6^g?9mFQ1WJR=`%g0q!Rec|q7PIJ`{$-pEIm7eL3OjME{wxUjNmwE?
zF>AC#D3*s;o6n&uMVe=#iE)p>P-$+W>F`s4<%D>Y=$L2)hR?pnUxL|VhM$8uS0&qI
zH9v;Bq0Di~1@Uksm|rPw5^*{10B@o?<3L7hfOn6G>INZe_{>urqG3S<$>UjUj|L3Y
zB3Hx%rzpNnjvwmk)R@)ck-!X+&>&MmI>-dsz^3Lp336y1)2OvhZkb(E*r`KPr@;rb
zJW7G$*q@>eBDeNil-F;1*e^vnwQCixqbeLUEY;=e)Xn#Zq##jfD`F$f_!$%>5HhJ;
zSL-aK((uEOV>98qPz(?pTtA21sDvHL0G>gs*slSc(o#)_&*Ro1v@!a-FrqvN4M;bt
zXT^#1borUIc@x$t?(huGW>KiJssj8!cksZki%040<lL7(rGF#E1>CLRwDGh6jm{^;
z57}w^0$Sb{Ms82xeVl%P;tB}Y<V)g}94lhly^b&dZc%)Z+q0@LnnUwo>pS>5fnpOf
z1v9@0I%xvAVrfHjf?plgFr^W)CP!3w4uqTTfqq%7Zu5GJFX1$Gy~UU7%^GIUKg8AN
z;rCkO^Wswe=+sB37_=m8*Rp`c@PIt3D4rkqH)`Tx{-o0Y>!Ld${>uM(0$UbWH(YT9
kO;7mQ?ENw^+i1~F$WG%wfoP}57e+^nLZ-02P$=yG4@WxftpET3

diff --git a/tasks/forms.py b/tasks/forms.py
index 7095ce8..a5f96f0 100644
--- a/tasks/forms.py
+++ b/tasks/forms.py
@@ -10,10 +10,9 @@ class TasksAddTaskForm(forms.ModelForm):
 		labels = {
 			"name" : "Aufgabenname",
 			"area" : "Übergeordneter Bereich",
-			"desc" : "Beschreibung",
 			"visible": "Im Organigramm sichtbar"
 			}
-		fields = ['name', 'area', 'desc', 'visible']		
+		fields = ['name', 'area', 'visible']		
 
 	def __init__(self, *args, **kwargs):
 		user = kwargs.pop('user')
diff --git a/tasks/templates/tasks/tasks_add.html b/tasks/templates/tasks/tasks_add.html
index 3ad92f6..4e50986 100644
--- a/tasks/templates/tasks/tasks_add.html
+++ b/tasks/templates/tasks/tasks_add.html
@@ -2,15 +2,15 @@
 {% load crispy_forms_tags %}
 {% block content %}
 <div class="content-section col-6">
-  <h3>Neue Aufgabe anlegen</h3>
+  <h3>Neue Tätigkeit anlegen</h3>
   <hr>  
   <form method="POST">
 	  	{% csrf_token %}
 	  	{{ form|crispy }}		
 	  	<p>Nachdem Erstellen der Aufgabe können Mitarbeiter zugewiesen werden.</p>
 	  <hr>	  	
-	  	<button type="submit" class="btn btn-success"  href="{% url 'areas-addarea' %} ">Aufgabe anlegen</button>&nbsp;
-	  	<a class="btn" href="{% url 'tasks-management' %} ">Abbrechen</a>
+	  	<button type="submit" class="btn btn-success"  href="{% url 'dasettings' %} ">Tätigkeit anlegen</button>&nbsp;
+	  	<a class="btn" href="{% url 'dasettings' %} ">Abbrechen</a>
   </form>
 </div>
 {% endblock content %}
diff --git a/tasks/templates/tasks/tasks_confirm_delete.html b/tasks/templates/tasks/tasks_confirm_delete.html
index 317bcd2..1774083 100644
--- a/tasks/templates/tasks/tasks_confirm_delete.html
+++ b/tasks/templates/tasks/tasks_confirm_delete.html
@@ -15,7 +15,7 @@
         <p>Alle unter dieser Aufgabe erstellten Standards werden gelöscht!</p>
         <div class="form-group">
           <button type="submit" class="btn btn-danger">Aufgabe löschen</button>&nbsp;
-          <a href="{% url 'tasks-management' %}" class="btn btn-success">Abbrechen</a>
+          <a href="{% url 'dasettings' %}" class="btn btn-success">Abbrechen</a>
         </div>
       </form>
     </div>
diff --git a/tasks/templates/tasks/tasks_update.html b/tasks/templates/tasks/tasks_update.html
index 849dadd..7bae5ca 100644
--- a/tasks/templates/tasks/tasks_update.html
+++ b/tasks/templates/tasks/tasks_update.html
@@ -38,7 +38,7 @@
 	  <hr>
 
   	<button type="submit" class="btn btn-success">Aufgabe aktualisieren</button>&nbsp;
-  	<a class="btn" href="{% url 'tasks-management' %} ">Abbrechen</a>
+  	<a class="btn" href="{% url 'dasettings' %} ">Abbrechen</a>
   </form>
 </div>
 <script type="text/javascript">
diff --git a/tasks/urls.py b/tasks/urls.py
index 41a892a..bb32b3b 100644
--- a/tasks/urls.py
+++ b/tasks/urls.py
@@ -1,14 +1,13 @@
 from django.urls import path
 from django.contrib.auth import views as auth_views
 from django.contrib.auth.decorators import login_required, permission_required
-from .views import TasksManagement, TasksAddTask, TasksDeleteView, TasksUpdateView
+from .views import TasksAddTask, TasksDeleteView, TasksUpdateView
 from . import views
 '''
 Permissions definiert in models.py bei USERS und dann hier vor die View geschrieben!
 '''
 
 urlpatterns = [
-	path('', permission_required('users.tasks_management')(TasksManagement.as_view(template_name="tasks/tasks_management.html")), name='tasks-management'),
 	path('addtask/', permission_required('users.tasks_management')(TasksAddTask.as_view(template_name="tasks/tasks_add.html")), name='tasks-addtask'),   
     path('tasks/<int:pk>/delete', permission_required('users.tasks_management')(TasksDeleteView.as_view()), name='tasks-delete'),
     path('tasks/<int:pk>/', permission_required('users.tasks_management')(TasksUpdateView.as_view()), name='tasks-manage'),
diff --git a/tasks/views.py b/tasks/views.py
index dd7d355..ce05419 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -8,23 +8,11 @@ from django.contrib import messages
 from django.http import HttpResponse, JsonResponse
 from users.priomodel import Prio
 
-# Create your views here.
-class TasksManagement(LoginRequiredMixin, ListView):
-	model = Tasks
 
-	# Adding active_link
-	# Loading only user same agency
-	# Change context and return for template-data
-	def get_context_data(self, **kwargs):
-		context = super().get_context_data(**kwargs)
-	#	# Get all Users of the Same Agency as logged user
-		tasks_of_agency = Tasks.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('name')
-		context.update({'active_link' : 'tasksmanagement', 'tasks_of_agency':tasks_of_agency})
-		return context
 
 class TasksAddTask(LoginRequiredMixin, CreateView):
 	model = Tasks
-	success_url = '/tasks'
+	success_url = '/dasettings/main'
 	form_class = TasksAddTaskForm
 
 	def get_form_kwargs(self):
@@ -34,12 +22,12 @@ class TasksAddTask(LoginRequiredMixin, CreateView):
 
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
-		context.update({'active_link' : 'tasksmanagement'})
+		context.update({'active_link' : 'dasettings'})
 		return context
 	
 	def form_valid(self, form):	
 		# Send message to the site
-		messages.success(self.request, f'Aufgabe angelegt!')
+		messages.success(self.request, f'Tätigkeit angelegt!')
 		# SAVE OBJECTS TO SIGNALE!
 		form.instance.agency = self.request.user.profile.agency
 		form.instance.created_area_by = self.request.user
@@ -47,14 +35,14 @@ class TasksAddTask(LoginRequiredMixin, CreateView):
 
 class TasksDeleteView(LoginRequiredMixin, DeleteView):
 	model = Tasks
-	success_url = '/tasks'
+	success_url = '/dasettings/main'
 	template_name = 'tasks/tasks_confirm_delete.html'	
 	
 	def delete(self, request, *args, **kwargs):		
 		area = Tasks.objects.get(pk=kwargs['pk'])
 		response = super(TasksDeleteView, self).delete(request, *args, **kwargs)
 		name = area.name
-		messages.success(request, f'Aufgabe ' +name+ ' wurde gelöscht!')
+		messages.success(request, f'Tätigkeit ' +name+ ' wurde gelöscht!')
 		return response
 
 	def get_context_data(self, **kwargs):
@@ -66,7 +54,7 @@ class TasksDeleteView(LoginRequiredMixin, DeleteView):
 class TasksUpdateView(LoginRequiredMixin, UpdateView):
 	model = Tasks	
 	template_name = 'tasks/tasks_update.html'
-	success_url = '/tasks'
+	success_url = '/dasettings/main'
 	form_class = TasksAddTaskForm
 		
 	def get_form_kwargs(self):
@@ -76,19 +64,19 @@ class TasksUpdateView(LoginRequiredMixin, UpdateView):
 
 	def form_valid(self, form):	
 		# Send message to the site		
-		messages.success(self.request, f'Aufgabe aktualisiert!')
+		messages.success(self.request, f'Tätigkeit aktualisiert!')
 		return super().form_valid(form)
 
 	def get_context_data(self, **kwargs):
 		context = super(TasksUpdateView, self).get_context_data(**kwargs)		
 		tasks = Tasks.objects.get(pk=context['object'].pk)
 		# User still in Area		
-		context['added_users'] = tasks.usersfield.all()
+		user_in_task = tasks.usersfield.all()
 		# Get all Users from same Agency which are NOT in context_added_users
 		possible_users = User.objects.filter(profile__agency__pk=self.request.user.profile.agency.pk).exclude(pk__in=context['added_users'])
 		context['possible_users'] = possible_users				
 		# Active-Link for Base-Design
-		context['active_link'] = 'tasksmanagement'
+		context['active_link'] = 'dasettings'
 		# Area ID
 		context['objectid'] = context['object'].pk
 		return context
diff --git a/users/__pycache__/models.cpython-38.pyc b/users/__pycache__/models.cpython-38.pyc
index 99b664c0225f7cc2350f4e4ffdacb66e7fd28dea..623516e82437b3280e63e0ae0ee369a5ff6d8e6b 100644
GIT binary patch
delta 173
zcmX@8_FIiNl$V!_0SICwT;jfL<o(UT6vQ}r1E1Jt1x_|blT_v`@f3j+o?gZ%WiXo&
z%vMPeOc82fh*C`vP7wjpYN_feqA6l649$#D8k?QCSQ!~7PWIql$T)TKEABOnt0qt9
zQDfBHypJcBQ8J1*F(oCwB(XR<J~uHl2f>}J#%IoGG&zn>YjX?VDJI5)ll=uZGVa>U
KC}hvb7zO|cyD|j;

delta 118
zcmeyZc2JEsl$V!_0SI)CI>tqA<o(UTXtkM>Q<hOCMKDFEg&|5gML0zSNUNl(riiA9
zwJ<a@MyYL%;$mfF?3tXvy^wLjWG0?9j7ul4=TT!+-+YZHmvM3;pAn<p<SBewn-B3F
VV`AJhxl?c><JQgALiUV|fdE*SA+Z1e

diff --git a/users/__pycache__/signals.cpython-38.pyc b/users/__pycache__/signals.cpython-38.pyc
index 3a5da63a6f437e17c63293db6c40a555f1602ca2..025e517357502a298fc17eb74d7adfefbfe64d7f 100644
GIT binary patch
delta 1742
zcma)6&u<%55Z<?5uXi`=P2!|>oL@F7X=?&50S;6uA(T*PL4m4)gAcWg-;1-3y^dzr
zsi@X6QjoY{iLwVS96*9YE=W}`oZx_vxbP3`1+GY_5(hX`9GH1d+$0?6uHLt^GvB<K
z_ukC=JNwC^^KLqADfoQz-ukUy7VbLp?4P^K`+ctPu~xR7tK^s>4512#+XI!Sx$}{-
z&nh#hV<IVa<9tHu@~BIQWOKGT$0w1S;ZssSFS$eiX?{lP79=;<Ts-7vkGMQ{Qz^~-
z9+~VrJ-J!)cl_vkHW%GUU49}?b>44^df><UmfH#h#Om%&taH&4fjCG&CbHET<Swb}
z=d-A-dg8WU^*VvO<<@I~+wuG~F4R|PxhgCmMnAK)RhU5u=0-4&Qf&LRJyG3-4u%rv
zP;=x~M7gBKy6-l;S_?AwKU43q)B%Gm8lr1jY3`v_6kf0;zzfP1y8)f<ZhgDvHH3c<
z4YbeMg=i_+&%reE<3vLQkR(ZKxqbkP(GSToD?|^HS6Dt;(O1}PRM*e4IQm#G6fPhU
zE)v^l`;F>$&~6>iJNij4q@PB!zk#4=ni~D7zsauO|1CAn`ecA-2+9P{608tBNANtt
zRd@lhV$~YLtA9YdSJL1-S!Li7NmB@=Ntv=-0h~catPfq}9>5}LOu6~(n%jysuhtf@
z_7b_T5=;<WB^W1o8R3w>+x54>A!PxfWI~4IJi%=At(h;6b^xxC@(qGhCuho&qwrhN
zU*^UB4dm2ygrkRo8aUp@;ooA4!dcG<lqPGcK_b-l8CUZPPYhVk43(zVvqH0(Z0fKV
zGOq2Y@J^5lO`Z&`oWgY+DQ*lBy|HlYOXDkrDc(8cnaJCdyuKxgWB(<}Y0Xa=RJh%<
z4<~={XkyfvO^c^<3VzYQmkw<1gz3=c<6o%zYR?G`_#;U32|h_oj4<Nz40_q9nd+m-
zX|T}Y*n0yV^J@+BlYvLcJx(z4_`h(cqw&6i4V~TC1l(u^&JsL{(4{K5>5Ag*E^y%$
z_c~sY3n*^>_;uhmc7z)gVF@V}E5J)&*grsh2v3ps>`Cuao_Flxoo+*PfP11Jlwq0t
z9=HBW<HxG|Me@8vKrJ;a?R1UvDrHqYS+4OT1JykY3%*Z&vf@X@juB)@uaW5$f-3~C
z608%vMnFp(cFF4~RSb$KJ4qJ(sYW>218^NZKE&a_rBL~6S|ZEzgux7!WtK{4BrK-k
zzpYNN36xZPXL0BxJv1!q&?5hjSvE?AXxaL;U$H44zufNNP3yxXMv*rv6j6$GdF%Oc
zD%i&Budyu?0!k&ey1oE^%M~qttaD}l^5Qiv<CNW&SfzUL>BOfoL7PqE7`=&%#jF_|
MNrzdN@SAtozo|BRLjV8(

delta 818
zcmYk4OK;Oa5XZBQABh{MO`D`CeWaqiOi?O?012Ve7Rm+a1tFvyh)le7(mGBw>r#P`
zdMMmLs9GT|e1RTOPh3EJ3$z^g2HZe!V`f`WZTaV!zh-uKX7<(0uWIpu=eZethF&f|
zS}yMur`XrM`Q0YZamKB1=(Q0RLhnUpmo=-XWx2I6zEKN{s1JuDTAx7O;6)u<3P-he
zLgyc9V_{iqlVRn4#;?i??4$g_YVx<SFuk9J5^k<?-9)58(&ozE+zucT`xzLQ&y8Dt
zK?F~DYXJTAZp>#eRv2_#116BZp={BOk|2iC0ndJ5w$GF?*p$<jKl#j^<w?5EAxRs}
zLInM-LAw(q5f{D;taq#~|5!Vd%IQDe;O$hXY{XNra8+f-U6I15d}BA*nEYg~u!>~P
zMOKxUoH^E%51o3wj)8E7qH{eFwK{1phH=s~YVxg9_fDZN)({!fH02lPj=7As{K@V$
zU;!;<V^Jvwn9@$jV~$=Ko#RVU%4ehIwb1xi{OW<18)iFm6iU0mX~J2;If73(kGKu<
z$fg@aJZV2o__pv(pf-XoV3w>EgkRF7>tn%96qJ3KqR$4Sq~s~R)eE|@GLxXkVd*lZ
zUm=VT774?ItB9lc!ItPik;E~CpVtG23JF#DEkDut-$_^^@dn{oC(%`TeF<p$wmj)B
zICoK8^QYu{?|ZB-g0l5|g>upk4m#=pbsAO)6nt#K!}*}5a@TwPa4Y7E3_UT6D6<h(
UU}gM{-ipgytH|7I_|LlRFV3I2I{*Lx

diff --git a/users/models.py b/users/models.py
index 95aca19..33a1be3 100644
--- a/users/models.py
+++ b/users/models.py
@@ -137,6 +137,11 @@ class Profile(models.Model):
 	add_new_group_mail = models.BooleanField(default=False)
 	add_new_group_push = models.BooleanField(default=True)
 
+	# TASKS
+	# Einer neuen Tätigkeit zugewiesen
+	add_task_mail = models.BooleanField(default=False)
+	add_task_push = models.BooleanField(default=True)
+
 	def __str__(self):
 		return f'{self.user.last_name}'
 
diff --git a/users/signals.py b/users/signals.py
index 7e6dc92..5665687 100644
--- a/users/signals.py
+++ b/users/signals.py
@@ -7,6 +7,14 @@ from django.contrib.auth.models import Permission
 from notificsys.models import UserNotification
 from django.core.mail import send_mail
 from django.template.loader import render_to_string
+from tasks.models import Tasks
+
+# Deletes all Notifications added to to delete news
+@receiver(pre_delete, sender=News)
+def del_news_notifications(sender, instance, **kwargs):
+	UserNotification.objects.filter(elementid=instance.pk).delete()	
+
+
 # SIGNALS FOR USER
 '''
 @receiver(post_save, sender=User)
@@ -38,8 +46,6 @@ def adjust_group_notifications(instance, action, reverse, model, pk_set, using,
 
 	# IF FALSE NO MAILS WILL BE SEND - IN PRODUCTIVITY CHANGE TO TRUE #
 	GLOBALSENDMAILS = True
-
-
 	# GROUPSETTINGS FOR SOME USER WAS CHANGED
 	if isinstance(instance, Group):
 		group_touched = AgencyGroup.objects.get(group=instance)		
@@ -91,10 +97,7 @@ def adjust_group_notifications(instance, action, reverse, model, pk_set, using,
     
 # SIGNAL FOR NEWS
 
-# Deletes all Notifications added to to delete news
-@receiver(pre_delete, sender=News)
-def del_news_notifications(sender, instance, **kwargs):
-	UserNotification.objects.filter(elementid=instance.pk).delete()	
+
 
 @receiver(post_save, sender=News)
 def save_news(sender, instance, **kwargs):
@@ -120,3 +123,58 @@ def save_news(sender, instance, **kwargs):
 			if(user.profile.news_push):
 				newnotification = UserNotification(touser=user, notificationtext="Neue Agenturnews: " + instance.name, notificationtype="agencynews", elementid=instance.pk)
 				newnotification.save()
+
+# SIGNALS FOR TASK
+@receiver(signal=m2m_changed, sender=Tasks.usersfield.through)
+def adjust_group_notifications(instance, action, reverse, model, pk_set, using, *args, **kwargs):
+
+	# IF FALSE NO MAILS WILL BE SEND - IN PRODUCTIVITY CHANGE TO TRUE #
+	GLOBALSENDMAILS = True
+
+	# A USER WAS TOUCHED ATT HIS TASKS
+	user_touched = User.objects.get(pk=list(pk_set)[0])		
+	taskname = instance.name
+
+	# PUSH NOTIFICATION FOR GROUOPCHANGES
+	if(user_touched.profile.add_task_push):
+		if(action == 'post_remove'):
+			newnotification = UserNotification(touser=user_touched, notificationtext="Sie wurden von der Tätigkeit " + taskname + " entfernt.", notificationtype="taskchange")
+			newnotification.save()
+		# A USER WAS ADDED TO A GROUP
+		elif(action == 'post_add'):
+			newnotification = UserNotification(touser=user_touched, notificationtext="Sie wurden der Tätigkeit " + taskname + " zugeordnet.", notificationtype="taskchange")	
+			newnotification.save()
+
+	# E-MAILNOTIFICATIONS FOR GROUPCHANGES
+	if(user_touched.profile.add_task_mail):
+		notificationtext = ""
+		if(action == 'post_remove'):
+			notificationtext = "Sie wurden von der Tätigkeit " + taskname + " entfernt."
+			
+			username = user_touched.first_name + " " + user_touched.last_name
+			msg_html = render_to_string('notificsys/notification_mail.html', {'username': username, 'notificationtext' : notificationtext})		
+			if(GLOBALSENDMAILS):
+				send_mail(
+				    'Agentur-Benachrichtigung',
+				    'Hallo ' + user_touched.first_name + ' ' + user_touched.last_name + '! ' + notificationtext,
+				    'support@digitale-agentur.com',
+				    [user_touched.email],		    
+				    html_message=msg_html,
+				    fail_silently=False
+				)
+
+		# A USER WAS ADDED TO A GROUP
+		elif(action == 'post_add'):
+			notificationtext = "Sie wurden der Tätigkeit " + taskname + " zugeordnet."
+
+			username = user_touched.first_name + " " + user_touched.last_name
+			msg_html = render_to_string('notificsys/notification_mail.html', {'username': username, 'notificationtext' : notificationtext})		
+			if(GLOBALSENDMAILS):
+				send_mail(
+				    'Agentur-Benachrichtigung',
+				    'Hallo ' + user_touched.first_name + ' ' + user_touched.last_name + '! ' + notificationtext,
+				    'support@digitale-agentur.com',
+				    [user_touched.email],		    
+				    html_message=msg_html,
+				    fail_silently=False
+				)
\ No newline at end of file
diff --git a/users/templates/users/base.html b/users/templates/users/base.html
index 29f15ec..aeb741e 100644
--- a/users/templates/users/base.html
+++ b/users/templates/users/base.html
@@ -139,13 +139,7 @@
       </li>
       {% endif %}
 
-      {% if perms.users.users_usermanagement or  perms.users.areas_management or perms.users.tasks_management or perms.user.news_management %}
-       <hr class="sidebar-divider">
-      <!-- Heading -->
-      <div class="sidebar-heading">
-        Agenturorga
-      </div>  
-      {%endif%}   
+       
       <!--
       {% if perms.users.users_usermanagement %}
         {% if active_link == 'usersmanagement'  %}
@@ -159,18 +153,7 @@
         </li>     
       {%endif%}
       -->
-      {% if perms.users.tasks_management %}
-        {% if active_link == 'tasksmanagement'  %}
-          <li class="nav-item active">
-            {% else%}
-          <li class="nav-item">
-          {%endif%}
-        <a class="nav-link " href="{% url 'tasks-management' %}" aria-expanded="true">
-          <i class="fas fa-fw fa-tasks"></i>
-          <span>Aufgaben</span>
-        </a>
-      </li>
-      {%endif%}
+      
       <!--
       {% if perms.users.news_management %}
         {% if active_link == 'newsmanagement'  %}