From eb06b38d0a4fb1e4d772fd9f7828dfed0a9f75cc Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Thu, 12 Dec 2019 10:56:55 +0100
Subject: [PATCH] =?UTF-8?q?GitIgnore=20hinzugef=C3=BCgt=20um=20sicherzuste?=
 =?UTF-8?q?llen,=20dass=20die=20Ordner=20MIGRATIONS=20nicht=20mehr=20?=
 =?UTF-8?q?=C3=BCberschrieben=20werden.=20Damit=20sollte=20das=20anpassen?=
 =?UTF-8?q?=20der=20Datenbank=20mit=20makemigrations=20und=20migrate=20aus?=
 =?UTF-8?q?reichen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 orga/templates/orga/orga_main.html            |  87 ++++++++++++++++--
 .../__pycache__/0001_initial.cpython-38.pyc   | Bin 870 -> 1353 bytes
 users/__pycache__/views.cpython-38.pyc        | Bin 14410 -> 14410 bytes
 .../users/profile_update_DONTKNOW.html        |  61 ------------
 users/views.py                                |  13 +--
 5 files changed, 83 insertions(+), 78 deletions(-)
 delete mode 100644 users/templates/users/profile_update_DONTKNOW.html

diff --git a/orga/templates/orga/orga_main.html b/orga/templates/orga/orga_main.html
index 533a3f4..b83c6e8 100644
--- a/orga/templates/orga/orga_main.html
+++ b/orga/templates/orga/orga_main.html
@@ -11,16 +11,15 @@
 <script type="text/javascript">
 
 var data = [
-    { 'id': 'parent', 'role': 'Agentur {{request.user.profile.agency.name}}', 'color': '#71AF17' },    
+    { 'id': 'parent', 'role': "", 'name': 'Agentur {{request.user.profile.agency.name}}', 'color': '#71AF17', "imageUrl": "{{ request.user.profile.agency.agencypic.url }}",  },    
     {% 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' },
+        { 'id': '{{u.pk}}' , 'name': "{{u.first_name}} {{u.last_name}}",'role': '{{u.profile.get_func_display}}\n{{u.profile.compfunc}}', 'manager': 'parent', 'color': '#1859B7', "imageUrl": "{{u.profile.image.url}}" },
       {% 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}}" },
+      { 'id': '{{u.pk}}', 'name': "{{u.first_name}} {{u.last_name}}", 'role': '{{u.profile.get_func_display}}\n{{u.profile.compfunc}}', 'manager': '{{u.profile.parent.pk}}', 'color': '#1859B7', "imageUrl": "{{u.profile.image.url }}" },
       {% endif %}
     {% endfor %}
-];
-console.log(data)
+];/*
 var items = new ej.data.DataManager(data);
 var diagram = new ej.diagrams.Diagram({
     width: "1400px",
@@ -52,7 +51,7 @@ diagram.appendTo('#diagram');
 
 function nodeDefaults(node) {
     node.annotations[0].style.color = "white";
-    node.annotations[0].style.size = "2em";
+    node.annotations[0].style.font = "2em";
     node.width = 220; 
     node.height = 120; 
     return node;
@@ -68,6 +67,7 @@ function connectorDefaults(connector) {
 }
 
 //Funtion to add the Template of the Node.
+
 function setNodeTemplate(obj, diagram) {
     // create the stack panel
     var content = new ej.diagrams.StackPanel();
@@ -106,5 +106,80 @@ function setNodeTemplate(obj, diagram) {
     content.children = [image, innerStack];
     return content;
 }
+*/
+
+
+var items = new ej.data.DataManager(data);
+
+var diagram = new ej.diagrams.Diagram({
+  width: "1000px", height: "600px",
+  dataSourceSettings: {
+    // set the unique field from data source
+    id: 'id',
+    // set the field which is used to identify the reporting person
+    parentId: 'manager',
+    // define the employee data
+    dataManager: items
+  },
+  layout: {
+    // set the layout type
+    type: 'OrganizationalChart',
+  },
+  getConnectorDefaults: connectorDefaults,
+  setNodeTemplate: setNodeTemplate,
+  // hide the gridlines in the diagram
+  snapSettings: { constraints: ej.diagrams.SnapConstraints.None }
+});
+diagram.appendTo('#diagram');
+
+//Define the common settings for connectors.
+function connectorDefaults(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.fontSize = 16;
+    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/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc b/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc
index f5756a29b2338400a9a013e9ab993ea681e06d26..f537c945302fd3efe7de8c133fe753b5106ea13d 100644
GIT binary patch
literal 1353
zcmZ8hOOM+&5Ed!Pl5Basn{_t(=;Kzv7h{Xw(xQlC?<PUJn<DGI2o4C^q!nsq$tC3^
z-eZ!h|3iE1q4)lT{svwP6v(xg0tNaQ($1?QG@2RC^BYo^&1T(!=SB3#<DY%U`OOIL
zKOP8o;8k~lFo&VsNz51LXoeGv4DaUd%uBqPpZHcrc`XU<Im~1JD~I{q%fgp#5;An*
zbZW05j&t5YI#j%>M3Jfv*7cc4C9OnRC|#SCjOS`%?B0L2LAV32`W*;&62zPYGnBXt
zGnacm_`H?{KcW;eLB_~r=k=_?5Ud&tSh(`0m_?wAS)Dalyuu(iL2iP@7He5~8{{p9
zcq`k^cG!;9-2mMUu-RQ9@Mwdy%iGz_te)*<x7ba#XRU7iPrtv>AAF$SH&t$S4q@j2
z;vQMuM=N)V(};b%!YN7)*(ZS3r#d=&gUk?c@~Pxh>4=c2kg6iY=oX4gB?CZ3`$MX(
zl*WRcYW!f(@pMcVRY@k`R&k~qb17z2F3A;N>InP<&BZm>@l!6xrQ)QZGp;>Lo!7rY
zNJtPcKBbGif+^AGB<Dq1J<%THY9fAVSPOrg)8b0DO$j@jT*Q=07^LlBxd%IP*K7w*
zg%abOchFj{(UcdH<#lYk==Q7xNu#nLa140GHLgnSnP}Gy+kUraL1=xDXuQ;Q8)7PW
z&UDlAL=>a~L^`gmK*y5j1_#@wJhJUcbFOsFx~cQdkq(L7CPdc>fwQ>CIq)$d-!Eux
zkO3(Wg{S~K=^E#@dPe7S3SB|Tb6zmhk;G=J)w>+tCzlr|kI31>!O6EeerqAP(v7|y
z%$Ygy(p)ti^<ZA7wuh+ygvt#&<j<=OJAe+>Y-rG}gqfJ(v|p8sE_HmjEOSnawNd@F
zlw736H!$%U%V?378ndwuExK^ybkOfz^m~I79enrb;qatC)U7jGEQh6`n;_+!Z|>($
zj=T+pTJqO<|Muw89KX^1GEcc24a&)4#*0dg?mZZem`FuMp%$2GwU8q-3pILo*GI?4
z$DhNHESBB*Qo<j|iQrYA0SU3^VuVrsZ!ho=#%;6>tBtnMKCDC3{uBS>{cC+Xk?ewp
zZmb*ZPRe4s9ze9wu(6%h8svkw%I^AS(|rSm`~t$*kng%&b6=YH;aBSe@wJ(|3W0<u
IhN43EKS%tIXaE2J

delta 466
zcmX9&Jx}965Z#$wJI;q4lZy~YS0E&~vk?3MKqn-Mt4PB~vC<WR*;uxm1g!%F4F$9=
zkQ@FI4L=}1;1K22C*3h?b~JD1Jw3ghm(FiLIuFB+;P?FY=a-aE(bxSwW+Vs-q20s+
zrl@f$wFL1~kR<geNEyu4gVc)PR3zTJix@pUe!F*JN8IHdgAp1?Xe7`w6<QfD_X$aw
zRvr*=De}m#)C8%;TAKoDQ>Q}aUFIEj^eAk2#Jo#jdU=>f)NizywLW`RDwtsE(V)WB
z6m(2q_@?2qeUhbiyvXLWv-%b8A+ATbzBAyvY@cD-y3NY$vM>oWJVD!YvOmd8LFFh}
zsRwd*bJ-(vZDwR<SD7g-I!pK1n(@M%%*hm1)|I@dzpK#Sa?xA$fjYZYytcT@HHH8c
zDy0B%2r<_XqQCf0{kP7Qcy@!wvQ7DTmd^L+viZYG78`^8jCHixww*gToX+W{Fh88F
JbU6XU@&k2|V%q=!

diff --git a/users/__pycache__/views.cpython-38.pyc b/users/__pycache__/views.cpython-38.pyc
index dcfeadbeb4ddd34e42573dd063179dda6e442a78..79d49d9443412920fcf0abbcd816dad617f05aeb 100644
GIT binary patch
delta 229
zcmV<B02=?waLRBERSgXa00000DhTpj(y<K;3IPSP8VU#j0X(xK3w!|qR+FF%Z~;)W
z5e+E;0co>44l)7(Zj){hBLN7Lk`QSDW3&7aoB;uXvzZbd0Rfz|w-a>%0j;ww6_f%2
zvy;LXg#o6sNEp!p0ok(}8lwUM0kggwS_1(mlNlhO0U?vRAe8}1vrr)y0RdQ(Xd;6F
zQnTzLzySedv#lhc0RelHPA0PfiL(MH1Ox$(lLsp^0RoddE5HG*v-~Sc1Oc?OM=-+#
f0{Q{73^fk}2^j(b3KJ3&5+9Q!I3Wcd2nPs8uunk>

delta 229
zcmV<B02=?waLRBERSgXa00000tmW}t=dle83IPhU8VU#j0Y0-M3w!|qSd*X(Z~;=Y
z5e+E;0c*264l)7(aFcEjBLNGOk`QSDWwZPcoB;ucvzZbd0Rf@2w-a>%0kX3#6_f%2
zxRb&cg#oLxNEp!p0p7D38lwUM2D82#S_1(rlNlhO0Vb2WAe8}6vrr)y0Rdf;Xd;6F
zSF`LQzySeiv#lhc0Re!MPA0Pfj<W(M1Ox$;lLsp^0S1#hE5HG^v-~Sc1OdIXM=-+#
f0s{iG3^fk}2^#_d3KJ3&5+ai%I3Wch2nPs80GC1v

diff --git a/users/templates/users/profile_update_DONTKNOW.html b/users/templates/users/profile_update_DONTKNOW.html
deleted file mode 100644
index 4489168..0000000
--- a/users/templates/users/profile_update_DONTKNOW.html
+++ /dev/null
@@ -1,61 +0,0 @@
-{% extends "users/base.html" %}
-{% load crispy_forms_tags %}
-{% block content %}
-    <div class="content-section">
-      <div class="media">
-        <img class="img-profile " width="17%" src="{{ user.image.url }}">
-        <div class="media-body col-5">
-          <h2 class="account-heading">ddddProfil von {{ user.first_name }} {{ user.last_name }}</h2>
-          <hr>
-          <div class="row mt-2">
-                  <div class="col-md-6">
-                      <h6><b>Name</b></h6>
-                      <p>
-                          {{ user.first_name}} {{ user.last_name }}
-                      </p>
-                      <h6><b>E-Mail</b></h6>
-                      <p>
-                         {{ user.email }}
-                      </p>
-                      <h6><b>Agenturfunktion</b></h6>
-                      <p>
-                          {{ get_func_display }}
-                      </p>                      
-                  </div>
-                  <div class="col-md-6">
-                      <h6><b>Tätigkeit</b></h6>
-                      <p>
-                          {{ compfunc }}
-                      </p>
-                      <h6><b>Fesetznetz</b></h6>
-                      <p>
-                          {{ phoneland }}
-                      </p>
-                      <h6><b>Mobil</b></h6>
-                      <p>
-                          {{ phonemobile }}
-                      </p>                            
-                  </div>
-             </div>
-          </div>
-      </div>
-      <!-- Für das Speichern der Bilder enctype -->
-      <div class="col-7 mt-5">
-      <form method="POST" enctype="multipart/form-data">
-        {% csrf_token %}
-        <fieldset class="form-group">
-          <legend class="border-bottom mb-4">
-            Profil bearbeiten
-          </legend>
-          <!-- FORMS LADEN -->          
-          {{ profileform_form|crispy }}
-        </fieldset>
-        <hr>
-        <div class="form-group">
-          <button type="submit" class="btn btn-success">Speichern</button>&nbsp;
-          <a href="{% url 'usersmanagement' %}" class="btn">Abbrechen</a>
-        </div>
-      </form>
-    </div>
-    </div>
-{% endblock content %}
\ No newline at end of file
diff --git a/users/views.py b/users/views.py
index 5ca26af..2ef9fde 100644
--- a/users/views.py
+++ b/users/views.py
@@ -55,9 +55,7 @@ class AgencyCreateView(CreateView):
 		    html_message=msg_html,
 		    fail_silently=False
 		)
-		return super().form_valid(form)
-
-    
+		return super().form_valid(form)    
 
 @login_required
 def dashboard(request):
@@ -69,7 +67,7 @@ def dashboard(request):
 	# Loading only user same agency
 	# Change context and return for template-data
 	#	# Get all Users of the Same Agency as logged user
-	standards_of_agency = Standards.objects.filter(agency__pk=request.user.profile.agency.pk).filter(public=True).order_by('-created_standard_date')[:10] 
+	standards_of_agency = Standards.objects.filter(agency__pk=request.user.profile.agency.pk).filter(public=True).order_by('-created_standard_date')[:5] 
 	
 	filterdate = datetime.now()
 	news = News.objects.filter(agency__pk=request.user.profile.agency.pk).filter(go_online_on__lt=filterdate).filter(go_offline_on__gt=filterdate).order_by('-go_online_on')[:4]
@@ -126,9 +124,6 @@ class UsersCreateUser(LoginRequiredMixin, CreateView):
 		    html_message=msg_html,
 		    fail_silently=False,
 		)
-
-		
-
 		return super().form_valid(form)
 
 # USER muss eingeloggt sein, um diese Seite zu sehen
@@ -426,10 +421,6 @@ def GlobalSearch(request):
 			final_results_st.append(tempele)
 			i += 1
 
-
-
-
-
 		return JsonResponse({'standards' : final_results_st})
 	else:
 		return HttpResponse("Request method is not a GET")