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

aula/Group/routes.py

@@ -1,12 +1,15 @@
 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
+from aula.models import select_users_by_id
 import sys, datetime
 
 Group = Blueprint('Group', __name__)
 
 @Group.route("/groups/index", methods=['GET'])
 def index():
-    user = select_users(5000)
-    return user.address
+    user = select_users_by_id(5000)
+    groups = user.get_groups()
+    for group in groups:
+        print(group.name)
+    return "hej"
 

aula/Threads/routes.py

@@ -0,0 +1,12 @@
+from flask import render_template, url_for, flash, redirect, request, Blueprint
+from bank import app, conn, bcrypt
+from aula.forms import TransferForm, DepositForm, AddCustomerForm
+from flask_login import current_user, login_required
+import sys, datetime
+
+Group = Blueprint('Threads', __name__)
+
+@login_required()
+@Group.route("threads/index", methods=['GET'])
+def index():
+    return render_template()

aula/models.py

@@ -64,10 +64,24 @@ class User(tuple, UserMixin):
     def get_id(self):
         return self.user_id
 
+    def get_groups(self):
+        cur = conn.cursor()
+        sql_call = f"""
+        SELECT groups.* FROM users_groups JOIN groups ON users_groups.group_id = groups.group_id WHERE users_groups.user_id = {self.user_id}
+        """
+        cur.execute(sql_call)
+        groups = cur.fetchall()
+        result = []
+        for group_data in groups:
+            result.append(Group(group_data))
+        cur.close()
+        return result
+
+
 def insert_users(user_id, first_name, last_name, password, email, adresse, role):
     cur = conn.cursor()
     sql_call = """
-    INSERT INTO Customers(user_id, first_name, last_name, password, email, adresse, role)
+    INSERT INTO users(user_id, first_name, last_name, password, email, adresse, role)
     VALUES (%s, %s, %s, %s, %s, %s, %s)
     """
     cur.execute(sql_call, (user_id, first_name, last_name, password, email, adresse, role))
@@ -95,6 +109,11 @@ def select_users_by_email(email):
     cur.execute(sql_call, (email,))
     user = User(cur.fetchone()) if cur.rowcount > 0 else None
     cur.close()
+<<<<<<< HEAD
+    return 
+
+
+=======
     return user
 
 def get_posts_for_user(user_id):
@@ -107,3 +126,4 @@ def get_posts_for_user(user_id):
     print(posts)
     cur.close()
     return posts
+>>>>>>> 44c5063a11505828679f1ebd8455debca1f8cf84

aula/schema_ins.sql

@@ -1,18 +1,18 @@
 TRUNCATE users, groups, threads, messages, posts, users_groups, users_threads;
 
 INSERT INTO public.users(user_id, first_name, last_name, password, email, address, role) VALUES 
-    (5000, 'Gordon', 'Freeman', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'test@test.dk', 'aud Auditorium A, bygning 1, 1. sal Universitetsparken 15 (Zoo)', 'teacher'),
+    (5000, 'Gordon', 'Freeman', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'gordon@test.dk', 'Black Mesa', 'teacher'),
     (5001, 'Rachel', 'Green', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'rachel@test.dk', 'Cnetral Park', 'parent'),
     (5002,'Joey', 'Trib', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'joey@test.dk', 'New York', 'student'),
-    (5003,'Chandler', 'Bing', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'Chandler@test.dk', 'Central Park', 'student'),
-    (5004,'Phoebe', 'Buffay', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'Phoebe@test.dk', 'Central Perk', 'parent'),
-    (5005,'Ross', 'Geller', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'Ross@test.dk', 'Central Perk', 'student');
+    (5003,'Chandler', 'Bing', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'chandler@test.dk', 'Central Park', 'student'),
+    (5004,'Phoebe', 'Buffay', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'phoebe@test.dk', 'Central Perk', 'parent'),
+    (5005,'Ross', 'Geller', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'ross@test.dk', 'Central Perk', 'student');
 
 INSERT INTO public.groups(group_id, name, leaveable, parents_can_post) VALUES 
     (1000, 'fodbold', TRUE, TRUE), 
     (1001,'3a', FALSE, TRUE);
 
-INSERT INTO users_groups (user_id, group_id) VALUES (5000, 1000), (5000, 1001);
+INSERT INTO users_groups (user_id, group_id) VALUES (5000, 1000), (5001, 1001);
 
 INSERT INTO threads(thread_id ,title, group_id, creator_id) VALUES 
     (2000, 'Anbefalinger til fodboldsko?', 1000, 5000);

aula/templates/threads.html

@@ -0,0 +1,46 @@
+{% extends "layout.html" %}
+{% block content %}
+    <div class="content-section">
+        <form method="POST" action="">
+            {{ form.hidden_tag() }}
+            <div class="form-group">
+                {{ form.sourceAccount.label(class="form-control-label") }}
+                {{ form.sourceAccount(class="form-control")}}
+            </div>
+            <fieldset class="form-group">
+                <div class="form-group">
+                    {{ form.amount.label(class="form-control-label") }}
+                    {% if form.amount.errors %}
+                        {{ form.amount(class="form-control form-control-lg is-invalid") }}
+                        <div class="invalid-feedback">
+                            {% for error in form.password.errors %}
+                                <span>{{ error }}</span>
+                            {% endfor %}
+                        </div>
+                    {% else %}
+                        {{ form.amount(class="form-control form-control-lg") }}
+                    {% endif %}
+                </div>
+            </fieldset>
+            <div class="form-group">
+                {{ form.targetAccount.label(class="form-control-label") }}
+                {{ form.targetAccount(class="form-control") }}
+            </div>
+            <div class="form-group">
+                {{ form.submit(class="btn btn-outline-info") }}
+            </div>
+        </form>
+    </div>
+	
+    <div class="content-section">	
+      <p>Dropdown customer account tuples:</p>
+      <ul class="list-group">
+        {% for n in drop_cus_acc %}
+        <li class="list-group-item list-group-item-light">{{n}}}</li>
+        {% endfor %}
+      </ul>
+      <br>
+      <p>Same list with a filter: {{ drop_cus_acc|join(', ') }}</p>
+    </div>
+	
+{% endblock content %}