0.8.2. Zwischencommit Steckbrief Prios fertig Korrektur und aufraeumen

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):
@@ -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']
+				task = Tasks.objects.get(pk=ele['id'])
-				prio.save()
+				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")
-'''

orga/templates/orga/orga_single.html

@@ -80,46 +80,39 @@
 </div>
 
 <script type="text/javascript">
-
+var sortstatus = false;
-  var sortstatus = false;
+var sortablearea_ids = [{% for area in areas %} {{area.pk}},{% endfor %}];  
-
+{% if user|usergperm:"usermanager" %} 
-  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>