From 674c8741e7a8896e3c58e6909d3ffcba18c4acc1 Mon Sep 17 00:00:00 2001
From: Mikkel <4072916+Mikk3@users.noreply.github.com>
Date: Tue, 31 May 2022 16:54:37 +0200
Subject: [PATCH] =?UTF-8?q?=C3=86ndre=20felt=20hidden=20til=20mandatory.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

En gruppe kan være obligatorisk. Som man hverkan tilmelde sig eller forlade.
---
 aula/Group/routes.py       |  2 +-
 aula/forms.py              |  2 +-
 aula/models.py             | 12 ++++++------
 aula/schema.sql            |  2 +-
 aula/schema_ins.sql        |  6 +++---
 aula/templates/groups.html |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/aula/Group/routes.py b/aula/Group/routes.py
index 7375e96..d15afc2 100644
--- a/aula/Group/routes.py
+++ b/aula/Group/routes.py
@@ -30,7 +30,7 @@ def show(group_id):
 def create():
     form = CreateGroupForm()
     
-    if insert_group(form.title.data, form.hidden.data):
+    if insert_group(form.title.data, form.mandatory.data):
         flash('Gruppen blev oprettet', 'success')
     else:
         flash('En gruppe med det navn findes allerede', 'danger')
diff --git a/aula/forms.py b/aula/forms.py
index 447124e..dbccf69 100644
--- a/aula/forms.py
+++ b/aula/forms.py
@@ -27,7 +27,7 @@ class CreateThreadForm(FlaskForm):
 
 class CreateGroupForm(FlaskForm):
     title = StringField('Title', validators=[DataRequired()])
-    hidden = BooleanField('Skjul gruppe')
+    mandatory = BooleanField('Obligatorisk gruppe')
     submit = SubmitField("Opret gruppe")
 
 class CreatePostForm(FlaskForm):
diff --git a/aula/models.py b/aula/models.py
index 631b5f0..0777cf0 100644
--- a/aula/models.py
+++ b/aula/models.py
@@ -25,7 +25,7 @@ class Group(tuple):
     def __init__(self, group_data):
         self.group_id = group_data[0]
         self.name = group_data[1]
-        self.hidden = group_data[2]
+        self.mandatory = group_data[2]
         super().__init__()
 
     def get_posts(self):
@@ -194,8 +194,8 @@ class User(tuple, UserMixin):
         sql_call = """
         SELECT groups.* FROM groups INNER JOIN users_groups ON groups.group_id = users_groups.group_id WHERE users_groups.user_id = %s 
         UNION
-        SELECT groups.* FROM groups WHERE groups.hidden = FALSE
-        ORDER BY hidden ASC, name DESC
+        SELECT groups.* FROM groups WHERE groups.mandatory = FALSE
+        ORDER BY mandatory ASC, name DESC
         """
         cur.execute(sql_call, (self.user_id,))
         groups = cur.fetchall()
@@ -332,7 +332,7 @@ def insert_thread(group_id, title):
     conn.commit()
     cur.close()
 
-def insert_group(name, hidden):
+def insert_group(name, mandatory):
     # Make sure we dont try to create group with same name as others
     # Since name has UNIQUE constraint.
     cur = conn.cursor()
@@ -344,9 +344,9 @@ def insert_group(name, hidden):
 
     # Do insertion
     sql = """
-    INSERT INTO groups(name, hidden) VALUES (%s, %s)
+    INSERT INTO groups(name, mandatory) VALUES (%s, %s)
     """ 
-    cur.execute(sql, (name, hidden))
+    cur.execute(sql, (name, mandatory))
     conn.commit()
     cur.close()
     return True
diff --git a/aula/schema.sql b/aula/schema.sql
index 7305e70..e25e593 100644
--- a/aula/schema.sql
+++ b/aula/schema.sql
@@ -13,7 +13,7 @@ CREATE TABLE IF NOT EXISTS users (
 CREATE TABLE IF NOT EXISTS groups (
     group_id SERIAL PRIMARY KEY,
     name varchar(64) NOT NULL UNIQUE,
-    hidden boolean DEFAULT TRUE
+    mandatory boolean DEFAULT TRUE
 );
 
 CREATE TABLE IF NOT EXISTS threads (
diff --git a/aula/schema_ins.sql b/aula/schema_ins.sql
index 1562795..8a0b0ea 100644
--- a/aula/schema_ins.sql
+++ b/aula/schema_ins.sql
@@ -8,7 +8,7 @@ INSERT INTO public.users(user_id, first_name, last_name, password, email, addres
     (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, hidden) VALUES 
+INSERT INTO public.groups(group_id, name, mandatory) VALUES 
     (1000, 'fodbold', TRUE), 
     (1001,'3a', FALSE);
 
@@ -19,8 +19,8 @@ INSERT INTO threads(thread_id ,title, group_id) VALUES
 
 INSERT INTO messages (content, thread_id, author_id, created_date) VALUES
     ('Eleverne har ondt i fødderne når de spiller fodbild. Hvem kender et godt skomærke?', 2000, 5000, NOW() - INTERVAL '3.189 day'),
-    ('Jeg tror min søn har nogle han er glad for. Jeg spørger ham lige 😀', 2000, 5002, NOW() - INTERVAL '2.951 day'),
-    ('Tak 👍', 2000, 5000, NOW() - INTERVAL '1.894 day'),
+    ('Jeg tror min søn har nogle han er glad for. Jeg spørger ham lige', 2000, 5002, NOW() - INTERVAL '2.951 day'),
+    ('Tak', 2000, 5000, NOW() - INTERVAL '1.894 day'),
     ('Er det meningen vi skal give dem sko med????', 2000, 5001, NOW() - INTERVAL '1.05 hour'),
     ('Rachel, giver du ikke dine børn sko med til fodbold?', 2000, 5002, NOW() - INTERVAL '0.95 hour'),
     ('Hvad er der galt med dig?', 2000, 5003, NOW() - INTERVAL '0.94 hour'),
diff --git a/aula/templates/groups.html b/aula/templates/groups.html
index b2138ec..4e3575b 100644
--- a/aula/templates/groups.html
+++ b/aula/templates/groups.html
@@ -20,7 +20,7 @@
 <form method="POST" action="{{ url_for('Group.create')}}">
     <p>{{ form.title(class="form-control", placeholder="Gruppens navn") }}</p>
 
-    <p>{{ form.hidden() }} {{ form.hidden.label(class="form-check-label") }}</p>
+    <p>{{ form.mandatory() }} {{ form.mandatory.label(class="form-check-label") }}</p>
     <p>{{ form.submit(class="btn btn-primary btn-block") }}</p>
     </form>
 {% endblock sidebar %}