MultipleChoiceOption is now a widget

migrations/versions/f97aa3c73453_.py → migrations/versions/e526e7b52673_.py

 """ empty message
 
-Revision ID: f97aa3c73453
+Revision ID: e526e7b52673
 Revises: 4204f4a83863
 
 """
@@ -9,7 +9,7 @@ import sqlalchemy as sa
 
 
 # revision identifiers, used by Alembic.
-revision = 'f97aa3c73453'
+revision = 'e526e7b52673'
 down_revision = '4204f4a83863'
 branch_labels = None
 depends_on = None
@@ -18,13 +18,13 @@ depends_on = None
 def upgrade():
     op.create_table('mc_option',
                     sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
-                    sa.Column('x', sa.Integer(), nullable=False),
-                    sa.Column('y', sa.Integer(), nullable=False),
                     sa.Column('page', sa.Integer(), nullable=False),
                     sa.Column('label', sa.String(), nullable=True),
+                    sa.Column('type', sa.String(length=20), nullable=True),
                     sa.Column('problem_id', sa.Integer(), nullable=False),
                     sa.Column('feedback_id', sa.Integer(), nullable=True),
                     sa.ForeignKeyConstraint(['feedback_id'], ['feedback_option.id'], ),
+                    sa.ForeignKeyConstraint(['id'], ['widget.id'], ),
                     sa.ForeignKeyConstraint(['problem_id'], ['solution.id'], ),
                     sa.PrimaryKeyConstraint('id')
                     )

zesje/database.py

@@ -160,19 +160,23 @@ class Widget(db.Model):
     }
 
 
-class MultipleChoiceOption(db.Model):
+class MultipleChoiceOption(Widget):
     __tablename__ = 'mc_option'
-    id = Column(Integer, primary_key=True, autoincrement=True)
+    id = Column(Integer, ForeignKey('widget.id'), primary_key=True, autoincrement=True)
 
-    x = Column(Integer, nullable=False)
-    y = Column(Integer, nullable=False)
     page = Column(Integer, nullable=False)
-
     label = Column(String, nullable=True)
 
+    type = Column(String(20))
+
     problem_id = Column(Integer, ForeignKey('solution.id'), nullable=False)
     feedback_id = Column(Integer, ForeignKey('feedback_option.id'), nullable=True)
 
+    __mapper_args__ = {
+        'polymorphic_identity': 'widget',
+        'polymorphic_on': type
+    }
+
 
 class ExamWidget(Widget):
     __tablename__ = 'exam_widget'