From bd8a4379165e4b37902d8c67245677139bd51858 Mon Sep 17 00:00:00 2001
From: Holger Trampe <htrampe@gmail.com>
Date: Thu, 12 Dec 2019 00:08:30 +0100
Subject: [PATCH] Orga Testversion

---
 orga/__pycache__/views.cpython-38.pyc  | Bin 1817 -> 1587 bytes
 orga/templates/orga/orga_main.html     |  95 +++++++++++++++----------
 orga/views.py                          |  29 ++++----
 users/__pycache__/views.cpython-38.pyc | Bin 14410 -> 14410 bytes
 users/views.py                         |   4 +-
 5 files changed, 76 insertions(+), 52 deletions(-)

diff --git a/orga/__pycache__/views.cpython-38.pyc b/orga/__pycache__/views.cpython-38.pyc
index 8f8bb8b3387d4505cbf1b4241825a64577e9050d..f8a858f9a35a8e662d43497ab64b8f675d5e54af 100644
GIT binary patch
delta 443
zcmYMw&q~8E90%|wX}hjl=bUq!qTASHI)=&=1kXOe4&rf)+J;h;7Sm3gY<QS2Fam-g
zs7KG9^+9s-2^3Er1TnuJG>}iezmR|AHus#hjx5VmWV;SO`|mUBEk|Ub%6=ewv^V=+
zYCIS&ene9=K`t31SG~g%9H+;MtBvuL94c*{zoJU(l5F~}P($X~Z7edj6Z_|MaOwvq
z!n8daIHO@i8Q;gfjuA4Kvcd6)VR=iNh!mq|LmI^_BWsaz!XTy>@sq+z`~~;&$qUo<
z6h`<*H(7;mkuOx>Ep^*S!vR@l^1gbrYr$^f(U|Enu^g}fWC0DB1M<K;P~aWSxoSXc
z0&76>s0=G63xH%(9ny+KAYZ69qc&TGsVYzd7J<?qWtoH-`GI#z;a4_f9qmXIoYRVE
j8L7xXc{y@RZ=x>m>i0ER!zw@*_&+R3W&WYBlPX5PebHOU

delta 615
zcmY+BL2J}N6vs1}NjAHiY}IOUYeC)0)*PfKOTnYmi|8K2iy$FprXg;atZ%1cAxjTE
zdsqU3Ab9rdy&q&weu7>-6vX$IuxN()&HK;%=grH^&+zLYdL2bQ2ft^t%eRwd^lRXw
zp#Bv5{9<`E9KYw%mHab1XA5S68b>Ln0uE~&ht7g&A(6{JTOm5V*6Fs|Z#74KhU=YH
z3yGO(x8}8w-EZE)Gu_&ez1lnHubjC5GG=yj2Gwy<sw7EsrL)r{nN6)IRVrilCR#5Z
zpXdx2R%`u2%c=q!s82?LPD|S{kQQ1gD=Ns-aqQWCnwjFGO3Fe{txw4m0Nnue2_d2}
zZ1R|wN`s3k_H75$hZ8k7utApp&9;+O+Tejd9N2Cy*<`eXCWnt$$a=0|BWm1bZM*UV
z*lAw4zu8uE#P@@UP6%Pp)cnigbrhE8$^bn8+#nfLfE6b1PT?BOd4x^EO~Ne#W)fLG
zrf`q&kgzJf54Tqa!fMk4itZsSE38OCrEs67Muc6$kg&bR9gJ*mUg*43bcMUkhWCUW
aG|#>7cOQ|9{uU0_{(p8hU4M@cUG^6vh>mFh

diff --git a/orga/templates/orga/orga_main.html b/orga/templates/orga/orga_main.html
index 13077dd..da68a53 100644
--- a/orga/templates/orga/orga_main.html
+++ b/orga/templates/orga/orga_main.html
@@ -8,30 +8,20 @@
   <h4>Organigramm</h4>
   <div id="diagram"></div>   
 </div>
-
 <script type="text/javascript">
 
-
 var data = [
-    { 'id': 'parent', 'role': 'Board', 'color': '#71AF17' },
-    { 'id': 'parent', 'role': 'General Manager', 'manager': 'parent', 'color': '#71AF17' },
-    { 'id': '2', 'role': 'Human Resource Manager', 'manager': '1', 'color': '#1859B7' },
-    { 'id': '3', 'role': 'Trainers', 'manager': '2', 'color': '#2E95D8' },
-    { 'id': '4', 'role': 'Recruiting Team', 'manager': '2', 'color': '#2E95D8' }, 
-    { 'id': '6', 'role': 'Design Manager', 'manager': '1', 'color': '#1859B7' },
-    { 'id': '7', 'role': 'Design Supervisor', 'manager': '6', 'color': '#2E95D8' },
-    { 'id': '8', 'role': 'Development Supervisor', 'manager': '6', 'color': '#2E95D8' },
-    { 'id': '10', 'role': 'Operations Manager', 'manager': '1', 'color': '#1859B7' },
-    { 'id': '11', 'role': 'Statistics Department', 'manager': '10', 'color': '#2E95D8' },
-    { 'id': '12', 'role': 'Logistics Department', 'manager': '10', 'color': '#2E95D8' },
-    { 'id': '16', 'role': 'Marketing Manager', 'manager': '1', 'color': '#1859B7' },
-    { 'id': '17', 'role': 'Overseas Sales Manager', 'manager': '16', 'color': '#2E95D8' }, 
-    { 'id': '20', 'role': 'Service Department Manager', 'manager': '16', 'color': '#2E95D8' }
+    { 'id': 'parent', 'role': 'Agentur {{request.user.profile.agency.name}}', 'color': '#71AF17' },    
+    {% for u in agencyuser %}
+      {% if u.profile.parent == u %}
+        { 'id': '{{u.pk}}', 'role': '{{u.first_name}} {{u.last_name}}\n{{u.profile.get_func_display}}', 'manager': 'parent', 'color': '#1859B7' },
+      {% else %}
+      { 'id': '{{u.pk}}', 'role': '{{u.first_name}} {{u.last_name}}\n{{u.profile.get_func_display}}', 'manager': '{{u.profile.parent.pk}}', 'color': '#1859B7', "imageUrl": "{{u.profile.image}}" },
+      {% endif %}
+    {% endfor %}
 ];
-
-
-  var items = new ej.data.DataManager(data);
-
+console.log(data)
+var items = new ej.data.DataManager(data);
 var diagram = new ej.diagrams.Diagram({
     width: "1000px",
     height: "600px",
@@ -62,28 +52,59 @@ diagram.appendTo('#diagram');
 
 function nodeDefaults(node) {
     node.annotations[0].style.color = "white";
-    node.width = 120; 
+    node.annotations[0].style.size = "2em";
+    node.width = 220; 
+    node.height = 120; 
     return node;
 }
 
+
+//Define the common settings for connectors.
 function connectorDefaults(connector) {
-    connector.type = 'Orthogonal';
-    connector.targetDecorator = { shape: 'None' };
-    return connector;
+  connector.targetDecorator.shape = 'None';
+  connector.type = 'Orthogonal';
+  connector.style.strokeColor = 'gray';
+  return connector;
 }
 
-
+//Funtion to add the Template of the Node.
+function setNodeTemplate(obj, diagram) {
+    // create the stack panel
+    var content = new ej.diagrams.StackPanel();
+    content.id = obj.id + '_outerstack';
+    content.orientation = 'Horizontal';
+    content.style.strokeColor = 'gray';
+    content.padding = { left: 5, right: 10, top: 5, bottom: 5 };
+  
+    // create the image element to map the image data from the data source
+    var image = new ej.diagrams.ImageElement();
+    image.id = obj.id + '_pic';
+    image.width = 50; image.height = 50; image.style.strokeColor = 'none';
+    image.source = obj.data.imageUrl;
+  
+    // create the stack panel to append the text elements.
+    var innerStack = new ej.diagrams.StackPanel();
+    innerStack.style.strokeColor = 'none';
+    innerStack.margin = { left: 5, right: 0, top: 0, bottom: 0 };
+    innerStack.id = obj.id + '_innerstack';
+  
+    // create the text element to map the name data from the data source
+    var text = new ej.diagrams.TextElement();
+    text.style.bold = true;
+    text.id = obj.id + '_name';
+    text.content = obj.data.name;
+  
+    // create the text element to map the role data from the data source
+    var desigText = new ej.diagrams.TextElement();
+    desigText.id = obj.id + '_desig';
+    desigText.content = obj.data.role;
+  
+    // append the text elements
+    innerStack.children = [text, desigText];
+    
+    // append the image and inner stack elements
+    content.children = [image, innerStack];
+    return content;
+}
 </script>
-
-
-
-
-
-
-
-
-
-
-
-
 {% endblock content %}
\ No newline at end of file
diff --git a/orga/views.py b/orga/views.py
index 378d37d..b142c63 100644
--- a/orga/views.py
+++ b/orga/views.py
@@ -9,22 +9,27 @@ import webcolors
 @login_required
 def mainorga(request):
 
-	leader = list(User.objects.filter(profile__agency__pk=request.user.profile.agency.pk).filter(profile__func='lead'))
-	if len(leader) > 0:
-		leader = leader[0]
-	else:
-		leader = None
-	indoor = list(User.objects.filter(profile__agency__pk=request.user.profile.agency.pk).filter(profile__func='indoor'))
-	external = list(User.objects.filter(profile__agency__pk=request.user.profile.agency.pk).filter(profile__func='external'))
-	trainee = list(User.objects.filter(profile__agency__pk=request.user.profile.agency.pk).filter(profile__func='trainee'))
+	#leader = list(User.objects.filter(profile__agency__pk=request.user.profile.agency.pk).filter(profile__func='lead'))
+	#if len(leader) > 0:
+	#		leader = leader[0]
+	#else:
+	#		leader = None
+
+	agencyuser = list(User.objects.filter(profile__agency__pk=request.user.profile.agency.pk).order_by('-id'))
+
+	#indoor = list(User.objects.filter(profile__agency__pk=request.user.profile.agency.pk).filter(profile__func='indoor'))
+	#external = list(User.objects.filter(profile__agency__pk=request.user.profile.agency.pk).filter(profile__func='external'))
+	#trainee = list(User.objects.filter(profile__agency__pk=request.user.profile.agency.pk).filter(profile__func='trainee'))
 	
 	context = {		
 		'active_link' : 'orga',
-		'leader' : leader,
-		'indoor' : indoor,
-		'external' : external,
-		'trainee' : trainee
+		'agencyuser' : agencyuser
 	}
+	#	'leader' : leader,
+	#	'indoor' : indoor,
+	#	'external' : external,
+	#	'trainee' : trainee
+	
 	
 	return render(request, 'orga/orga_main.html', context)
 
diff --git a/users/__pycache__/views.cpython-38.pyc b/users/__pycache__/views.cpython-38.pyc
index b96a4dfe9773a398e49bc40dbfe307e0bfb4c3e7..3859238042f7ffc9c6169487dd1c75d78b4ef851 100644
GIT binary patch
delta 134
zcmV;10D1q)aLRBERSgXa000007;N!f=dlgE90LIk0kg~;OalQdlNlhO0Vb2WAe8}6
zvrr)y0Rdf;Xd;6FSF`LQzySeiv#lhc0Re!MPA0Pfj<W(M1Ox$;lLssG0k*UJD@p_b
oy|YI!!vp~XvkNsS0~a3>DFOis2NDtp7YGap0tf~OA_xZvM!}~fBLDyZ

delta 134
zcmV;10D1q)aLRBERSgXa00000{A=-D?XeBK90LLl0<+8<OalQflNlhO0VtEYAe8}8
zvrr)y0Rdl=Xd;6FS+ndSzySekv#lhc0Re)OPA0Pfkh20O1Ox$=lLssG0l2gLD@p_b
ozq3a$!vp~ZvkNsS0~a9@DFOis2NDtp7YGap0tf~OA_xZvMmGp0C;$Ke

diff --git a/users/views.py b/users/views.py
index 9313115..5ca26af 100644
--- a/users/views.py
+++ b/users/views.py
@@ -262,9 +262,7 @@ def ProfileUpdateView(request, pk):
 @login_required
 def setuserparent(request):
 	if request.method == 'GET':
-		
-		if request.GET['action'] == 'adduserp':
-			
+		if request.GET['action'] == 'adduserp':			
 			userid = request.GET['objectid']
 			toadd = request.GET['userid']
 			toadd_user = User.objects.get(pk=toadd)