From 3deb15c4f4a5bc8016f7e141098b4c45311feb8c Mon Sep 17 00:00:00 2001
From: Dmitry <nerosketch@gmail.com>
Date: Sun, 16 Apr 2017 04:06:45 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=88=D0=BD=D0=B5=D0=B5=20=D0=BF=D0=BE=D0=BB=D0=B5=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=20=D0=B4=D0=B5=D0=B9=D1=81=D1=82=D0=B2=D0=B8=D1=8F=20=D1=83?=
 =?UTF-8?q?=D1=81=D0=BB=D1=83=D0=B3=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tariff_app/forms.py                            |  1 -
 tariff_app/templates/tariff_app/editTarif.html |  9 ---------
 tariff_app/templates/tariff_app/tarifs.html    | 12 ++----------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/tariff_app/forms.py b/tariff_app/forms.py
index bf1fd14..8f7e9e1 100644
--- a/tariff_app/forms.py
+++ b/tariff_app/forms.py
@@ -13,6 +13,5 @@ class TariffForm(forms.ModelForm):
             'speedIn': forms.NumberInput(attrs={'class': 'form-control'}),
             'speedOut': forms.NumberInput(attrs={'class': 'form-control'}),
             'amount': forms.NumberInput(attrs={'class': 'form-control'}),
-            'time_of_action': forms.DateTimeInput(attrs={'class': 'form-control'}),
             'calc_type': forms.Select(attrs={'class': 'form-control'})
         }
diff --git a/tariff_app/templates/tariff_app/editTarif.html b/tariff_app/templates/tariff_app/editTarif.html
index 50caaa8..dc86afe 100644
--- a/tariff_app/templates/tariff_app/editTarif.html
+++ b/tariff_app/templates/tariff_app/editTarif.html
@@ -68,15 +68,6 @@
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <label for="id_time_of_action">Время действия (в днях)</label>
-
-                    <div class="input-group">
-                        <span class="input-group-addon"><span class="glyphicon glyphicon-user"></span></span>
-                        {{ form.time_of_action }}{{ form.time_of_action.errors }}
-                    </div>
-                </div>
-
                 <div class="form-group">
                     <label for="id_calc_type">Скрипт</label>
 
diff --git a/tariff_app/templates/tariff_app/tarifs.html b/tariff_app/templates/tariff_app/tarifs.html
index 213fead..668c0d1 100644
--- a/tariff_app/templates/tariff_app/tarifs.html
+++ b/tariff_app/templates/tariff_app/tarifs.html
@@ -1,7 +1,6 @@
 {% extends 'base.html' %}
 {% block main %}
 
-
     <ol class="breadcrumb">
         <li><span class="glyphicon glyphicon-home"></span></li>
         <li class="active">Тарифы</li>
@@ -38,12 +37,6 @@
                     </a>
                     {% if order_by == 'amount' %}<span class="glyphicon glyphicon-filter"></span>{% endif %}
                 </th>
-                <th>
-                    <a href="{% url 'tarifs:home' %}?order_by=time_of_action&dir={{ dir|default:"down" }}">
-                        Время действия
-                    </a>
-                    {% if order_by == 'time_of_action' %}<span class="glyphicon glyphicon-filter"></span>{% endif %}
-                </th>
                 <th width="250">Название скрипта</th>
                 <th width="50">Do</th>
             </tr>
@@ -61,7 +54,6 @@
                     <td>{{ tar.speedIn }}</td>
                     <td>{{ tar.speedOut }}</td>
                     <td>{{ tar.amount }} руб</td>
-                    <td>{{ tar.time_of_action }} дней</td>
                     <td>{{ tar.get_calc_type_display }}</td>
                     <td>
                         {% if perms.tariff_app.delete_tariff %}
@@ -73,7 +65,7 @@
                 </tr>
             {% empty %}
                 <tr>
-                    <td colspan="7">Ещё нет созданных тарифов.
+                    <td colspan="6">Ещё нет созданных тарифов.
                         {% if perms.tariff_app.add_tariff %}
                             <a href="{% url 'tarifs:add' %}" class="lgtbx">Создать</a>
                         {% endif %}
@@ -85,7 +77,7 @@
             {% if perms.tariff_app.add_tariff %}
             <tfoot>
             <tr>
-                <td colspan="7">
+                <td colspan="6">
                     <a href="{% url 'tarifs:add' %}" class="btn btn-sm btn-success">
                         <span class="glyphicon glyphicon-plus"></span> Добавить
                     </a>