diff --git a/app/flask-postgres/app/app.py b/app/flask-postgres/app/app.py index dc0e5a0..1a84cca 100644 --- a/app/flask-postgres/app/app.py +++ b/app/flask-postgres/app/app.py @@ -20,7 +20,7 @@ from werkzeug.utils import secure_filename from config import Config, COUNTRY_VAT_LABELS from db import get_connection, fetchone_dict, fetchall_dict from auth import login_required -from permissions import is_video_allowed_for_level, is_course_allowed_for_level +from permissions import is_video_allowed_for_level, is_course_allowed_for_level, get_allowed_checklist_levels_for_mandant_level from security import ( admin_required, get_current_user, @@ -1261,4 +1261,10 @@ def dokument_file(item_id): stored_filename = row[0] mandant_dir = os.path.join("/files", str(mandant_id)) - return send_from_directory(mandant_dir, stored_filename) \ No newline at end of file + return send_from_directory(mandant_dir, stored_filename) + +@app.template_filter("datetime") +def format_datetime(value): + if not value: + return "-" + return value.strftime("%d.%m.%Y %H:%M") \ No newline at end of file diff --git a/app/flask-postgres/app/permissions.py b/app/flask-postgres/app/permissions.py index 1205695..9de5c3e 100644 --- a/app/flask-postgres/app/permissions.py +++ b/app/flask-postgres/app/permissions.py @@ -52,3 +52,24 @@ def is_course_allowed_for_level(code: str, mandant_level: int | None) -> bool: return False +def get_allowed_checklist_levels_for_mandant_level(mandant_level: int | None) -> list[int]: + if mandant_level is None: + return [] + + # 0 = Admin -> alles + if mandant_level == 0: + return [1, 2, 3] + + # 1 = Gold -> Bronze + Silber + Gold + if mandant_level == 1: + return [1, 2, 3] + + # 2 = Silber -> Bronze + Silber + if mandant_level == 2: + return [1, 2] + + # 3 = Bronze -> nur Bronze + if mandant_level == 3: + return [1] + + return [] \ No newline at end of file diff --git a/app/flask-postgres/app/security.py b/app/flask-postgres/app/security.py index bf0900d..f42d024 100644 --- a/app/flask-postgres/app/security.py +++ b/app/flask-postgres/app/security.py @@ -69,6 +69,7 @@ def get_current_user(): "is_logged_in": bool(session.get("user_id")), "is_admin": user_is_admin() if session.get("user_id") else False, "is_user_admin": user_is_user_admin() if session.get("user_id") else False, + "is_contentmanager": user_is_contentmanager() if session.get("user_id") else False, "country": country, } @@ -121,3 +122,40 @@ def user_admin_required(view_func): return view_func(*args, **kwargs) return wrapper +def user_is_contentmanager(): + user_id = session.get("user_id") + current_mandant_id = session.get("mandant_id") + + if not user_id or not current_mandant_id: + return False + + conn = get_connection() + cur = conn.cursor() + + cur.execute(""" + SELECT 1 + FROM user_group ug + JOIN app_group g ON g.id = ug.group_id + WHERE ug.user_id = %s + AND ug.mandant_id = %s + AND g.mandant_id = %s + AND g.group_name = 'Contentmanager' + LIMIT 1 + """, (user_id, current_mandant_id, current_mandant_id)) + + result = cur.fetchone() + + cur.close() + conn.close() + + return result is not None + +def contentmanager_required(view_func): + @wraps(view_func) + def wrapper(*args, **kwargs): + if not session.get("user_id"): + return redirect(url_for("login", next=request.path)) + if not user_is_contentmanager(): + abort(403) + return view_func(*args, **kwargs) + return wrapper \ No newline at end of file diff --git a/app/flask-postgres/app/templates/base.html b/app/flask-postgres/app/templates/base.html index d992a55..2747553 100644 --- a/app/flask-postgres/app/templates/base.html +++ b/app/flask-postgres/app/templates/base.html @@ -40,6 +40,9 @@ {% if is_user_admin %} Useradministration {% endif %} + {% if is_contentmanager %} + Dokumente + {% endif %} Logout diff --git a/app/flask-postgres/app/templates/dokumente.html b/app/flask-postgres/app/templates/dokumente.html new file mode 100644 index 0000000..8e559ff --- /dev/null +++ b/app/flask-postgres/app/templates/dokumente.html @@ -0,0 +1,103 @@ +{% extends "base.html" %} + +{% block content %} + +
+

Dokumente

+

Checkliste der hochzuladenden Zertifizierungsdokumente.

+
+ +
+
+
+ + + + + + + + + + + + + + + + {% for item in items %} + + + + + + + + + + + + + + + + + + + + + {% endfor %} + +
IDTitelKurzbeschreibungDateiStatusDatumUserGrรถรŸeAktionen
{{ item.id }}{{ item.title }}{{ item.short_description or "-" }} + {% if item.stored_filename %} + + {{ item.original_filename or item.stored_filename }} + + {% else %} + - + {% endif %} + + {% if item.stored_filename %} + โœ” OK + {% else %} + Fehlt + {% endif %} + + {% if item.uploaded_at %} + {{ item.uploaded_at | datetime }} + {% else %} + - + {% endif %} + + {{ item.uploaded_by_name or "-" }} + + {% if item.filesize %} + {% if item.filesize < 1024 %} + {{ item.filesize }} B + {% elif item.filesize < 1024*1024 %} + {{ (item.filesize / 1024)|round(1) }} KB + {% else %} + {{ (item.filesize / (1024*1024))|round(2) }} MB + {% endif %} + {% else %} + - + {% endif %} + +
+ {% if not item.stored_filename %} +
+ + +
+ {% else %} +
+ +
+ {% endif %} +
+
+
+
+
+ +{% endblock %} \ No newline at end of file diff --git a/app/flask-postgres/styles/site.css b/app/flask-postgres/styles/site.css index a152b29..eedad2e 100644 --- a/app/flask-postgres/styles/site.css +++ b/app/flask-postgres/styles/site.css @@ -718,4 +718,25 @@ button { display: flex; justify-content: space-between; margin-top: 30px; +} + +/* ========================= + Dokumente +========================= */ +.status-ok { + color: #178b35; + font-weight: 700; +} + +.status-missing { + color: #b62323; + font-weight: 700; +} +.col-id { + width: 60px; +} + +.mandanten-table td, +.mandanten-table th { + vertical-align: middle; } \ No newline at end of file