Resolve conflicts

3 files changed, 101 insertions, 0 deletions

diff --git a/yaksh/migrations/0021_auto_20200703_1556.py b/yaksh/migrations/0021_auto_20200703_1556.py
new file mode 100644
index 0000000..713b2d8
--- /dev/null
+++ b/yaksh/migrations/0021_auto_20200703_1556.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.0.7 on 2020-07-03 10:26
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('yaksh', '0020_release_0_21_0'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='course',
+            name='end_enroll_time',
+            field=models.DateTimeField(default=datetime.datetime(2198, 12, 31, 18, 7, tzinfo=utc), null=True, verbose_name='End Date and Time for enrollment of course'),
+        ),
+        migrations.AlterField(
+            model_name='quiz',
+            name='end_date_time',
+            field=models.DateTimeField(default=datetime.datetime(2198, 12, 31, 18, 7, tzinfo=utc), null=True, verbose_name='End Date and Time of the quiz'),
+        ),
+    ]
diff --git a/yaksh/migrations/0022_release_0_22_1.py b/yaksh/migrations/0022_release_0_22_1.py
new file mode 100644
index 0000000..5275b86
--- /dev/null
+++ b/yaksh/migrations/0022_release_0_22_1.py
@@ -0,0 +1,30 @@
+# Generated by Django 3.0.7 on 2020-08-28 07:17
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('yaksh', '0021_auto_20200703_1556'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='course',
+            name='end_enroll_time',
+            field=models.DateTimeField(default=datetime.datetime(2199, 1, 1, 0, 0, tzinfo=utc), null=True, verbose_name='End Date and Time for enrollment of course'),
+        ),
+        migrations.AlterField(
+            model_name='questionpaper',
+            name='fixed_question_order',
+            field=models.TextField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='quiz',
+            name='end_date_time',
+            field=models.DateTimeField(default=datetime.datetime(2199, 1, 1, 0, 0, tzinfo=utc), null=True, verbose_name='End Date and Time of the quiz'),
+        ),
+    ]
diff --git a/yaksh/migrations/0023_release_0_23_0.py b/yaksh/migrations/0023_release_0_23_0.py
new file mode 100644
index 0000000..0666fb8
--- /dev/null
+++ b/yaksh/migrations/0023_release_0_23_0.py
@@ -0,0 +1,46 @@
+# Generated by Django 3.0.7 on 2020-09-09 02:25
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('yaksh', '0022_release_0_22_1'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='answerpaper',
+            name='extra_time',
+            field=models.FloatField(default=0.0, verbose_name='Additional time in mins'),
+        ),
+        migrations.AddField(
+            model_name='answerpaper',
+            name='is_special',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.CreateModel(
+            name='MicroManager',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('special_attempt', models.BooleanField(default=False)),
+                ('attempts_permitted', models.IntegerField(default=0)),
+                ('permitted_time', models.DateTimeField(default=django.utils.timezone.now)),
+                ('attempts_utilised', models.IntegerField(default=0)),
+                ('wait_time', models.IntegerField(default=0, verbose_name='Days to wait before special attempt')),
+                ('attempt_valid_for', models.IntegerField(default=90, verbose_name='Validity days')),
+                ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='yaksh.Course')),
+                ('manager', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='micromanaging', to=settings.AUTH_USER_MODEL)),
+                ('quiz', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='yaksh.Quiz')),
+                ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='micromanaged', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'unique_together': {('student', 'course', 'quiz')},
+            },
+        ),
+    ]