Add live check field & admin for live lesson

remotes/origin/hasaccess
Ivlev Denis 8 years ago
parent c0d811fb1e
commit fe17bdc275
  1. 10
      api/v1/serializers/school.py
  2. 7
      apps/school/admin.py
  3. 22
      apps/school/migrations/0009_auto_20180410_1019.py
  4. 6
      apps/school/models.py

@ -122,6 +122,7 @@ class LiveLessonCreateSerializer(serializers.ModelSerializer):
child=ContentCreateSerializer(), child=ContentCreateSerializer(),
required=False, required=False,
) )
live = serializers.SerializerMethodField()
class Meta: class Meta:
model = LiveLesson model = LiveLesson
@ -132,6 +133,7 @@ class LiveLessonCreateSerializer(serializers.ModelSerializer):
'stream', 'stream',
'date', 'date',
'content', 'content',
'live',
'created_at', 'created_at',
'update_at', 'update_at',
'deactivated_at', 'deactivated_at',
@ -144,6 +146,9 @@ class LiveLessonCreateSerializer(serializers.ModelSerializer):
'deactivated_at', 'deactivated_at',
) )
def get_live(self, object):
return True
def dispatch_content(self, lesson, content): def dispatch_content(self, lesson, content):
for c in content: for c in content:
if 'type' not in c or not c['type'] or 'data' not in c or not c['data']: if 'type' not in c or not c['type'] or 'data' not in c or not c['data']:
@ -266,6 +271,7 @@ class LiveLessonCreateSerializer(serializers.ModelSerializer):
class LiveLessonSerializer(serializers.ModelSerializer): class LiveLessonSerializer(serializers.ModelSerializer):
content = ContentSerializer(many=True) content = ContentSerializer(many=True)
live = serializers.SerializerMethodField()
class Meta: class Meta:
model = LiveLesson model = LiveLesson
@ -276,6 +282,7 @@ class LiveLessonSerializer(serializers.ModelSerializer):
'stream', 'stream',
'date', 'date',
'content', 'content',
'live',
'created_at', 'created_at',
'update_at', 'update_at',
'deactivated_at', 'deactivated_at',
@ -287,3 +294,6 @@ class LiveLessonSerializer(serializers.ModelSerializer):
'update_at', 'update_at',
'deactivated_at', 'deactivated_at',
) )
def get_live(self, object):
return True

@ -1,6 +1,11 @@
from django.contrib import admin from django.contrib import admin
from .models import SchoolSchedule from .models import SchoolSchedule, LiveLesson
@admin.register(LiveLesson)
class LiveLessonAdmin(admin.ModelAdmin):
pass
@admin.register(SchoolSchedule) @admin.register(SchoolSchedule)

@ -0,0 +1,22 @@
# Generated by Django 2.0.3 on 2018-04-10 10:19
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('school', '0008_livelesson'),
]
operations = [
migrations.AlterModelOptions(
name='livelesson',
options={'ordering': ('title',), 'verbose_name': 'Урок онлайн школы', 'verbose_name_plural': 'Уроки онлайн школы'},
),
migrations.AlterField(
model_name='livelesson',
name='stream',
field=models.URLField(blank=True, default='', verbose_name='Ссылка на VIMEO'),
),
]

@ -55,7 +55,7 @@ class SchoolScheduleImage(models.Model):
class LiveLesson(BaseModel, DeactivatedMixin): class LiveLesson(BaseModel, DeactivatedMixin):
title = models.CharField('Название урока', max_length=100) title = models.CharField('Название урока', max_length=100)
short_description = models.TextField('Краткое описание урока') short_description = models.TextField('Краткое описание урока')
stream = models.URLField('Ссылка на VIMEO') stream = models.URLField('Ссылка на VIMEO', default='', blank=True)
date = models.DateField(null=True, blank=True) date = models.DateField(null=True, blank=True)
created_at = models.DateTimeField(auto_now_add=True) created_at = models.DateTimeField(auto_now_add=True)
@ -65,6 +65,6 @@ class LiveLesson(BaseModel, DeactivatedMixin):
return self.title return self.title
class Meta: class Meta:
verbose_name = 'Урок' verbose_name = 'Урок онлайн школы'
verbose_name_plural = 'Уроки' verbose_name_plural = 'Уроки онлайн школы'
ordering = ('title',) ordering = ('title',)

Loading…
Cancel
Save