Merge branch 'master' of git.fsmpi.rwth-aachen.de:redl/redeleitsystem

migrations/versions/201dda3f23e_.py

+"""empty message
+
+Revision ID: 201dda3f23e
+Revises: 48e6d548f0f
+Create Date: 2015-11-07 15:01:10.159383
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '201dda3f23e'
+down_revision = '48e6d548f0f'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('speakers', sa.Column('number', sa.Integer(), nullable=True))
+    ### end Alembic commands ###
+
+
+def downgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('speakers', 'number')
+    ### end Alembic commands ###

migrations/versions/48e6d548f0f_.py

+"""empty message
+
+Revision ID: 48e6d548f0f
+Revises: 7670a05866
+Create Date: 2015-11-07 14:03:03.505241
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '48e6d548f0f'
+down_revision = '7670a05866'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('statements', sa.Column('topic_id', sa.Integer(), nullable=False))
+    op.drop_constraint('statements_event_id_fkey', 'statements', type_='foreignkey')
+    op.create_foreign_key(None, 'statements', 'topics', ['topic_id'], ['id'])
+    op.drop_column('statements', 'event_id')
+    ### end Alembic commands ###
+
+
+def downgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('statements', sa.Column('event_id', sa.INTEGER(), autoincrement=False, nullable=False))
+    op.drop_constraint(None, 'statements', type_='foreignkey')
+    op.create_foreign_key('statements_event_id_fkey', 'statements', 'events', ['event_id'], ['id'])
+    op.drop_column('statements', 'topic_id')
+    ### end Alembic commands ###

models/database.py

@@ -54,7 +54,6 @@ class Topic(db.Model):
     event_id = db.Column(db.Integer, db.ForeignKey("events.id"), nullable=False)
     event = relationship("Event", backref=backref("topics",order_by=id))
     
-    
     def __init__(self, name, mode, event_id):
         self.name = name
         self.mode = mode
@@ -68,16 +67,27 @@ class Topic(db.Model):
             self.event_id
         )
     
+    def sorted_statements(self):
+        statements = [statement for statement in self.statements if not statement.executed]
+        if self.mode == "fifo":
+            return sorted(statements, key=lambda st: st.id)
+        elif self.mode == "balanced":
+            return sorted(statements, key=lambda st: st.speaker.count(self))
+        else:
+            return statements
+    
 
 class Speaker(db.Model):
     __tablename__ = "speakers"
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.String)
+    number = db.Column(db.Integer)
     event_id = db.Column(db.Integer, db.ForeignKey("events.id"), nullable=False)
     event = relationship("Event", backref=backref("speakers",order_by=id))
     
-    def __init__(self, name, event_id):
+    def __init__(self, name, number, event_id):
         self.name = name
+        self.number = number
         self.event_id = event_id
     
     def __repr__(self):
@@ -86,32 +96,45 @@ class Speaker(db.Model):
             self.name,
             self.event_id
         )
+    
+    def identifier(self):
+        if self.number == 0:
+            return self.name
+        elif self.name == "":
+            return self.number
+        else:
+            return "{} ({})".format(self.name, self.number)
+    
+    def count(self, topic):
+        return len([statement for statement in self.statements if statement.topic == topic])
+    
+    def count_active(self, topic):
+        return len([statement for statement in self.statements if statement.topic == topic and not statement.executed])
 
 
 class Statement(db.Model):
     __tablename__ = "statements"
     id = db.Column(db.Integer, primary_key=True)
     speaker_id = db.Column(db.Integer, db.ForeignKey("speakers.id"), nullable=False)
-    event_id = db.Column(db.Integer, db.ForeignKey("events.id"), nullable=False)
+    topic_id = db.Column(db.Integer, db.ForeignKey("topics.id"), nullable=False)
     insertion_time = db.Column(db.DateTime)
     executed = db.Column(db.Boolean)
     execution_time = db.Column(db.DateTime)
 
     speaker = relationship("Speaker", backref=backref("statements",order_by=id))
-    event = relationship("Event", backref=backref("statements",order_by=id))
+    topic = relationship("Topic", backref=backref("statements",order_by=id))
     
-    def __init__(self, speaker_id, event_id, insertion_time=None, executed=False, execution_time=None):
+    def __init__(self, speaker_id, topic_id, insertion_time=None, executed=False, execution_time=None):
         self.speaker_id = speaker_id
-        self.event_id = event_id
+        self.topic_id = topic_id
         self.insertion_time = insertion_time or datetime.now()
         self.executed = executed
         self.execution_time = execution_time or datetime.now()
     
     def __repr__(self):
-        return "<Statement(id={}, speaker={}, event_id={}, topic_id={}, insertion_time={}, executed={}, execution_time={})>".format(
+        return "<Statement(id={}, speaker={}, topic_id={}, insertion_time={}, executed={}, execution_time={})>".format(
             self.id, 
             self.speaker,
-            self.event_id,
             self.topic_id,
             self.insertion_time,
             self.executed,

modules/admin.py

@@ -2,10 +2,11 @@ from flask import Blueprint, redirect, url_for, request, flash, abort, send_file
 from flask.ext.login import login_required
 from passlib.hash import pbkdf2_sha256
 
-from models.database import User, Topic, Event
-from models.forms import AdminUserForm, NewUserForm, NewTopicForm, NewEventForm
+from models.database import User, Topic, Event, Speaker, Statement
+from models.forms import AdminUserForm, NewUserForm, NewTopicForm, NewEventForm, AddStatementForm
 
-from shared import db, admin_permission, render_layout
+from shared import db, admin_permission
+from utils import render_layout, speaker_by_name_or_number
 
 admin = Blueprint("admin", __name__)
 
@@ -84,6 +85,7 @@ def event_show():
     if event_id is not None:
         event = Event.query.filter_by(id=event_id).first()
         return render_layout("admin_event_show.html", event=event)
+    return redirect(url_for(".index"))
 
 
 @admin.route("/event/new", methods=["GET", "POST"])
@@ -132,6 +134,19 @@ def event_edit():
         return redirect(url_for(".index"))
 
 
+@admin.route("/topic/show")
+@login_required
+@admin_permission.require()
+def topic_show():
+    topic_id = request.args.get("id", None)
+    if topic_id is not None:
+        topic = Topic.query.filter_by(id=topic_id).first()
+        form = AddStatementForm()
+        form.topic.data = topic.id
+        return render_layout("admin_topic_show.html", topic=topic, form=form)
+    return redirect(url_for(".index"))
+        
+
 @admin.route("/topic/new", methods=["GET", "POST"])
 @login_required
 @admin_permission.require()
@@ -186,3 +201,58 @@ def topic_edit():
 def topic():
     topics = Topic.query.all()
     return render_layout("admin_topic_index.html", topics=topics)
+
+
+@admin.route("/statement/")
+@login_required
+@admin_permission.require()
+def statement():
+    statements = Statement.query.all()
+    return render_layout("admin_statement_index.html", statement=statement)
+
+@admin.route("/statement/new", methods=["GET", "POST"])
+@login_required
+@admin_permission.require()
+def statement_new():
+    form = AddStatementForm()
+    if form.validate_on_submit():
+        topic = Topic.query.filter_by(id=form.topic.data).first()
+        speaker = speaker_by_name_or_number(form.speaker_name.data, topic.event.id)
+        if topic is not None and speaker is not None:
+            if speaker.count_active(topic) == 0:
+                statement = Statement(speaker.id, topic.id)
+                db.session.add(statement)
+                db.session.commit()
+            return redirect(url_for(".topic_show", id=topic.id))
+    return render_layout("admin_statement_new.html", form=form)
+
+@admin.route("/statement/done")
+@login_required
+@admin_permission.require()
+def statement_done():
+    statement_id = request.args.get("id", None)
+    if statement_id is not None:
+        statement = Statement.query.filter_by(id=statement_id).first()
+        if statement is not None:
+            statement.done()
+            db.session.commit()
+    topic_id = request.args.get("topic_id", None)
+    if topic_id is not None:
+        return redirect(url_for(".topic_show", id=topic_id))
+    return redirect(url_for(".index"))
+
+@admin.route("/statement/delete")
+@login_required
+@admin_permission.require()
+def statement_delete():
+    statement_id = request.args.get("id", None)
+    if statement_id is not None:
+        statement = Statement.query.filter_by(id=statement_id).first()
+        if statement is not None:
+            db.session.delete(statement)
+            db.session.commit()
+    topic_id = request.args.get("topic_id", None)
+    if topic_id is not None:
+        return redirect(url_for(".topic_show", id=topic_id))
+    return redirect(url_for(".index"))
+

modules/speech.py

@@ -4,7 +4,8 @@ from flask.ext.login import login_required
 from models.database import User, Statement, Speaker, Topic
 from models.forms import AddStatementForm
 
-from shared import db, admin_permission, user_permission, render_layout
+from shared import db, admin_permission, user_permission
+from utils import render_layout
 
 from datetime import datetime
 import json
@@ -13,9 +14,10 @@ import config
 
 speech = Blueprint("speech", __name__)
 
+"""
 def query_statements(mode, topic_id):
-    statements = db.session.query(Statement).filter_by(topic=topic_id).all()
-    speakers = db.session.query(Speaker).filter_by(topic=topic_id).all()
+    statements = db.session.query(Statement).filter_by(topic_id=topic_id).all()
+    speakers = db.session.query(Speaker).filter_by(topic_id=topic_id).all()
     if mode == "balanced" or mode == "pending":
         count = { speaker.id: 0 for speaker in speakers }
         for statement in statements:
@@ -37,6 +39,7 @@ def query_statements(mode, topic_id):
         return result
     
     print("unknown querying mode {}".format(mode))
+"""
 
 @speech.route("/index")
 def index():

server.py

@@ -8,7 +8,8 @@ from flask.ext.migrate import Migrate, MigrateCommand
 from passlib.hash import pbkdf2_sha256
 
 import config
-from shared import db, login_manager, render_layout
+from shared import db, login_manager
+from utils import render_layout
 from models.forms import LoginForm, NewUserForm
 from models.database import User, Statement, Speaker, Topic
 
@@ -61,13 +62,7 @@ def adduser():
 
 @app.route("/")
 def index():
-    topics = Topic.query.all()
     meta = []
-    for topic in topics:
-        ls = speech.query_statements(topic.mode, topic.id)
-        no_speaker = Speaker("No Speaker", topic)
-        no_statement = Statement(no_speaker, topic)
-        meta.append((ls[0] if len(ls) > 0 else (no_statement, no_speaker, ()), topic))
     return render_layout("index.html", meta=meta)
 
 @app.route("/update")

shared.py

-from flask import abort, render_template
 from flask.ext.sqlalchemy import SQLAlchemy
 from flask.ext.login import LoginManager
 from flask.ext.principal import Permission, RoleNeed
-from datetime import datetime
 
 db = SQLAlchemy()
 login_manager = LoginManager()
@@ -11,6 +9,3 @@ admin_permission = Permission(RoleNeed("admin"))
 user_permission = Permission(RoleNeed("user"))
 roles = ["user", "admin"]
 
-def render_layout(template, **kwargs):
-    current_time = datetime.now()
-    return render_template(template, current_time=current_time, **kwargs)

templates/admin_event_index.html

@@ -7,6 +7,7 @@
             <thead>
                 <tr>
                     <th class="mdl-data-table__cell--non-numeric">Name</th>
+                    <th class="mdl-data-table__cell--non-numeric">Mode</th>
                     <th class="mdl-data-table__cell--non-numeric">Edit</th>
                     <th class="mdl-data-table__cell--non-numeric">Delete</th>
                 </tr>

templates/admin_event_show.html

@@ -16,6 +16,7 @@
             {% for topic in event.topics %}
                 <tr>
                     <td class="mdl-data-table__cell--non-numeric"><a href="{{ url_for(".topic_show", id=topic.id) }}">{{ topic.name }}</a></td>
+                    <td class="mdl-data-table__cell--non-numeric">{{ topic.mode }}</td>
                     <td class="mdl-data-table__cell--non-numeric">
                         <a href="{{ url_for(".topic_edit", id=topic.id) }}">
                             <i class="material-icons">edit</i>

templates/admin_statement_new.html

+{% extends "admin_index.html" %}
+{% from "macros.html" import render_form %}
+{% block admin_title %}Add Statement{% endblock %}
+
+{% block content %}
+        {{ render_form(form, action_url=url_for(".statement_new"), action_text="Add", title="Add Statement") }}
+{% endblock %}

templates/admin_topic_index.html

@@ -8,6 +8,8 @@
                 <tr>
                     <th class="mdl-data-table__cell--non-numeric">Name</th>
                     <th class="mdl-data-table__cell--non-numeric">Mode</th>
+                    <th class="mdl-data-table__cell--non-numeric">Event</th>
+                    <th class="mdl-data-table__cell--non-numeric">Edit</th>
                     <th class="mdl-data-table__cell--non-numeric">Delete</th>
                 </tr>
             </thead>
@@ -16,6 +18,12 @@
                 <tr>
                     <td class="mdl-data-table__cell--non-numeric"><a href="{{ url_for(".topic_edit", id=topic.id) }}">{{ topic.name }}</a></td>
                     <td class="mdl-data-table__cell--non-numeric">{{ topic.mode }}</td>
+                    <td class="mdl-data-table__cell--non-numeric">{{ topic.event.name }}</td>
+                    <td class="mdl-data-table__cell--non-numeric">
+                        <a href="{{ url_for('.topic_edit', id=topic.id) }}">
+                            <i class="material-icons">edit</i>
+                        </a>
+                    </td>
                     <td class="mdl-data-table__cell--non-numeric">
                         <a href="{{ url_for('.topic_delete', id=topic.id) }}">
                             <i class="material-icons">delete</i>

templates/admin_topic_show.html

+{% extends "admin_index.html" %}
+{% from "macros.html" import render_form %}
+{% block admin_title %}Topic - {{ topic.name }}{% endblock %}
+
+{% block content %}
+    <div class="mdl-cell mdl-cell--6-col mdl-cell--5-col-tablet mdl-cell--4-col-phone mdl-grid mdl-grid--no-spacing">
+        <table class="mdl-data-table mdl-js-table mdl-shadow--2dp mdl-cell mdl-cell--12-col">
+            <thead>
+                <tr>
+                    <th class="mdl-data-table__cell--non-numeric">Speaker</th>
+                    <th class="mdl-data-table__cell--non-numeric">Topic</th>
+                    <th class="mdl-data-table__cell--non-numeric">Count</th>
+                    <th class="mdl-data-table__cell--non-numeric">Done</th>
+                    <th class="mdl-data-table__cell--non-numeric">Remove</th>
+                </tr>
+            </thead>
+            <tbody>
+            {% for statement in topic.sorted_statements() %}
+                <tr>
+                    <td class="mdl-data-table__cell--non-numeric">{{ statement.speaker.identifier() }}</td>
+                    <td class="mdl-data-table__cell--non-numeric">{{ statement.topic.name }}</td>
+                    <td class="mdl-data-table__cell--non-numeric">{{ statement.speaker.count(statement.topic) }}</td>
+                    <td class="mdl-data-table__cell--non-numeric">
+                        <a href="{{ url_for(".statement_done", id=statement.id, topic_id=topic.id) }}">
+                            <i class="material-icons">done</i>
+                        </a>
+                    </td>
+                    <td class="mdl-data-table__cell--non-numeric">
+                        <a href="{{ url_for('.statement_delete', id=statement.id, topic_id=topic.id) }}">
+                            <i class="material-icons">cancel</i>
+                        </a>
+                    </td>
+                </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+    </div>
+    {{ render_form(form, action_url=url_for(".statement_new"), action_text="Add", title="Add Statement", class_="mdl-card mdl-shadow--2dp mdl-cell mdl-cell--3-col mdl-cell-3-col-tablet mdl-cell--4-col-phone") }}
+{% endblock %}

todo.txt

+themen (event -> topic, +event in topic)
+multiple sorting algorithms

utils.py

+from flask import abort, render_template
+from datetime import datetime
+
+from models.database import Speaker
+
+from shared import db
+
+def render_layout(template, **kwargs):
+    current_time = datetime.now()
+    return render_template(template, current_time=current_time, **kwargs)
+       
+def speaker_by_name_or_number(name_or_number, event_id):
+    if name_or_number.isnumeric():
+        number = int(name_or_number)
+        speaker = Speaker.query.filter_by(number=number).first()
+        if speaker is not None:
+            return speaker
+        else:
+            speaker = Speaker("", number, event_id)
+            db.session.add(speaker)
+            db.session.commit()
+            return speaker
+    else:
+        name = name_or_number
+        speaker = Speaker.query.filter_by(name=name).first()
+        if speaker is not None:
+            return speaker
+        else:
+            speaker = Speaker(name, 0, event_id)
+            db.session.add(speaker)
+            db.session.commit()
+            return speaker
+