Add fields to models to order question parts and add chosen options f…

…or the answers

consultation_analyser/consultations/migrations/0029_answer2_chosen_options_questionpart_order_and_more.py

@@ -0,0 +1,32 @@
+# Generated by Django 5.1.4 on 2025-01-02 09:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("consultations", "0028_alter_consultation2_slug_alter_question2_slug"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="answer2",
+            name="chosen_options",
+            field=models.JSONField(default=list),
+        ),
+        migrations.AddField(
+            model_name="questionpart",
+            name="order",
+            field=models.IntegerField(null=True),
+        ),
+        migrations.AlterField(
+            model_name="question2",
+            name="order",
+            field=models.IntegerField(null=True),
+        ),
+        migrations.AlterField(
+            model_name="questionpart",
+            name="options",
+            field=models.JSONField(default=list),
+        ),
+    ]

consultation_analyser/consultations/models.py

@@ -392,9 +392,8 @@ class Meta(UUIDPrimaryKeyModel.Meta, TimeStampedModel.Meta):
 class Question2(UUIDPrimaryKeyModel, TimeStampedModel, SlugFromTextModel):
     text = models.TextField()
     consultation = models.ForeignKey(Consultation2, on_delete=models.CASCADE)
-    order = models.IntegerField()
+    order = models.IntegerField(null=True)
     question_group = models.ForeignKey(QuestionGroup, on_delete=models.CASCADE, null=True)
-    # TODO - add slug
 
     class Meta(UUIDPrimaryKeyModel.Meta, TimeStampedModel.Meta, SlugFromTextModel.Meta):
         constraints = [
@@ -411,13 +410,13 @@ class QuestionType(models.TextChoices):
     question = models.ForeignKey(Question2, on_delete=models.CASCADE)
     text = models.TextField()
     type = models.CharField(max_length=16, choices=QuestionType.choices)
-    options = models.JSONField(default=list, blank=True)
+    options = models.JSONField(default=list)
+    order = models.IntegerField(null=True)
 
     class Meta(UUIDPrimaryKeyModel.Meta, TimeStampedModel.Meta):
         pass
 
 
-# TODO - add expanded question
 class ExpandedQuestion(UUIDPrimaryKeyModel, TimeStampedModel):
     question_part = models.ForeignKey(QuestionPart, on_delete=models.CASCADE)
     text = models.TextField()
@@ -441,6 +440,7 @@ class Answer2(UUIDPrimaryKeyModel, TimeStampedModel):
     question_part = models.ForeignKey(QuestionPart, on_delete=models.CASCADE)
     respondent = models.ForeignKey(Respondent, on_delete=models.CASCADE)
     text = models.TextField()
+    chosen_options = models.JSONField(default=list)
     # TODO - add favourite
 
     class Meta(UUIDPrimaryKeyModel.Meta, TimeStampedModel.Meta):