From 2cdfacab532bb363b88c627e1dbbaeb181b33105 Mon Sep 17 00:00:00 2001 From: Marie Birner Date: Tue, 24 Sep 2024 19:44:33 +0200 Subject: [PATCH 1/4] [BUGFIX] dark mode bg issue --- templates/admin/user/fees.html.tera | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin/user/fees.html.tera b/templates/admin/user/fees.html.tera index fc357b2..a277dc9 100644 --- a/templates/admin/user/fees.html.tera +++ b/templates/admin/user/fees.html.tera @@ -16,7 +16,7 @@
{% for fee in fees | sort(attribute="name") %} -
-- 2.45.2 From ca8cd4612da1c8c7ba687aa698d448cf8e6df0f3 Mon Sep 17 00:00:00 2001 From: philipp Date: Tue, 24 Sep 2024 20:01:14 +0200 Subject: [PATCH 2/4] add additional role --- seeds.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/seeds.sql b/seeds.sql index c88c422..f1e1acd 100644 --- a/seeds.sql +++ b/seeds.sql @@ -12,6 +12,7 @@ INSERT INTO "role" (name) VALUES ('schnupperant'); INSERT INTO "role" (name) VALUES ('kassier'); INSERT INTO "role" (name) VALUES ('schriftfuehrer'); INSERT INTO "role" (name) VALUES ('no-einschreibgebuehr'); +INSERT INTO "role" (name) VALUES ('schnupper-betreuer'); INSERT INTO "user" (name, pw) VALUES('admin', '$argon2id$v=19$m=19456,t=2,p=1$dS/X5/sPEKTj4Rzs/CuvzQ$4P4NCw4Ukhv80/eQYTsarHhnw61JuL1KMx/L9dm82YM'); INSERT INTO "user_role" (user_id, role_id) VALUES(1,1); INSERT INTO "user_role" (user_id, role_id) VALUES(1,2); -- 2.45.2 From 4581ec4abcdb37b0db5596eb2609639368309c39 Mon Sep 17 00:00:00 2001 From: Marie Birner Date: Tue, 24 Sep 2024 20:09:53 +0200 Subject: [PATCH 3/4] [TASK] style schnupperer even more --- templates/admin/schnupper/index.html.tera | 47 +++++++++++++---------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/templates/admin/schnupper/index.html.tera b/templates/admin/schnupper/index.html.tera index 1b17856..8611c34 100644 --- a/templates/admin/schnupper/index.html.tera +++ b/templates/admin/schnupper/index.html.tera @@ -4,28 +4,35 @@

Schnupper Verwaltung

-
-- 2.45.2 From b6efe5170b3be00f798db93adbfbd0e8d7c54b1d Mon Sep 17 00:00:00 2001 From: philipp Date: Tue, 24 Sep 2024 20:10:59 +0200 Subject: [PATCH 4/4] lint code --- templates/admin/schnupper/index.html.tera | 27 +++++++++++------------ templates/admin/user/fees.html.tera | 15 ++++++------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/templates/admin/schnupper/index.html.tera b/templates/admin/schnupper/index.html.tera index 8611c34..b1fece6 100644 --- a/templates/admin/schnupper/index.html.tera +++ b/templates/admin/schnupper/index.html.tera @@ -11,28 +11,27 @@
  • -  {{ user.name }} ({{ user.mail }} - {%- if user.notes %} | {{ user.notes }} - {% endif -%} - ) +  {{ user.name }} ({{ user.mail }} + {%- if user.notes %} | {{ user.notes }} + {% endif -%} + ) Zu Scheckbuch umwandeln + href="/admin/user/move/schnupperant/{{ user.id }}/to/scheckbuch" + onclick="return confirm('Willst du wirklich ein Scheckbuch erstellen? Die Person erhält ein Mail mit allen Infos.')">Zu Scheckbuch umwandeln
    • {% endfor %}
    -
    -

    Legende

    -
    - Bezahlt - Juhuuu! -
    -
    - Noch nicht bezahlt -
    +

    Legende

    +
    + Bezahlt - Juhuuu! +
    +
    + Noch nicht bezahlt +
    diff --git a/templates/admin/user/fees.html.tera b/templates/admin/user/fees.html.tera index a277dc9..1a75b25 100644 --- a/templates/admin/user/fees.html.tera +++ b/templates/admin/user/fees.html.tera @@ -2,9 +2,7 @@ {% extends "base" %} {% block content %}
    -

    - Gebühren -

    +

    Gebühren

    {% for fee in fees | sort(attribute="name") %} -
    @@ -32,13 +30,14 @@ {% endfor %}
    {% if "admin" in loggedin_user.roles or "kassier" in loggedin_user.roles %} -
    Zahlungsstatus ändern
    +
    + Zahlungsstatus ändern +
    {% endif %}
    {% endfor %} - - - + {% endblock content %} -- 2.45.2