From 0a4b7694810abe2fcf947b49e1dded682d02fc73 Mon Sep 17 00:00:00 2001 From: Mikkel <4072916+Mikk3@users.noreply.github.com> Date: Thu, 26 May 2022 15:41:21 +0200 Subject: [PATCH] Update groups and add show ggroup --- aula/Group/routes.py | 13 ++++++++++--- aula/models.py | 21 +++++++++++++++++++++ aula/templates/group_show.html | 6 ++++++ aula/templates/groups.html | 2 +- 4 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 aula/templates/group_show.html diff --git a/aula/Group/routes.py b/aula/Group/routes.py index 78acfad..231a06d 100644 --- a/aula/Group/routes.py +++ b/aula/Group/routes.py @@ -1,13 +1,20 @@ from flask import render_template, url_for, flash, redirect, request, Blueprint from flask_login import current_user, login_required -from aula.models import select_users_by_id +from aula.models import * import sys, datetime Group = Blueprint('Group', __name__) @Group.route("/groups", methods=['GET']) def index(): - current_user.join_group(1000) - groups = current_user.get_groups() + groups = current_user.get_groups_joinable() return render_template('groups.html', groups=groups) +@Group.route("/group/", methods=['GET']) +def show(group_id): + group = get_group(group_id) + if (group is not None): + return render_template('group_show.html', group=group) + else: + return "Der findes ingen gruppe med det id" + diff --git a/aula/models.py b/aula/models.py index a7925bc..f82b662 100644 --- a/aula/models.py +++ b/aula/models.py @@ -129,6 +129,16 @@ class User(tuple, UserMixin): cur.close() return result + def is_member_of_group(group_id): + cur = conn.cursor() + sql_call = """ + SELECT * FROM users_groups WHERE user_id = %s AND group_id = %s + """ + cur.execute(sql_call, (self.user_id, group_id)) + result = cur.fetchone() + return cur.rowcount > 0 + + def get_groups_joinable(self): cur = conn.cursor() sql_call = """ @@ -230,3 +240,14 @@ def get_posts_for_user(user_id): cur.close() return user +def get_group(group_id): + cur = conn.cursor() + sql = """ + SELECT * FROM groups + WHERE group_id = %s + """ + cur.execute(sql, (group_id,)) + group = Group(cur.fetchone()) if cur.rowcount > 0 else None + cur.close() + return group + diff --git a/aula/templates/group_show.html b/aula/templates/group_show.html new file mode 100644 index 0000000..60cdb8e --- /dev/null +++ b/aula/templates/group_show.html @@ -0,0 +1,6 @@ +{% extends "layout.html" %} +{% block content %} +

{{ group.name }}

+

TODO: Tilføj opslag og tråde som er tilknyttet denne gruppe

+ +{% endblock content %} diff --git a/aula/templates/groups.html b/aula/templates/groups.html index 2f27bfe..106d6f6 100644 --- a/aula/templates/groups.html +++ b/aula/templates/groups.html @@ -6,7 +6,7 @@ {% for group in groups %}
- {{ group.name }} +

{{ group.name }}

{% endfor %}