Merge pull request 'steering' (#367) from steering into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m13s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m36s

Reviewed-on: #367
This commit is contained in:
philipp 2024-04-14 20:18:45 +02:00
commit 2ff08141ae
3 changed files with 16 additions and 17 deletions

View File

@ -7,6 +7,7 @@ INSERT INTO "role" (name) VALUES ('planned_event');
INSERT INTO "role" (name) VALUES ('Rennrudern'); INSERT INTO "role" (name) VALUES ('Rennrudern');
INSERT INTO "role" (name) VALUES ('paid'); INSERT INTO "role" (name) VALUES ('paid');
INSERT INTO "role" (name) VALUES ('Vorstand'); INSERT INTO "role" (name) VALUES ('Vorstand');
INSERT INTO "role" (name) VALUES ('Bootsführer');
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" (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,1);
INSERT INTO "user_role" (user_id, role_id) VALUES(1,2); INSERT INTO "user_role" (user_id, role_id) VALUES(1,2);

View File

@ -22,7 +22,7 @@
<small class="uppercase text-gray-600 dark:text-gray-100"> <small class="uppercase text-gray-600 dark:text-gray-100">
<strong>{{ notification.category }}</strong> &bullet; {{ notification.created_at | date(timezone="Europe/Vienna", format="%d.%m.%Y %H:%M",) }} <strong>{{ notification.category }}</strong> &bullet; {{ notification.created_at | date(timezone="Europe/Vienna", format="%d.%m.%Y %H:%M",) }}
</small> </small>
<div class="mt-1">{{ notification.message | safe}}</div> <div class="mt-1">{{ notification.message | safe }}</div>
</div> </div>
<div> <div>
{% if not notification.read_at %} {% if not notification.read_at %}
@ -47,7 +47,7 @@
<small class="uppercase text-gray-600 dark:text-gray-100"> <small class="uppercase text-gray-600 dark:text-gray-100">
<strong>{{ notification.category }}</strong> &bullet; {{ notification.created_at | date(timezone="Europe/Vienna", format="%d.%m.%Y %H:%M") }} <strong>{{ notification.category }}</strong> &bullet; {{ notification.created_at | date(timezone="Europe/Vienna", format="%d.%m.%Y %H:%M") }}
</small> </small>
<div class="mt-1">{{ notification.message | safe}}</div> <div class="mt-1">{{ notification.message | safe }}</div>
</div> </div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
@ -154,7 +154,8 @@
<a href="/admin/list" class="block w-100 py-2 hover:text-primary-600">Fingerabdruck-Liste überprüfen</a> <a href="/admin/list" class="block w-100 py-2 hover:text-primary-600">Fingerabdruck-Liste überprüfen</a>
</li> </li>
<li class="py-1"> <li class="py-1">
<a href="/admin/notification" class="block w-100 py-2 hover:text-primary-600">Nachricht ausschreiben</a> <a href="/admin/notification"
class="block w-100 py-2 hover:text-primary-600">Nachricht ausschreiben</a>
</li> </li>
</ul> </ul>
</div> </div>

View File

@ -2,21 +2,18 @@
{% extends "base" %} {% extends "base" %}
{% block content %} {% block content %}
<div class="max-w-screen-lg w-full"> <div class="max-w-screen-lg w-full">
<h1 class="h1">Steuerberechtigte (Steuerprüfung oder Ausnahmegenehmigung)</h1> <h1 class="h1">Steuerberechtigungen</h1>
<div class="border-r border-l border-gray-200 dark:border-primary-600"> <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5">
<div class="border-t border-gray-200 dark:border-primary-600 bg-white dark:bg-primary-900 text-black dark:text-white flex justify-between items-center px-3 py-1"> <h2 class="h2">Bootskundige</h2>
<ul> <ul class="list-none ms-2 divide-y divide-gray-200 dark:divide-primary-600">
{% for cox in coxes | sort(attribute='name') %}<li>{{ cox.name }}</li>{% endfor %} {% for cox in bootskundige | sort(attribute='name') %}<li class="py-1">{{ cox.name }}</li>{% endfor %}
</ul> </ul>
</div>
</div> </div>
<h1 class="h1">Bootskundige</h1> <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5">
<div class="border-r border-l border-gray-200 dark:border-primary-600"> <h2 class="h2">Steuerberechtigte oder Personen mit Ausnahmegenehmigung</h2>
<div class="border-t border-gray-200 dark:border-primary-600 bg-white dark:bg-primary-900 text-black dark:text-white flex justify-between items-center px-3 py-1"> <ul class="list-none ms-2 divide-y divide-gray-200 dark:divide-primary-600">
<ul> {% for cox in coxes | sort(attribute='name') %}<li class="py-1">{{ cox.name }}</li>{% endfor %}
{% for cox in bootskundige | sort(attribute='name') %}<li>{{ cox.name }}</li>{% endfor %} </ul>
</ul>
</div>
</div> </div>
</div> </div>
{% endblock content %} {% endblock content %}