Implemented events and front page

models/database.py

@@ -34,44 +34,68 @@ class User(db.Model, UserMixin):
         )
 
 
+class Event(db.Model):
+    __tablename__ = "events"
+    id = db.Column(db.Integer, primary_key=True)
+    name = db.Column(db.String, unique=True)
+    date = db.Column(db.Date)
+    
+    def __init__(self, name, date):
+        self.name = name
+        self.date = date
+    
+    def __repr__(self):
+        return "<Event(id={}, name='{}', date={})>".format(
+            self.id, 
+            self.name, 
+            self.date
+        )
+
+
 class Speaker(db.Model):
     __tablename__ = "speakers"
     id = db.Column(db.Integer, primary_key=True)
-    name = db.Column(db.String, unique=True)
+    name = db.Column(db.String)
+    event = db.Column(db.Integer, db.ForeignKey("events.id"), nullable=False)
     
-    def __init__(self, name):
+    def __init__(self, name, event):
         self.name = name
+        self.event = event
     
     def __repr__(self):
-        return "<Speaker(id={}, name={})>".format(self.id, self.name)
+        return "<Speaker(id={}, name={}, event={})>".format(
+            self.id, 
+            self.name,
+            self.event
+        )
 
 
 class Statement(db.Model):
     __tablename__ = "statements"
     id = db.Column(db.Integer, primary_key=True)
     speaker = db.Column(db.Integer, db.ForeignKey("speakers.id"), nullable=False)
+    event = db.Column(db.Integer, db.ForeignKey("events.id"), nullable=False)
     insertion_time = db.Column(db.DateTime)
     executed = db.Column(db.Boolean)
     execution_time = db.Column(db.DateTime)
     
-    def __init__(self, speaker, insertion_time=None, executed=False, execution_time=None):
+    def __init__(self, speaker, event, insertion_time=None, executed=False, execution_time=None):
         self.speaker = speaker
+        self.event = event
         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={}, insertion_time={}, executed={}, execution_time={})>".format(
+        return "<Statement(id={}, speaker={}, event={}, insertion_time={}, executed={}, execution_time={})>".format(
             self.id, 
             self.speaker,
+            self.event,
             self.insertion_time,
             self.executed,
             self.execution_time
         )
     
-    def dump(self):
-        return { "speaker": self.speaker, "insertion_time": self.insertion_time.timestamp(), "executed": self.executed, "execution_time": self.execution_time.timestamp() }
-    
     def done(self):
         if self.executed:
             return False

models/forms.py

 from flask.ext.wtf import Form
-from wtforms import StringField, PasswordField, BooleanField, SelectMultipleField, SelectField, DateField, IntegerField, TextAreaField
+from wtforms import StringField, PasswordField, BooleanField, SelectMultipleField, SelectField, DateField, IntegerField, TextAreaField, HiddenField
 from wtforms.validators import InputRequired, Length, EqualTo, Email, Optional, Length, NumberRange, AnyOf
 from models.database import User
 
@@ -24,3 +24,8 @@ class AdminUserForm(Form):
 
 class AddStatementForm(Form):
     speaker_name = StringField("Speaker", validators=[InputRequired("Entering the speaker is required.")])
+    event = HiddenField("Event")
+
+class NewEventForm(Form):
+    name = StringField("Name", validators=[InputRequired("Entering the name is required.")])
+    date = DateField("Date (DD.MM.YYYY)", validators=[InputRequired("Entering the date is required.")], format="%d.%m.%Y")

modules/admin.py

@@ -2,8 +2,8 @@ from flask import Blueprint, render_template, redirect, url_for, request, flash,
 from flask.ext.login import login_required
 from passlib.hash import pbkdf2_sha256
 
-from models.database import User
-from models.forms import AdminUserForm, NewUserForm
+from models.database import User, Event
+from models.forms import AdminUserForm, NewUserForm, NewEventForm
 
 from shared import db, admin_permission
 
@@ -15,7 +15,8 @@ admin = Blueprint("admin", __name__)
 @admin_permission.require()
 def index():
     users = User.query.limit(10).all()
-    return render_template("admin_index.html", users=users)
+    events = Event.query.limit(10).all()
+    return render_template("admin_index.html", users=users, events=events)
 
 @admin.route("/user/")
 @login_required
@@ -66,3 +67,56 @@ def user_new():
         db.session.commit()
         return redirect(url_for(".user"))
     return render_template("admin_user_new.html", form=form)
+
+
+@admin.route("/event/new", methods=["GET", "POST"])
+@login_required
+@admin_permission.require()
+def event_new():
+    form = NewEventForm()
+    if form.validate_on_submit():
+        if Event.query.filter_by(name=form.name.data).count() > 0:
+            flash("There already is an event with that name.", "alert-error")
+            return render_template("admin_event_new.html", form=form)
+        event = Event(form.name.data, form.date.data)
+        db.session.add(event)
+        db.session.commit()
+        return redirect(url_for(".event"))
+    return render_template("admin_event_new.html", form=form)
+
+@admin.route("/event/delete")
+@login_required
+@admin_permission.require()
+def event_delete():
+    event_id = request.args.get("id", None)
+    if event_id is not None:
+        event  = Event.query.filter_by(id=event_id).first()
+        db.session.delete(event)
+        db.session.commit()
+        flash("Event deleted.", "alert-success")
+    return redirect(url_for(".event"))
+
+@admin.route("/event/edit", methods=["GET", "POST"])
+@login_required
+@admin_permission.require()
+def event_edit():
+    event_id = request.args.get("id", None)
+    if event_id is not None:
+        event = db.session.query(Event).filter_by(id=event_id).first()
+        form = NewEventForm(obj=event)
+        if form.validate_on_submit():
+            form.populate_obj(event)
+            db.session.commit()
+            return redirect(url_for(".index"))
+        else:
+            return render_template("admin_event_edit.html", form=form, id=event_id)
+    else:
+        return redirect(url_for(".index"))
+
+@admin.route("/event/")
+@login_required
+@admin_permission.require()
+def event():
+    events = Event.query.all()
+    print(events)
+    return render_template("admin_event_index.html", events=events)

modules/speech.py

 from flask import Blueprint, render_template, redirect, url_for, request, flash, abort, send_file, Response
 from flask.ext.login import login_required
 
-from models.database import User, Statement, Speaker
+from models.database import User, Statement, Speaker, Event
 from models.forms import AddStatementForm
 
 from shared import db, admin_permission, user_permission
@@ -15,36 +15,59 @@ def transpose(arr):
     print(list)
     return list(map(list, zip(*arr)))
 
-def query_statements(mode):
+def query_statements(mode, event_id):
     statements = []
     if mode == "pending":
-        statements = db.session.query(Statement, Speaker, db.func.count(Statement.speaker).label("total")).group_by(Speaker.id).join(Speaker).order_by("total ASC", Statement.insertion_time).all()
+        statements = db.session.query(Statement, Speaker, db.func.count(Statement.speaker).label("total")).group_by(Speaker.id).join(Speaker).filter(Statement.event == event_id).order_by("total ASC", Statement.insertion_time).all()
     elif mode == "all":
-        statements = db.session.query(Statement, Speaker).join(Speaker).order_by(Statement.insertion_time).all()
+        statements = db.session.query(Statement, Speaker).join(Speaker).filter(Statement.event == event_id).order_by(Statement.insertion_time).all()
     elif mode == "past":
-        statements = db.session.query(Statement, Speaker).join(Speaker).filter(Statement.executed == True).order_by(Statement.execution_time).all()
+        statements = db.session.query(Statement, Speaker).join(Speaker).filter(Statement.executed == True).filter(Statement.event == event_id).order_by(Statement.execution_time).all()
     return statements
 
 @speech.route("/index")
 def index():
     mode = request.args.get("mode", "pending")
-    statements = query_statements(mode)
-    add_form = AddStatementForm()
-    current = ".index"
-    return render_template("speech_index.html", statements=statements, add_form=add_form, current=current)
+    event_id = request.args.get("event", None) 
+    meta = []
+    if event_id is not None and event_id != "-1":
+        event = Event.query.filter_by(id=event_id).first()
+        form = AddStatementForm()
+        form.event.data = event.id
+        meta.append((query_statements(mode, event_id), form, event))
+    else:
+        for event in Event.query.all():
+            form = AddStatementForm()
+            form.event.data = event.id
+            meta.append((query_statements(mode, event.id), form, event))
+        event_id = -1
+    return render_template("speech_index.html", meta=meta, event_id=event_id)
 
 @speech.route("/show")
 def show():
     mode = request.args.get("mode", "pending") 
-    statements = query_statements(mode)
-    current = ".show"
-    return render_template("speech_show.html", statements=statements, current=current, mode=mode)
+    event_id = request.args.get("event", None)
+    meta = []
+    if event_id is not None and event_id is not "-1":
+        event = Event.query.filter_by(id=event_id).first()
+        meta.append((query_statements(mode, event_id), event))
+    else:
+        for event in Event.query.all():
+            meta.append((query_statements(mode, event.id), event))
+    return render_template("speech_show.html", mode=mode, meta=meta, event_id=event_id)
 
 @speech.route("/update")
 def update():
-    mode = request.args.get("mode", "pending")
-    statements = query_statements(mode)
-    return render_template("speech_update_show.html", statements=statements, mode=mode)
+    mode = request.args.get("mode", "pending") 
+    event_id = request.args.get("event", None)
+    meta = []
+    if event_id is not None and event_id != "-1":
+        event = Event.query.filter_by(id=event_id).first()
+        meta.append((query_statements(mode, event_id), event))
+    else:
+        for event in Event.query.all():
+            meta.append((query_statements(mode, event.id), event))
+    return render_template("speech_update_show.html", mode=mode, meta=meta)
 
 
 @speech.route("/add", methods=["GET", "POST"])
@@ -54,28 +77,31 @@ def add():
     add_form = AddStatementForm()
     if add_form.validate_on_submit():
         speaker_name = add_form["speaker_name"].data
-    if speaker_name is None:
-        flash("Missing speaker name", "alert-error")
-        return redirect(url_for(".show"))
-    speaker = Speaker.query.filter_by(name=speaker_name).first()
+        event_id = add_form["event"].data
+    if speaker_name is None or event_id is None:
+        flash("Missing data", "alert-error")
+        return redirect(url_for(".index"))
+    speaker = Speaker.query.filter_by(name=speaker_name).filter_by(event=event_id).first()
     if not speaker:
-        speaker = Speaker(speaker_name)
+        speaker = Speaker(speaker_name, event_id)
         db.session.add(speaker)
         db.session.commit()
-    if Statement.query.filter_by(speaker=speaker.id).filter_by(executed=False).count() > 0:
+    if Statement.query.filter_by(speaker=speaker.id).filter_by(event=event_id).filter_by(executed=False).count() > 0:
         flash("Speaker already listet", "alert-error")
         return redirect(url_for(request.args.get("next") or ".show"))
-    statement = Statement(speaker.id)
+    statement = Statement(speaker.id, event_id)
     db.session.add(statement)
     db.session.commit()
     mode = request.args.get("mode", "pending")
-    return redirect(url_for(request.args.get("next") or ".index", mode=mode))
+    event_id = request.args.get("event", None)
+    return redirect(url_for(request.args.get("next") or ".index", mode=mode, event=event_id))
 
 
 @speech.route("/cancel")
 @user_permission.require()
 def cancel():
     statement_id = request.args.get("statement", None)
+    event_id = request.args.get("event", -1)
     if not statement_id:
         flash("Missing statement id", "alert-error")
         return redirect(url_for(request.args.get("next") or ".index"))
@@ -84,12 +110,13 @@ def cancel():
     db.session.commit()
     flash("Statement canceled", "alert-success")
     mode = request.args.get("mode", "pending")
-    return redirect(url_for(request.args.get("next") or ".index", mode=mode))
+    return redirect(url_for(request.args.get("next") or ".index", mode=mode, event=event_id))
 
 @speech.route("/done")
 @user_permission.require()
 def done():
     statement_id = request.args.get("statement", None)
+    event_id = request.args.get("event", -1)
     if not statement_id:
         flash("Missing statement id", "alert-error")
         return redirect(url_for(request.args.get("next") or ".index"))
@@ -99,10 +126,11 @@ def done():
     else:
         flash("Statement already done", "alert-error")
     mode = request.args.get("mode", "pending")
-    return redirect(url_for(request.args.get("next") or ".index", mode=mode))
+    return redirect(url_for(request.args.get("next") or ".index", mode=mode, event=event_id))
 
 @speech.route("/update_show.js")
 def update_show_js():
     mode = request.args.get("mode", "pending")
-    return render_template("update_show.js", mode=mode)
+    event_id = request.args.get("event", -1)
+    return render_template("update_show.js", mode=mode, event_id=event_id)
 

server.py

@@ -8,7 +8,7 @@ from passlib.hash import pbkdf2_sha256
 import config
 from shared import db, login_manager
 from models.forms import LoginForm, NewUserForm
-from models.database import User, Statement, Speaker
+from models.database import User, Statement, Speaker, Event
 
 app = Flask(__name__)
 app.config.from_object(config)
@@ -34,8 +34,23 @@ def index():
         user = User(fullname, username, password, ["admin", "user"])
         db.session.add(user)
         db.session.commit()
-    #return render_template("index.html")
-    return redirect(url_for("speech.show", mode="pending"))
+    events = Event.query.all()
+    meta = []
+    for event in events:
+        meta.append(([ (statement, speaker, count) for (statement, speaker, count) in speech.query_statements("pending", event.id) if not statement.executed ][0], event))
+    return render_template("index.html", meta=meta)
+
+@app.route("/update")
+def update():
+    events = Event.query.all()
+    meta = []
+    for event in events:
+        meta.append(([ (statement, speaker, count) for (statement, speaker, count) in speech.query_statements("pending", event.id) if not statement.executed ][0], event))
+    return render_template("update_index.html", meta=meta)
+
+@app.route("/update.js")
+def update_js():
+    return render_template("update_index.js")
 
 @app.route("/login", methods=["GET", "POST"])
 def login():

templates/admin_event_edit.html

+{% extends "layout.html" %}
+{% from "macros.html" import render_form %}
+{% block title %}Edit Event - Administration{% endblock %}
+
+{% block content %}
+        {{ render_form(form, action_url=url_for(".event_edit", id=id), action_text="Apply", title="Edit Event") }}
+{% endblock %}

templates/admin_event_index.html

+{% extends "admin_index.html" %}
+{% block admin_title %}Events{% endblock %}
+
+{% block content %}
+    <div class="mdl-cell mdl-cell--3-col mdl-grid mdl-grid--no-spacing">
+        <table class="mdl-data-table mdl-js-table mdl-shadow--2dp mdl-cell mdl-cell--3-col">
+            <thead>
+                <tr>
+                    <th class="mdl-data-table__cell--non-numeric">Name</th>
+                    <th class="mdl-data-table__cell--non-numeric">Date</th>
+                    <th class="mdl-data-table__cell--non-numeric">Delete</th>
+                </tr>
+            </thead>
+            <tbody>
+            {% for event in events %}
+                <tr>
+                    <td class="mdl-data-table__cell--non-numeric"><a href="{{ url_for(".event_edit", id=event.id) }}">{{ event.name }}</a></td>
+                    <td class="mdl-data-table__cell--non-numeric">{{ event.date.strftime("%d.%m.%Y") }}</td>
+                    <td class="mdl-data-table__cell--non-numeric">
+                        <a href="{{ url_for('.event_delete', id=event.id) }}">
+                            <i class="material-icons">delete</i>
+                        </a>
+                    </td>
+                </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+        <div class="rede-separator">
+            <div class="mdl-cell mdl-cell--1-col">
+                <a class="mdl-button mdl-button--colored mdl-js-button mdl-button--fab mdl-js-ripple-effect" href="{{ url_for('.event_new') }}">
+                    <i class="material-icons">add</i>
+                </a>
+            </div>
+        </div>
+    </div>
+{% endblock %}

templates/admin_event_new.html

+{% extends "layout.html" %}
+{% from "macros.html" import render_form %}
+{% block title %}Add Event - Administration{% endblock %}
+
+{% block content %}
+        {{ render_form(form, action_url=url_for(".event_new", id=id), action_text="Add", title="Create Event") }}
+{% endblock %}

templates/admin_index.html

@@ -27,4 +27,28 @@
             </a>
         </div>
     </div>
+    <div class="mdl-cell mdl-cell--6-col mdl-cell--8-col-tablet mdl-cell--4-col-phone mdl-grid mdl-grid--no-spacing">
+        <table class="mdl-data-table mdl-js-table mdl-shadow--2dp sortable mdl-cell mdl-cell--12-col mdl-cell--8-col-tablet mdl-cell--4-col-phone">
+            <thead>
+                <tr>
+                    <th class="mdl-data-table__cell--non-numeric">Name</th>
+                    <th class="mdl-data-table__cell--non-numeric">Date</th>
+                </tr>
+            </thead>
+            <tbody>
+            {% for event in events %}
+                <tr>
+                    <td class="mdl-data-table__cell--non-numeric"><a href="{{ url_for(".event_edit", id=event.id) }}">{{ event.name }}</a></td>
+                    <td class="mdl-data-table__cell--non-numeric">{{ event.date.strftime("%d.%m.%Y") }}</td>
+                </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+        <div class="mdl-cell mdl-cell--3-col mdl-cell--3-col-tablet mdl-cell--2-col-phone">
+            <a class="mdl-button mdl-button--colored mdl-js-button" href="{{ url_for(".event") }}">
+                All events
+            </a>
+        </div>
+    </div>
+
 {% endblock %}

templates/index.html

 {% extends "layout.html" %}
 {% block title %}Index{% endblock %}
+{% block additional_js %}
+    <script src="{{ url_for(".update_js") }}" async></script>
+{% endblock %}
 
 {% block content %}
-    <div class="rede-nocontent mdl-color--white mdl-shadow--2dp mdl-cell mdl-cell-12-col mdl-grid">
-        No content here
+    {% for (statement, speaker, count), event in meta %}
+    <div class="mdl-color--white mdl-shadow--2dp mdl-cell mdl-cell--4-col mdl-cell--4-col-tablet mdl-cell--4-col-phone mdl-card">
+        <div class="mdl-card__title">
+            <h3 class="mdl-card__title-text">{{ event.name }}: {{ speaker.name }}</h3>
+        </div>
+        <div class="mdl-card__actions">
+            {% if current_user.is_authenticated() and "user" in current_user.roles %}
+            <a href="{{ url_for("speech.index", event=event.id, mode="pending") }}">
+                <button type="button" class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored">
+                    <i class="material-icons" role="presentation">build</i>
+                </button>
+            </a>
+            {% endif %}
+            <a href="{{ url_for("speech.show", event=event.id, mode="pending") }}">
+                <button type="button" class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored">
+                    <i class="material-icons" role="presentation">announcement</i>
+                </button>
+            </a>
+            <a href="{{ url_for("speech.show", event=event.id, mode="all") }}">
+                <button type="button" class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored">
+                    <i class="material-icons" role="presentation">list</i>
+                </button>
+            </a>
+            <a href="{{ url_for("speech.show", event=event.id, mode="past") }}">
+                <button type="button" class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored">
+                    <i class="material-icons" role="presentation">schedule</i>
+                </button>
+            </a>
+        </div>
     </div>
+    {% endfor %}
 {% endblock %}

templates/macros.html

@@ -10,7 +10,7 @@
 
 {% macro render_stringfield(field) -%}
     <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
-        <input id="{{ field.id }}" name="{{ field.id }}" class="mdl-textfield__input" type="text"{% if field.data is not none %}value="{{ field.data }}"{% endif %} />