From 8d4600b490b9bf53fd8ea3c1688b7280f372ed2c Mon Sep 17 00:00:00 2001 From: jeanGaston Date: Wed, 5 Jun 2024 07:14:19 +0000 Subject: [PATCH] Fix bugs in the delete function for doors and groups --- Server/Program/Webserver.py | 6 +++--- Server/Program/database.py | 1 + Server/Program/static/style.css | 10 ++++++++++ Server/Program/templates/groupsdb.html | 7 ++++--- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Server/Program/Webserver.py b/Server/Program/Webserver.py index 41d4f44..891bdd3 100644 --- a/Server/Program/Webserver.py +++ b/Server/Program/Webserver.py @@ -10,10 +10,10 @@ from flask import ( ) import io from ldapSync import sync_ldap_to_database -from database import (WebServerPORT, add_door_to_database, check_access, delete_group_from_database, +from database import (add_door_to_database, check_access, delete_group_from_database, get_doors, get_existing_groups, get_latest_logs, get_logs, get_users, log_access_attempt) -from env import DBFILE +from env import DBFILE, WebServerPORT app = Flask(__name__) @@ -120,7 +120,7 @@ def door_access(): def run_flask_app(): - app.run(debug=True, use_reloader=False, port=5000, host="0.0.0.0") + app.run(debug=True, use_reloader=False, port=WebServerPORT, host="0.0.0.0") def run_webServer_thread(): diff --git a/Server/Program/database.py b/Server/Program/database.py index 4a15d1b..c5180d3 100644 --- a/Server/Program/database.py +++ b/Server/Program/database.py @@ -232,6 +232,7 @@ def delete_group_from_database(group_cn): conn = sqlite3.connect(DBFILE) cursor = conn.cursor() cursor.execute("DELETE FROM Groups WHERE cn = ?", (group_cn,)) + cursor.execute("DELETE FROM Doors WHERE GroupCn = ?", (group_cn,)) conn.commit() conn.close() diff --git a/Server/Program/static/style.css b/Server/Program/static/style.css index 4c88618..842d716 100644 --- a/Server/Program/static/style.css +++ b/Server/Program/static/style.css @@ -99,4 +99,14 @@ form input[type="submit"]:hover { .navbar a:hover { background-color: #ddd; color: black; +} + +.delete-btn { +width: 100%; + padding: 10px; + background-color: #b2424a; + color: white; + border: none; + border-radius: 4px; + cursor: pointer; } \ No newline at end of file diff --git a/Server/Program/templates/groupsdb.html b/Server/Program/templates/groupsdb.html index 76da027..f046d21 100644 --- a/Server/Program/templates/groupsdb.html +++ b/Server/Program/templates/groupsdb.html @@ -3,7 +3,7 @@ - Access Logs + Doors and Groups Associations @@ -14,7 +14,8 @@ Logs -

Doors and Groups Associations

+
+

Doors and Groups Associations

Doors

@@ -45,7 +46,7 @@
{{group}} -
+