From 7220b8185b5fa32c7c61d59a5f9e22d4a4c91888 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Mon, 9 Mar 2020 10:11:13 +0100
Subject: [PATCH] Fehler im Organigramm behoben bzgl. Funktion

---
 orga/__pycache__/views.cpython-38.pyc | Bin 1927 -> 2115 bytes
 orga/templates/orga/orga_main.html    |  11 +++++++++--
 orga/views.py                         |  11 ++++++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/orga/__pycache__/views.cpython-38.pyc b/orga/__pycache__/views.cpython-38.pyc
index 0578d50230602c73d037fda7ddb6727870f2c874..26dbe5aea1f2546c4bfff9bc09682dab2dd65d49 100644
GIT binary patch
delta 837
zcmYjP&1(}u6yG<ynQZneX`7~POxhv}U0RA44`MB7L8M?oifD7NG?{74lJ4T{rqr^F
zNCi(q!{9;aLBWehFP;T&9=v$lf5W2)zS*ickNNF;GjD$HYhPBs)V%wyYiYPX()~xf
z*4S&o(RlgZ%7NQ)L1P*-hhE3yI;$}2g?0j+D(W_K3cbe6ZOwPbXB)l`dF5uGhrOqp
zQFp5cit^7g@vHU*?)dBY=eyO!4oIM<T3`gFfHLzHWRz7>NOfkN=~+2(QjOVZ`9w#0
zM}C4E7V^`*f?xiCJK)MSvRo1lQp$)d+*SO7Aoylp7W~PG$BC$--SNUGJRHP>?vRgS
zE<_CvbDa-)N5|t1k_J&X&da?hO!!gqK@)BHjciiYl=z~Y*PAP(ZV*8EMX6Z8<DLri
zcc~Oy+(mUuAiMgCaSEa(Pxbg&kdmO5l@TX06Om?><7P4$KtRwkf~oWBgL-B?(83yM
zN?0YccC?T@)R>hTX*o61N~)v(bZQl^8U@Z2I9uQxv(KE&PMX*^C$&}Ik_*hOp1?NF
z5S!?2`9w4%H*R0DF<Bo(13$;!)}Z$|Sv=&T&$~Pnsu151p8RaQz1k86nqm?m*ZVvX
zb!AQ~P(>FEf+}rF!Hj|l`MPw=6>1#0u|EoXxgo!ouDOnAs%sTg)a4w#ywh>iIFw7c
zcfdtU-L(I~JZiZW55oSCN20&Cgm%1+ppk|%3w2lo15Btv6D&eO2|=BLrOW5EO|PS;
zKOx`KH@oM7;?;wQ@nKw~Ca&OhF-oBv|BG8>Py{#E@WE)v*VV5atHd4nUra*4Y7_Vk
DclfU0

delta 684
zcmYk4&ubGw6vuaF;_UAvO_OM1syQe$t%qJJ2>uRgsS=PPg&ZtNW=PVeyY=m+SlFDR
zcn)(CdhjBse}Mmhe}f+O;=#LrfFSs0@z;CIXWx9^?3<al`>FV<kbmO)j)C@d_tDdl
zy~sDnWU>CZ+4Uq7matzKbJF!Oc7&V7d13AtEpPFzeX%nj`pw^F;?u&>#u0r)s9U6_
zHpt7muo99mVV|-YkKM!&PQvF5tGMbLxuMqR7V%U>*M}+Z4P`JmN$Jr+YK0&q?DbDl
ze$)dQ#3=`P7#>TYSiEJXCdg+~8O7k^yqgcg;CLL3`x7~hBtRa;l*x(gGL%zu5C*Y)
z9=|uBp$cr9+nA4<YLC^|7$xXGIfn}<4s`iH=3=1BXP5e6sJHA2h41P!i~6I4?iXh!
za%pBE`OL<P<`Ofp5<6k2l!T4U?Js96XRKtb3g^_DIq_L+hMPFL8Sy#c&B=}-3~Y?w
zX;G-CFS+{_{c%7aBjxR_JDmsjS{``n_L(=EHOT2)QRmoD#!%AJWsR~%MT2WBX;d`|
zs>1K85#RJ(sA(ZvR8k-K<u;txLgO!1FiM?h91JHigkkRz&ZDacgI2vNDU&A25sMT_
zoj8;ebgEX(6@Cp@v<m8>`Fa~RFwVLPTK%thwoSH!b^S0D(}}#Pf2K&E+#~<oqLesw
GN`3)&IgVHW

diff --git a/orga/templates/orga/orga_main.html b/orga/templates/orga/orga_main.html
index f54d321..8c462e7 100644
--- a/orga/templates/orga/orga_main.html
+++ b/orga/templates/orga/orga_main.html
@@ -20,17 +20,24 @@
 
 <script type="text/javascript">
 
+
+
 var data = [
     { 'id' : '{{request.user.profile.agency.pk}}', 'parent' : "", 'role': "", 'name': '{{request.user.profile.agency.name}}', 'color': '#71AF17', "imageUrl": "", 'children' : []},    
     {% for u in agencyuser %}
       {% if u.profile.parent == u %}
-        { 'id': '{{u.pk}}' , 'name': "{{u.first_name}} {{u.last_name}}",'role': '<b>{{u.profile.get_func_display}}</b></br >{{u.profile.compfunc}}', 'parent': "{{request.user.profile.agency.pk}}", 'color': '#1859B7', "imageUrl": "{{u.profile.get_photo_url}}", 'userid' : '{{u.pk}}', 'children' : [] },
+
+
+
+
+        { 'id': '{{u.pk}}' , 'name': "{{u.first_name}} {{u.last_name}}",'role': '<b>{% if u.profile.func == None %} n.a.  {% else %} {{u.profile.func}} {% endif %}</b></br >{{u.profile.compfunc}}', 'parent': "{{request.user.profile.agency.pk}}", 'color': '#1859B7', "imageUrl": "{{u.profile.get_photo_url}}", 'userid' : '{{u.pk}}', 'children' : [] },
       {% else %}
-      { 'id': '{{u.pk}}', 'name': "{{u.first_name}} {{u.last_name}}", 'role': '<b>{{u.profile.get_func_display}}</b></br >{{u.profile.compfunc}}', 'parent': '{{u.profile.parent.pk}}', 'color': '#1859B7', "imageUrl": "{{u.profile.get_photo_url }}",  'userid' : '{{u.pk}}', 'children' : []},
+      { 'id': '{{u.pk}}', 'name': "{{u.first_name}} {{u.last_name}}", 'role': '<b>{% if u.profile.func == None %} n.a.  {% else %} {{u.profile.func}} {% endif %}</b></br >{{u.profile.compfunc}}', 'parent': '{{u.profile.parent.pk}}', 'color': '#1859B7', "imageUrl": "{{u.profile.get_photo_url }}",  'userid' : '{{u.pk}}', 'children' : []},
         {% endif %}
     {% endfor %}
 ];
 
+
 //Check for Agency and User-IDs - dont touch the userid for URLs!
 for(i = 0; i < data.length; i++){
   for(k = 0; k < data.length; k++){
diff --git a/orga/views.py b/orga/views.py
index 69352e8..3c9a637 100644
--- a/orga/views.py
+++ b/orga/views.py
@@ -4,6 +4,7 @@ from django.contrib.auth.models import User
 from areas.models import Areas
 from users.priomodel import Prio
 from tasks.models import Tasks
+from users.models import AgencyJob
 import webcolors
 
 @login_required
@@ -24,6 +25,9 @@ def mainorga(request):
 			except:
 				pass
 
+	agjobs = AgencyJob.objects.filter(agency=request.user.profile.agency)
+
+	
 	context = {		
 		'active_link' : 'orga',
 		'agencyuser' : agencyuser,
@@ -59,6 +63,11 @@ def singleorga(request, pk):
 		user_first_name = user.first_name
 		user_last_name = user.last_name
 		user_id = user.pk
+		try:
+			userfuncname = AgencyJob.objects.get(pk=user.profile.func.pk).name
+		except:
+			userfuncname = "Nicht vergeben"
+		
 		context = {
 			'active_link' : 'orga',
 			'areas' : areas,
@@ -67,7 +76,7 @@ def singleorga(request, pk):
 			'user_id' : user_id,
 			'prios' : prios,
 			'mail' : user.email,
-			'userfunc' : "CHANGE",
+			'userfunc' : userfuncname,
 			'imageurl' : user.profile.get_photo_url,
 			'compfunc' : user.profile.compfunc,
 			'phoneland' : user.profile.phoneland,