diff --git a/areas/templates/areas/areas_update.html b/areas/templates/areas/areas_update.html index 9ba7364..aae7a6f 100644 --- a/areas/templates/areas/areas_update.html +++ b/areas/templates/areas/areas_update.html @@ -125,7 +125,7 @@ } else{ tempid = null; - $("#addusertoareabtn").prop('disabled', true); + $("#addusertoareabtn").prop("disabled", true); } } diff --git a/orga/__pycache__/views.cpython-38.pyc b/orga/__pycache__/views.cpython-38.pyc index fc75078..f175d9a 100644 Binary files a/orga/__pycache__/views.cpython-38.pyc and b/orga/__pycache__/views.cpython-38.pyc differ diff --git a/orga/views.py b/orga/views.py index a87b8fc..7e73755 100644 --- a/orga/views.py +++ b/orga/views.py @@ -41,33 +41,42 @@ def singleorga(request, pk): VON GROß NACH KLEIN - SINNLOS prios = Prio.objects.filter(user__pk=pk).order_by('-prio')[::-1] ''' - prios = Prio.objects.filter(user__pk=pk).order_by('-prio') - areas = list(Areas.objects.filter(agency__pk=request.user.profile.agency.pk).order_by('areaorder')) - i = 0 - for area in areas: - areas[i].hex = areas[i].color - areas[i].color = list(webcolors.hex_to_rgb(areas[i].color)) - i += 1 + ''' + + Wenn eingelogger Nutzer nicht die gleiche Agency-ID hat, + gehts zum Dashboard - user_first_name = user.first_name - user_last_name = user.last_name - user_id = user.pk - context = { - 'active_link' : 'orga', - 'areas' : areas, - 'user_first_name' : user_first_name, - 'user_last_name' : user_last_name, - 'user_id' : user_id, - 'prios' : prios, - 'mail' : user.email, - 'userfunc' : user.profile.get_func_display, - 'imageurl' : user.profile.get_photo_url, - 'compfunc' : user.profile.compfunc, - 'phoneland' : user.profile.phoneland, - 'phonemobile' : user.profile.phonemobile - } - return render(request, 'orga/orga_single.html', context) + ''' + if(user.profile.agency.pk==request.user.profile.agency.pk): + prios = Prio.objects.filter(user__pk=pk).order_by('-prio') + areas = list(Areas.objects.filter(agency__pk=request.user.profile.agency.pk).order_by('areaorder')) + i = 0 + for area in areas: + areas[i].hex = areas[i].color + areas[i].color = list(webcolors.hex_to_rgb(areas[i].color)) + i += 1 + + user_first_name = user.first_name + user_last_name = user.last_name + user_id = user.pk + context = { + 'active_link' : 'orga', + 'areas' : areas, + 'user_first_name' : user_first_name, + 'user_last_name' : user_last_name, + 'user_id' : user_id, + 'prios' : prios, + 'mail' : user.email, + 'userfunc' : user.profile.get_func_display, + 'imageurl' : user.profile.get_photo_url, + 'compfunc' : user.profile.compfunc, + 'phoneland' : user.profile.phoneland, + 'phonemobile' : user.profile.phonemobile + } + return render(request, 'orga/orga_single.html', context) + else: + return redirect('users-dashboard') diff --git a/users/__pycache__/views.cpython-38.pyc b/users/__pycache__/views.cpython-38.pyc index c8d9dee..23973ea 100644 Binary files a/users/__pycache__/views.cpython-38.pyc and b/users/__pycache__/views.cpython-38.pyc differ diff --git a/users/templates/users/base.html b/users/templates/users/base.html index 1c5d7e2..a7874e5 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -197,17 +197,18 @@
- + - + +
@@ -262,6 +263,8 @@ {% endfor %} {% endif %} +
+
{% block content %} {% endblock %} @@ -320,6 +323,17 @@ diff --git a/users/templates/users/dashboard.html b/users/templates/users/dashboard.html index 228b629..a153ad9 100644 --- a/users/templates/users/dashboard.html +++ b/users/templates/users/dashboard.html @@ -9,7 +9,7 @@
-
+
News
@@ -30,14 +30,14 @@
-
+
-
+
Neueste Standards
diff --git a/users/templates/users/searchres.html b/users/templates/users/searchres.html new file mode 100644 index 0000000..e03c17f --- /dev/null +++ b/users/templates/users/searchres.html @@ -0,0 +1,42 @@ +
+

Suchergebnisse

+
+

Standards

+ {% if res_standard|length > 0 %} + {% for s in res_standard %} + {{s.name|striptags}} | {{s.content|truncatechars:125|striptags}}

+ {% endfor %} + {% else %} +

Keine Ergebnisse in Standards

+ {% endif %} + +
+

Bereiche

+ {% if res_areas|length > 0 %} + {% for s in res_areas %} + {{s.name|striptags}}

+ {% endfor %} + {% else %} +

Keine Ergebnisse in Bereichen

+ {% endif %} + +
+

Aufgaben

+ {% if res_tasks|length > 0 %} + {% for s in res_tasks %} + {{s.name|striptags}}

+ {% endfor %} + {% else %} +

Keine Ergebnisse in Aufgaben

+ {% endif %} + +
+

Personen

+ {% if res_pers|length > 0 %} + {% for s in res_pers %} + {{s.first_name}} {{s.last_name}}

+ {% endfor %} + {% else %} +

Keine Ergebnisse in Personen

+ {% endif %} +
diff --git a/users/views.py b/users/views.py index 04abfe9..895cd60 100644 --- a/users/views.py +++ b/users/views.py @@ -22,6 +22,8 @@ import json from PIL import Image from django.template.loader import render_to_string from django.contrib.auth.forms import PasswordResetForm +from django.template.loader import render_to_string + ''' DASHBOARD-View @@ -399,8 +401,11 @@ def GlobalSearch(request): searchfor = request.GET['searchstring'] results = {} ag = request.user.profile.agency.pk - results = Standards.objects.filter(agency__pk=ag, public=True).filter(name__icontains=searchfor) | Standards.objects.filter(agency__pk=ag, public=True).filter(content__contains=searchfor) | Standards.objects.filter(agency__pk=ag, public=True).filter(area__name__icontains=searchfor) | Standards.objects.filter(agency__pk=ag, public=True).filter(task__name__icontains=searchfor) | Standards.objects.filter(agency__pk=ag, public=True).filter(created_standard_by__last_name__icontains=searchfor)|Standards.objects.filter(agency__pk=ag, public=True).filter(created_standard_by__first_name__icontains=searchfor) - + res_standard = Standards.objects.filter(agency__pk=ag, public=True).filter(name__icontains=searchfor) | Standards.objects.filter(agency__pk=ag, public=True).filter(content__contains=searchfor) | Standards.objects.filter(agency__pk=ag, public=True).filter(area__name__icontains=searchfor) | Standards.objects.filter(agency__pk=ag, public=True).filter(task__name__icontains=searchfor) | Standards.objects.filter(agency__pk=ag, public=True).filter(created_standard_by__last_name__icontains=searchfor)|Standards.objects.filter(agency__pk=ag, public=True).filter(created_standard_by__first_name__icontains=searchfor) + res_areas = Areas.objects.filter(agency__pk=ag).filter(name__icontains=searchfor) + res_tasks = Tasks.objects.filter(agency__pk=ag).filter(name__icontains=searchfor) |Tasks.objects.filter(agency__pk=ag).filter(area__name__icontains=searchfor) + res_pers = User.objects.filter(profile__agency__pk=ag).filter(first_name__icontains=searchfor) | User.objects.filter(profile__agency__pk=ag).filter(last_name__icontains=searchfor) + ''' results_st = list(results) final_results_st = [] i = 0 @@ -418,8 +423,10 @@ def GlobalSearch(request): tempele['last_modified_on'] = formats.date_format(ele.last_modified_on, "d.m.Y") final_results_st.append(tempele) i += 1 - - return JsonResponse({'standards' : final_results_st}) + ''' + #return JsonResponse({'standards' : final_results_st}) + html = render_to_string('users/searchres.html', {'res_standard': res_standard, 'res_areas': res_areas, 'res_tasks': res_tasks, 'res_pers': res_pers}) + return HttpResponse(html) else: return HttpResponse("Request method is not a GET") @@ -430,10 +437,8 @@ def searchStandardRouter(request): else: return redirect('dashboard') - def UsersAreaTaskUpdate(request, pk): - user = User.objects.get(pk=pk) if request.user.profile.agency.pk != user.profile.agency.pk: return redirect('dashboard') @@ -481,8 +486,6 @@ def UsersAreaTaskUpdate(request, pk): task.usersfield.remove(user) Prio.objects.filter(user__pk=pk).filter(task__pk=task.pk).delete() task.save() - - username_message = user.first_name + " " + user.last_name messages.success(request, f'Zuständigkeiten für {username_message} aktualisiert!') return redirect('users-management')