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

Neue globale Suche implementiert

This commit is contained in:
holger.trampe 2019-12-16 13:26:43 +01:00
parent c94d0a2f0f
commit 049cf1f183
8 changed files with 118 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
areas/templates/areas/areas_update.html
View File

@ -125,7 +125,7 @@
} }
else{ else{
tempid = null; tempid = null;
$("#addusertoareabtn").prop('disabled', true); $("#addusertoareabtn").prop("disabled", true);
} }
} }
</script> </script>

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

Binary file not shown.

59
orga/views.py
View File

@ -41,33 +41,42 @@ def singleorga(request, pk):
VON GROß NACH KLEIN - SINNLOS 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')[::-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
'''
user_first_name = user.first_name Wenn eingelogger Nutzer nicht die gleiche Agency-ID hat,
user_last_name = user.last_name gehts zum Dashboard
user_id = user.pk
context = { '''
'active_link' : 'orga', if(user.profile.agency.pk==request.user.profile.agency.pk):
'areas' : areas, prios = Prio.objects.filter(user__pk=pk).order_by('-prio')
'user_first_name' : user_first_name, areas = list(Areas.objects.filter(agency__pk=request.user.profile.agency.pk).order_by('areaorder'))
'user_last_name' : user_last_name, i = 0
'user_id' : user_id, for area in areas:
'prios' : prios, areas[i].hex = areas[i].color
'mail' : user.email, areas[i].color = list(webcolors.hex_to_rgb(areas[i].color))
'userfunc' : user.profile.get_func_display, i += 1
'imageurl' : user.profile.get_photo_url,
'compfunc' : user.profile.compfunc, user_first_name = user.first_name
'phoneland' : user.profile.phoneland, user_last_name = user.last_name
'phonemobile' : user.profile.phonemobile user_id = user.pk
} context = {
return render(request, 'orga/orga_single.html', 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')

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

Binary file not shown.

39
users/templates/users/base.html
View File

@ -197,17 +197,18 @@
<!-- Topbar Search --> <!-- Topbar Search -->
<form class="d-none d-sm-inline-block form-inline mr-auto ml-md-3 my-2 my-md-0 mw-100 navbar-search"> <form class="d-none d-sm-inline-block form-inline mr-auto ml-md-3 my-2 my-md-0 mw-100 navbar-search">
<div class="input-group"> <div class="input-group">
<input list="searchres" placeholder="Suche..." id="search_string" onchange="javascript:checkValueSearchStringGlobal()" onkeyup="javascript:startSearch(this.value)" class="form-control bg-light border-0 small" > <input list="searchres" placeholder="Suche..." id="search_string" onkeyup="javascript:startSearch(this.value)" class="form-control bg-light border-0 small" >
<datalist id="searchres" > <datalist id="searchres" >
</datalist> </datalist>
<!-- <!--
<input type="text" onkeyup="javascript:startSearch(this.value)" class="form-control bg-light border-0 small" placeholder="Suche..." aria-label="Suche" aria-describedby="basic-addon2" id="searchfield"> <input type="text" onkeyup="javascript:startSearch(this.value)" class="form-control bg-light border-0 small" placeholder="Suche..." aria-label="Suche" aria-describedby="basic-addon2" id="searchfield">
--> -->
<!--<div class="input-group-append"> <div class="input-group-append">
<button class="btn btn-primary" type="button" onclick="javascript:clearSF()"> <button class="btn btn-primary" type="button" onclick="javascript:clearSF()">
<i class="fas fa-times fa-sm"></i> <i class="fas fa-times fa-sm"></i>
</button>--> </button>
</div>
</div> </div>
@ -262,6 +263,8 @@
</div> </div>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
<div id="searchcontent">
</div>
<div id="maincontent"> <div id="maincontent">
{% block content %} {% block content %}
{% endblock %} {% endblock %}
@ -320,6 +323,17 @@
<script type="text/javascript"> <script type="text/javascript">
function clearSF(){
$("#searchcontent").empty();
$("#searchcontent").hide();
$("#maincontent").show();
$("#search_string").val("");
}
$(document).ready(function(){
$("#searchcontent").hide();
})
function startSearch(searchstring){ function startSearch(searchstring){
if(searchstring.length > 2){ if(searchstring.length > 2){
@ -332,19 +346,18 @@
}, },
success: function( data ) success: function( data )
{ {
$("#searchres").empty(); $("#maincontent").hide();
for (var i = 0; i < data['standards'].length; i++) $("#searchcontent").show();
{ $("#searchcontent").html(data);
id = data['standards'][i]['id'];
name = data['standards'][i]['name'] + " | " + data['standards'][i]['content'];
console.log(name);
$("#searchres").append('<option id="'+id+'" value="'+name+'"></option>');
}
} }
}); });
} else {
$("#searchcontent").empty();
$("#searchcontent").hide();
$("#maincontent").show();
} }
} }
/*
//Check valid input and go to standard by click //Check valid input and go to standard by click
function checkValueSearchStringGlobal(){ function checkValueSearchStringGlobal(){
for(i = 0; i < document.getElementById("searchres").options.length; i++){ for(i = 0; i < document.getElementById("searchres").options.length; i++){
@ -355,5 +368,5 @@
} }
} }
} }
*/
</script> </script>

6
users/templates/users/dashboard.html
View File

@ -9,7 +9,7 @@
<div class="row" style="float: left;"> <div class="row" style="float: left;">
<div class="card d-block mb-2 mr-2 " style="width: 60%" > <div class="card d-block mb-3 mr-3 " style="width: 60%" >
<div class="card-body" > <div class="card-body" >
<h5 class="card-title">News</h5> <h5 class="card-title">News</h5>
<table class="table"> <table class="table">
@ -30,14 +30,14 @@
</table> </table>
</div> </div>
</div> </div>
<div class="card d-block mb-2" style="width: 35%"> <div class="card d-block mb-3" style="width: 34.8%">
<div class="card-body"> <div class="card-body">
<img width="100%" src="{{ request.user.profile.agency.get_photo_url }}"> <img width="100%" src="{{ request.user.profile.agency.get_photo_url }}">
</div> </div>
</div> </div>
<div class="card d-block mb-2" style="width: 96%"> <div class="card d-block mb-3" style="width: 96%">
<div class="card-body"> <div class="card-body">
<h5 class="card-title">Neueste Standards</h5> <h5 class="card-title">Neueste Standards</h5>
<table class="table"> <table class="table">

42
users/templates/users/searchres.html Normal file
View File

@ -0,0 +1,42 @@
<div class="content-section col-12">
<h3>Suchergebnisse</h3>
<hr>
<h4>Standards</h4>
{% if res_standard|length > 0 %}
{% for s in res_standard %}
<a href="{% url 'standard-single' s.pk %}"><b>{{s.name|striptags}}</b>&nbsp;|&nbsp;{{s.content|truncatechars:125|striptags}}</a><br /><br />
{% endfor %}
{% else %}
<p>Keine Ergebnisse in Standards</p>
{% endif %}
<hr>
<h4>Bereiche</h4>
{% if res_areas|length > 0 %}
{% for s in res_areas %}
<a href="{% url 'standard-area' s.pk %}"><b>{{s.name|striptags}}</b></a><br /><br />
{% endfor %}
{% else %}
<p>Keine Ergebnisse in Bereichen</p>
{% endif %}
<hr>
<h4>Aufgaben</h4>
{% if res_tasks|length > 0 %}
{% for s in res_tasks %}
<a href="{% url 'standard-task' s.pk %}"><b>{{s.name|striptags}}</b></a><br /><br />
{% endfor %}
{% else %}
<p>Keine Ergebnisse in Aufgaben</p>
{% endif %}
<hr>
<h4>Personen</h4>
{% if res_pers|length > 0 %}
{% for s in res_pers %}
<a href="{% url 'orga-single' s.pk %}"><b>{{s.first_name}}&nbsp;{{s.last_name}}</b></a><br /><br />
{% endfor %}
{% else %}
<p>Keine Ergebnisse in Personen</p>
{% endif %}
</div>

19
users/views.py
View File

@ -22,6 +22,8 @@ import json
from PIL import Image from PIL import Image
from django.template.loader import render_to_string from django.template.loader import render_to_string
from django.contrib.auth.forms import PasswordResetForm from django.contrib.auth.forms import PasswordResetForm
from django.template.loader import render_to_string
''' '''
DASHBOARD-View DASHBOARD-View
@ -399,8 +401,11 @@ def GlobalSearch(request):
searchfor = request.GET['searchstring'] searchfor = request.GET['searchstring']
results = {} results = {}
ag = request.user.profile.agency.pk 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) results_st = list(results)
final_results_st = [] final_results_st = []
i = 0 i = 0
@ -418,8 +423,10 @@ def GlobalSearch(request):
tempele['last_modified_on'] = formats.date_format(ele.last_modified_on, "d.m.Y") tempele['last_modified_on'] = formats.date_format(ele.last_modified_on, "d.m.Y")
final_results_st.append(tempele) final_results_st.append(tempele)
i += 1 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: else:
return HttpResponse("Request method is not a GET") return HttpResponse("Request method is not a GET")
@ -430,10 +437,8 @@ def searchStandardRouter(request):
else: else:
return redirect('dashboard') return redirect('dashboard')
def UsersAreaTaskUpdate(request, pk): def UsersAreaTaskUpdate(request, pk):
user = User.objects.get(pk=pk) user = User.objects.get(pk=pk)
if request.user.profile.agency.pk != user.profile.agency.pk: if request.user.profile.agency.pk != user.profile.agency.pk:
return redirect('dashboard') return redirect('dashboard')
@ -481,8 +486,6 @@ def UsersAreaTaskUpdate(request, pk):
task.usersfield.remove(user) task.usersfield.remove(user)
Prio.objects.filter(user__pk=pk).filter(task__pk=task.pk).delete() Prio.objects.filter(user__pk=pk).filter(task__pk=task.pk).delete()
task.save() task.save()
username_message = user.first_name + " " + user.last_name username_message = user.first_name + " " + user.last_name
messages.success(request, f'Zuständigkeiten für {username_message} aktualisiert!') messages.success(request, f'Zuständigkeiten für {username_message} aktualisiert!')
return redirect('users-management') return redirect('users-management')