bob
/
newmediamonitoring
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#add message

This commit is contained in:
xieshen 2021-03-30 11:09:04 +08:00
parent 04641c02d3
commit 5bbe484c0c
2 changed files with 99 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
dashboard/views.py
View File

@ -448,14 +448,21 @@ def import_user(request):
@login_required @login_required
def user_search_by_keyword(request): def user_search_by_keyword(request):
keytype = None
keyword = None
if request.method == 'POST':
keytype = request.POST.get('keytype')
keyword = request.POST.get('keyword')
else:
keytype = request.GET.get('keytype')
keyword = request.GET.get('keyword')
user = request.user user = request.user
o = Organization.objects.get(userprofile__user_id=user.id) o = Organization.objects.get(userprofile__user_id=user.id)
level = o.level.level level = o.level.level
province = o.province province = o.province
cities = o.cities cities = o.cities
district = o.district district = o.district
keytype = request.POST.get('keytype')
keyword = request.POST.get('ketword')
userpaginator = None userpaginator = None
if level == 1: if level == 1:
if keytype == '1': if keytype == '1':
@ -464,6 +471,22 @@ def user_search_by_keyword(request):
elif keytype == '2': elif keytype == '2':
userpaginator = Userprofile.objects.filter(organization__name__contains=keyword, userpaginator = Userprofile.objects.filter(organization__name__contains=keyword,
userprofile__organization__province=province) userprofile__organization__province=province)
elif keytype == '3':
userpaginator = Userprofile.objects.filter(user__username__contains=keyword,
userprofile__organization__province=province)
elif keytype == '4':
key = Area_code_2020.objects.filter(name__contains=keyword)
for k in key:
userpaginator = Userprofile.objects.filter(organization__cities=k.code,
userprofile__organization__province=province)
elif keytype == '5':
key = Area_code_2020.objects.filter(name__contains=keyword)
for k in key:
userpaginator = Userprofile.objects.filter(organization__district=k.code,
userprofile__organization__province=province)
elif keytype == '6':
userpaginator = Userprofile.objects.filter(message_status=True,name__contains=keyword,
userprofile__organization__province=province)
elif level == 2: elif level == 2:
if keytype == '1': if keytype == '1':
userpaginator = Userprofile.objects.filter(name__contains=keyword, userpaginator = Userprofile.objects.filter(name__contains=keyword,
@ -473,6 +496,26 @@ def user_search_by_keyword(request):
userpaginator = Userprofile.objects.filter(organization__name__contains=keyword, userpaginator = Userprofile.objects.filter(organization__name__contains=keyword,
userprofile__organization__province=province, userprofile__organization__province=province,
userprofile__organization__cities=cities) userprofile__organization__cities=cities)
elif keytype == '3':
userpaginator = Userprofile.objects.filter(user__username__contains=keyword,
userprofile__organization__province=province,
userprofile__organization__cities=cities)
elif keytype == '4':
key = Area_code_2020.objects.filter(name__contains=keyword)
for k in key:
userpaginator = Userprofile.objects.filter(organization__cities=k.code,
userprofile__organization__province=province,
userprofile__organization__cities=cities)
elif keytype == '5':
key = Area_code_2020.objects.filter(name__contains=keyword)
for k in key:
userpaginator = Userprofile.objects.filter(organization__district=k.code,
userprofile__organization__province=province,
userprofile__organization__cities=cities)
elif keytype == '6':
userpaginator = Userprofile.objects.filter(message_status=True,name__contains=keyword,
userprofile__organization__province=province,
userprofile__organization__cities=cities)
elif level == 3: elif level == 3:
if keytype == '1': if keytype == '1':
userpaginator = Userprofile.objects.filter(name__contains=keyword, userpaginator = Userprofile.objects.filter(name__contains=keyword,
@ -484,25 +527,60 @@ def user_search_by_keyword(request):
userprofile__organization__province=province, userprofile__organization__province=province,
userprofile__organization__cities=cities, userprofile__organization__cities=cities,
userprofile__organization__district=district) userprofile__organization__district=district)
elif keytype == '3':
userpaginator = Userprofile.objects.filter(user__username__contains=keyword,
userprofile__organization__province=province,
userprofile__organization__cities=cities,
userprofile__organization__district=district)
elif keytype == '4':
key = Area_code_2020.objects.filter(name__contains=keyword)
for k in key:
userpaginator = Userprofile.objects.filter(organization__cities=k.code,
userprofile__organization__province=province,
userprofile__organization__cities=cities,
userprofile__organization__district=district)
elif keytype == '5':
key = Area_code_2020.objects.filter(name__contains=keyword)
for k in key:
userpaginator = Userprofile.objects.filter(organization__district=k.code,
userprofile__organization__province=province,
userprofile__organization__cities=cities,
userprofile__organization__district=district)
elif keytype == '6':
userpaginator = Userprofile.objects.filter(message_status=True,name__contains=keyword,
userprofile__organization__province=province,
userprofile__organization__cities=cities,
userprofile__organization__district=district)
elif level == 9: elif level == 9:
if keytype == '1': if keytype == '1':
print(keyword)
userpaginator = Userprofile.objects.filter(name__contains=keyword) userpaginator = Userprofile.objects.filter(name__contains=keyword)
elif keytype == '2': elif keytype == '2':
userpaginator = Userprofile.objects.filter(organization__name__contains=keyword) userpaginator = Userprofile.objects.filter(organization__name__contains=keyword)
elif keytype == '3':
userpaginator = Userprofile.objects.filter(user__username__contains=keyword)
elif keytype == '4':
key = Area_code_2020.objects.filter(name__contains=keyword)
for k in key:
userpaginator = Userprofile.objects.filter(organization__cities=k.code)
elif keytype == '5':
key = Area_code_2020.objects.filter(name__contains=keyword)
for k in key:
userpaginator = Userprofile.objects.filter(organization__district=k.code)
elif keytype == '6':
userpaginator = Userprofile.objects.filter(message_status=True,name__contains=keyword)
# paginator = Paginator(userpaginator, 6) user_count = userpaginator.count()
# page = int(request.GET.get('page', 1)) paginator = Paginator(userpaginator, 6)
# try: page = int(request.GET.get('page', 1))
# userpaginator = paginator.page(page) try:
# except PageNotAnInteger: userpaginator = paginator.page(page)
# userpaginator = paginator.page(1) except PageNotAnInteger:
# except EmptyPage: userpaginator = paginator.page(1)
# userpaginator = paginator.page(paginator.num_pages) except EmptyPage:
user_count = None userpaginator = paginator.page(paginator.num_pages)
if userpaginator:
user_count = userpaginator.count()
userallinfo = [] userallinfo = []
for u in userpaginator[:30]: for u in userpaginator:
o = dict() o = dict()
o['id'] = str(u.id) o['id'] = str(u.id)
o['user_id'] = str(u.user_id) o['user_id'] = str(u.user_id)
@ -553,7 +631,7 @@ def user_search_by_keyword(request):
'None', '') 'None', '')
userallinfo.append(o) userallinfo.append(o)
return render(request, 'management/user-management.html', return render(request, 'management/user-management.html',
{'userallinfo': userallinfo, 'userpaginator': userpaginator, 'user_count': user_count}) {'userallinfo': userallinfo, 'userpaginator': userpaginator, 'user_count': user_count,'keytype':keytype,'keyword':keyword})
@login_required @login_required

9
management/templates/management/user-management.html
View File

@ -29,13 +29,14 @@
<option value="1">姓名</option> <option value="1">姓名</option>
<option value="2">单位</option> <option value="2">单位</option>
<option value="3">电话</option> <option value="3">电话</option>
<option value="4">行政区划</option> <option value="4">行政区划(市)</option>
<option value="4">行政区划</option> <option value="5">行政区划(县)</option>
<option value="6">短信通知</option>
</select> </select>
</div> </div>
<div class="col-lg-6 title"> <div class="col-lg-6 title">
<div class="input-group"> <div class="input-group">
<input type="text" class="form-control" placeholder="输入搜索关键字" name="ketword"> <input type="text" class="form-control" placeholder="输入搜索关键字" name="keyword" value="{{ keyword }}">
<span class="input-group-btn"> <span class="input-group-btn">
<button class="btn btn-default" type="submit">搜索</button> <button class="btn btn-default" type="submit">搜索</button>
</span> </span>
@ -75,6 +76,8 @@
<td style="vertical-align: middle;text-align: center"> <td style="vertical-align: middle;text-align: center">
<a href="{% url 'user-management-delete' u.user_id %}" <a href="{% url 'user-management-delete' u.user_id %}"
class="btn btn-danger btn-mini">删除</a> class="btn btn-danger btn-mini">删除</a>
{# <a href="{% url 'user-management-update' u.user_id %}"#}
{# class="btn btn-success btn-mini">修改</a>#}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}