rebase changes for simple question types

3 files changed, 26 insertions, 5 deletions

diff --git a/yaksh/migrations/0001_initial.py b/yaksh/migrations/0001_initial.py
index 8ee8c6a..8770a72 100644
--- a/yaksh/migrations/0001_initial.py
+++ b/yaksh/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2017-03-14 08:33
+# Generated by Django 1.9.5 on 2017-03-17 16:42
 from __future__ import unicode_literals
 
 import datetime
@@ -114,6 +114,7 @@ class Migration(migrations.Migration):
                 ('active', models.BooleanField(default=True)),
                 ('snippet', models.CharField(blank=True, max_length=256)),
                 ('partial_grading', models.BooleanField(default=False)),
+                ('grade_assignment_upload', models.BooleanField(default=False)),
                 ('tags', taggit.managers.TaggableManager(blank=True, help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags')),
                 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user', to=settings.AUTH_USER_MODEL)),
             ],
@@ -171,7 +172,7 @@ class Migration(migrations.Migration):
             name='HookTestCase',
             fields=[
                 ('testcase_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='yaksh.TestCase')),
-                ('hook_code', models.TextField(default='def check_answer(user_answer):\n   \'\'\' Evaluates user answer to return -\n   success - Boolean, indicating if code was executed correctly\n   mark_fraction - Float, indicating fraction of the\n                  weight to a test case\n   error - String, error message if success is false\'\'\'\n   success = False\n   err = "Incorrect Answer" # Please make this more specific\n   mark_fraction = 0.0\n\n   # write your code here\n\n   return success, err, mark_fraction\n\n')),
+                ('hook_code', models.TextField(default='def check_answer(user_answer):\n   \'\'\' Evaluates user answer to return -\n   success - Boolean, indicating if code was executed correctly\n   mark_fraction - Float, indicating fraction of the\n                  weight to a test case\n   error - String, error message if success is false\n   In case of assignment upload there will be no user answer \'\'\'\n   success = False\n   err = "Incorrect Answer" # Please make this more specific\n   mark_fraction = 0.0\n\n   # write your code here\n\n   return success, err, mark_fraction\n\n')),
                 ('weight', models.FloatField(default=1.0)),
             ],
             bases=('yaksh.testcase',),
@@ -233,7 +234,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='assignmentupload',
             name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='yaksh.Profile'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
         ),
         migrations.AddField(
             model_name='answerpaper',
diff --git a/yaksh/migrations/0002_questionpaper_fixed_question_order.py b/yaksh/migrations/0002_questionpaper_fixed_question_order.py
new file mode 100644
index 0000000..3cc46ed
--- /dev/null
+++ b/yaksh/migrations/0002_questionpaper_fixed_question_order.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2017-03-20 13:32
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('yaksh', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='questionpaper',
+            name='fixed_question_order',
+            field=models.CharField(blank=True, max_length=255),
+        ),
+    ]
diff --git a/yaksh/migrations/0002_auto_20170320_1135.py b/yaksh/migrations/0003_auto_20170321_0917.py
index 81c7572..5a575c7 100644
--- a/yaksh/migrations/0002_auto_20170320_1135.py
+++ b/yaksh/migrations/0003_auto_20170321_0917.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2017-03-20 11:35
+# Generated by Django 1.9.5 on 2017-03-21 09:17
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -9,7 +9,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('yaksh', '0001_initial'),
+        ('yaksh', '0002_questionpaper_fixed_question_order'),
     ]
 
     operations = [