From 97e7a1ce8ffebcc31222ff611245e9d488f63e1f Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Fri, 24 Apr 2020 10:31:33 +0200
Subject: [PATCH] DynStandard LoggedUserBug behoben

---
 .../__pycache__/settings.cpython-38.pyc       | Bin 3946 -> 3946 bytes
 orga/templates/orga/orga_single.html          |  11 +++--
 .../__pycache__/counter_tag.cpython-38.pyc    | Bin 6315 -> 6262 bytes
 standards/templatetags/counter_tag.py         |  44 +++++++++---------
 4 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc
index 898d79acc502cca8017963e12425cd54479f12ca..3e03d8dd221edca411932aafa2b5b0366e9ce015 100644
GIT binary patch
delta 19
ZcmaDQ_ezc{l$V!_0SL}6-pG}}4*)lm1ug&p

delta 19
ZcmaDQ_ezc{l$V!_0SFe(+{l%{4*)h=1o!{|

diff --git a/orga/templates/orga/orga_single.html b/orga/templates/orga/orga_single.html
index 597b684..e604503 100644
--- a/orga/templates/orga/orga_single.html
+++ b/orga/templates/orga/orga_single.html
@@ -69,7 +69,7 @@
 
     {% if request.user.profile.agency.dynamicprofile %}
 
-     als <span id="view_info_0">Verantwortlicher</span>
+     als <span id="view_info_0" style="display: none;">Verantwortlicher</span>
      <span id="view_info_1" style="display: none;">Ausführender</span>
      <span id="view_info_2" style="display: none;">Vertreter</span>
      {% endif %}
@@ -90,21 +90,21 @@
             {% if request.user.profile.agency.dynamicprofile %}
               
             {% for task in tasks %}
-                {% isUserInAuth task area request.user as checkIsUserAuth %}
+                {% isUserInAuth task area user_id as checkIsUserAuth %}
                 {% if task.area.pk == area.pk and task.visible and checkIsUserAuth %}
                 <div style="display: none; background-color: rgba({{area.color.0}},{{area.color.1}},{{area.color.2}}, 1)" class="mb-2 pt-3 pb-1 view_0" id="ele_{{task.pk}}">
                  <span ><h6 ><a style=" color: #FFFFFF;"href="{% url 'standard-task' task.pk %}"><span class="arrows_area_{{area.pk}} ml-4" style="display:none; float: left;"><i class="fas fa-sort"></i></span>{{task.name}}</a></h6></span>
                 </div>
                 {% endif %}
 
-                {% isUserInEx task area request.user as checkIsUserEx %}
+                {% isUserInEx task area user_id as checkIsUserEx %}
                 {% if task.area.pk == area.pk and task.visible and checkIsUserEx %}
                 <div style="display: none; background-color: rgba({{area.color.0}},{{area.color.1}},{{area.color.2}}, 1)" class="mb-2 pt-3 pb-1 view_1" id="ele_{{task.pk}}">
                  <span ><h6 ><a style=" color: #FFFFFF;"href="{% url 'standard-task' task.pk %}"><span class="arrows_area_{{area.pk}} ml-4" style="display:none; float: left;"><i class="fas fa-sort"></i></span>{{task.name}}</a></h6></span>
                 </div>
                 {% endif %}
 
-                {% isUserInRep task area request.user as checkIsUserRep %}
+                {% isUserInRep task area user_id as checkIsUserRep %}
                 {% if task.area.pk == area.pk and task.visible and checkIsUserRep %}
                 <div style="display: none; background-color: rgba({{area.color.0}},{{area.color.1}},{{area.color.2}}, 1)" class="mb-2 pt-3 pb-1 view_2" id="ele_{{task.pk}}">
                  <span ><h6 ><a style=" color: #FFFFFF;"href="{% url 'standard-task' task.pk %}"><span class="arrows_area_{{area.pk}} ml-4" style="display:none; float: left;"><i class="fas fa-sort"></i></span>{{task.name}}</a></h6></span>
@@ -204,7 +204,8 @@ $( document ).ready(function() {
       }
 
 
-      $(document).find(".view_0").show();
+      $(document).find(".view_1").show();
+      $(document).find("#view_info_1").show();
     
 });
 
diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index 59ca8c15e61299e01184846e6113331401ecd1fa..c6cff322df61a114d890e216cf4286647cc6ebc0 100644
GIT binary patch
delta 603
zcmZ2&_|1SXl$V!_0SM+UUKHmbxsmUra6KE4>kP!j4nU%WA&W7KsfH<qv6r!yxr7<W
zW2s@zV$EW!VW?rOVNPdEVd`b6Wl3SKWi4T^VQFSeVaaAGvPogBWvyWiX3%8wD>4F_
zqsda_3Z!nalq42s-(pEDN==O7O)M?R$S=w)sf>@$%yTPZ1S$ww>BLdQ0%R1)fe3jJ
z!3iRCfW$5Kf};Gi%$!uPSw-4Fp_Ob!*&yj0uykp0YEgV<%H#<mqLWvOC<*ZZMH!g+
zn57t5n0SD=sA%#-5fPgD5aFCCp45ue<kFJ-A|&q><pLeVP?SHpS5z71JQgV?sPl^H
z={%vL)Pkba;?%s7#FEUiRJbEK8A3p=1Ua%&OkVsqkXeiokR_Wpi+M6~7lG6jgNTyJ
PiYyY7<s~|q1y~pXZwiB_

delta 673
zcmexnu-cF>l$V!_0SJDmEs8Uj*vNNMxSkcrbq3;MHy}~Mkj0qARKt|ToW)YZP{WwQ
z*vnkYoWfMgQp4=R5UW(nTEkSsn#H<+Z6QN8TajD}b1h2=dkRZ4BO?PNL!nclTn$Sw
zgC?urO6DS0pn11gN)n5+Z?Pm6r6#(CRB<_mhIlBr`G@+sXmS*B0u>Ym%YjH8kXrVF
zqWrYXoK%QT&cxD^jQpa^lFA}QkSuFKQD$DrO17dLkcM0kp#&tN*o#ZzK}v72rsbFB
zrQBjFE}6VmL`h5lD9OMi#>B$J!N|wR!pOnM##B@?`Jspijl5ix4YUyGNe<TtR4>AP
zSd<4;QRFHKByVw~R-`7EmgE<KeOFWfk|~^AE~<>(;bnAiIA@S+0A80XfTNVJD7By{
zwKz4eB(Ws3EEUE59%Ay+KY?B;#v1w+o9o0p8M#Y9ek}tL6_XWNBqqNS?_}m<VFUoo
CxRb5`

diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py
index a341a8d..5753233 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -218,44 +218,46 @@ def getifuserdidcomment(standard, user):
 
 
 @register.simple_tag
-def isUserInAuth(task, area, user):
-	st_auth = Standards.objects.filter(agency=user.profile.agency, task=task, area=area)
+def isUserInAuth(task, area, user_id):
 
+	user = User.objects.get(pk=user_id)
+
+	#st_auth = Standards.objects.filter(agency=user.profile.agency, task=task, area=area)
+	st_auth = Standards.objects.filter(agency=user.profile.agency, task=task, area=area, authority__in=[user])
 	found = False
 
-	for st in st_auth:
-		if user in st.authority.all():
-			found = True
-			print("AUTH FOUND")
-			break
+	if len(st_auth) > 0:
+		found = True
 		
 	return found
 
 @register.simple_tag
-def isUserInEx(task, area, user):
-	st_auth = Standards.objects.filter(agency=user.profile.agency, task=task, area=area)
+def isUserInEx(task, area, user_id):
+
+	user = User.objects.get(pk=user_id)
+
+
+	#st_auth = Standards.objects.filter(agency=user.profile.agency, task=task, area=area)
+	st_auth = Standards.objects.filter(agency=user.profile.agency, task=task, area=area, executor__in=[user])
 
 	found = False
 
-	for st in st_auth:
-		if user in st.executor.all():
-			found = True
-			print("EX FOUND")
-			break
+	if len(st_auth) > 0:
+		found = True
 		
 	return found
 
 	
 @register.simple_tag
-def isUserInRep(task, area, user):
-	st_auth = Standards.objects.filter(agency=user.profile.agency, task=task, area=area)
+def isUserInRep(task, area, user_id):
 
+	user = User.objects.get(pk=user_id)
+
+	#st_auth = Standards.objects.filter(agency=user.profile.agency, task=task, area=area)
+	st_auth = Standards.objects.filter(agency=user.profile.agency, task=task, area=area, representative__in=[user])
 	found = False
 
-	for st in st_auth:
-		if user in st.representative.all():
-			found = True
-			print("REP FOUND")
-			break
+	if len(st_auth) > 0:
+		found = True
 
 	return found
\ No newline at end of file