From 684388cf8c4549e7500dd4ae0a9ac97ef6c43b30 Mon Sep 17 00:00:00 2001 From: gzbender Date: Thu, 25 Apr 2019 02:34:51 +0300 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C=20?= =?UTF-8?q?=D1=81=D0=BF=D0=B8=D1=81=D0=BE=D0=BA=20=D0=BC=D0=B0=D1=82=D0=B5?= =?UTF-8?q?=D1=80=D0=B8=D0=B0=D0=BB=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D1=83=D1=80=D0=BE=D0=BA=D0=B0,=20=D0=B5=D1=81=D0=BB=D0=B8=20?= =?UTF-8?q?=D0=BE=D0=BD=20=D0=B7=D0=B0=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?,=20=D1=82=D0=BE=20=D0=BF=D0=BE=D0=BA=D0=B0=D0=B7=D1=8B=D0=B2?= =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D0=B5=D0=B3=D0=BE,=20=D0=B2=D0=BC=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=BE=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=B8=D0=B7=20=D1=80=D0=B0=D1=81=D0=BF=D0=B8=D1=81=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/v1/serializers/school.py | 2 ++ .../migrations/0022_livelesson_materials.py | 18 ++++++++++++++++ apps/school/models.py | 1 + .../templates/blocks/schedule_item.html | 4 ++-- web/src/components/CourseRedactor.vue | 21 +++++++------------ web/src/js/modules/api.js | 2 ++ web/src/sass/_common.sass | 1 - 7 files changed, 32 insertions(+), 17 deletions(-) create mode 100644 apps/school/migrations/0022_livelesson_materials.py diff --git a/api/v1/serializers/school.py b/api/v1/serializers/school.py index 4f8cd318..e25f06d6 100644 --- a/api/v1/serializers/school.py +++ b/api/v1/serializers/school.py @@ -141,6 +141,7 @@ class LiveLessonCreateSerializer(DispatchContentMixin, serializers.ModelSerializ 'cover', 'content', 'live', + 'materials', 'created_at', 'update_at', 'deactivated_at', @@ -188,6 +189,7 @@ class LiveLessonSerializer(serializers.ModelSerializer): 'cover', 'content', 'live', + 'materials', 'created_at', 'update_at', 'deactivated_at', diff --git a/apps/school/migrations/0022_livelesson_materials.py b/apps/school/migrations/0022_livelesson_materials.py new file mode 100644 index 00000000..99189aac --- /dev/null +++ b/apps/school/migrations/0022_livelesson_materials.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.7 on 2019-04-24 14:41 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('school', '0021_schoolschedule_trial_lesson'), + ] + + operations = [ + migrations.AddField( + model_name='livelesson', + name='materials', + field=models.TextField(blank=True, default='', verbose_name='Материалы'), + ), + ] diff --git a/apps/school/models.py b/apps/school/models.py index 38889f44..c6eb5ba8 100644 --- a/apps/school/models.py +++ b/apps/school/models.py @@ -117,6 +117,7 @@ class LiveLesson(BaseModel, DeactivatedMixin): short_description = models.TextField('Краткое описание урока', default='', blank=True) stream = models.URLField('Ссылка на VIMEO', default='', blank=True) date = models.DateField(default=now, unique=True) + materials = models.TextField('Материалы', blank=True, default='') cover = models.ForeignKey( ImageObject, related_name='livelesson_covers', diff --git a/apps/school/templates/blocks/schedule_item.html b/apps/school/templates/blocks/schedule_item.html index 31d9f314..c8342620 100644 --- a/apps/school/templates/blocks/schedule_item.html +++ b/apps/school/templates/blocks/schedule_item.html @@ -68,12 +68,12 @@ {% if print %}
- {{ school_schedule.materials }} + {{ live_lesson.materials|default:school_schedule.materials|safe }}
{% else %}
- {{ school_schedule.materials }} + {{ live_lesson.materials|default:school_schedule.materials|safe }}
{% endif %} diff --git a/web/src/components/CourseRedactor.vue b/web/src/components/CourseRedactor.vue index 54d61412..319a59c3 100644 --- a/web/src/components/CourseRedactor.vue +++ b/web/src/components/CourseRedactor.vue @@ -60,13 +60,12 @@ - +
ДОСТУП
@@ -178,15 +177,11 @@ Уроки
+
- -
+
Содержание курса
@@ -299,6 +294,7 @@ stream: '', time: null, short_description: '', + materials: '', content: [], gallery: { images: [], @@ -667,9 +663,6 @@ }); return request; - }, - loadLessons(courseId) { - }, onCoursePublish() { if(this.validate()) { diff --git a/web/src/js/modules/api.js b/web/src/js/modules/api.js index 8acb7de1..cb88cf69 100644 --- a/web/src/js/modules/api.js +++ b/web/src/js/modules/api.js @@ -121,6 +121,7 @@ export const api = { gallery_images: courseObject.gallery && courseObject.gallery.images || [] }, content: api.convertContentJson(courseObject.content, true), + materials: courseObject.materials, }; if(courseObject.live) { @@ -200,6 +201,7 @@ export const api = { coverImage: courseJSON.cover && courseJSON.cover.image ? courseJSON.cover.image : null, content: api.convertContentJson(courseJSON.content), gallery: {images: (courseJSON.gallery) ? courseJSON.gallery.gallery_images:[]}, + materials: courseJSON.materials, } }, convertGalleryImagesJson: (images) => { diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index fba66e0c..d0858c96 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -3593,7 +3593,6 @@ a.grey-link flex-grow: 1 &__wrap max-width: 349px - height: 600px padding: 10px 40px 30px 30px +t max-width: 100%