Refs #102 -- Added multiple-choice question types

src/pretix/base/models/__init__.py

@@ -3,7 +3,8 @@ from .base import CachedFile, cachedfile_name
 from .event import Event, EventLock, EventPermission, EventSetting
 from .invoices import Invoice, InvoiceLine, invoice_filename
 from .items import (
-    Item, ItemCategory, ItemVariation, Question, Quota, itempicture_upload_to,
+    Item, ItemCategory, ItemVariation, Question, QuestionOption, Quota,
+    itempicture_upload_to,
 )
 from .log import LogEntry
 from .orders import (
@@ -19,5 +20,5 @@ __all__ = [
     'BaseRestriction', 'Quota', 'Order', 'CachedTicket', 'QuestionAnswer', 'AbstractPosition', 'OrderPosition',
     'CartPosition', 'EventSetting', 'OrganizerSetting', 'EventLock', 'cachedfile_name', 'itempicture_upload_to',
     'generate_secret', 'Voucher', 'LogEntry', 'InvoiceAddress', 'generate_position_secret', 'InvoiceLine',
-    'Invoice', 'invoice_filename'
+    'Invoice', 'invoice_filename', 'QuestionOption'
 ]

src/pretix/base/models/items.py

@@ -302,6 +302,7 @@ class Question(LoggedModel):
     * a one-line string (``TYPE_STRING``)
     * a multi-line string (``TYPE_TEXT``)
     * a boolean (``TYPE_BOOLEAN``)
+    * a multiple choice option (``TYPE_CHOICE`` and ``TYPE_CHOICE_MULTIPLE``)
 
     :param event: The event this question belongs to
     :type event: Event
@@ -317,11 +318,15 @@ class Question(LoggedModel):
     TYPE_STRING = "S"
     TYPE_TEXT = "T"
     TYPE_BOOLEAN = "B"
+    TYPE_CHOICE = "C"
+    TYPE_CHOICE_MULTIPLE = "M"
     TYPE_CHOICES = (
         (TYPE_NUMBER, _("Number")),
         (TYPE_STRING, _("Text (one line)")),
         (TYPE_TEXT, _("Multiline text")),
         (TYPE_BOOLEAN, _("Yes/No")),
+        (TYPE_CHOICE, _("Choose one from a list")),
+        (TYPE_CHOICE_MULTIPLE, _("Choose multiple from a list"))
     )
 
     event = models.ForeignKey(
@@ -366,6 +371,14 @@ class Question(LoggedModel):
             self.event.get_cache().clear()
 
 
+class QuestionOption(models.Model):
+    question = models.ForeignKey('Question', related_name='options')
+    answer = I18nCharField(verbose_name=_('Answer'))
+
+    def __str__(self):
+        return str(self.answer)
+
+
 class Quota(LoggedModel):
     """
     A quota is a "pool of tickets". It is there to limit the number of items

src/pretix/base/models/orders.py

@@ -12,7 +12,7 @@ from typing import List, Union
 from ..decimal import round_decimal
 from .base import CachedFile, LoggedModel
 from .event import Event
-from .items import Item, ItemVariation, Question, Quota
+from .items import Item, ItemVariation, Question, QuestionOption, Quota
 
 
 def generate_secret():
@@ -286,6 +286,9 @@ class QuestionAnswer(models.Model):
     question = models.ForeignKey(
         Question, related_name='answers'
     )
+    options = models.ManyToManyField(
+        QuestionOption, related_name='answers', blank=True
+    )
     answer = models.TextField()
 
     def __str__(self):