remotes/origin/pm_task_31703
Andrey 8 years ago
parent 7ce3a6a97c
commit 46d2adb1c8
  1. 6
      journals/models.py

@ -34,8 +34,8 @@ class TeacherJ(models.Model):
student = models.ForeignKey(User, verbose_name=u'Студент', related_name=u'teacherJ_student', null=True, blank=True)
full = models.BooleanField(verbose_name=u'Журнал создан', default=False)
course = models.ForeignKey(Course, verbose_name=u'Курс')
homework = models.ForeignKey(Homework, verbose_name=u'ДЗ', blank=True, null=True)
lesson = models.ForeignKey(Lesson, verbose_name=u'Урок', blank=True, null=True)
homework = models.ForeignKey(Homework, verbose_name=u'ДЗ', blank=True, null=True, on_delete=None)
lesson = models.ForeignKey(Lesson, verbose_name=u'Урок', blank=True, null=True, on_delete=None)
progress = models.IntegerField(verbose_name=u'Прогресс', default=0)
current_token = models.CharField(verbose_name=u'Текущий ключ', blank=True, default='', max_length=100)
teacher = models.ForeignKey(User, verbose_name=u'Преподаватель', related_name=u'teacherJ_teacher', blank=True,
@ -246,7 +246,7 @@ class CourseThemeJ(models.Model):
material = models.ForeignKey(CourseTheme, verbose_name=u'Тема')
date = models.DateTimeField(verbose_name=u'Дата начала', blank=True, null=True)
f_date = models.DateTimeField(verbose_name=u'Дата завершения', blank=True, null=True)
actual_lesson = models.ForeignKey(Lesson, verbose_name=u'Актуальны урок для этой темы', blank=True, null=True)
actual_lesson = models.ForeignKey(Lesson, verbose_name=u'Актуальны урок для этой темы', blank=True, null=True, on_delete=None)
def __unicode__(self):
return u'%s: %s %s' % (self.id, self.material, self.student)

Loading…
Cancel
Save