Browse Source

Удалил лишнее поле для времени действия услуги

devel
Dmitry 9 years ago
parent
commit
3deb15c4f4
  1. 1
      tariff_app/forms.py
  2. 9
      tariff_app/templates/tariff_app/editTarif.html
  3. 12
      tariff_app/templates/tariff_app/tarifs.html

1
tariff_app/forms.py

@ -13,6 +13,5 @@ class TariffForm(forms.ModelForm):
'speedIn': forms.NumberInput(attrs={'class': 'form-control'}), 'speedIn': forms.NumberInput(attrs={'class': 'form-control'}),
'speedOut': forms.NumberInput(attrs={'class': 'form-control'}), 'speedOut': forms.NumberInput(attrs={'class': 'form-control'}),
'amount': 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'}) 'calc_type': forms.Select(attrs={'class': 'form-control'})
} }

9
tariff_app/templates/tariff_app/editTarif.html

@ -68,15 +68,6 @@
</div> </div>
</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"> <div class="form-group">
<label for="id_calc_type">Скрипт</label> <label for="id_calc_type">Скрипт</label>

12
tariff_app/templates/tariff_app/tarifs.html

@ -1,7 +1,6 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% block main %} {% block main %}
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><span class="glyphicon glyphicon-home"></span></li> <li><span class="glyphicon glyphicon-home"></span></li>
<li class="active">Тарифы</li> <li class="active">Тарифы</li>
@ -38,12 +37,6 @@
</a> </a>
{% if order_by == 'amount' %}<span class="glyphicon glyphicon-filter"></span>{% endif %} {% if order_by == 'amount' %}<span class="glyphicon glyphicon-filter"></span>{% endif %}
</th> </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="250">Название скрипта</th>
<th width="50">Do</th> <th width="50">Do</th>
</tr> </tr>
@ -61,7 +54,6 @@
<td>{{ tar.speedIn }}</td> <td>{{ tar.speedIn }}</td>
<td>{{ tar.speedOut }}</td> <td>{{ tar.speedOut }}</td>
<td>{{ tar.amount }} руб</td> <td>{{ tar.amount }} руб</td>
<td>{{ tar.time_of_action }} дней</td>
<td>{{ tar.get_calc_type_display }}</td> <td>{{ tar.get_calc_type_display }}</td>
<td> <td>
{% if perms.tariff_app.delete_tariff %} {% if perms.tariff_app.delete_tariff %}
@ -73,7 +65,7 @@
</tr> </tr>
{% empty %} {% empty %}
<tr> <tr>
<td colspan="7">Ещё нет созданных тарифов.
<td colspan="6">Ещё нет созданных тарифов.
{% if perms.tariff_app.add_tariff %} {% if perms.tariff_app.add_tariff %}
<a href="{% url 'tarifs:add' %}" class="lgtbx">Создать</a> <a href="{% url 'tarifs:add' %}" class="lgtbx">Создать</a>
{% endif %} {% endif %}
@ -85,7 +77,7 @@
{% if perms.tariff_app.add_tariff %} {% if perms.tariff_app.add_tariff %}
<tfoot> <tfoot>
<tr> <tr>
<td colspan="7">
<td colspan="6">
<a href="{% url 'tarifs:add' %}" class="btn btn-sm btn-success"> <a href="{% url 'tarifs:add' %}" class="btn btn-sm btn-success">
<span class="glyphicon glyphicon-plus"></span> Добавить <span class="glyphicon glyphicon-plus"></span> Добавить
</a> </a>

Loading…
Cancel
Save