From a4b6c53fcfb5759e928c0b80be76780ff8be454d Mon Sep 17 00:00:00 2001 From: Robin Sonnabend Date: Sun, 8 Nov 2015 13:30:06 +0100 Subject: [PATCH] Benutzeransicht --- migrations/versions/3c75c74bb94_.py | 26 +++++ models/database.py | 12 ++- modules/speech.py | 151 +++++----------------------- templates/content_index.html | 31 +++--- templates/layout.html | 5 +- templates/speech_content_index.html | 37 +++++++ templates/speech_content_show.html | 21 ---- templates/speech_index.html | 57 +---------- templates/speech_show.html | 10 -- 9 files changed, 111 insertions(+), 239 deletions(-) create mode 100644 migrations/versions/3c75c74bb94_.py create mode 100644 templates/speech_content_index.html delete mode 100644 templates/speech_content_show.html delete mode 100644 templates/speech_show.html diff --git a/migrations/versions/3c75c74bb94_.py b/migrations/versions/3c75c74bb94_.py new file mode 100644 index 0000000..783756c --- /dev/null +++ b/migrations/versions/3c75c74bb94_.py @@ -0,0 +1,26 @@ +"""empty message + +Revision ID: 3c75c74bb94 +Revises: 256d9df3492 +Create Date: 2015-11-08 13:06:23.520483 + +""" + +# revision identifiers, used by Alembic. +revision = '3c75c74bb94' +down_revision = '256d9df3492' + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint('events_current_topic_id_fkey', 'events', type_='foreignkey') + ### end Alembic commands ### + + +def downgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.create_foreign_key('events_current_topic_id_fkey', 'events', 'topics', ['current_topic_id'], ['id']) + ### end Alembic commands ### diff --git a/models/database.py b/models/database.py index 7346687..453e893 100644 --- a/models/database.py +++ b/models/database.py @@ -41,15 +41,13 @@ class Event(db.Model): name = db.Column(db.String, unique=True) paused = db.Column(db.Boolean) paused_until = db.Column(db.DateTime) - current_topic_id = db.Column(db.Integer, db.ForeignKey("topics.id")) - - current_topic = relationship("Topic", foreign_keys=[current_topic_id]) + current_topic_id = db.Column(db.Integer) def __init__(self, name, paused=False, current_topic_id=None): self.name = name self.paused = paused self.paused_until = datetime(1970, 1, 1) - self.current_topic_id = current_topic_id or 0 + self.current_topic_id = current_topic_id or -1 def __repr__(self): return "".format( @@ -61,6 +59,12 @@ class Event(db.Model): def sorted_topics(self): return sorted(self.topics, key=lambda tp: tp.get_index()) + + def get_current_topic(self): + candidates = [topic for topic in self.topics if topic.id == self.current_topic_id] + if len(candidates) < 1: + return None + return candidates[0] class Topic(db.Model): __tablename__ = "topics" diff --git a/modules/speech.py b/modules/speech.py index 1670d00..b205f2c 100644 --- a/modules/speech.py +++ b/modules/speech.py @@ -1,7 +1,7 @@ from flask import Blueprint, redirect, url_for, request, flash, abort, send_file, Response from flask.ext.login import login_required -from models.database import User, Statement, Speaker, Topic +from models.database import User, Statement, Speaker, Topic, Event from models.forms import AddStatementForm from shared import db, admin_permission, user_permission @@ -14,142 +14,37 @@ import config speech = Blueprint("speech", __name__) -""" -def query_statements(mode, topic_id): - 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: - if statement.speaker in count: - count[statement.speaker] += 1 - else: - count[statement.speaker] = 1 - sorted_speakers = sorted(speakers, key=lambda sp: count[sp.id]) - result = [] - for speaker in sorted_speakers: - pending_statements = [statement for statement in statements if statement.speaker == speaker.id and not statement.executed] - if len(pending_statements) > 0: - result.append((pending_statements[0], speaker, count[speaker.id])) - return result - - if mode == "fifo": - speaker_by_id = { speaker.id: speaker for speaker in speakers } - result = [(statement, speaker_by_id[statement.speaker], 0) for statement in statements if not statement.executed] - return result - - print("unknown querying mode {}".format(mode)) -""" @speech.route("/") def index(): - topic_id = request.args.get("topic", None) - mode = request.args.get("mode", None) - meta = [] - if topic_id is not None and topic_id != "-1": - topic = Topic.query.filter_by(id=topic_id).first() - form = AddStatementForm() - form.topic.data = topic.id - meta.append((query_statements(mode if mode is not None else topic.mode, topic_id), form, topic)) - else: - for topic in Topic.query.all(): - form = AddStatementForm() - form.topic.data = topic.id - meta.append((query_statements(mode if mode is not None else topic.mode, topic.id), form, topic)) - topic_id = -1 - return render_layout("speech_index.html", meta=meta, topic_id=topic_id, mode=mode) - -@speech.route("/show") -def show(): - topic_id = request.args.get("topic", None) - mode = request.args.get("mode", None) - meta = [] - if topic_id is not None and topic_id is not "-1": - topic = Topic.query.filter_by(id=topic_id).first() - meta.append((query_statements(mode if mode is not None else topic.mode, topic_id), topic)) + event_id = request.args.get("event", None) + events = [] + if event_id is not None and event_id.isnumeric() and int(event_id) > -1: + event = Event.query.filter_by(id=event_id).first() + if event is not None: + events.append(event) else: - for topic in Topic.query.all(): - meta.append((query_statements(mode if mode is not None else topic.mode, topic.id), topic)) - return render_layout("speech_show.html", mode=mode, meta=meta, topic_id=topic_id) + events = Event.query.all() + return render_layout("speech_index.html", events=events, event=-1 if len(events) != 1 else events[0].id) @speech.route("/update") def update(): - topic_id = request.args.get("topic", None) - mode = request.args.get("mode", None) - meta = [] - if topic_id is not None and topic_id != "-1": - topic = Topic.query.filter_by(id=topic_id).first() - meta.append((query_statements(mode if mode is not None else topic.mode, topic_id), topic)) - else: - for topic in Topic.query.all(): - meta.append((query_statements(mode if mode is not None else topic.mode, topic.id), topic)) - return render_layout("speech_content_show.html", mode=mode, meta=meta) - - -@speech.route("/add", methods=["GET", "POST"]) -@user_permission.require() -def add(): - speaker_name = request.args.get("speaker", None) - add_form = AddStatementForm() - if add_form.validate_on_submit(): - speaker_name = add_form["speaker_name"].data - topic_id = add_form["topic"].data - if speaker_name is None or topic_id is None: - flash("Missing data", "alert-error") - return redirect(url_for(".index")) - speaker = Speaker.query.filter_by(name=speaker_name).filter_by(topic=topic_id).first() - if not speaker: - speaker = Speaker(speaker_name, topic_id) - db.session.add(speaker) - db.session.commit() - if Statement.query.filter_by(speaker=speaker.id).filter_by(topic=topic_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, topic_id) - db.session.add(statement) - db.session.commit() - mode = request.args.get("mode", None) - topic_id = request.args.get("topic", None) - return redirect(url_for(request.args.get("next") or ".index", mode=mode, topic=topic_id)) - - -@speech.route("/cancel") -@user_permission.require() -def cancel(): - statement_id = request.args.get("statement", None) - topic_id = request.args.get("topic", -1) - if not statement_id: - flash("Missing statement id", "alert-error") - return redirect(url_for(request.args.get("next") or ".index")) - statement = Statement.query.filter_by(id=statement_id).first() - db.session.delete(statement) - db.session.commit() - flash("Statement canceled", "alert-success") - mode = request.args.get("mode", None) - return redirect(url_for(request.args.get("next") or ".index", mode=mode, topic=topic_id)) - -@speech.route("/done") -@user_permission.require() -def done(): - statement_id = request.args.get("statement", None) - topic_id = request.args.get("topic", -1) - if not statement_id: - flash("Missing statement id", "alert-error") - return redirect(url_for(request.args.get("next") or ".index")) - statement = Statement.query.filter_by(id=statement_id).first() - if statement.done(): - db.session.commit() + event_id = request.args.get("event", None) + events = [] + if event_id is not None and event_id.isnumeric() and int(event_id) > -1: + event = Event.query.filter_by(id=event_id).first() + if event is not None: + events.append(event) else: - flash("Statement already done", "alert-error") - mode = request.args.get("mode", None) - return redirect(url_for(request.args.get("next") or ".index", mode=mode, topic=topic_id)) + events = Event.query.all() + return render_layout("speech_content_index.html", events=events) -@speech.route("/update_show.js") -def update_show_js(): - update_interval = config.UPDATE_SHOW_INTERVAL or 1 +@speech.route("/update_index.js") +def update_index_js(): + update_interval = config.UPDATE_INDEX_INTERVAL or 1 div = "rede-content-div" mode = request.args.get("mode", None) - topic_id = request.args.get("topic", -1) - target_url = url_for(".update", mode=mode, topic=topic_id) - return render_layout("update.js", update_interval=update_interval, div=div, target_url=target_url, prefix="update_show_") + event_id = request.args.get("event", -1) + target_url = url_for(".update", event=event_id) + return render_layout("update.js", update_interval=update_interval, div=div, target_url=target_url, prefix="update_index_") diff --git a/templates/content_index.html b/templates/content_index.html index 97f49dc..966d8ed 100644 --- a/templates/content_index.html +++ b/templates/content_index.html @@ -1,21 +1,18 @@ - {% for (statement, speaker, count), topic in meta %}
+ {% if event.current_topic_id != -1 %}
-

{{ topic.name }}: {{ speaker.name }}

-
-
- {% if current_user.is_authenticated and "user" in current_user.roles %} - - - - {% endif %} - - - +

{{ event.current_topic.name }}: {{ event.current_topic.sorted_statements()[0].speaker.name }}

+ {% if event.get_current_topic() %} + + {% for statement in event.get_current_topic().sorted_statements() %} + + + + {% endfor %} +
statement.speaker.name
+ {% endif %} + {% else %} + No topic selected + {% endif %}
- {% endfor %} diff --git a/templates/layout.html b/templates/layout.html index ee9b659..f71a307 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -79,10 +79,7 @@