Merge branch 'master' into tinymce

3 files changed, 122 insertions, 0 deletions

diff --git a/yaksh/migrations/0025_release_0_26.py b/yaksh/migrations/0025_release_0_26.py
new file mode 100644
index 0000000..e619c93
--- /dev/null
+++ b/yaksh/migrations/0025_release_0_26.py
@@ -0,0 +1,70 @@
+# Generated by Django 3.0.7 on 2020-10-07 11:32
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import yaksh.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('yaksh', '0024_release_0_24_0'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Topic',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+                ('description', models.TextField(blank=True, null=True)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='lesson',
+            name='video_path',
+            field=models.CharField(blank=True, default=None, help_text='Youtube id, vimeo id, others', max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='learningmodule',
+            name='check_prerequisite',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='learningunit',
+            name='check_prerequisite',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='lesson',
+            name='video_file',
+            field=models.FileField(blank=True, default=None, help_text='Please upload video files in mp4, ogv, webm format', max_length=255, null=True, upload_to=yaksh.models.get_file_dir),
+        ),
+        migrations.CreateModel(
+            name='TableOfContents',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('time', models.CharField(default=0, max_length=100)),
+                ('content', models.IntegerField(choices=[(1, 'Topic'), (2, 'Graded Quiz'), (3, 'Exercise'), (4, 'Poll')])),
+                ('object_id', models.PositiveIntegerField()),
+                ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')),
+                ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course', to='yaksh.Course')),
+                ('lesson', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='contents', to='yaksh.Lesson')),
+            ],
+            options={
+                'verbose_name_plural': 'Table Of Contents',
+            },
+        ),
+        migrations.CreateModel(
+            name='LessonQuizAnswer',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('answer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='yaksh.Answer')),
+                ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ('toc', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='yaksh.TableOfContents')),
+            ],
+        ),
+    ]
diff --git a/yaksh/migrations/0026_release_0_27_0.py b/yaksh/migrations/0026_release_0_27_0.py
new file mode 100644
index 0000000..bbfb4cc
--- /dev/null
+++ b/yaksh/migrations/0026_release_0_27_0.py
@@ -0,0 +1,34 @@
+# Generated by Django 3.0.7 on 2020-10-08 11:21
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+        ('yaksh', '0025_release_0_26'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='post',
+            name='course',
+        ),
+        migrations.AddField(
+            model_name='forumbase',
+            name='anonymous',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='post',
+            name='target_ct',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='target_obj', to='contenttypes.ContentType'),
+        ),
+        migrations.AddField(
+            model_name='post',
+            name='target_id',
+            field=models.PositiveIntegerField(blank=True, db_index=True, null=True),
+        ),
+    ]
diff --git a/yaksh/migrations/0027_release_0_28_0.py b/yaksh/migrations/0027_release_0_28_0.py
new file mode 100644
index 0000000..a248665
--- /dev/null
+++ b/yaksh/migrations/0027_release_0_28_0.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.7 on 2020-11-04 13:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('yaksh', '0026_release_0_27_0'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='answer',
+            name='comment',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]