equal
deleted
inserted
replaced
13 from database import db_session |
13 from database import db_session |
14 import models |
14 import models |
15 |
15 |
16 @app.route('/') |
16 @app.route('/') |
17 def page_home(): |
17 def page_home(): |
18 return render_template('index.html') |
18 events = db_session.query(models.Event).filter(models.Event.active == True).order_by(models.Event.start_date, models.Event.code).all() |
19 #return render_template('annotationclient.html', logging=True) |
19 return render_template('index.html', events=events) |
20 |
20 |
21 |
21 |
22 @app.route('/annot') |
22 @app.route('/annot') |
23 def page_annot(): |
23 def page_annot(): |
24 return render_template('annot.html') |
24 return render_template('annot.html') |
29 return render_template('annotationclient.html', logging=True) |
29 return render_template('annotationclient.html', logging=True) |
30 |
30 |
31 @app.route('/annotationclient/<event_code>') |
31 @app.route('/annotationclient/<event_code>') |
32 def page_annotationclient_event_code(event_code): |
32 def page_annotationclient_event_code(event_code): |
33 #TODO: check event code + get event session |
33 #TODO: check event code + get event session |
34 event_query = db_session.query(models.Event).filter(models.Event.code==event_code) |
34 event_query = db_session.query(models.Event).filter(models.Event.code == event_code, models.Event.active == True) |
35 event = event_query.one() |
35 event = event_query.one() |
|
36 |
36 if not event: |
37 if not event: |
37 abort(404) |
38 abort(404) |
38 |
39 |
39 #TODO: See why the relationship management does not work |
40 #TODO: See why the relationship management does not work |
40 event_session_q = db_session.query(models.EventSession).filter(models.EventSession.event_id==event.id).order_by(models.EventSession.order.desc()) |
41 event_session_q = db_session.query(models.EventSession).filter(models.EventSession.event_id==event.id).order_by(models.EventSession.order.desc()) |