From feb0fd2cda8d2da50062c69b401bd1d61cf0cadf Mon Sep 17 00:00:00 2001
From: bashmak <nerosketch@gmail.com>
Date: Wed, 14 Feb 2018 13:42:15 +0300
Subject: [PATCH] Display flags in userlist

---
 abonapp/forms.py                        |  1 -
 abonapp/templates/abonapp/peoples.html  |  9 +++++++--
 abonapp/templates/abonapp/viewAbon.html | 23 ++++-------------------
 abonapp/views.py                        |  2 +-
 4 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/abonapp/forms.py b/abonapp/forms.py
index acfa9e8..a2932d0 100644
--- a/abonapp/forms.py
+++ b/abonapp/forms.py
@@ -7,7 +7,6 @@ from random import choice
 from string import digits, ascii_lowercase
 from . import models
 from django.conf import settings
-from bitfield.forms import BitFieldCheckboxSelectMultiple
 
 
 TELEPHONE_REGEXP = getattr(settings, 'TELEPHONE_REGEXP', r'^\+[7,8,9,3]\d{10,11}$')
diff --git a/abonapp/templates/abonapp/peoples.html b/abonapp/templates/abonapp/peoples.html
index bc52466..bd3a348 100644
--- a/abonapp/templates/abonapp/peoples.html
+++ b/abonapp/templates/abonapp/peoples.html
@@ -58,6 +58,7 @@
                             </a>
                             {% if order_by == 'ballance' %}<span class="glyphicon glyphicon-filter"></span>{% endif %}
                         </th>
+                        <th class="hidden-xs">{% trans 'Markers' %}</th>
                         <th class="hidden-xs">#</th>
                     </tr>
                     </thead>
@@ -102,6 +103,10 @@
                             {% endif %}
                         </td>
                         <td class="hidden-xs">{{ human.ballance|floatformat:2 }}</td>
+                        <td>
+                            {% for user_icon in human.get_flag_icons %}<span class="m-icon {{ user_icon }}"></span>
+                            {% endfor %}
+                        </td>
                         <td class="hidden-xs">
                             {% if can_del_trf %}
                                 <a href="{% url 'abonapp:del_abon' %}?id={{ human.pk }}" class="btn btn-danger btn-sm">
@@ -112,7 +117,7 @@
                         </tr>
                     {% empty %}
                         <tr>
-                            <td colspan="11">
+                            <td colspan="12">
                                 {% trans 'Subscribers not found' %}.
                                 {% if perms.abonapp.add_abon %}
                                     <a href="{% url 'abonapp:add_abon' abon_group.pk %}">{% trans 'Add abon' %}</a>
@@ -124,7 +129,7 @@
                     </tbody>
                     <tfoot>
                     <tr>
-                        <td colspan="11" class="btn-group btn-group-sm">
+                        <td colspan="12" class="btn-group btn-group-sm">
                             {% if perms.abonapp.add_abon %}
                                 <a href="{% url 'abonapp:add_abon' abon_group.pk %}" class="btn btn-default" title="{% trans 'Add' %}" data-toggle="tooltip">
                                     <span class="glyphicon glyphicon-plus"></span> {% trans 'Add abon' %}
diff --git a/abonapp/templates/abonapp/viewAbon.html b/abonapp/templates/abonapp/viewAbon.html
index b05df1a..47f5869 100644
--- a/abonapp/templates/abonapp/viewAbon.html
+++ b/abonapp/templates/abonapp/viewAbon.html
@@ -61,33 +61,18 @@
             </div>
 
         </div>
-        {% if perms.abonapp.can_view_passport %}
         <div class="col-sm-6">
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    <h3 class="panel-title">{% trans 'Passport information' %}</h3>
+                    <h3 class="panel-title">{% trans 'User flags' %}</h3>
                 </div>
                 <div class="panel-body">
-                    <table class="table borderbot">
-                    <tbody>
-                    <tr>
-                        <td>{% trans 'Pasport serial' %}</td>
-                        <td><i>67 54 937238746</i></td>
-                    </tr>
-                    <tr>
-                        <td>{% trans 'Distributor' %}</td>
-                        <td><i>ОСУО Всякое название</i></td>
-                    </tr>
-                    <tr>
-                        <td>Ещё строчка</td>
-                        <td><i>Новая</i></td>
-                    </tr>
-                    </tbody>
-                    </table>
+                    {% for user_icon in abon.get_flag_icons %}
+                    <span class="m-icon {{ user_icon }}"></span>
+                    {% endfor %}
                 </div>
             </div>
         </div>
-        {% endif %}
     </div>
 
 {% endblock %}
\ No newline at end of file
diff --git a/abonapp/views.py b/abonapp/views.py
index 7f1d7e8..65fedd9 100644
--- a/abonapp/views.py
+++ b/abonapp/views.py
@@ -1058,7 +1058,7 @@ class EditSibscriberMarkers(UpdateView):
     def form_invalid(self, form):
         messages.add_message(self.request, messages.ERROR, _('fix form errors'))
         return super(EditSibscriberMarkers, self).form_invalid(form)
-    
+
     def form_valid(self, form):
         v = super(EditSibscriberMarkers, self).form_valid(form)
         messages.add_message(self.request, messages.SUCCESS, _('User flags has changed successfully'))