From 049cf1f1834fd69343baa4b68fb639062cb350da Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Mon, 16 Dec 2019 13:26:43 +0100 Subject: [PATCH] Neue globale Suche implementiert --- areas/templates/areas/areas_update.html | 2 +- orga/__pycache__/views.cpython-38.pyc | Bin 1634 -> 1699 bytes orga/views.py | 59 ++++++++++++++---------- users/__pycache__/views.cpython-38.pyc | Bin 15111 -> 14965 bytes users/templates/users/base.html | 41 ++++++++++------ users/templates/users/dashboard.html | 6 +-- users/templates/users/searchres.html | 42 +++++++++++++++++ users/views.py | 19 ++++---- 8 files changed, 118 insertions(+), 51 deletions(-) create mode 100644 users/templates/users/searchres.html 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 fc750788e937d88ea86705c68e9d56d07ef95d7b..f175d9ab393b8eb9fb25b3122e17313791f8074b 100644 GIT binary patch delta 360 zcmX}ny-ve05C?Fd?KFv-r0EBxbSe@I9auUr@&s%FsS6STM}Qd+ju~1xQ|C@zJAjxN zc?jMBmX3^NhZQ?WSn^N4yT4BIXY?E=r*X`XJ@5I?S;$_K89w>8r9uJ(*1%y271me~ zL4~K0X#BlyvD_%%W&)eROLz=9d4h^4rkZv4Kgp?^nm4=;%zWY9{M>F!E8p6#0;^Yr zJkV78I?$mew$rhfh;D7KcB{5uyUoK@R53Nsh%?O=BtvS4Hy4m0jxsckOin(I=dFjb zkmUi-%j=7~T=MZyQu{F(Th`>NP%?F8+tG2f91Ta}=sF^YXYT2Ytpi!`8(CZ`v!T<$ jp`9R{M1APN2q*-Q!VnlXQ*T5gEGK5}y}-omHI9A(sDo2F delta 259 zcmW;Gu};G<5C-7f*-q?)q)ACDm4z}O)UnK{?CeM^3`nVvJVstB*;D7T+|U&S3nMeH z0SjzAL}$)9=|1WIZ@Jg<@2I*h%RJ$^+8^#u%}2Gt)fY#XSg`1!gB=8Pf|KNgJ9t)| zc!3~X>aw9tthUDHw&-NM(l4GvN+8azZ#>#MWNZ^OTLjZ-FMZ~SZLV|g405uE zAr&<=juByy^-x$Z)qx5%NKtx7%LoZq5Cqy=Z_$GVonyXvf85Xc-rxQGe&@^KTp9SK zSx!lkk)zMCOTW8HJ8oJ^A@QuH8;lC4IHOIm=FVnv1Ii5G!%xI%s3I5goje>QX;TW| z4E|$IK#;^FA3&7cww&bQB3`$Szd!){u1b9jwI>vZ-ftyQ)VUo<2 zl=JYFe0M$Kc>r?VeKrrg_(%B!c<@!vEjUifDx3hPaYJPWI>=Pz8vun2?wSA?#HC&W z*YL8pYKMWEZ=LqtsFDW)vY6%>6IhV+_odv;sS zkcC6skf52iYRy{{q%3U9SvG48npr7G=~DWXkTNLNyE<2f9}+bwC1xPVX_8XNR)q_4 zJ{wN^K1)Gr94Qn&=yc%LYDbz1dsJ4nP+X3ML!sX8{PS>yJM(9>6oX^sOk7(qul3dP_Dzrzk9 zk7lvtpDBFKs)WrdBNX#!j^z9i9v1N7S|a8IIgtp*75uk$UYMsvXaT>iYd5`OP3(|3 z9`CF_;sz_Qks=5z=;hgp4M9YUBvWtGIo`AG4-Cr;D-0j;<3P23iOLPU8aMz;#Mux4 z_=MXVlkPg6?qQ?HFvH@Bn-x}9J_`-&);&=PTU9(KiF)T8$nP`pSD8BD6 jDiHU_`juof+(M00=lDU>-aIgy@JdsSp;8pYHZkxI&fDv{ delta 993 zcmYk3duUTv9LLY^G`YD=nlw$DN7ZW8Y2ObvvaY55$LbVC-4GQcC8RyKBe8kx7RY;59J&$I#^NIUvm~9FIU$#0GyNkb>jf@@~Zy?g==DK=rGL5hoMFaMfv-R zIZFQ}a<<`M1#A#+8w;>ToLGAjw#n9YL4bW?)A~GoB^TD;0T`Ck8wvoEqPa=Jv{-EV zq~4BCJcxJJ0zxd3APf%CW56?_zWL%5H7hNehn(#jlCv{cPP1&A$%S24mohiN^@1G?3vxI5uN?JetS)HNmTE&0B(R(>sZsVVrdPwjSA zcY&hiU$*MXP5=w+1;3?V03epef;}XsefzT+U?IyMhdk^dW{}mZosm7HWraA{^2-#y zBH^A7RzLe6yuHJ&(@}{h?5)H@i8-tsS)pJJQW*@ zesqcu=QCIoahOIjV~iQ%i?)W|BlvN$ooExN0w>sz$Ec3G4HTW=qyhBaFCX|yP8H?% z#6;WenoFu$D^)uoK>30kY)?>lAm%%zo!`ZPhUV-*fr7wz}-n0IDN-iioQc%@=Nn8#E#Xr5(Ff2TMpMp~i_O&@y K>kj=(J^UYX`wbZY 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')