DigitaleAgentur___ALT
/
digitaleagenturnc
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

0.8.2. Zwischencommit Steckbrief Prios fertig Korrektur und aufraeumen

This commit is contained in:
holger.trampe 2020-03-25 00:58:15 +01:00
parent 9f41152153
commit 69d12f8658
3 changed files with 39 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
areas/__pycache__/views.cpython-38.pyc
View File

Binary file not shown.

27
areas/views.py
View File

@ -9,6 +9,7 @@ from django.http import HttpResponse, JsonResponse
import json import json
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from users.priomodel import Prio from users.priomodel import Prio
from tasks.models import Tasks
@login_required @login_required
def area_addareas_ajax(request): def area_addareas_ajax(request):
@ -62,7 +63,7 @@ def area_addareas_ajax(request):
@login_required @login_required
def area_neworder(request): def area_neworder(request):
if request.method == 'GET': if request.method == 'GET':
if request.GET['action'] == 'newareaorder': if request.GET['action'] == 'newareaorder':
neworderdata = json.loads(request.GET['finalod']) neworderdata = json.loads(request.GET['finalod'])
for ele in neworderdata: for ele in neworderdata:
area = Areas.objects.get(pk=ele['id']) area = Areas.objects.get(pk=ele['id'])
@ -75,24 +76,10 @@ def area_neworder(request):
neworderdata = json.loads(request.GET['finalod']) neworderdata = json.loads(request.GET['finalod'])
for ele in neworderdata: for ele in neworderdata:
prio = list(Prio.objects.filter(user__pk=request.GET['userid'], task__pk=ele['id']))[0] 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") return HttpResponse("UPDATED")
else: else:
return HttpResponse("Request method is not a GET") 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")
'''

71
orga/templates/orga/orga_single.html
View File

@ -80,46 +80,39 @@
</div> </div>
<script type="text/javascript"> <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 %} {% for area in areas %}
//Initial function for draggable areas
$( function() {
//Initial function for draggable areas $( "#sortarea_{{area.pk}}" ).sortable
$( function() { ({
$( "#sortarea_{{area.pk}}" ).sortable axis:"y",
({ update: function( event, ui )
axis:"y", {
update: function( event, ui ) datatoserver = [];
{ var rows = $( "#sortarea_{{area.pk}}" ).sortable( "widget" )[0]['children'];
datatoserver = []; for(i = 0; i < rows.length; i++){
var rows = $( "#sortarea_{{area.pk}}" ).sortable( "widget" )[0]['children']; tempid = rows[i]['id'].split("_")[1];
for(i = 0; i < rows.length; i++){ datatoserver.push({"id" : tempid, "neworder" : i});
tempid = rows[i]['id'].split("_")[1]; }
datatoserver.push({"id" : tempid, "neworder" : i}); $.ajax(
} {
$.ajax( type: "GET",
{ url: "/areas/updateorder",
type: "GET", data:{
url: "/areas/updateorder", action: "newtaskorder",
data:{ finalod : JSON.stringify(datatoserver),
action: "newtaskorder", userid : {{user_id}}
finalod : JSON.stringify(datatoserver), },
userid : {{user_id}} success: function( data ){}
}, });
success: function( data ){}
}); }
});
} });
});
});
{% endfor %} {% endfor %}
function activateChangeTaskOrder(){ function activateChangeTaskOrder(){
@ -141,7 +134,7 @@ $( function() {
} }
{% endif %} {% endif %}
</script> </script>