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 %} + +
| Автор | +Исполнители | +Комментарий | +Состояние | +Тип | +Дата создания | +
|---|---|---|---|---|---|
| {{ task.author.get_short_name }} | ++ {% for rec in task.recipients.all %} + {{ rec.get_short_name }} + {% empty %} + Нет исполнителей + {% endfor %} + | +{{ task.descr|default:'—' }} | +{{ task.get_state_display }} | +{{ task.get_mode_display }} | +{{ task.time_of_create|date:"D d E Y H:i:s" }} | +
| Нет задач | +|||||