From 69d12f865867a695d72647193d7b3105b8254b47 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Wed, 25 Mar 2020 00:58:15 +0100
Subject: [PATCH] 0.8.2. Zwischencommit Steckbrief Prios fertig Korrektur und
 aufraeumen

---
 areas/__pycache__/views.cpython-38.pyc | Bin 2518 -> 2611 bytes
 areas/views.py                         |  27 +++-------
 orga/templates/orga/orga_single.html   |  71 +++++++++++--------------
 3 files changed, 39 insertions(+), 59 deletions(-)

diff --git a/areas/__pycache__/views.cpython-38.pyc b/areas/__pycache__/views.cpython-38.pyc
index 09ba9ba3d2be6f298fa3f3f7842d6fdaf78f3916..1c2239dcd79ea74925ed2af6e80f22e3298c1d86 100644
GIT binary patch
delta 761
zcmYjO&1=*^6rag%K6f|merR`fKcrSLwyt_m5L*jY!BYimF9BUrCzZ`+H|tAEK_WfW
ztKc$6L9AZt$wN=xya|FQ(L>Ju4_<vU{lE$H%ggWm-fv#!{jMI=?DbN~BDgl*y?C-$
zn%GVHbu$0<5+ke>o*g#bCMABI*=*_+*`;m^<7rlwahq9d#HmdF{4yPysgJyP5FdP@
z3reMhe$W=sL2&ZW;D2*It?|eChxL<Wmh-|e(>D8I;sezAxBN=Af%>el9l@YKdbSlK
ze~!1*2gWS&p9n1RL|vyg|E}IzTt@0CML1qM1{&@a-0>OAq$D7W4wN?(Y>X*W8ieHr
z3XJ)(cJp#KRhZr&X|89bx%Y)VLdo-PQe?(1T@$s3dQ;Y)<{veOy8MSWx093uHPEnF
zMLX>^eW|5dpksj%n1PP=`$xuVuac@q#{0*{BLkz7ID!$pK6@2v*e{$yaEl{<+XLT=
zfcfC+oBfd&MoeBJ%m{&j0=}xZXoH7(r*j@TrwVhzK)7W2AdW_v8b%(Ap};@uGdtjj
zgn42M3qn05z!q>#Kt;e60ab)7KZbtf=x`lBWK*&s<|Q613egQAG7^6{mLs|+YZ9D4
zEQz#)+kz~4cky?6*tK*JBa1I05T!_MI!z5)LA3BO@LiM4><MQna38f!hi@4_wL2JQ
sZC*BOe8arZb&KM_xI2uPAI7q85dN~{zdjC|;UCO-lNJ?)T2~eN4+*lVv;Y7A

delta 629
zcmYk2&ubG=5Xax!?7sbx?6ys!-I}z)nyO1eDWV|u2TF@q!O}|)#>KZvnwYJ#5uq%I
z)QiXPZhBD=#B)6g{s$t69u~oy^w@*<I<vN=?=c@{zHh$F?(9{6R=f?@br_z;>z#Xt
z-pH%-PovhGnaG!}^j@-EzFEV3OpfPyT{`P5m>3=W*!#-cTDgu+m?q310v&u+(j#6`
zpx^aR9<xH&?`Ps+w?B*kCe<%}wc=xcR(uviuRD13G(o+gt{8W$^QeDhu%uoY8{AdD
zjl~-)C_Uha<0CMkSj9;GB2u=+B=2dkj~SQR6q5z42I`wQqk5v*YNwhsr&wC(IBDT+
z@g3vrNqbn5)-GQs_kWL#o&)t+1pK=CBbwDClhK(-jU&^0b<;d2DmW9W>b_YM^xtq+
zy)fsvuRfTK=d&mTWw<~(^=0~25)U$?ABQr5BFRm{9N{A265%o;vqOl&7$k0^MdBF2
zBP<Zggn2}!Z$mc@1YE^pvowfsk7$zNFzmr1bzP$_YZyJ=&Ud>;+R_P@>D8rSontR8
zIiU|@n!`Ol&MjU>I(RLttGO~uwdQDW8~cK3^~L(mZz*N3)PVfCd}>TSa9JJNEnCyL
Ivw$)A52;><VgLXD

diff --git a/areas/views.py b/areas/views.py
index d838559..9fbe650 100644
--- a/areas/views.py
+++ b/areas/views.py
@@ -9,6 +9,7 @@ from django.http import HttpResponse, JsonResponse
 import json
 from django.contrib.auth.decorators import login_required
 from users.priomodel import Prio
+from tasks.models import Tasks
 
 @login_required
 def area_addareas_ajax(request):
@@ -62,7 +63,7 @@ def area_addareas_ajax(request):
 @login_required
 def area_neworder(request):
 	if request.method == 'GET':
-		if request.GET['action'] == 'newareaorder':
+		if request.GET['action'] == 'newareaorder':			
 			neworderdata = json.loads(request.GET['finalod'])
 			for ele in neworderdata:				
 				area = Areas.objects.get(pk=ele['id'])
@@ -75,24 +76,10 @@ def area_neworder(request):
 			neworderdata = json.loads(request.GET['finalod'])
 			for ele in neworderdata:
 				prio = list(Prio.objects.filter(user__pk=request.GET['userid'], task__pk=ele['id']))[0]
-				prio.prio = ele['neworder']
-				prio.save()
-
+				task = Tasks.objects.get(pk=ele['id'])
+				if(task.agency == request.user.profile.agency):					
+					prio.prio = ele['neworder']
+					prio.save()
 			return HttpResponse("UPDATED")
 	else:
-		return HttpResponse("Request method is not a GET")
-
-
-'''
-@login_required
-def UsersPrioUpdate(request):
-	tempuser = User.objects.get(pk=request.GET['userid'])
-	if request.method == 'GET' and tempuser.profile.agency.pk == request.user.profile.agency.pk:
-		prio = Prio.objects.filter(user__pk=request.GET['userid']).filter(task__pk=request.GET['taskid'])
-		prio = list(prio)[0]
-		prio.prio = request.GET['value']
-		prio.save()
-		return HttpResponse("udated...")
-	else:
-		return HttpResponse("Request method is not a GET")
-'''
\ No newline at end of file
+		return HttpResponse("Request method is not a GET")
\ No newline at end of file
diff --git a/orga/templates/orga/orga_single.html b/orga/templates/orga/orga_single.html
index a118247..6d76602 100644
--- a/orga/templates/orga/orga_single.html
+++ b/orga/templates/orga/orga_single.html
@@ -80,46 +80,39 @@
 </div>
 
 <script type="text/javascript">
-
-  var sortstatus = false;
-
-  var sortablearea_ids = [{% for area in areas %} {{area.pk}},{% endfor %}];  
- 
-
-  {% if user|usergperm:"usermanager" %} 
-
+var sortstatus = false;
+var sortablearea_ids = [{% for area in areas %} {{area.pk}},{% endfor %}];  
+{% if user|usergperm:"usermanager" %} 
 
   {% for area in areas %}
-
-
-//Initial function for draggable areas
-$( function() {
-    $( "#sortarea_{{area.pk}}" ).sortable
-    ({
-      axis:"y",
-      update: function( event, ui ) 
-      {
-        datatoserver = [];
-        var rows = $( "#sortarea_{{area.pk}}" ).sortable( "widget" )[0]['children'];
-        for(i = 0; i < rows.length; i++){
-          tempid = rows[i]['id'].split("_")[1];
-          datatoserver.push({"id" : tempid, "neworder" : i});
-        }
-        $.ajax(
-        {
-            type: "GET",
-            url: "/areas/updateorder",
-            data:{
-              action: "newtaskorder",
-              finalod : JSON.stringify(datatoserver),
-              userid : {{user_id}}
-            },
-            success: function( data ){}
-         });        
-         
-    }
-  });
-});
+      //Initial function for draggable areas
+      $( function() {
+          $( "#sortarea_{{area.pk}}" ).sortable
+          ({
+            axis:"y",
+            update: function( event, ui ) 
+            {
+              datatoserver = [];
+              var rows = $( "#sortarea_{{area.pk}}" ).sortable( "widget" )[0]['children'];
+              for(i = 0; i < rows.length; i++){
+                tempid = rows[i]['id'].split("_")[1];
+                datatoserver.push({"id" : tempid, "neworder" : i});
+              }
+              $.ajax(
+              {
+                  type: "GET",
+                  url: "/areas/updateorder",
+                  data:{
+                    action: "newtaskorder",
+                    finalod : JSON.stringify(datatoserver),
+                    userid : {{user_id}}
+                  },
+                  success: function( data ){}
+               });        
+               
+          }
+        });
+      });
 
   {% endfor %}
   function activateChangeTaskOrder(){
@@ -141,7 +134,7 @@ $( function() {
 
   }
 
-  {% endif %}
+{% endif %}
 
 
 </script>