Aufgeräumt, Kommentare hinzugefügt und auskommentierte Methoden entfernt
This commit is contained in:
parent
59a6903a1b
commit
f727bcb857
Binary file not shown.
|
|
@ -205,19 +205,6 @@ class UsersPermUpdateView(LoginRequiredMixin, View):
|
||||||
|
|
||||||
|
|
||||||
# Benutzerprofil wird aktualisiert
|
# Benutzerprofil wird aktualisiert
|
||||||
'''
|
|
||||||
class ProfileUpdateView(LoginRequiredMixin, UpdateView):
|
|
||||||
model = Profile
|
|
||||||
form_class = UsersAddProfileForm
|
|
||||||
template_name = 'users/profile_update.html'
|
|
||||||
success_url = '/dashboard/usersman/'
|
|
||||||
|
|
||||||
def get_context_data(self, **kwargs):
|
|
||||||
context = super(ProfileUpdateView, self).get_context_data(**kwargs)
|
|
||||||
context['active_link'] = 'usersmanagement'
|
|
||||||
return context
|
|
||||||
|
|
||||||
'''
|
|
||||||
@login_required
|
@login_required
|
||||||
def ProfileUpdateView(request, pk):
|
def ProfileUpdateView(request, pk):
|
||||||
prof_user = User.objects.get(profile__pk=pk)
|
prof_user = User.objects.get(profile__pk=pk)
|
||||||
|
|
@ -376,7 +363,12 @@ def UsersPrio(request, pk):
|
||||||
}
|
}
|
||||||
|
|
||||||
return render(request, 'users/users_prio.html', context)
|
return render(request, 'users/users_prio.html', context)
|
||||||
|
'''
|
||||||
|
|
||||||
|
Ajax-Call für Prio.Updates seitens des Users
|
||||||
|
im Profil
|
||||||
|
|
||||||
|
'''
|
||||||
def UsersPrioUpdate(request):
|
def UsersPrioUpdate(request):
|
||||||
tempuser = User.objects.get(pk=request.GET['userid'])
|
tempuser = User.objects.get(pk=request.GET['userid'])
|
||||||
if request.method == 'GET' and tempuser.profile.agency.pk == request.user.profile.agency.pk:
|
if request.method == 'GET' and tempuser.profile.agency.pk == request.user.profile.agency.pk:
|
||||||
|
|
@ -416,7 +408,12 @@ def searchStandardRouter(request):
|
||||||
return redirect('/standards/standard/'+request.GET['s_id']+'/single')
|
return redirect('/standards/standard/'+request.GET['s_id']+'/single')
|
||||||
else:
|
else:
|
||||||
return redirect('dashboard')
|
return redirect('dashboard')
|
||||||
|
'''
|
||||||
|
|
||||||
|
Hier werden die Zuständigkeiten eines Benutzers über alle Bereiche/Aufgaben hinweg gesetzt.
|
||||||
|
Das Update erfolgt per Booleanfields.
|
||||||
|
|
||||||
|
'''
|
||||||
def UsersAreaTaskUpdate(request, pk):
|
def UsersAreaTaskUpdate(request, pk):
|
||||||
|
|
||||||
user = User.objects.get(pk=pk)
|
user = User.objects.get(pk=pk)
|
||||||
|
|
@ -434,10 +431,11 @@ def UsersAreaTaskUpdate(request, pk):
|
||||||
areatask_formdata = list(form)
|
areatask_formdata = list(form)
|
||||||
# CRSF-Token löschen
|
# CRSF-Token löschen
|
||||||
del areatask_formdata[0]
|
del areatask_formdata[0]
|
||||||
|
# Formular übertragen
|
||||||
area_ids = []
|
area_ids = []
|
||||||
task_ids = []
|
task_ids = []
|
||||||
|
|
||||||
|
# Areas in Formular laden
|
||||||
for ar in areatask_formdata:
|
for ar in areatask_formdata:
|
||||||
tempdata = ar.split("_")
|
tempdata = ar.split("_")
|
||||||
if(tempdata[0] == 'area'):
|
if(tempdata[0] == 'area'):
|
||||||
|
|
@ -445,9 +443,11 @@ def UsersAreaTaskUpdate(request, pk):
|
||||||
elif(tempdata[0] == 'task'):
|
elif(tempdata[0] == 'task'):
|
||||||
task_ids.append(int(tempdata[1]))
|
task_ids.append(int(tempdata[1]))
|
||||||
|
|
||||||
|
# Alle Areas und Tasks laden
|
||||||
areas = Areas.objects.filter(agency__pk=user.profile.agency.pk)
|
areas = Areas.objects.filter(agency__pk=user.profile.agency.pk)
|
||||||
tasks = Tasks.objects.filter(agency__pk=user.profile.agency.pk)
|
tasks = Tasks.objects.filter(agency__pk=user.profile.agency.pk)
|
||||||
|
|
||||||
|
# Prüfen, ob der User in Area ist oder nicht und ihn ggf. hinzufügen/entfernen
|
||||||
for area in areas:
|
for area in areas:
|
||||||
if area.pk in area_ids:
|
if area.pk in area_ids:
|
||||||
area.usersfield.add(user)
|
area.usersfield.add(user)
|
||||||
|
|
@ -455,6 +455,15 @@ def UsersAreaTaskUpdate(request, pk):
|
||||||
area.usersfield.remove(user)
|
area.usersfield.remove(user)
|
||||||
area.save()
|
area.save()
|
||||||
|
|
||||||
|
'''
|
||||||
|
|
||||||
|
Prüfen, ob ein User einem Aufgabenbereich hinzugeprdnet ist.
|
||||||
|
Ist er im Bereich, passiert nichts. Ist er nicht in diesem
|
||||||
|
Bereich, wird er dem usersfield der Aufgabe und der Tabelle
|
||||||
|
Prio hinzugeüfügt. Damit kann der User seine individuellen
|
||||||
|
Prios im Profil anpassen.
|
||||||
|
|
||||||
|
'''
|
||||||
for task in tasks:
|
for task in tasks:
|
||||||
if task.pk in task_ids:
|
if task.pk in task_ids:
|
||||||
prio_check = Prio.objects.filter(user__pk=pk, task=task)
|
prio_check = Prio.objects.filter(user__pk=pk, task=task)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue