annot-server/webapp/views.py
changeset 43 e27c3c1c57f1
parent 42 926f0426ce78
child 57 cb4df234fd79
--- a/annot-server/webapp/views.py	Sun Oct 19 12:52:38 2014 +0200
+++ b/annot-server/webapp/views.py	Mon Oct 20 01:31:33 2014 +0200
@@ -15,8 +15,8 @@
 
 @app.route('/')
 def page_home():
-    return render_template('index.html')
-    #return render_template('annotationclient.html', logging=True)
+    events = db_session.query(models.Event).filter(models.Event.active == True).order_by(models.Event.start_date, models.Event.code).all()
+    return render_template('index.html', events=events)
 
 
 @app.route('/annot')
@@ -31,8 +31,9 @@
 @app.route('/annotationclient/<event_code>')
 def page_annotationclient_event_code(event_code):
     #TODO: check event code + get event session
-    event_query = db_session.query(models.Event).filter(models.Event.code==event_code)
+    event_query = db_session.query(models.Event).filter(models.Event.code == event_code, models.Event.active == True)
     event = event_query.one()
+
     if not event:
         abort(404)