diff --git a/areas/__pycache__/__init__.cpython-38.pyc b/areas/__pycache__/__init__.cpython-38.pyc index 3fed716..3ff9165 100644 Binary files a/areas/__pycache__/__init__.cpython-38.pyc and b/areas/__pycache__/__init__.cpython-38.pyc differ diff --git a/areas/__pycache__/admin.cpython-38.pyc b/areas/__pycache__/admin.cpython-38.pyc index f4e758a..c67ec55 100644 Binary files a/areas/__pycache__/admin.cpython-38.pyc and b/areas/__pycache__/admin.cpython-38.pyc differ diff --git a/areas/__pycache__/apps.cpython-38.pyc b/areas/__pycache__/apps.cpython-38.pyc index 9290f60..e7a6b78 100644 Binary files a/areas/__pycache__/apps.cpython-38.pyc and b/areas/__pycache__/apps.cpython-38.pyc differ diff --git a/areas/__pycache__/forms.cpython-38.pyc b/areas/__pycache__/forms.cpython-38.pyc index b1a2c81..c9f46ac 100644 Binary files a/areas/__pycache__/forms.cpython-38.pyc and b/areas/__pycache__/forms.cpython-38.pyc differ diff --git a/areas/__pycache__/models.cpython-38.pyc b/areas/__pycache__/models.cpython-38.pyc index 04f8d72..83d08a8 100644 Binary files a/areas/__pycache__/models.cpython-38.pyc and b/areas/__pycache__/models.cpython-38.pyc differ diff --git a/areas/__pycache__/urls.cpython-38.pyc b/areas/__pycache__/urls.cpython-38.pyc index 7683456..ddff2d1 100644 Binary files a/areas/__pycache__/urls.cpython-38.pyc and b/areas/__pycache__/urls.cpython-38.pyc differ diff --git a/areas/__pycache__/views.cpython-38.pyc b/areas/__pycache__/views.cpython-38.pyc index 0d77c06..aae0ee2 100644 Binary files a/areas/__pycache__/views.cpython-38.pyc and b/areas/__pycache__/views.cpython-38.pyc differ diff --git a/areas/migrations/__pycache__/0001_initial.cpython-38.pyc b/areas/migrations/__pycache__/0001_initial.cpython-38.pyc index 77c5047..4b1a5c3 100644 Binary files a/areas/migrations/__pycache__/0001_initial.cpython-38.pyc and b/areas/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/areas/migrations/__pycache__/__init__.cpython-38.pyc b/areas/migrations/__pycache__/__init__.cpython-38.pyc index 2cd3248..1f7cdb4 100644 Binary files a/areas/migrations/__pycache__/__init__.cpython-38.pyc and b/areas/migrations/__pycache__/__init__.cpython-38.pyc differ diff --git a/digitaleagentur/__pycache__/__init__.cpython-38.pyc b/digitaleagentur/__pycache__/__init__.cpython-38.pyc index 1ffa496..f932871 100644 Binary files a/digitaleagentur/__pycache__/__init__.cpython-38.pyc and b/digitaleagentur/__pycache__/__init__.cpython-38.pyc differ diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index cf0c19c..7697a67 100644 Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ diff --git a/digitaleagentur/__pycache__/urls.cpython-38.pyc b/digitaleagentur/__pycache__/urls.cpython-38.pyc index e2b5daf..49c08fe 100644 Binary files a/digitaleagentur/__pycache__/urls.cpython-38.pyc and b/digitaleagentur/__pycache__/urls.cpython-38.pyc differ diff --git a/digitaleagentur/__pycache__/views.cpython-38.pyc b/digitaleagentur/__pycache__/views.cpython-38.pyc index 268c51d..ecd32fe 100644 Binary files a/digitaleagentur/__pycache__/views.cpython-38.pyc and b/digitaleagentur/__pycache__/views.cpython-38.pyc differ diff --git a/digitaleagentur/__pycache__/wsgi.cpython-38.pyc b/digitaleagentur/__pycache__/wsgi.cpython-38.pyc index c66704f..3e8074e 100644 Binary files a/digitaleagentur/__pycache__/wsgi.cpython-38.pyc and b/digitaleagentur/__pycache__/wsgi.cpython-38.pyc differ diff --git a/digitaleagentur/urls.py b/digitaleagentur/urls.py index 90bf276..305027f 100644 --- a/digitaleagentur/urls.py +++ b/digitaleagentur/urls.py @@ -7,6 +7,7 @@ from users.views import AgencyCreateView from . import views from ckeditor_uploader.views import upload from django.contrib.auth.decorators import login_required + ''' ADMINPAGE - Verwaltung der Super-User - LOGIN-Page diff --git a/media/default.jpg b/media/default.jpg index bca23bf..b29dcd8 100644 Binary files a/media/default.jpg and b/media/default.jpg differ diff --git a/media/uploadsCK/2019/12/06/bildschirm.png b/media/uploadsCK/2019/12/06/bildschirm.png new file mode 100644 index 0000000..a64452f Binary files /dev/null and b/media/uploadsCK/2019/12/06/bildschirm.png differ diff --git a/media/uploadsCK/2019/12/06/bildschirm_thumb.png b/media/uploadsCK/2019/12/06/bildschirm_thumb.png new file mode 100644 index 0000000..fbad68f Binary files /dev/null and b/media/uploadsCK/2019/12/06/bildschirm_thumb.png differ diff --git a/orga/__pycache__/__init__.cpython-38.pyc b/orga/__pycache__/__init__.cpython-38.pyc index 5fbb46a..496d807 100644 Binary files a/orga/__pycache__/__init__.cpython-38.pyc and b/orga/__pycache__/__init__.cpython-38.pyc differ diff --git a/orga/__pycache__/admin.cpython-38.pyc b/orga/__pycache__/admin.cpython-38.pyc index 52eca0c..6513846 100644 Binary files a/orga/__pycache__/admin.cpython-38.pyc and b/orga/__pycache__/admin.cpython-38.pyc differ diff --git a/orga/__pycache__/apps.cpython-38.pyc b/orga/__pycache__/apps.cpython-38.pyc index bad2d21..52f5b45 100644 Binary files a/orga/__pycache__/apps.cpython-38.pyc and b/orga/__pycache__/apps.cpython-38.pyc differ diff --git a/orga/__pycache__/models.cpython-38.pyc b/orga/__pycache__/models.cpython-38.pyc index 0ceedb8..96f69e5 100644 Binary files a/orga/__pycache__/models.cpython-38.pyc and b/orga/__pycache__/models.cpython-38.pyc differ diff --git a/orga/__pycache__/urls.cpython-38.pyc b/orga/__pycache__/urls.cpython-38.pyc index dbd2557..442122f 100644 Binary files a/orga/__pycache__/urls.cpython-38.pyc and b/orga/__pycache__/urls.cpython-38.pyc differ diff --git a/orga/__pycache__/views.cpython-38.pyc b/orga/__pycache__/views.cpython-38.pyc index ffca203..bdc046f 100644 Binary files a/orga/__pycache__/views.cpython-38.pyc and b/orga/__pycache__/views.cpython-38.pyc differ diff --git a/orga/migrations/__pycache__/__init__.cpython-38.pyc b/orga/migrations/__pycache__/__init__.cpython-38.pyc index 378acdf..c81252e 100644 Binary files a/orga/migrations/__pycache__/__init__.cpython-38.pyc and b/orga/migrations/__pycache__/__init__.cpython-38.pyc differ diff --git a/orga/templates/orga/orga_main.html b/orga/templates/orga/orga_main.html index 59d3c62..97d75f9 100644 --- a/orga/templates/orga/orga_main.html +++ b/orga/templates/orga/orga_main.html @@ -8,7 +8,10 @@ + {% if leader != None %} + {% endif %} +
diff --git a/orga/templates/orga/orga_single.html b/orga/templates/orga/orga_single.html index d0775ea..b44f6be 100644 --- a/orga/templates/orga/orga_single.html +++ b/orga/templates/orga/orga_single.html @@ -4,11 +4,11 @@

Bereiche und Aufgaben von {{user_first_name}} {{user_last_name}}

- -
+ +
- -
+
+
Name

{{ user_first_name }} {{ user_last_name }} @@ -21,38 +21,57 @@

{{ mail }}

-
+
+
+
Tätigkeit
+

+ {{ compfunc }} +

+
Festznetz
+

+ {{ phoneland }} +

+
Mobil
+

+ {{ phonemobile }} +

+
+
- - - +
+
+ {% for area in areas %} - + {% endfor %} - + + + + {% for area in areas %} - - {% endfor %} - - - + + {% endfor %}

{{area.name}}

 
- {%for prio in prios %} - {% if prio.task.area.pk == area.pk %} -
-
{{prio.task.name}}
 +
+ {%for prio in prios %} + {% if prio.task.area.pk == area.pk and prio.task.visible %} +
+
{{prio.task.name}}
{% endif %} {% endfor %} - 		 
+
{% endblock content %} \ No newline at end of file diff --git a/orga/views.py b/orga/views.py index 9be6a9d..378d37d 100644 --- a/orga/views.py +++ b/orga/views.py @@ -9,7 +9,11 @@ import webcolors @login_required def mainorga(request): - leader = list(User.objects.filter(profile__agency__pk=request.user.profile.agency.pk).filter(profile__func='lead'))[0] + leader = list(User.objects.filter(profile__agency__pk=request.user.profile.agency.pk).filter(profile__func='lead')) + if len(leader) > 0: + leader = leader[0] + else: + leader = None indoor = list(User.objects.filter(profile__agency__pk=request.user.profile.agency.pk).filter(profile__func='indoor')) external = list(User.objects.filter(profile__agency__pk=request.user.profile.agency.pk).filter(profile__func='external')) trainee = list(User.objects.filter(profile__agency__pk=request.user.profile.agency.pk).filter(profile__func='trainee')) @@ -31,7 +35,11 @@ def mainorga(request): @login_required def singleorga(request, pk): user = User.objects.get(pk=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)) i = 0 for area in areas: @@ -52,7 +60,10 @@ def singleorga(request, pk): 'prios' : prios, 'mail' : user.email, 'userfunc' : user.profile.get_func_display, - 'imageurl' : user.profile.image.url + 'imageurl' : user.profile.image.url, + 'compfunc' : user.profile.compfunc, + 'phoneland' : user.profile.phoneland, + 'phonemobile' : user.profile.phonemobile } return render(request, 'orga/orga_single.html', context) diff --git a/standards/__pycache__/__init__.cpython-38.pyc b/standards/__pycache__/__init__.cpython-38.pyc index 10c9914..3efa48c 100644 Binary files a/standards/__pycache__/__init__.cpython-38.pyc and b/standards/__pycache__/__init__.cpython-38.pyc differ diff --git a/standards/__pycache__/admin.cpython-38.pyc b/standards/__pycache__/admin.cpython-38.pyc index 636f01b..a4a2637 100644 Binary files a/standards/__pycache__/admin.cpython-38.pyc and b/standards/__pycache__/admin.cpython-38.pyc differ diff --git a/standards/__pycache__/apps.cpython-38.pyc b/standards/__pycache__/apps.cpython-38.pyc index 4506211..4552384 100644 Binary files a/standards/__pycache__/apps.cpython-38.pyc and b/standards/__pycache__/apps.cpython-38.pyc differ diff --git a/standards/__pycache__/forms.cpython-38.pyc b/standards/__pycache__/forms.cpython-38.pyc index a5c0e28..26a019c 100644 Binary files a/standards/__pycache__/forms.cpython-38.pyc and b/standards/__pycache__/forms.cpython-38.pyc differ diff --git a/standards/__pycache__/models.cpython-38.pyc b/standards/__pycache__/models.cpython-38.pyc index d7f1d7e..adaf8ca 100644 Binary files a/standards/__pycache__/models.cpython-38.pyc and b/standards/__pycache__/models.cpython-38.pyc differ diff --git a/standards/__pycache__/urls.cpython-38.pyc b/standards/__pycache__/urls.cpython-38.pyc index 23f55f1..04657f0 100644 Binary files a/standards/__pycache__/urls.cpython-38.pyc and b/standards/__pycache__/urls.cpython-38.pyc differ diff --git a/standards/__pycache__/views.cpython-38.pyc b/standards/__pycache__/views.cpython-38.pyc index d0f9ea2..10f6c3a 100644 Binary files a/standards/__pycache__/views.cpython-38.pyc and b/standards/__pycache__/views.cpython-38.pyc differ diff --git a/standards/migrations/__pycache__/0001_initial.cpython-38.pyc b/standards/migrations/__pycache__/0001_initial.cpython-38.pyc index 7411eab..8e4ffe6 100644 Binary files a/standards/migrations/__pycache__/0001_initial.cpython-38.pyc and b/standards/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/standards/migrations/__pycache__/0002_auto_20191205_0809.cpython-38.pyc b/standards/migrations/__pycache__/0002_auto_20191205_0809.cpython-38.pyc index a457549..176d9da 100644 Binary files a/standards/migrations/__pycache__/0002_auto_20191205_0809.cpython-38.pyc and b/standards/migrations/__pycache__/0002_auto_20191205_0809.cpython-38.pyc differ diff --git a/standards/migrations/__pycache__/__init__.cpython-38.pyc b/standards/migrations/__pycache__/__init__.cpython-38.pyc index 912f5d5..29deb7e 100644 Binary files a/standards/migrations/__pycache__/__init__.cpython-38.pyc and b/standards/migrations/__pycache__/__init__.cpython-38.pyc differ diff --git a/standards/urls.py b/standards/urls.py index 132f2da..033a13c 100644 --- a/standards/urls.py +++ b/standards/urls.py @@ -16,5 +16,5 @@ urlpatterns = [ path('standard//changestat', views.StandardChangePublic, name="standard-status"), path('standard//single', views.StandardSingle, name="standard-single"), path('standard//area', views.StandardArea, name="standard-area"), - path('standard//task', views.StandardTask, name="standard-task") + path('standard//task', views.StandardTask, name="standard-task") ] diff --git a/tasks/__pycache__/__init__.cpython-38.pyc b/tasks/__pycache__/__init__.cpython-38.pyc index ba2b443..5761d3d 100644 Binary files a/tasks/__pycache__/__init__.cpython-38.pyc and b/tasks/__pycache__/__init__.cpython-38.pyc differ diff --git a/tasks/__pycache__/admin.cpython-38.pyc b/tasks/__pycache__/admin.cpython-38.pyc index 4785bcc..64cf5df 100644 Binary files a/tasks/__pycache__/admin.cpython-38.pyc and b/tasks/__pycache__/admin.cpython-38.pyc differ diff --git a/tasks/__pycache__/apps.cpython-38.pyc b/tasks/__pycache__/apps.cpython-38.pyc index acb7215..1b8289c 100644 Binary files a/tasks/__pycache__/apps.cpython-38.pyc and b/tasks/__pycache__/apps.cpython-38.pyc differ diff --git a/tasks/__pycache__/forms.cpython-38.pyc b/tasks/__pycache__/forms.cpython-38.pyc index 7d05cbf..bfae0d8 100644 Binary files a/tasks/__pycache__/forms.cpython-38.pyc and b/tasks/__pycache__/forms.cpython-38.pyc differ diff --git a/tasks/__pycache__/models.cpython-38.pyc b/tasks/__pycache__/models.cpython-38.pyc index d012e57..45cdb3b 100644 Binary files a/tasks/__pycache__/models.cpython-38.pyc and b/tasks/__pycache__/models.cpython-38.pyc differ diff --git a/tasks/__pycache__/urls.cpython-38.pyc b/tasks/__pycache__/urls.cpython-38.pyc index 065fae8..fbe82ce 100644 Binary files a/tasks/__pycache__/urls.cpython-38.pyc and b/tasks/__pycache__/urls.cpython-38.pyc differ diff --git a/tasks/__pycache__/views.cpython-38.pyc b/tasks/__pycache__/views.cpython-38.pyc index 1765bf2..869f6db 100644 Binary files a/tasks/__pycache__/views.cpython-38.pyc and b/tasks/__pycache__/views.cpython-38.pyc differ diff --git a/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc b/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc index decdf9d..ff34734 100644 Binary files a/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc and b/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/tasks/migrations/__pycache__/0002_tasks_name.cpython-38.pyc b/tasks/migrations/__pycache__/0002_tasks_name.cpython-38.pyc index 3872823..d481111 100644 Binary files a/tasks/migrations/__pycache__/0002_tasks_name.cpython-38.pyc and b/tasks/migrations/__pycache__/0002_tasks_name.cpython-38.pyc differ diff --git a/tasks/migrations/__pycache__/0003_auto_20191205_0809.cpython-38.pyc b/tasks/migrations/__pycache__/0003_auto_20191205_0809.cpython-38.pyc index 212e6c2..98ebf6a 100644 Binary files a/tasks/migrations/__pycache__/0003_auto_20191205_0809.cpython-38.pyc and b/tasks/migrations/__pycache__/0003_auto_20191205_0809.cpython-38.pyc differ diff --git a/tasks/migrations/__pycache__/__init__.cpython-38.pyc b/tasks/migrations/__pycache__/__init__.cpython-38.pyc index 42a7700..ded374b 100644 Binary files a/tasks/migrations/__pycache__/__init__.cpython-38.pyc and b/tasks/migrations/__pycache__/__init__.cpython-38.pyc differ diff --git a/tasks/views.py b/tasks/views.py index c1a025b..79229b8 100644 --- a/tasks/views.py +++ b/tasks/views.py @@ -8,10 +8,10 @@ from django.contrib import messages from django.http import HttpResponse, JsonResponse from users.priomodel import Prio - # Create your views here. class TasksManagement(LoginRequiredMixin, ListView): model = Tasks + # Adding active_link # Loading only user same agency # Change context and return for template-data diff --git a/users/__pycache__/__init__.cpython-38.pyc b/users/__pycache__/__init__.cpython-38.pyc index 09287f9..1988400 100644 Binary files a/users/__pycache__/__init__.cpython-38.pyc and b/users/__pycache__/__init__.cpython-38.pyc differ diff --git a/users/__pycache__/admin.cpython-38.pyc b/users/__pycache__/admin.cpython-38.pyc index 131dcf0..407ba3c 100644 Binary files a/users/__pycache__/admin.cpython-38.pyc and b/users/__pycache__/admin.cpython-38.pyc differ diff --git a/users/__pycache__/apps.cpython-38.pyc b/users/__pycache__/apps.cpython-38.pyc index e12f316..cea3da8 100644 Binary files a/users/__pycache__/apps.cpython-38.pyc and b/users/__pycache__/apps.cpython-38.pyc differ diff --git a/users/__pycache__/models.cpython-38.pyc b/users/__pycache__/models.cpython-38.pyc index 4d0e60d..9777db5 100644 Binary files a/users/__pycache__/models.cpython-38.pyc and b/users/__pycache__/models.cpython-38.pyc differ diff --git a/users/__pycache__/priomodel.cpython-38.pyc b/users/__pycache__/priomodel.cpython-38.pyc index e0c5566..f822ee2 100644 Binary files a/users/__pycache__/priomodel.cpython-38.pyc and b/users/__pycache__/priomodel.cpython-38.pyc differ diff --git a/users/__pycache__/signals.cpython-38.pyc b/users/__pycache__/signals.cpython-38.pyc index 46f1761..a854aad 100644 Binary files a/users/__pycache__/signals.cpython-38.pyc and b/users/__pycache__/signals.cpython-38.pyc differ diff --git a/users/__pycache__/urls.cpython-38.pyc b/users/__pycache__/urls.cpython-38.pyc index 401209d..481f925 100644 Binary files a/users/__pycache__/urls.cpython-38.pyc and b/users/__pycache__/urls.cpython-38.pyc differ diff --git a/users/__pycache__/usersforms.cpython-38.pyc b/users/__pycache__/usersforms.cpython-38.pyc index e972567..eff3788 100644 Binary files a/users/__pycache__/usersforms.cpython-38.pyc and b/users/__pycache__/usersforms.cpython-38.pyc differ diff --git a/users/__pycache__/views.cpython-38.pyc b/users/__pycache__/views.cpython-38.pyc index 9ea782e..d1e70f0 100644 Binary files a/users/__pycache__/views.cpython-38.pyc and b/users/__pycache__/views.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0001_initial.cpython-38.pyc b/users/migrations/__pycache__/0001_initial.cpython-38.pyc index ae1f439..86fdee3 100644 Binary files a/users/migrations/__pycache__/0001_initial.cpython-38.pyc and b/users/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0002_auto_20191204_0857.cpython-38.pyc b/users/migrations/__pycache__/0002_auto_20191204_0857.cpython-38.pyc index 095b6ca..ffe61ff 100644 Binary files a/users/migrations/__pycache__/0002_auto_20191204_0857.cpython-38.pyc and b/users/migrations/__pycache__/0002_auto_20191204_0857.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0003_prio.cpython-38.pyc b/users/migrations/__pycache__/0003_prio.cpython-38.pyc index 1a17aa4..eb2c2c2 100644 Binary files a/users/migrations/__pycache__/0003_prio.cpython-38.pyc and b/users/migrations/__pycache__/0003_prio.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/__init__.cpython-38.pyc b/users/migrations/__pycache__/__init__.cpython-38.pyc index d799506..e100748 100644 Binary files a/users/migrations/__pycache__/__init__.cpython-38.pyc and b/users/migrations/__pycache__/__init__.cpython-38.pyc differ diff --git a/users/templates/users/base.html b/users/templates/users/base.html index 03abb3c..385dfd6 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -101,7 +101,7 @@
- Agenturverwaltung + Agenturorga
{%endif%} @@ -173,12 +173,14 @@
- + +
-
+
@@ -219,7 +221,9 @@
- + +
+ {% if messages %} {% for message in messages %} @@ -239,9 +243,11 @@ {% endfor %} {% endif %} - - {% block content %} - {% endblock %} + +
@@ -288,3 +294,67 @@ + + \ No newline at end of file diff --git a/users/templates/users/users_management.html b/users/templates/users/users_management.html index a77f2b8..6f374c3 100644 --- a/users/templates/users/users_management.html +++ b/users/templates/users/users_management.html @@ -28,12 +28,11 @@
Benutzerdaten
Bearbeiten - Rechte Priorisierung -
+
+ Rechte - Bereiche - Aufgaben + Zuständigkeitenn {% if item != request.user %}
Löschen diff --git a/users/templates/users/users_prio.html b/users/templates/users/users_prio.html index 477a671..657a723 100644 --- a/users/templates/users/users_prio.html +++ b/users/templates/users/users_prio.html @@ -3,7 +3,7 @@ {% block content %}

Priorisierung von {{ user_first_name }} {{ user_last_name }} verändern

- Elemente mit einer kleineren Zahl werden im Organigramm weiter oben angezeigt. Die Änderungen werden sofort gespeichert. + Elemente mit einer größeren Zahl werden im Organigramm weiter oben angezeigt. Die Änderungen werden sofort gespeichert.
{% for area in areas %} diff --git a/users/urls.py b/users/urls.py index 3053ac4..d8f4d51 100644 --- a/users/urls.py +++ b/users/urls.py @@ -24,7 +24,9 @@ urlpatterns = [ path('agencyinfo/', views.agency, name='agencyinfo'), path('agencyinfo//', permission_required('users.agency_change')(AgencyUpdateView.as_view()), name='agency-manage'), path('usersman//prio', views.UsersPrio, name='users-prio'), - path('prioupdate/', views.UsersPrioUpdate, name="users-prioupdate") + path('prioupdate/', views.UsersPrioUpdate, name="users-prioupdate"), + path('globalsearch/', views.GlobalSearch, name="globalsearch"), + path('standardrout/', views.searchStandardRouter, name="standardrouter") ] diff --git a/users/views.py b/users/views.py index 1dd1371..24a13b2 100644 --- a/users/views.py +++ b/users/views.py @@ -1,4 +1,4 @@ -from django.shortcuts import render, redirect +from django.shortcuts import render, redirect, reverse from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin from django.contrib.auth.decorators import login_required from django.conf import settings @@ -10,10 +10,13 @@ from django.db import models from .models import Profile, Agency from django.core.mail import send_mail from django.contrib.auth.models import Permission -from django.http import HttpResponseRedirect,HttpResponse +from django.http import HttpResponseRedirect,HttpResponse, JsonResponse from areas.models import Areas from tasks.models import Tasks from .priomodel import Prio +from standards.models import Standards +from datetime import datetime +from django.utils import formats ''' DASHBOARD-View @@ -234,24 +237,31 @@ class AgencyUpdateView(LoginRequiredMixin, UpdateView): ''' def UsersPrio(request, pk): + user = User.objects.get(pk=pk) - prios = Prio.objects.filter(user__pk=pk) - areas = Areas.objects.filter(agency__pk=request.user.profile.agency.pk) - user_first_name = user.first_name - user_last_name = user.last_name - user_id = user.pk - context = { - 'active_link' : '', - 'areas' : areas, - 'user_first_name' : user_first_name, - 'user_last_name' : user_last_name, - 'user_id' : user_id, - 'prios' : prios - } - return render(request, 'users/users_prio.html', context) + + if(user.profile.agency.pk != request.user.profile.agency.pk): + return HttpResponseRedirect('users-dashboard') + else: + prios = Prio.objects.filter(user__pk=pk) + areas = Areas.objects.filter(agency__pk=request.user.profile.agency.pk) + user_first_name = user.first_name + user_last_name = user.last_name + user_id = user.pk + context = { + 'active_link' : '', + 'areas' : areas, + 'user_first_name' : user_first_name, + 'user_last_name' : user_last_name, + 'user_id' : user_id, + 'prios' : prios + } + + return render(request, 'users/users_prio.html', context) def UsersPrioUpdate(request): - if request.method == 'GET': + 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'] @@ -259,4 +269,43 @@ def UsersPrioUpdate(request): return HttpResponse("udated...") else: return HttpResponse("Request method is not a GET") + +# Searxh for Standards by name, content, creator - standards needs to be public! +def GlobalSearch(request): + if request.method == 'GET': + 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) + + results = list(results) + + final_results = [] + + i = 0 + for ele in results: + tempele = {} + tempele['id'] = ele.pk + tempele['name'] = ele.name + # First 100 chars of the Content + tempele['content'] = ele.content[:100] + tempele['first_name'] = ele.created_standard_by.first_name + tempele['last_name'] = ele.created_standard_by.last_name + tempele['first_name_mod'] = ele.last_modified_by.first_name + tempele['last_name_mod'] = ele.last_modified_by.last_name + tempele['created'] = formats.date_format(ele.created_standard_date, "d.m.Y") + tempele['last_modified_on'] = formats.date_format(ele.last_modified_on, "d.m.Y") + final_results.append(tempele) + i += 1 + return JsonResponse({'res' : final_results}) + else: + return HttpResponse("Request method is not a GET") + + +def searchStandardRouter(request): + if request.method == 'GET': + return redirect('/standards/standard/'+request.GET['s_id']+'/single') + else: + return redirect('dashboard') + \ No newline at end of file