diff --git a/db_repository/versions/004_istrained.py b/db_repository/versions/004_istrained.py new file mode 100644 index 0000000..271d698 --- /dev/null +++ b/db_repository/versions/004_istrained.py @@ -0,0 +1,35 @@ +from sqlalchemy import * +from migrate import * + + +from migrate.changeset import schema +pre_meta = MetaData() +post_meta = MetaData() +threads = Table('threads', post_meta, + Column('created_at', TIMESTAMP, nullable=False), + Column('updated_at', TIMESTAMP, nullable=False), + Column('id', Integer, primary_key=True, nullable=False), + Column('firstmail', Integer), + Column('date', DateTime), + Column('islabeled', Boolean), + Column('istrained', Boolean), + Column('opened', Boolean), + Column('body', Text), + Column('maintopic', String), +) + + +def upgrade(migrate_engine): + # Upgrade operations go here. Don't create your own engine; bind + # migrate_engine to your metadata + pre_meta.bind = migrate_engine + post_meta.bind = migrate_engine + post_meta.tables['threads'].columns['istrained'].create() + + +def downgrade(migrate_engine): + # Operations to reverse the above upgrade go here. + pre_meta.bind = migrate_engine + post_meta.bind = migrate_engine + post_meta.tables['threads'].columns['istrained'].drop() + diff --git a/flaskapp/__init__.py b/flaskapp/__init__.py index b14876d..5899ea6 100644 --- a/flaskapp/__init__.py +++ b/flaskapp/__init__.py @@ -52,3 +52,9 @@ def store_answered(id, value): def studium(): mth=db_session.query(MailThread).filter(MailThread.maintopic=="studium").order_by(desc(MailThread.date)).all() return render_index(mth) + + +@app.route("/") +def maintopic(maintopic): + mth=db_session.query(MailThread).filter(MailThread.maintopic=="%s" % maintopic).order_by(desc(MailThread.date)).all() + return render_index(mth) diff --git a/flaskapp/templates/index.html b/flaskapp/templates/index.html index d127712..dc96d23 100644 --- a/flaskapp/templates/index.html +++ b/flaskapp/templates/index.html @@ -31,7 +31,10 @@
-
{{ m.print_text() }}
+ {{m.maintopic}} +
+ {{ m.print_text() }} +
diff --git a/requirements.txt b/requirements.txt index 8141473..ca3cf0d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,5 +6,6 @@ numpy scipy bs4 sqlalchemy +sqlalchemy-migrate marshmallow PyYAML diff --git a/storage/thread_model.py b/storage/thread_model.py index 35641c4..79c3e63 100644 --- a/storage/thread_model.py +++ b/storage/thread_model.py @@ -25,6 +25,7 @@ class MailThread(Base): firstmail = Column(Integer) date = Column(DateTime) islabeled = Column(Boolean) + istrained = Column(Boolean) opened = Column(Boolean) body = Column(Text) maintopic=Column(String)