3 changed files with 101 additions and 0 deletions
-
43abonapp/migrations/0006_auto_20170128_1626.py
-
18accounts_app/migrations/0004_auto_20170128_1316.py
-
40templates/abonapp/task_log.html
@ -0,0 +1,43 @@ |
|||
# -*- coding: utf-8 -*- |
|||
# Generated by Django 1.9 on 2017-01-28 13:26 |
|||
from __future__ import unicode_literals |
|||
|
|||
from django.db import migrations, models |
|||
import django.db.models.deletion |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('abonapp', '0005_auto_20161226_0054'), |
|||
] |
|||
|
|||
operations = [ |
|||
migrations.CreateModel( |
|||
name='AbonStreets', |
|||
fields=[ |
|||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), |
|||
('name', models.CharField(max_length=64)), |
|||
('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='abonapp.AbonGroup')), |
|||
], |
|||
), |
|||
migrations.RemoveField( |
|||
model_name='abon', |
|||
name='address', |
|||
), |
|||
migrations.AddField( |
|||
model_name='abon', |
|||
name='description', |
|||
field=models.TextField(blank=True, null=True), |
|||
), |
|||
migrations.AddField( |
|||
model_name='abon', |
|||
name='house', |
|||
field=models.CharField(blank=True, max_length=12, null=True), |
|||
), |
|||
migrations.AddField( |
|||
model_name='abon', |
|||
name='street', |
|||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='abonapp.AbonStreets'), |
|||
), |
|||
] |
|||
@ -0,0 +1,18 @@ |
|||
# -*- coding: utf-8 -*- |
|||
# Generated by Django 1.9 on 2017-01-28 10:16 |
|||
from django.db import migrations, models |
|||
|
|||
|
|||
class Migration(migrations.Migration): |
|||
|
|||
dependencies = [ |
|||
('accounts_app', '0003_auto_20161206_2135'), |
|||
] |
|||
|
|||
operations = [ |
|||
migrations.AlterField( |
|||
model_name='userprofile', |
|||
name='email', |
|||
field=models.EmailField(default='admin@example.ru', max_length=254), |
|||
), |
|||
] |
|||
@ -0,0 +1,40 @@ |
|||
{% extends request.is_ajax|yesno:'nullcont.htm,abonapp/ext.htm' %} |
|||
{% block content %} |
|||
|
|||
<table class="table table-striped table-bordered"> |
|||
<thead> |
|||
<tr> |
|||
<th>Автор</th> |
|||
<th>Исполнители</th> |
|||
<th>Комментарий</th> |
|||
<th>Состояние</th> |
|||
<th>Тип</th> |
|||
<th>Дата создания</th> |
|||
</tr> |
|||
</thead> |
|||
<tbody> |
|||
{% for task in tasks %} |
|||
<tr> |
|||
<td><a href="{% url 'acc_app:other_profile' task.author.id %}">{{ task.author.get_short_name }}</a></td> |
|||
<td> |
|||
{% for rec in task.recipients.all %} |
|||
<a href="{% url 'acc_app:other_profile' rec.id %}">{{ rec.get_short_name }}</a> |
|||
{% empty %} |
|||
Нет исполнителей |
|||
{% endfor %} |
|||
</td> |
|||
<td>{{ task.descr|default:'—' }}</td> |
|||
<td>{{ task.get_state_display }}</td> |
|||
<td>{{ task.get_mode_display }}</td> |
|||
<td>{{ task.time_of_create|date:"D d E Y H:i:s" }}</td> |
|||
</tr> |
|||
{% empty %} |
|||
<tr> |
|||
<td colspan="6">Нет задач</td> |
|||
</tr> |
|||
{% endfor %} |
|||
</tbody> |
|||
|
|||
</table> |
|||
{% include 'toolbar_page.html' with pag=tasks %} |
|||
{% endblock %} |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue