Browse Source

Добавил фильтр по улицам в список абонентов группы

devel
bashmak 9 years ago
parent
commit
befd67b0ec
  1. 3
      abonapp/locale/ru/LC_MESSAGES/django.po
  2. 13
      abonapp/templates/abonapp/peoples.html
  3. 8
      abonapp/views.py

3
abonapp/locale/ru/LC_MESSAGES/django.po

@ -714,3 +714,6 @@ msgstr "Экземпляр option82 неожиданно исчез из баз
msgid "SNMP error on device" msgid "SNMP error on device"
msgstr "Ошибка в SNMP на устройстве" msgstr "Ошибка в SNMP на устройстве"
msgid "No streets found for that group"
msgstr "Не найдены улицы для группы"

13
abonapp/templates/abonapp/peoples.html

@ -12,6 +12,8 @@
{% include 'message_block.html' %} {% include 'message_block.html' %}
<h3>{% trans 'The people in the selected group' %}</h3> <h3>{% trans 'The people in the selected group' %}</h3>
<div class="row">
<div class="col-lg-10">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-bordered"> <table class="table table-striped table-bordered">
<thead> <thead>
@ -119,6 +121,17 @@
</tfoot> </tfoot>
</table> </table>
</div> </div>
</div>
<div class="col-lg-2 sidebar-offcanvas">
<div class="list-group">
{% for street in streets %}
<a href="{% url 'abonapp:people_list' abon_group.pk %}?street={{ street.pk }}" class="list-group-item{% if street_id == street.pk %} active{% endif %}">{{ street.name }}</a>
{% empty %}
<a href="#" class="list-group-item">{% trans 'No streets found for that group' %}</a>
{% endfor %}
</div>
</div>
</div>
{% include 'toolbar_page.html' with pag=peoples %} {% include 'toolbar_page.html' with pag=peoples %}

8
abonapp/views.py

@ -22,6 +22,10 @@ import mydefs
@login_required @login_required
@mydefs.only_admins @mydefs.only_admins
def peoples(request, gid): def peoples(request, gid):
street_id = mydefs.safe_int(request.GET.get('street'))
if street_id > 0:
peoples_list = models.Abon.objects.filter(group=gid, street=street_id)
else:
peoples_list = models.Abon.objects.filter(group=gid) peoples_list = models.Abon.objects.filter(group=gid)
# фильтр # фильтр
@ -31,9 +35,13 @@ def peoples(request, gid):
peoples_list = mydefs.pag_mn(request, peoples_list) peoples_list = mydefs.pag_mn(request, peoples_list)
streets = models.AbonStreet.objects.filter(group=gid)
return render(request, 'abonapp/peoples.html', { return render(request, 'abonapp/peoples.html', {
'peoples': peoples_list, 'peoples': peoples_list,
'abon_group': get_object_or_404(models.AbonGroup, pk=gid), 'abon_group': get_object_or_404(models.AbonGroup, pk=gid),
'streets': streets,
'street_id': street_id,
'dir': dr, 'dir': dr,
'order_by': request.GET.get('order_by') 'order_by': request.GET.get('order_by')
}) })

Loading…
Cancel
Save