From 6827252b4357633057f0d5cb636d17e4f88f47ea Mon Sep 17 00:00:00 2001
From: Dmitry <nerosketch@gmail.com>
Date: Sat, 28 Jan 2017 14:23:46 +0000
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B4=D0=BE=D0=BB=D0=B6?=
 =?UTF-8?q?=D0=B0=D1=8E...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 abonapp/migrations/0006_auto_20170128_1626.py | 43 +++++++++++++++++++
 .../migrations/0004_auto_20170128_1316.py     | 18 ++++++++
 templates/abonapp/task_log.html               | 40 +++++++++++++++++
 3 files changed, 101 insertions(+)
 create mode 100644 abonapp/migrations/0006_auto_20170128_1626.py
 create mode 100644 accounts_app/migrations/0004_auto_20170128_1316.py
 create mode 100644 templates/abonapp/task_log.html

diff --git a/abonapp/migrations/0006_auto_20170128_1626.py b/abonapp/migrations/0006_auto_20170128_1626.py
new file mode 100644
index 0000000..64ddb21
--- /dev/null
+++ b/abonapp/migrations/0006_auto_20170128_1626.py
@@ -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'),
+        ),
+    ]
diff --git a/accounts_app/migrations/0004_auto_20170128_1316.py b/accounts_app/migrations/0004_auto_20170128_1316.py
new file mode 100644
index 0000000..824e7e9
--- /dev/null
+++ b/accounts_app/migrations/0004_auto_20170128_1316.py
@@ -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),
+        ),
+    ]
diff --git a/templates/abonapp/task_log.html b/templates/abonapp/task_log.html
new file mode 100644
index 0000000..b4699bf
--- /dev/null
+++ b/templates/abonapp/task_log.html
@@ -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:'&mdash;' }}</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 %}
\ No newline at end of file