|
|
|
|
@ -28,7 +28,7 @@ class Account(models.Model): |
|
|
|
|
(1, 'male'), |
|
|
|
|
(2, 'female'), |
|
|
|
|
) |
|
|
|
|
b_day = models.DateField(blank=True, null=True) |
|
|
|
|
b_day = models.DateField(blank=True, null=True) # TODO birth_day |
|
|
|
|
city = models.CharField(max_length=63, null=True, blank=True) |
|
|
|
|
gender = models.SmallIntegerField(choices=GENDER_CHOICES, default=0) |
|
|
|
|
owner = models.OneToOneField(to=settings.AUTH_USER_MODEL, null=True) |
|
|
|
|
@ -60,14 +60,15 @@ class Progress(models.Model): |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class PivotProgressVertex(models.Model): |
|
|
|
|
# TODO переименовать в ProgressVertex |
|
|
|
|
VERTEX_STATUS = ( |
|
|
|
|
(2, 'Выполненно'), |
|
|
|
|
(1, 'Ожидание'), |
|
|
|
|
(0, 'Не выполненно'), |
|
|
|
|
) |
|
|
|
|
teacher = models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name="Преподователь",) |
|
|
|
|
) # TODO перейти на Choices из django-model-utils и сделать ключи строками done/wait/fail |
|
|
|
|
progress = models.ForeignKey(to=Progress) |
|
|
|
|
vertex = models.CharField(max_length=15, blank=True, verbose_name='Ссылки на узлы') |
|
|
|
|
status = models.SmallIntegerField(choices=VERTEX_STATUS, default=0) |
|
|
|
|
teacher = models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name="Преподователь",) |
|
|
|
|
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) |
|
|
|
|
|