Merge branch 'main' of git.ingemanngade.net:NikolajDanger/UIS_Prototype

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/<int:group_id>", 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"
+

aula/models.py

@@ -144,6 +144,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 = """
@@ -245,3 +255,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
+

aula/templates/group_show.html

@@ -0,0 +1,6 @@
+{% extends "layout.html" %}
+{% block content %}
+    <h1>{{ group.name }}</h1>
+    <p>TODO: Tilføj opslag og tråde som er tilknyttet denne gruppe</p>
+
+{% endblock content %}

aula/templates/groups.html

@@ -6,7 +6,7 @@
         {% for group in groups %}
         <div class="card">
             <div class="card-body">
-                {{ group.name }}
+                <p><a class="" href="{{ url_for('Group.show', group_id = group.group_id) }}">{{ group.name }}</a></p>
             </div>
           </div>
         {% endfor %}