From d0686194cbe64fd5caa2f6638414ccd2da8eaaad Mon Sep 17 00:00:00 2001
From: Dmitry <nerosketch@gmail.com>
Date: Tue, 30 Aug 2016 21:10:34 +0000
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D1=85=D0=BB=D0=B5=D0=B1=D0=BD=D1=8B=D0=B5=20=D0=BA=D1=80=D0=BE?=
 =?UTF-8?q?=D1=88=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/abonapp/abonamount.html        |  4 +--
 templates/abonapp/addAbon.html           | 10 +++++-
 templates/abonapp/addGroup.html          |  8 +++++
 templates/abonapp/addInvoice.html        | 19 ++++++++---
 templates/abonapp/buy_tariff.html        | 17 ++++++++--
 templates/abonapp/complete_service.html  | 13 +++++++-
 templates/abonapp/editAbon.html          |  2 +-
 templates/abonapp/ext.htm                | 23 +++++++++-----
 templates/abonapp/group_list.html        | 32 ++++++++++++++++---
 templates/abonapp/invoiceForPayment.html |  5 +--
 templates/abonapp/log.html               |  6 ++++
 templates/abonapp/payHistory.html        |  2 +-
 templates/abonapp/peoples.html           | 40 ++++++++++++++++++++----
 templates/abonapp/services.html          | 10 +++---
 14 files changed, 151 insertions(+), 40 deletions(-)

diff --git a/templates/abonapp/abonamount.html b/templates/abonapp/abonamount.html
index 6bfac58..42f3967 100644
--- a/templates/abonapp/abonamount.html
+++ b/templates/abonapp/abonamount.html
@@ -13,7 +13,7 @@
 
     <div class="row">
         <div class="col-sm-4">
-            <form role="form" action="{% url 'abon_amount_link' gid abon_id %}" method="post"> {% csrf_token %}
+            <form role="form" action="{% url 'abon_amount_link' abon_group.id abon.id %}" method="post"> {% csrf_token %}
 
                 <div class="form-group-sm">
                     <label for="amount">Количество денег</label>
@@ -22,7 +22,7 @@
                         <input id="amount" type="text" name="amount" placeholder="0.0" class="form-control" required pattern="\d+">
                     </div>
                 </div>
-                <input type="hidden" name="abonid" value="{{ abon_id }}"><br>
+                <input type="hidden" name="abonid" value="{{ abon.id }}"><br>
                 <div class="btn-group">
                     <button type="submit" class="btn btn-sm btn-primary">
                         <span class="glyphicon glyphicon-save"></span> Пополнить
diff --git a/templates/abonapp/addAbon.html b/templates/abonapp/addAbon.html
index 5a3c24a..ecdab22 100644
--- a/templates/abonapp/addAbon.html
+++ b/templates/abonapp/addAbon.html
@@ -1,6 +1,14 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
 {% block main %}
 
+<ol class="breadcrumb">
+  <li><span class="glyphicon glyphicon-home"></span></li>
+  <li><a href="{% url 'abongroup_list_link' %}">Группы абонентов</a></li>
+  <li><a href="{% url 'people_list_link' abon_group.id %}">{{ abon_group.title }}</a></li>
+  <li class="active">Добавить абонента</li>
+</ol>
+
+
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">Добавьте аккаунт абонента</h3>
@@ -9,7 +17,7 @@
         {% if warntext %}
             <div class="alert-danger">{{ warntext }}</div>
         {% endif %}
-        <form role="form" action="{% url 'addabon_link' gid %}" method="post">{% csrf_token %}
+        <form role="form" action="{% url 'addabon_link' abon_group.id %}" method="post">{% csrf_token %}
             <div class="form-group">
                 <label for="login">Логин абонента</label>
                 <div class="input-group">
diff --git a/templates/abonapp/addGroup.html b/templates/abonapp/addGroup.html
index 6f198cb..3902a38 100644
--- a/templates/abonapp/addGroup.html
+++ b/templates/abonapp/addGroup.html
@@ -1,6 +1,14 @@
 {% extends 'base.html' %}
 {% block main %}
 
+
+<ol class="breadcrumb">
+  <li><span class="glyphicon glyphicon-home"></span></li>
+  <li><a href="{% url 'abongroup_list_link' %}">Группы абонентов</a></li>
+  <li class="active">Добавить группу</li>
+</ol>
+
+
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">Добавьте группу абонентов</h3>
diff --git a/templates/abonapp/addInvoice.html b/templates/abonapp/addInvoice.html
index 29e5d34..043aeaa 100644
--- a/templates/abonapp/addInvoice.html
+++ b/templates/abonapp/addInvoice.html
@@ -1,15 +1,24 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
-
 {% block main %}
 
+
+    <ol class="breadcrumb">
+      <li><span class="glyphicon glyphicon-home"></span></li>
+      <li><a href="{% url 'abongroup_list_link' %}">Группы абонентов</a></li>
+      <li><a href="{% url 'people_list_link' abon_group.id %}">{{ abon_group.title }}</a></li>
+      <li><a href="{% url 'abonhome_link' abon_group.id abon.id %}">{{ abon.fio }}</a></li>
+      <li class="active">Добавить долг</li>
+    </ol>
+
+
     <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">Добавьте платёж для
-            <u><a href="{% url 'abonhome_link' gid abon.id %}">{{ abon.fio }}</a></u>
+        <h3 class="panel-title">Добавьте платёж на оплату для
+            <u><a href="{% url 'abonhome_link' abon_group.id abon.id %}">{{ abon.fio }}</a></u>
         </h3>
     </div>
     <div class="panel-body">
-        <form role="form" action="{% url 'abonapp_addinvoice_link' gid abon.id %}" method="post">{% csrf_token %}
+        <form role="form" action="{% url 'abonapp_addinvoice_link' abon_group.id abon.id %}" method="post">{% csrf_token %}
             <div class="form-group">
                 <label for="pamount">Сумма для платежа</label>
                 <div class="input-group">
@@ -38,4 +47,4 @@
     </div>
 </div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/abonapp/buy_tariff.html b/templates/abonapp/buy_tariff.html
index d0caae3..64d3fe6 100644
--- a/templates/abonapp/buy_tariff.html
+++ b/templates/abonapp/buy_tariff.html
@@ -1,15 +1,26 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
-
 {% block main %}
+
+
+<ol class="breadcrumb">
+  <li><span class="glyphicon glyphicon-home"></span></li>
+  <li><a href="{% url 'abongroup_list_link' %}">Группы абонентов</a></li>
+  <li><a href="{% url 'people_list_link' abon_group.id %}">{{ abon_group.title }}</a></li>
+  <li><a href="{% url 'abonhome_link' abon_group.id abon.id %}">{{ abon.fio }}</a></li>
+  <li class="active">Заказать услугу</li>
+</ol>
+
+
+
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">Купить новую услугу (заказать тариф) для <a href="{% url 'abonhome_link' gid uid %}" title="На страницу абонента">абонента</a></h3>
+        <h3 class="panel-title">Купить новую услугу (заказать тариф) для <a href="{% url 'abonhome_link' abon_group.id abon.id %}" title="На страницу абонента">абонента</a></h3>
     </div>
     <div class="panel-body">
         {% if warntext %}
             <div class="alert-danger">{{ warntext }}</div>
         {% endif %}
-        <form role="form" action="{% url 'abonapp_buy_tariff' gid uid %}" method="post">{% csrf_token %}
+        <form role="form" action="{% url 'abonapp_buy_tariff' abon_group.id abon.id %}" method="post">{% csrf_token %}
             <div class="form-group">
                 <label for="tariff">Выбирите тарифф</label>
                 <div class="input-group">
diff --git a/templates/abonapp/complete_service.html b/templates/abonapp/complete_service.html
index 8bb1802..c7f2448 100644
--- a/templates/abonapp/complete_service.html
+++ b/templates/abonapp/complete_service.html
@@ -1,6 +1,17 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
 {% block main %}
 
+
+<ol class="breadcrumb">
+  <li><span class="glyphicon glyphicon-home"></span></li>
+  <li><a href="{% url 'abongroup_list_link' %}">Группы абонентов</a></li>
+  <li><a href="{% url 'people_list_link' abon_group.id %}">{{ abon_group.title }}</a></li>
+  <li><a href="{% url 'abonhome_link' abon_group.id abon.id %}">{{ abon.fio }}</a></li>
+  <li class="active">Завершить услугу</li>
+</ol>
+
+
+
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">Завершить услугу</h3>
@@ -9,7 +20,7 @@
         {% if warntext %}
             <div class="alert-danger">{{ warntext }}</div>
         {% endif %}
-        <form role="form" action="{% url 'abonapp_compl_srv' gid uid abtar.id %}" method="post">{% csrf_token %}
+        <form role="form" action="{% url 'abonapp_compl_srv' abon_group.id abon.id abtar.id %}" method="post">{% csrf_token %}
             <input name="finish_confirm" value="yes" type="hidden">
 
             <p>Досрочное завершение текущей услуги приведёт к тому что на счёт вернуться деньги за неиспользованные
diff --git a/templates/abonapp/editAbon.html b/templates/abonapp/editAbon.html
index cfb6438..830a5f3 100644
--- a/templates/abonapp/editAbon.html
+++ b/templates/abonapp/editAbon.html
@@ -11,7 +11,7 @@
 
     <div class="row">
         <div class="col-sm-4">
-            <form role="form" action="{% url 'abonhome_link' gid abon_id %}" method="post"> {% csrf_token %}
+            <form role="form" action="{% url 'abonhome_link' abon_group.id abon.id %}" method="post"> {% csrf_token %}
 
                 <div class="form-group-sm">
                     <label for="grp">Группа</label>
diff --git a/templates/abonapp/ext.htm b/templates/abonapp/ext.htm
index 89fc8bc..9bb2e95 100644
--- a/templates/abonapp/ext.htm
+++ b/templates/abonapp/ext.htm
@@ -1,17 +1,24 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
-
 {% block main %}
 
+    <ol class="breadcrumb">
+      <li><span class="glyphicon glyphicon-home"></span></li>
+      <li><a href="{% url 'abongroup_list_link' %}">Группы абонентов</a></li>
+      <li><a href="{% url 'people_list_link' abon_group.id %}">{{ abon_group.title }}</a></li>
+      <li class="active">{{ abon.fio }}</li>
+    </ol>
+
+
     <div class="page-header">
-        <h2>Имя абонента <small>Балланс <b>&#8399;{{ ballance }}</b> руб</small></h2>
+        <h2>{{ abon.fio|default:"Имя абонента" }} <small>Балланс <b>&#8399;{{ ballance }}</b> руб</small></h2>
     </div>
 
     <ul class="nav nav-tabs">
-        <li class="active"><a href="#livetab_content" data-tab-remote="{% url 'abonhome_link' gid abon_id %}" role="tab" data-toggle="tab">Информация абонента</a></li>
-        <li><a href="#livetab_content" data-tab-remote="{% url 'abon_services_link' gid abon_id %}" role="tab" data-toggle="tab">Услуги</a></li>
-        <li><a href="#livetab_content" data-tab-remote="{% url 'abon_amount_link' gid abon_id %}" role="tab" data-toggle="tab">Пополнить счёт</a></li>
-        <li><a href="#livetab_content" data-tab-remote="{% url 'abon_debts_link' gid abon_id %}" role="tab" data-toggle="tab">Долги</a></li>
-        <li><a href="#livetab_content" data-tab-remote="{% url 'abon_phistory_link' gid abon_id %}" role="tab" data-toggle="tab">История платежей</a></li>
+        <li class="active"><a href="#livetab_content" data-tab-remote="{% url 'abonhome_link' abon_group.id abon.id %}" role="tab" data-toggle="tab">Информация абонента</a></li>
+        <li><a href="#livetab_content" data-tab-remote="{% url 'abon_services_link' abon_group.id abon.id %}" role="tab" data-toggle="tab">Услуги</a></li>
+        <li><a href="#livetab_content" data-tab-remote="{% url 'abon_amount_link' abon_group.id abon.id %}" role="tab" data-toggle="tab">Пополнить счёт</a></li>
+        <li><a href="#livetab_content" data-tab-remote="{% url 'abon_debts_link' abon_group.id abon.id %}" role="tab" data-toggle="tab">Долги</a></li>
+        <li><a href="#livetab_content" data-tab-remote="{% url 'abon_phistory_link' abon_group.id abon.id %}" role="tab" data-toggle="tab">История платежей</a></li>
     </ul>
 
     <div class="tab-content">
@@ -20,4 +27,4 @@
         </div>
     </div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/abonapp/group_list.html b/templates/abonapp/group_list.html
index c54519a..06e211f 100644
--- a/templates/abonapp/group_list.html
+++ b/templates/abonapp/group_list.html
@@ -1,6 +1,13 @@
 {% extends 'base.html' %}
 {% block main %}
 
+
+    <ol class="breadcrumb">
+      <li><span class="glyphicon glyphicon-home"></span></li>
+      <li class="active">Группы абонентов</li>
+    </ol>
+
+
     <h3>Группы абонентов</h3>
 
     <div class="table-responsive">
@@ -8,9 +15,21 @@
         <thead>
         <tr>
             <th width="50">#</th>
-            <th>Название группы</th>
-            <th>Адресс группы</th>
-            <th>Количество абонентов</th>
+            <th>
+                <a href="{% url 'abongroup_list_link' %}?order_by=title&dir={{ dir|default:"down" }}">
+                    Название группы
+                </a>
+                {% if order_by == 'title' %}<span class="glyphicon glyphicon-filter"></span>{% endif %}
+            </th>
+            <th>
+                <a href="{% url 'abongroup_list_link' %}?order_by=address&dir={{ dir|default:"down" }}">
+                    Адресс группы
+                </a>
+                {% if order_by == 'address' %}<span class="glyphicon glyphicon-filter"></span>{% endif %}
+            </th>
+            <th>
+                Количество абонентов
+            </th>
             <th width="100">Do</th>
         </tr>
         </thead>
@@ -18,7 +37,7 @@
         {% for gr in groups %}
             <tr>
                 <td>{{ gr.id }}</td>
-                <td><a href="{% url 'pays_people_list_link' gr.id %}">{{ gr.title }}</a></td>
+                <td><a href="{% url 'people_list_link' gr.id %}">{{ gr.title }}</a></td>
                 <td>{{ gr.address }}</td>
                 <td>{{ gr.usercount }}</td>
                 <td>
@@ -38,10 +57,13 @@
         </tbody>
         <tfoot>
         <tr>
-            <td colspan="5">
+            <td colspan="5" class="btn-group">
                 <a href="{% url 'addgroup_link' %}" class="btn btn-success btn-sm">
                     <span class="glyphicon glyphicon-plus"></span> Создать группу
                 </a>
+                <a href="{% url 'abonapp_log_link' %}" class="btn btn-default btn-sm">
+                    <span class="glyphicon glyphicon-record"></span> Действия абонентов
+                </a>
             </td>
         </tr>
         </tfoot>
diff --git a/templates/abonapp/invoiceForPayment.html b/templates/abonapp/invoiceForPayment.html
index 4977dbe..9a3ec9f 100644
--- a/templates/abonapp/invoiceForPayment.html
+++ b/templates/abonapp/invoiceForPayment.html
@@ -1,5 +1,6 @@
 {% extends request.is_ajax|yesno:'nullcont.htm,abonapp/ext.htm' %}
 {% block content %}
+
 <table class="table table-striped table-bordered">
     <thead>
     <tr>
@@ -39,11 +40,11 @@
     </tbody>
     <tfoot>
     <tr><th colspan="7">
-        <a href="{% url 'abonapp_addinvoice_link' gid abon_id %}" class="btn btn-success btn-sm">
+        <a href="{% url 'abonapp_addinvoice_link' abon_group.id abon.id %}" class="btn btn-success btn-sm">
             <span class="glyphicon glyphicon-plus"></span> Добавить
         </a>
     </th></tr>
     </tfoot>
 </table>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/abonapp/log.html b/templates/abonapp/log.html
index 1b0d395..a85f634 100644
--- a/templates/abonapp/log.html
+++ b/templates/abonapp/log.html
@@ -1,6 +1,12 @@
 {% extends 'base.html' %}
 {% block main %}
 
+    <ol class="breadcrumb">
+      <li><span class="glyphicon glyphicon-home"></span></li>
+      <li><a href="{% url 'abongroup_list_link' %}">Группы абонентов</a></li>
+      <li class="active">История действий абонентов</li>
+    </ol>
+
 
     <h3>История абонента</h3>
     <div class="table-responsive">
diff --git a/templates/abonapp/payHistory.html b/templates/abonapp/payHistory.html
index e0bb560..c80579a 100644
--- a/templates/abonapp/payHistory.html
+++ b/templates/abonapp/payHistory.html
@@ -13,7 +13,7 @@
     </thead>
     <tbody>
     {% for ph in pay_history %}<tr>
-        <td><a href="{% url 'abonhome_link' gid abon_id %}">{{ ph.abon.username }}</a></td>
+        <td><a href="{% url 'abonhome_link' abon_group.id abon.id %}">{{ ph.abon.username }}</a></td>
         <td>{{ ph.amount }}</td>
         <td>{{ ph.date|date:'d F Y, H:i:s' }}</td>
         <td><a target="_blank" href="{% url 'other_profile' ph.author.id %}">{{ ph.author.username }}</a></td>
diff --git a/templates/abonapp/peoples.html b/templates/abonapp/peoples.html
index 1aeb176..282d0cc 100644
--- a/templates/abonapp/peoples.html
+++ b/templates/abonapp/peoples.html
@@ -1,16 +1,44 @@
 {% extends 'base.html' %}
 {% block main %}
 
+
+    <ol class="breadcrumb">
+      <li><span class="glyphicon glyphicon-home"></span></li>
+      <li><a href="{% url 'abongroup_list_link' %}">Группы абонентов</a></li>
+      <li class="active">{{ abon_group.title }}</li>
+    </ol>
+
+
     <h3>Народ в выбранной группе</h3>
     <div class="table-responsive">
     <table class="table table-striped table-bordered">
         <thead>
         <tr>
             <th width="15">#</th>
-            <th>Абонент</th>
-            <th>IP Адрес</th>
-            <th>ФИО</th>
-            <th width="50">Балланс</th>
+            <th>
+                <a href="{% url 'people_list_link' abon_group.id %}?order_by=username&dir={{ dir|default:"down" }}">
+                    Абонент
+                </a>
+                {% if order_by == 'username' %}<span class="glyphicon glyphicon-filter"></span>{% endif %}
+            </th>
+            <th>
+                <a href="{% url 'people_list_link' abon_group.id %}?order_by=ip_address&dir={{ dir|default:"down" }}">
+                    IP Адрес
+                </a>
+                {% if order_by == 'ip_address' %}<span class="glyphicon glyphicon-filter"></span>{% endif %}
+            </th>
+            <th>
+                <a href="{% url 'people_list_link' abon_group.id %}?order_by=fio&dir={{ dir|default:"down" }}">
+                    ФИО
+                </a>
+                {% if order_by == 'fio' %}<span class="glyphicon glyphicon-filter"></span>{% endif %}
+            </th>
+            <th width="50">
+                <a href="{% url 'people_list_link' abon_group.id %}?order_by=ballance&dir={{ dir|default:"down" }}">
+                    Балланс
+                </a>
+                {% if order_by == 'ballance' %}<span class="glyphicon glyphicon-filter"></span>{% endif %}
+            </th>
             <th width="150">Телефон</th>
             <th width="150">Тариф</th>
             <th width="100">Do</th>
@@ -38,7 +66,7 @@
         {% empty %}
             <tr>
                 <td colspan="8">
-                    Ещё нет абонентов, <a href="{% url 'addabon_link' gid %}">добавить</a>
+                    Ещё нет абонентов, <a href="{% url 'addabon_link' abon_group.id %}">добавить</a>
                 </td>
             </tr>
         {% endfor %}
@@ -46,7 +74,7 @@
         <tfoot>
         <tr>
             <td colspan="8">
-                <a href="{% url 'addabon_link' gid %}" class="btn btn-sm btn-default" title="Добавить">
+                <a href="{% url 'addabon_link' abon_group.id %}" class="btn btn-sm btn-default" title="Добавить">
                     <span class="glyphicon glyphicon-plus"></span> Добавить абонента
                 </a>
             </td>
diff --git a/templates/abonapp/services.html b/templates/abonapp/services.html
index 10b1fc1..b8b79c2 100644
--- a/templates/abonapp/services.html
+++ b/templates/abonapp/services.html
@@ -26,10 +26,10 @@
         <td>{{ trf.tariff.time_of_action }}</td>
         {% if trf.id != active_abontariff_id %}
             <td colspan="2" class="btn-group">
-                <a href="{% url 'abonapp_chpriority_tariff' gid abon_id %}?t={{ trf.id }}&a=up" class="btn btn-blue">
+                <a href="{% url 'abonapp_chpriority_tariff' abon_group.id abon.id %}?t={{ trf.id }}&a=up" class="btn btn-blue">
                     <i class="icon-fing_up"></i>
                 </a>
-                <a href="{% url 'abonapp_chpriority_tariff' gid abon_id %}?t={{ trf.id }}&a=down" class="btn btn-blue">
+                <a href="{% url 'abonapp_chpriority_tariff' abon_group.id abon.id %}?t={{ trf.id }}&a=down" class="btn btn-blue">
                     <i class="icon-fing_down"></i>
                 </a>
                 <a href="#" class="btn btn-blue" title="Отменить услугу">
@@ -38,20 +38,20 @@
             </td>
         {% else %}
             <td colspan="2">
-                <a href="{% url 'abonapp_compl_srv' gid abon_id trf.id %}" title="Завершить услугу досрочно" class="btn btn-danger btn-sm">
+                <a href="{% url 'abonapp_compl_srv' abon_group.id abon.id trf.id %}" title="Завершить услугу досрочно" class="btn btn-danger btn-sm">
                     <i class="glyphicon glyphicon-remove"></i> Завершить
                 </a>
             </td>
         {% endif %}
     </tr>
     {% empty %}
-    <tr><td colspan="8">Нет подключённых абоненту услуг, <a href="{% url 'abonapp_buy_tariff' gid abon_id %}" class="lgtbx">купить</a></td></tr>
+    <tr><td colspan="8">Нет подключённых абоненту услуг, <a href="{% url 'abonapp_buy_tariff' abon_group.id abon.id %}" class="lgtbx">купить</a></td></tr>
     {% endfor %}
     </tbody>
 
     <tfoot>
     <tr><th colspan="8">
-        <a href="{% url 'abonapp_buy_tariff' gid abon_id %}" class="btn btn-sm btn-success">
+        <a href="{% url 'abonapp_buy_tariff' abon_group.id abon.id %}" class="btn btn-sm btn-success">
             <span class="glyphicon glyphicon-plus"></span> Купить услугу
         </a>
     </th></tr>