mitri4
/
skill-back
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

зависимости

Browse Source
feature/fix_generate_pass
Andrey 8 years ago
parent 85d182e756
commit 9cdbfa6e7f
11 changed files with 27556 additions and 27558 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      access/migrations/0001_initial.py
  2. 16
      access/models/other.py
  3. 4
      achievements/migrations/0001_initial.py
  4. 10
      courses/migrations/0001_initial.py
  5. 5
      courses/models.py
  6. 37885
      csv/access/account.csv
  7. 17170
      csv/access/progress.csv
  8. 2
      csv/access/users.csv
  9. 2
      finance/migrations/0001_initial.py
  10. 2
      library/migrations/0001_initial.py
  11. 2
      storage/migrations/0001_initial.py

16
access/migrations/0001_initial.py
Unescape View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Generated by Django 1.11.6 on 2018-01-11 13:07 # Generated by Django 1.11.6 on 2018-01-11 14:34
from __future__ import unicode_literals from __future__ import unicode_literals
import access.models.user import access.models.user
@ -76,10 +76,8 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name='Progress', name='Progress',
fields=[ fields=[
('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, primary_key=True, verbose_name='Токен урока'), default=[], size=None, verbose_name='Список скрытых уроков')),
('lessons', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=15, unique=True, verbose_name='Ссылки на скрытые уроки'), default=[], size=None)), ('course_token', models.UUIDField(editable=False, primary_key=True, serialize=False, verbose_name='Токен курса')),
('route', models.CharField(blank=True, max_length=15, null=True, verbose_name='Токен прохождения')),
('course', models.CharField(max_length=127, verbose_name='Слаг курса')),
('teacher', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='teacher_progress', to=settings.AUTH_USER_MODEL, 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='Студент')), ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Студент')),
], ],
@ -91,8 +89,7 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name='ProgressLesson', name='ProgressLesson',
fields=[ fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('lesson_token', models.UUIDField(editable=False, primary_key=True, serialize=False, verbose_name='Токен урока')),
('lesson', models.CharField(blank=True, max_length=15, verbose_name='Ссылка на узлы')),
('comment', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=15, unique=True, verbose_name='Ссылки на комменты'), default=[], size=None)), ('comment', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=15, unique=True, verbose_name='Ссылки на комменты'), default=[], size=None)),
('date', models.DateTimeField(blank=True, null=True, verbose_name='Дата зачтения задания')), ('date', models.DateTimeField(blank=True, null=True, verbose_name='Дата зачтения задания')),
('progress', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='access.Progress')), ('progress', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='access.Progress')),
@ -119,9 +116,8 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name='UserAnswerBlock', name='UserAnswerBlock',
fields=[ fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('date', models.DateTimeField(auto_now_add=True, verbose_name='Дата сдачи')), ('date', models.DateTimeField(auto_now_add=True, verbose_name='Дата сдачи')),
('demand', models.CharField(blank=True, max_length=15, verbose_name='Ссылка на правило')), ('demand_token', models.UUIDField(editable=False, primary_key=True, serialize=False, verbose_name='Токен правила')),
('checker', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Проверяющий')), ('checker', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Проверяющий')),
('progress', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='access.ProgressLesson')), ('progress', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='access.ProgressLesson')),
], ],
@ -154,6 +150,6 @@ class Migration(migrations.Migration):
), ),
migrations.AlterUniqueTogether( migrations.AlterUniqueTogether(
name='progress', name='progress',
unique_together=set([('user', 'route')]), unique_together=set([('user', 'course_token')]),
), ),
] ]

16
access/models/other.py
Unescape View File

@ -45,13 +45,15 @@ class Account(models.Model):
class Progress(models.Model): class Progress(models.Model):
lessons = ArrayField( hidden_lessons = ArrayField(
models.CharField(max_length=15, verbose_name='Ссылки на скрытые уроки', unique=True), default=[]) models.UUIDField(verbose_name="Токен урока", primary_key=True, editable=False),
default=[],
verbose_name='Список скрытых уроков',
)
teacher = models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name="Преподователь по умолчанию", teacher = models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name="Преподователь по умолчанию",
related_name='teacher_progress') related_name='teacher_progress')
user = models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name='Студент') user = models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name='Студент')
route = models.CharField(max_length=15, verbose_name='Токен прохождения', blank=True, null=True) course_token = models.UUIDField(verbose_name="Токен курса", primary_key=True, editable=False)
course = models.CharField(max_length=127, verbose_name='Слаг курса')
def __str__(self): def __str__(self):
return '%s' % (self.user.email,) return '%s' % (self.user.email,)
@ -59,12 +61,12 @@ class Progress(models.Model):
class Meta: class Meta:
verbose_name = 'Прогресс пользователя' verbose_name = 'Прогресс пользователя'
verbose_name_plural = 'Прогресс пользователя' verbose_name_plural = 'Прогресс пользователя'
unique_together = (("user", "route"),) unique_together = (("user", "course_token"),)
class ProgressLesson(models.Model): class ProgressLesson(models.Model):
progress = models.ForeignKey(to=Progress) progress = models.ForeignKey(to=Progress)
lesson = models.CharField(max_length=15, blank=True, verbose_name='Ссылка на узлы') lesson_token = models.UUIDField(verbose_name="Токен урока", primary_key=True, editable=False)
teacher = models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name="Преподователь",) teacher = models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name="Преподователь",)
comment = ArrayField(models.CharField(max_length=15, verbose_name='Ссылки на комменты', unique=True), default=[]) comment = ArrayField(models.CharField(max_length=15, verbose_name='Ссылки на комменты', unique=True), default=[])
date = models.DateTimeField(verbose_name='Дата зачтения задания', blank=True, null=True) date = models.DateTimeField(verbose_name='Дата зачтения задания', blank=True, null=True)
@ -77,7 +79,7 @@ class ProgressLesson(models.Model):
class UserAnswerBlock(models.Model): class UserAnswerBlock(models.Model):
progress = models.ForeignKey(to=ProgressLesson) progress = models.ForeignKey(to=ProgressLesson)
date = models.DateTimeField(verbose_name='Дата сдачи', auto_now_add=True) date = models.DateTimeField(verbose_name='Дата сдачи', auto_now_add=True)
demand = models.CharField(max_length=15, blank=True, verbose_name='Ссылка на правило') demand_token = models.UUIDField(verbose_name="Токен правила", primary_key=True, editable=False)
checker = models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name="Проверяющий",) checker = models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name="Проверяющий",)
class Meta: class Meta:

4
achievements/migrations/0001_initial.py
Unescape View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Generated by Django 1.11.6 on 2018-01-11 10:47 # Generated by Django 1.11.6 on 2018-01-11 14:34
from __future__ import unicode_literals from __future__ import unicode_literals
from django.conf import settings from django.conf import settings
@ -12,8 +12,8 @@ class Migration(migrations.Migration):
initial = True initial = True
dependencies = [ dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('courses', '0001_initial'), ('courses', '0001_initial'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
] ]
operations = [ operations = [

10
courses/migrations/0001_initial.py
Unescape View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Generated by Django 1.11.6 on 2018-01-11 10:47 # Generated by Django 1.11.6 on 2018-01-11 14:34
from __future__ import unicode_literals from __future__ import unicode_literals
import django.contrib.postgres.fields import django.contrib.postgres.fields
@ -19,7 +19,7 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name='Course', name='Course',
fields=[ fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('token', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, verbose_name='Токен')),
('slug', models.SlugField(editable=False, max_length=127, unique=True)), ('slug', models.SlugField(editable=False, max_length=127, unique=True)),
('title', models.CharField(max_length=255, unique=True, verbose_name='Заголовок')), ('title', models.CharField(max_length=255, unique=True, verbose_name='Заголовок')),
('description', models.TextField(blank=True, verbose_name='Описание')), ('description', models.TextField(blank=True, verbose_name='Описание')),
@ -40,8 +40,7 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name='Demand', name='Demand',
fields=[ fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('token', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, verbose_name='Токен')),
('token', models.UUIDField(default=uuid.uuid4, editable=False, unique=True, verbose_name='Токен валидатора')),
('name', models.CharField(max_length=31, unique=True, verbose_name='Название')), ('name', models.CharField(max_length=31, unique=True, verbose_name='Название')),
('checker', models.CharField(choices=[('student', 'student'), ('teacher', 'teacher'), ('support', 'support')], default='teacher', max_length=15, verbose_name='Проверяющий')), ('checker', models.CharField(choices=[('student', 'student'), ('teacher', 'teacher'), ('support', 'support')], default='teacher', max_length=15, verbose_name='Проверяющий')),
('min_balls', models.SmallIntegerField(default=50, verbose_name='Проходной бал')), ('min_balls', models.SmallIntegerField(default=50, verbose_name='Проходной бал')),
@ -72,8 +71,7 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name='Lesson', name='Lesson',
fields=[ fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('token', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, verbose_name='Токен')),
('token', models.CharField(editable=False, max_length=15, unique=True, verbose_name='Ключ доступа к узлу')),
('title', models.CharField(max_length=255, verbose_name='Название')), ('title', models.CharField(max_length=255, verbose_name='Название')),
('description', models.TextField(blank=True, null=True, verbose_name='Описание')), ('description', models.TextField(blank=True, null=True, verbose_name='Описание')),
('video', models.TextField(blank=True, null=True, verbose_name='Код видео')), ('video', models.TextField(blank=True, null=True, verbose_name='Код видео')),

5
courses/models.py
Unescape View File

@ -64,6 +64,7 @@ class CourseManager(models.Manager):
class Course(models.Model): class Course(models.Model):
token = models.UUIDField(verbose_name="Токен", default=uuid.uuid4, primary_key=True, editable=False)
slug = models.SlugField(unique=True, editable=False, max_length=127) slug = models.SlugField(unique=True, editable=False, max_length=127)
title = models.CharField(verbose_name="Заголовок", max_length=255, unique=True) title = models.CharField(verbose_name="Заголовок", max_length=255, unique=True)
description = models.TextField(verbose_name='Описание', blank=True) description = models.TextField(verbose_name='Описание', blank=True)
@ -106,7 +107,7 @@ class Topic(models.Model):
class Lesson(models.Model): class Lesson(models.Model):
token = models.CharField(max_length=15, verbose_name="Ключ доступа к узлу", unique=True, editable=False) token = models.UUIDField(verbose_name="Токен", default=uuid.uuid4, primary_key=True, editable=False)
topic = models.ForeignKey(to=Topic, verbose_name='Тема') topic = models.ForeignKey(to=Topic, verbose_name='Тема')
title = models.CharField(verbose_name='Название', max_length=255) title = models.CharField(verbose_name='Название', max_length=255)
description = models.TextField(verbose_name='Описание', blank=True, null=True) description = models.TextField(verbose_name='Описание', blank=True, null=True)
@ -138,7 +139,7 @@ class LessonDemand(models.Model):
class Demand(models.Model): class Demand(models.Model):
CHECK_TYPES = Choices('student', 'teacher', 'support',) CHECK_TYPES = Choices('student', 'teacher', 'support',)
token = models.UUIDField(verbose_name="Токен валидатора", default=uuid.uuid4, unique=True, editable=False) token = models.UUIDField(verbose_name="Токен", default=uuid.uuid4, primary_key=True, editable=False)
name = models.CharField(max_length=31, verbose_name="Название", unique=True) name = models.CharField(max_length=31, verbose_name="Название", unique=True)
checker = models.CharField( checker = models.CharField(
choices=CHECK_TYPES, default=CHECK_TYPES.teacher, max_length=15, verbose_name="Проверяющий",) choices=CHECK_TYPES, default=CHECK_TYPES.teacher, max_length=15, verbose_name="Проверяющий",)

37885
csv/access/account.csv
View File

File diff suppressed because it is too large Load Diff

17170
csv/access/progress.csv
View File

File diff suppressed because one or more lines are too long

2
csv/access/users.csv
Unescape View File

@ -16279,7 +16279,6 @@ id,email,first_name,last_name,last_login,role_list,is_superuser,date_joined,is_s
10614,a.by4kova@gmail.com,Анна,Бычкова,2017-12-05 20:21:15.161134,['students'],False,2017-03-01 16:29:11.958988,False,True,False,pbkdf2_sha256$24000$UM6S0tMsSCjq$TS+fqueiIPCnXa1BA95WG+tRn2K+a8L1B45B+l8736M= 10614,a.by4kova@gmail.com,Анна,Бычкова,2017-12-05 20:21:15.161134,['students'],False,2017-03-01 16:29:11.958988,False,True,False,pbkdf2_sha256$24000$UM6S0tMsSCjq$TS+fqueiIPCnXa1BA95WG+tRn2K+a8L1B45B+l8736M=
16706,nadya_tambov@mail.ru,Надежда,Медвинская,2017-11-10 10:19:30.762866,['students'],False,2017-09-22 17:29:31.635478,False,True,False,pbkdf2_sha256$24000$Oqlr6hGke6rd$LCQrP4Ge/Wk/FyOgd3fvBmlmpTN/zFz/cRWvf4AG9WE= 16706,nadya_tambov@mail.ru,Надежда,Медвинская,2017-11-10 10:19:30.762866,['students'],False,2017-09-22 17:29:31.635478,False,True,False,pbkdf2_sha256$24000$Oqlr6hGke6rd$LCQrP4Ge/Wk/FyOgd3fvBmlmpTN/zFz/cRWvf4AG9WE=
14778,stfm@inbox.ru,Назар,Безсмертный,2017-10-26 23:48:16.411697,['students'],False,2017-07-19 15:21:20.879007,False,True,False,pbkdf2_sha256$24000$EaLq6P1G1cnc$arI2Mhf1PesY8OH/B2wWh3GdUDUVMuM4CP+otv8hAcQ= 14778,stfm@inbox.ru,Назар,Безсмертный,2017-10-26 23:48:16.411697,['students'],False,2017-07-19 15:21:20.879007,False,True,False,pbkdf2_sha256$24000$EaLq6P1G1cnc$arI2Mhf1PesY8OH/B2wWh3GdUDUVMuM4CP+otv8hAcQ=
15809,andrey.korolev@skillbox.ru,Андрей,Королёв,2017-12-13 14:56:37.793323,[],True,2017-08-24 18:26:40,True,True,False,pbkdf2_sha256$24000$mjULUfqmRQc5$z+6OcjfoZI8rYyP11/hmDHfqcrVV6fMtwJnqCJh/HSc=
17105,mountop27@gmail.com,Илья,Сопин,2017-12-13 14:50:17.777810,['students'],False,2017-10-09 12:43:14.699604,False,True,False,pbkdf2_sha256$24000$GkyEqau466bL$yrcePorkFZDlCwh8m2ZTzXK/c9iCVjgwC6TbH11FQlE= 17105,mountop27@gmail.com,Илья,Сопин,2017-12-13 14:50:17.777810,['students'],False,2017-10-09 12:43:14.699604,False,True,False,pbkdf2_sha256$24000$GkyEqau466bL$yrcePorkFZDlCwh8m2ZTzXK/c9iCVjgwC6TbH11FQlE=
16153,m_a_k_c.07@mail.ru,Максим,Григорьев,2017-12-08 15:03:12.135598,['students'],False,2017-09-04 13:42:34.346155,False,True,False,pbkdf2_sha256$24000$tbbjZSYJAST2$ZSF8sIhCFyq9lrTFCFqwpytMDI9u41eSzp5ZGtxpALM= 16153,m_a_k_c.07@mail.ru,Максим,Григорьев,2017-12-08 15:03:12.135598,['students'],False,2017-09-04 13:42:34.346155,False,True,False,pbkdf2_sha256$24000$tbbjZSYJAST2$ZSF8sIhCFyq9lrTFCFqwpytMDI9u41eSzp5ZGtxpALM=
14183,383misha@mail.ru,Михаил ,Левин ,2017-12-14 08:09:44.239489,['students'],False,2017-06-26 17:30:01.276215,False,True,False,pbkdf2_sha256$24000$ROxPWaRdNNRy$4ZZADG5clRgiecplaycA5CC62pAwItmHpFEcxwACZW4= 14183,383misha@mail.ru,Михаил ,Левин ,2017-12-14 08:09:44.239489,['students'],False,2017-06-26 17:30:01.276215,False,True,False,pbkdf2_sha256$24000$ROxPWaRdNNRy$4ZZADG5clRgiecplaycA5CC62pAwItmHpFEcxwACZW4=
@ -18942,3 +18941,4 @@ id,email,first_name,last_name,last_login,role_list,is_superuser,date_joined,is_s
10667,mad-hatter613@yandex.ru,Татьяна ,Тихонова ,2017-08-02 17:23:59.817791,['students'],False,2017-03-03 11:53:39.739851,False,True,False,pbkdf2_sha256$24000$Jc4doAyshxRk$VBqyvAy5PgrXY6Cey+/OGvPIEYLrygvck426snYGPZ8= 10667,mad-hatter613@yandex.ru,Татьяна ,Тихонова ,2017-08-02 17:23:59.817791,['students'],False,2017-03-03 11:53:39.739851,False,True,False,pbkdf2_sha256$24000$Jc4doAyshxRk$VBqyvAy5PgrXY6Cey+/OGvPIEYLrygvck426snYGPZ8=
19310,vivu2015@yandex.ru,G,G,2017-12-14 10:06:04.299892,['students'],False,2017-12-14 09:14:16.736675,False,False,False,pbkdf2_sha256$24000$FsuJsGAqrUQa$e0dQ49cRXmC2IEiDWEhDX/Ehn0gUOlSUACs4e91xIAk= 19310,vivu2015@yandex.ru,G,G,2017-12-14 10:06:04.299892,['students'],False,2017-12-14 09:14:16.736675,False,False,False,pbkdf2_sha256$24000$FsuJsGAqrUQa$e0dQ49cRXmC2IEiDWEhDX/Ehn0gUOlSUACs4e91xIAk=
10724,7977417@gmail.com,яна,сыревич,2017-12-11 16:39:52.599517,['students'],False,2017-03-06 13:09:37.538459,False,True,False,pbkdf2_sha256$24000$vHfJQApHwy9l$CTwDtt/XbzPX37B/ZD8aqOkwX5WpHrqgTyJlZeiumTc= 10724,7977417@gmail.com,яна,сыревич,2017-12-11 16:39:52.599517,['students'],False,2017-03-06 13:09:37.538459,False,True,False,pbkdf2_sha256$24000$vHfJQApHwy9l$CTwDtt/XbzPX37B/ZD8aqOkwX5WpHrqgTyJlZeiumTc=
15809,andrey.korolev@skillbox.ru,Андрей,Королёв,2018-01-01 15:36:27.211386,[],True,2017-08-24 18:26:40,True,True,False,pbkdf2_sha256$24000$mjULUfqmRQc5$z+6OcjfoZI8rYyP11/hmDHfqcrVV6fMtwJnqCJh/HSc=

Can't render this file because it is too large.

2
finance/migrations/0001_initial.py
Unescape View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Generated by Django 1.11.6 on 2018-01-11 10:47 # Generated by Django 1.11.6 on 2018-01-11 14:34
from __future__ import unicode_literals from __future__ import unicode_literals
from django.conf import settings from django.conf import settings

2
library/migrations/0001_initial.py
Unescape View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Generated by Django 1.11.6 on 2018-01-11 10:47 # Generated by Django 1.11.6 on 2018-01-11 14:34
from __future__ import unicode_literals from __future__ import unicode_literals
import datetime import datetime

2
storage/migrations/0001_initial.py
Unescape View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Generated by Django 1.11.6 on 2018-01-11 10:47 # Generated by Django 1.11.6 on 2018-01-11 14:34
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations, models from django.db import migrations, models

Write Preview
Loading…
Cancel
Save