diff --git a/access/migrations/0001_initial.py b/access/migrations/0001_initial.py index 6342099..a80247f 100644 --- a/access/migrations/0001_initial.py +++ b/access/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.6 on 2018-01-22 09:27 +# Generated by Django 1.11.6 on 2018-01-29 16:48 from __future__ import unicode_literals import access.models.user @@ -81,6 +81,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('hidden_lessons', django.contrib.postgres.fields.ArrayField(base_field=models.UUIDField(editable=False, unique=True, verbose_name='Токен урока'), default=[], size=None, verbose_name='Список скрытых уроков')), ('course_token', models.UUIDField(editable=False, verbose_name='Токен курса')), + ('active_lesson', models.UUIDField(blank=True, null=True, verbose_name='Токен активного урока')), ('teacher', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='teacher_progress', to=settings.AUTH_USER_MODEL, verbose_name='Преподователь по умолчанию')), ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Студент')), ], @@ -105,6 +106,19 @@ class Migration(migrations.Migration): 'verbose_name_plural': 'Прохождение урока', }, ), + migrations.CreateModel( + name='UserActivity', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('ip_list', django.contrib.postgres.fields.ArrayField(base_field=models.GenericIPAddressField(editable=False, verbose_name='Ip адресс'), default=[], size=None)), + ('last_request', models.DateTimeField(auto_now=True, verbose_name='Был в сети')), + ('owner', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + options={ + 'verbose_name': 'Пользовательская активность', + 'verbose_name_plural': 'Пользовательская активность', + }, + ), migrations.CreateModel( name='ResetPassword', fields=[ diff --git a/access/migrations/0003_useractivity.py b/access/migrations/0003_useractivity.py deleted file mode 100644 index b87c032..0000000 --- a/access/migrations/0003_useractivity.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.6 on 2018-01-23 10:11 -from __future__ import unicode_literals - -from django.conf import settings -import django.contrib.postgres.fields -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0002_init_group'), - ] - - operations = [ - migrations.CreateModel( - name='UserActivity', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('ip_list', django.contrib.postgres.fields.ArrayField(base_field=models.GenericIPAddressField(editable=False, verbose_name='Ip адресс'), default=[], size=None)), - ('last_request', models.DateTimeField(auto_now=True, verbose_name='Был в сети')), - ('owner', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - options={ - 'verbose_name': 'Пользовательская активность', - 'verbose_name_plural': 'Пользовательская активность', - }, - ), - ] diff --git a/access/migrations/0004_auto_20180129_0933.py b/access/migrations/0004_auto_20180129_0933.py deleted file mode 100644 index 7440266..0000000 --- a/access/migrations/0004_auto_20180129_0933.py +++ /dev/null @@ -1,45 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.6 on 2018-01-29 09:33 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0003_useractivity'), - ] - - operations = [ - migrations.AlterUniqueTogether( - name='progress', - unique_together=set([]), - ), - migrations.RemoveField( - model_name='progress', - name='teacher', - ), - migrations.RemoveField( - model_name='progress', - name='user', - ), - migrations.AlterUniqueTogether( - name='progresslesson', - unique_together=set([]), - ), - migrations.RemoveField( - model_name='progresslesson', - name='progress', - ), - migrations.RemoveField( - model_name='progresslesson', - name='teacher', - ), - migrations.DeleteModel( - name='Progress', - ), - migrations.DeleteModel( - name='ProgressLesson', - ), - ] diff --git a/achievements/migrations/0001_initial.py b/achievements/migrations/0001_initial.py index b482f53..6036241 100644 --- a/achievements/migrations/0001_initial.py +++ b/achievements/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.6 on 2018-01-22 09:27 +# Generated by Django 1.11.6 on 2018-01-29 16:48 from __future__ import unicode_literals from django.conf import settings diff --git a/courses/migrations/0001_initial.py b/courses/migrations/0001_initial.py index 290ab1e..07fcae5 100644 --- a/courses/migrations/0001_initial.py +++ b/courses/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.6 on 2018-01-22 09:27 +# Generated by Django 1.11.6 on 2018-01-29 16:48 from __future__ import unicode_literals import django.contrib.postgres.fields diff --git a/finance/migrations/0001_initial.py b/finance/migrations/0001_initial.py index 6438d0b..7c9b6ff 100644 --- a/finance/migrations/0001_initial.py +++ b/finance/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.6 on 2018-01-22 09:27 +# Generated by Django 1.11.6 on 2018-01-29 16:48 from __future__ import unicode_literals from django.conf import settings @@ -12,8 +12,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('yandex_money', '0001_initial'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('yandex_money', '0002_auto_20171128_1150'), ] operations = [ diff --git a/library/migrations/0001_initial.py b/library/migrations/0001_initial.py index 7d71d43..7b1c6d4 100644 --- a/library/migrations/0001_initial.py +++ b/library/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.6 on 2018-01-22 09:27 +# Generated by Django 1.11.6 on 2018-01-29 16:48 from __future__ import unicode_literals import datetime diff --git a/storage/migrations/0001_initial.py b/storage/migrations/0001_initial.py index 1689788..4e36cc4 100644 --- a/storage/migrations/0001_initial.py +++ b/storage/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.6 on 2018-01-22 09:27 +# Generated by Django 1.11.6 on 2018-01-29 16:48 from __future__ import unicode_literals from django.db import migrations, models