Andrey
8 years ago
parent
2e938e53e7
commit
8fbdb28e92
29 changed files with 177 additions and 429 deletions
@ -1,27 +0,0 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.11.6 on 2017-10-13 11:56 |
||||
from __future__ import unicode_literals |
||||
|
||||
from django.conf import settings |
||||
from django.db import migrations, models |
||||
import django.db.models.deletion |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('access', '0002_auto_20171013_1118'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.CreateModel( |
||||
name='Account', |
||||
fields=[ |
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), |
||||
('b_day', models.DateTimeField(blank=True, null=True)), |
||||
('city', models.CharField(max_length=63, null=True)), |
||||
('gender', models.SmallIntegerField(choices=[(2, 'female'), (1, 'male'), (0, 'undefined')], default=0)), |
||||
('owner', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), |
||||
], |
||||
), |
||||
] |
||||
@ -1,38 +0,0 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.11.6 on 2017-10-13 12:22 |
||||
from __future__ import unicode_literals |
||||
|
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('access', '0004_auto_20171013_1200'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.RemoveField( |
||||
model_name='user', |
||||
name='phone', |
||||
), |
||||
migrations.RemoveField( |
||||
model_name='user', |
||||
name='photo', |
||||
), |
||||
migrations.AddField( |
||||
model_name='account', |
||||
name='phone', |
||||
field=models.CharField(blank=True, max_length=15), |
||||
), |
||||
migrations.AddField( |
||||
model_name='account', |
||||
name='photo', |
||||
field=models.ImageField(blank=True, default='user/photo/default_avatar.png', null=True, upload_to='user/photo/'), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='account', |
||||
name='gender', |
||||
field=models.SmallIntegerField(choices=[(1, 'male'), (0, 'undefined'), (2, 'female')], default=0), |
||||
), |
||||
] |
||||
@ -1,25 +0,0 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.11.6 on 2017-10-13 12:42 |
||||
from __future__ import unicode_literals |
||||
|
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('access', '0005_auto_20171013_1222'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AddField( |
||||
model_name='user', |
||||
name='is_blocked', |
||||
field=models.BooleanField(default=False, help_text='Определяет заблокирован ли пользователь. Поставьте флаг, если знаете, что это нехороший человек.', verbose_name='заблочен'), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='account', |
||||
name='gender', |
||||
field=models.SmallIntegerField(choices=[(2, 'female'), (0, 'undefined'), (1, 'male')], default=0), |
||||
), |
||||
] |
||||
@ -1,30 +0,0 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.11.6 on 2017-10-13 12:47 |
||||
from __future__ import unicode_literals |
||||
|
||||
from django.conf import settings |
||||
from django.db import migrations, models |
||||
import django.db.models.deletion |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('access', '0006_auto_20171013_1242'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.CreateModel( |
||||
name='Invite', |
||||
fields=[ |
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), |
||||
('hash', models.CharField(default='ukCbBjPYGTGLOGs', max_length=15)), |
||||
('owner', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), |
||||
], |
||||
), |
||||
migrations.AlterField( |
||||
model_name='account', |
||||
name='gender', |
||||
field=models.SmallIntegerField(choices=[(2, 'female'), (1, 'male'), (0, 'undefined')], default=0), |
||||
), |
||||
] |
||||
@ -1,30 +0,0 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.11.6 on 2017-10-16 16:34 |
||||
from __future__ import unicode_literals |
||||
|
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('access', '0008_auto_20171016_1159'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AlterField( |
||||
model_name='account', |
||||
name='gender', |
||||
field=models.SmallIntegerField(choices=[(0, 'undefined'), (2, 'female'), (1, 'male')], default=0), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='invite', |
||||
name='hash', |
||||
field=models.CharField(default='vwiZvxTTDrJJUUF', max_length=15), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='user', |
||||
name='last_login', |
||||
field=models.DateTimeField(auto_now_add=True, verbose_name='last login'), |
||||
), |
||||
] |
||||
@ -1,30 +0,0 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.11.6 on 2017-10-16 17:09 |
||||
from __future__ import unicode_literals |
||||
|
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('access', '0009_auto_20171016_1634'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AlterField( |
||||
model_name='account', |
||||
name='gender', |
||||
field=models.SmallIntegerField(choices=[(1, 'male'), (2, 'female'), (0, 'undefined')], default=0), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='invite', |
||||
name='hash', |
||||
field=models.CharField(default='QtrdrGbAnXtRHSL', max_length=15), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='user', |
||||
name='last_login', |
||||
field=models.DateTimeField(blank=True, null=True, verbose_name='last login'), |
||||
), |
||||
] |
||||
@ -1,30 +0,0 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.11.6 on 2017-10-17 09:24 |
||||
from __future__ import unicode_literals |
||||
|
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('access', '0011_auto_20171017_0800'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AddField( |
||||
model_name='invite', |
||||
name='date', |
||||
field=models.DateTimeField(blank=True, null=True), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='account', |
||||
name='gender', |
||||
field=models.SmallIntegerField(choices=[(0, 'undefined'), (2, 'female'), (1, 'male')], default=0), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='invite', |
||||
name='hash', |
||||
field=models.CharField(default='JnNSTfEkoDEclgp', max_length=15), |
||||
), |
||||
] |
||||
@ -1,35 +0,0 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.11.6 on 2017-10-17 09:33 |
||||
from __future__ import unicode_literals |
||||
|
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('access', '0012_auto_20171017_0924'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AlterField( |
||||
model_name='account', |
||||
name='gender', |
||||
field=models.SmallIntegerField(choices=[(0, 'undefined'), (1, 'male'), (2, 'female')], default=0), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='invite', |
||||
name='hash', |
||||
field=models.CharField(default='RGmRBoJxBvpmTzm', max_length=15), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='user', |
||||
name='first_name', |
||||
field=models.CharField(blank=True, default='Guest', max_length=63, verbose_name='first name'), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='user', |
||||
name='last_name', |
||||
field=models.CharField(blank=True, max_length=63, verbose_name='last name'), |
||||
), |
||||
] |
||||
@ -1,51 +0,0 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.11.6 on 2017-10-17 15:14 |
||||
from __future__ import unicode_literals |
||||
|
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('access', '0014_auto_20171017_1450'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AlterModelOptions( |
||||
name='account', |
||||
options={'verbose_name': 'Дополнительная информация о пользователе', 'verbose_name_plural': 'Дополнительная информация о пользователе'}, |
||||
), |
||||
migrations.AlterModelOptions( |
||||
name='extraprivilege', |
||||
options={'verbose_name': 'Доп право', 'verbose_name_plural': 'Доп права пользователя'}, |
||||
), |
||||
migrations.AlterModelOptions( |
||||
name='invite', |
||||
options={'verbose_name': 'Приглошение в систему', 'verbose_name_plural': 'Приглошения в систему'}, |
||||
), |
||||
migrations.AlterModelOptions( |
||||
name='progress', |
||||
options={'verbose_name': 'Прогресс пользователя', 'verbose_name_plural': 'Прогресс пользователя'}, |
||||
), |
||||
migrations.AlterField( |
||||
model_name='account', |
||||
name='city', |
||||
field=models.CharField(blank=True, max_length=63, null=True), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='account', |
||||
name='gender', |
||||
field=models.SmallIntegerField(choices=[(2, 'female'), (1, 'male'), (0, 'undefined')], default=0), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='account', |
||||
name='phone', |
||||
field=models.CharField(blank=True, max_length=15, null=True), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='invite', |
||||
name='hash', |
||||
field=models.CharField(default='EwxzlFyTLohcDNa', max_length=15), |
||||
), |
||||
] |
||||
@ -0,0 +1,23 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.11.6 on 2017-10-18 10:25 |
||||
from __future__ import unicode_literals |
||||
|
||||
from django.db import migrations |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('courses', '0003_auto_20171018_1022'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AlterModelOptions( |
||||
name='skillj', |
||||
options={'verbose_name': 'Размер навыка', 'verbose_name_plural': 'Размеры навыков'}, |
||||
), |
||||
migrations.RemoveField( |
||||
model_name='skillj', |
||||
name='size', |
||||
), |
||||
] |
||||
@ -0,0 +1,24 @@ |
||||
import os, sys, django, csv |
||||
|
||||
sys.path.append("../") |
||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "lms.settings") |
||||
django.setup() |
||||
|
||||
from courses.models import Course |
||||
|
||||
if __name__ == '__main__': |
||||
with open('./course/course.csv') as user_csv: |
||||
user_reader = csv.DictReader(user_csv) |
||||
for row in user_reader: |
||||
row = dict(row) |
||||
teachers = row.pop('teachers', None).split("[")[1].split("]")[0].split(", ") |
||||
mentors = row.pop('mentors', None).split("[")[1].split("]")[0].split(", ") |
||||
course, _is_create = Course.objects.get_or_create(**row) |
||||
|
||||
for teacher in teachers: |
||||
if teacher: |
||||
course.teachers.add(teacher) |
||||
|
||||
for mentor in mentors: |
||||
if mentor: |
||||
course.mentors.add(mentor) |
||||
@ -1,26 +0,0 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.11.6 on 2017-10-13 11:18 |
||||
from __future__ import unicode_literals |
||||
|
||||
from django.db import migrations, models |
||||
import django.db.models.deletion |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('library', '0001_initial'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AddField( |
||||
model_name='article', |
||||
name='section', |
||||
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='library.ArticleSection', verbose_name='Раздел'), |
||||
), |
||||
migrations.AddField( |
||||
model_name='article', |
||||
name='tags', |
||||
field=models.ManyToManyField(blank=True, to='library.Tags', verbose_name='Теги'), |
||||
), |
||||
] |
||||
Loading…
Reference in new issue