diff --git a/migrations/versions/c59998057d39_.py b/migrations/versions/c59998057d39_.py new file mode 100644 index 0000000000000000000000000000000000000000..75db345e90f3343f3787841910e77f27aee36fd0 --- /dev/null +++ b/migrations/versions/c59998057d39_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: c59998057d39 +Revises: 70547c924023 +Create Date: 2017-04-18 13:39:05.342669 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'c59998057d39' +down_revision = '70547c924023' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('defaulttops', sa.Column('description', sa.String(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('defaulttops', 'description') + # ### end Alembic commands ### diff --git a/models/database.py b/models/database.py index 641433a218ccb95c1d20864ef4a8199a542f6772..ffbedcde901c82131e52ff2edd356df805d07076 100644 --- a/models/database.py +++ b/models/database.py @@ -171,7 +171,7 @@ class Protocol(DatabaseModel): local_tops = [] for default_top in self.protocoltype.default_tops: local_tops.append(LocalTOP(defaulttop_id=default_top.id, - protocol_id=self.id, description="")) + protocol_id=self.id, description=default_top.description or "")) return local_tops def fill_from_remarks(self, remarks): @@ -326,6 +326,7 @@ class DefaultTOP(DatabaseModel): protocoltype_id = db.Column(db.Integer, db.ForeignKey("protocoltypes.id")) name = db.Column(db.String) number = db.Column(db.Integer) + description = db.Column(db.String) localtops = relationship("LocalTOP", backref=backref("defaulttop"), cascade="all, delete-orphan") diff --git a/views/forms.py b/views/forms.py index 283984aab4a8b382a61a4eedfb527a2acaf1de81..1c20ba508d00ed873188373bf0936895bc3fb475 100644 --- a/views/forms.py +++ b/views/forms.py @@ -136,6 +136,7 @@ class ProtocolTypeForm(FlaskForm): class DefaultTopForm(FlaskForm): name = StringField("Name", validators=[InputRequired("Du musst einen Namen angeben.")]) number = IntegerField("Nummer", validators=[InputRequired("Du musst eine Nummer angeben.")]) + description = TextAreaField("Standardinhalt") class MeetingReminderForm(FlaskForm): days_before = IntegerField("Tage vor Sitzung", validators=[InputRequired("Du musst eine Dauer angeben.")])