format
All checks were successful
CI/CD Pipeline / test (push) Successful in 14m23s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped

This commit is contained in:
Philipp Hofer 2025-04-29 23:06:45 +02:00
parent 5e588f209f
commit 90087843ad
2 changed files with 70 additions and 70 deletions

View File

@ -56,9 +56,9 @@
<div style="width: 100%" class="col-span-2"> <div style="width: 100%" class="col-span-2">
<b>{{ user.name }} - Ausfahrten: {{ trips | length }}</b> <b>{{ user.name }} - Ausfahrten: {{ trips | length }}</b>
<ul class="list-disc ms-4"> <ul class="list-disc ms-4">
{% for trip in trips %} {% for trip in trips %}
<li>{{ log::show_old(log=trip, state="completed", only_ones=false, index=loop.index) }}</li> <li>{{ log::show_old(log=trip, state="completed", only_ones=false, index=loop.index) }}</li>
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
{% if "admin" in loggedin_user.roles or "kassier" in loggedin_user.roles %} {% if "admin" in loggedin_user.roles or "kassier" in loggedin_user.roles %}

View File

@ -26,14 +26,14 @@
Rollen: Rollen:
<ul class="list-disc ms-4"> <ul class="list-disc ms-4">
{% for role in user.proper_roles -%} {% for role in user.proper_roles -%}
{% if not role.cluster %} {% if not role.cluster %}
<li> <li>
<strong>{{ role.name }}:</strong> Hier folgt eine Beschreibung der Rolle <strong>{{ role.name }}:</strong> Hier folgt eine Beschreibung der Rolle
{% if allowed_to_edit %} {% if allowed_to_edit %}
<a href="/admin/user/{{ user.id }}/remove-role/{{ role.id }}" <a href="/admin/user/{{ user.id }}/remove-role/{{ role.id }}"
onclick="return confirm('Willst du die Rolle \'{{ role.name }}\' von {{ user.name }} wirklich entfernen?');">🗑️</a> onclick="return confirm('Willst du die Rolle \'{{ role.name }}\' von {{ user.name }} wirklich entfernen?');">🗑️</a>
{% endif %} {% endif %}
</li> </li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</ul> </ul>
@ -60,14 +60,14 @@
<h2 class="h2">Vereinsmitglied</h2> <h2 class="h2">Vereinsmitglied</h2>
<div class="mx-2 divide-y divide-gray-200 dark:divide-primary-600"> <div class="mx-2 divide-y divide-gray-200 dark:divide-primary-600">
<div class="py-3"> <div class="py-3">
<ul class="list-disc ms-4"> <ul class="list-disc ms-4">
<li>Mitglied seit: {{ user.member_since_date }}</li> <li>Mitglied seit: {{ user.member_since_date }}</li>
<li>Geburtsdatum: {{ user.birthdate }}</li> <li>Geburtsdatum: {{ user.birthdate }}</li>
<li>Adresse: {{ user.address }}</li> <li>Adresse: {{ user.address }}</li>
<li> <li>
Familie: {{ macros::select(label="Familie", data=families, name='family_id', selected_id=user.family_id, display=['names'], default="Keine Familie", new_last_entry='Neue Familie anlegen') }} Familie: {{ macros::select(label="Familie", data=families, name='family_id', selected_id=user.family_id, display=['names'], default="Keine Familie", new_last_entry='Neue Familie anlegen') }}
</li> </li>
</ul> </ul>
</div> </div>
<div class="py-3"> <div class="py-3">
{% if user.membership_pdf %} {% if user.membership_pdf %}
@ -105,10 +105,10 @@
<h2 class="h2">Aktivität von und mit {{ user.name }}</h2> <h2 class="h2">Aktivität von und mit {{ user.name }}</h2>
<div class="mx-2 divide-y divide-gray-200 dark:divide-primary-600"> <div class="mx-2 divide-y divide-gray-200 dark:divide-primary-600">
<div class="py-3"> <div class="py-3">
<ul class="list-disc ms-4"> <ul class="list-disc ms-4">
<li>Passwort zurückgesetzt am/um X</li> <li>Passwort zurückgesetzt am/um X</li>
<li>Am X beigetreten.</li> <li>Am X beigetreten.</li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
@ -116,64 +116,64 @@
role="alert"> role="alert">
<h2 class="h2">TODO</h2> <h2 class="h2">TODO</h2>
<div class="border-t bg-white dark:bg-primary-900 py-3 px-4 relative"> <div class="border-t bg-white dark:bg-primary-900 py-3 px-4 relative">
<span class="text-black dark:text-white cursor-pointer"> <span class="text-black dark:text-white cursor-pointer">
<span class="font-bold"> <span class="font-bold">
{{ user.name }} {{ user.name }}
{% if not user.last_access and allowed_to_edit and user.mail %} {% if not user.last_access and allowed_to_edit and user.mail %}
<form action="/admin/user" <form action="/admin/user"
method="post" method="post"
enctype="multipart/form-data" enctype="multipart/form-data"
class="inline"> class="inline">
&bullet; <a class="font-normal text-primary-600 dark:text-primary-200 hover:text-primary-900 dark:hover:text-primary-300 underline" &bullet; <a class="font-normal text-primary-600 dark:text-primary-200 hover:text-primary-900 dark:hover:text-primary-300 underline"
href="/admin/user/{{ user.id }}/send-welcome-mail" href="/admin/user/{{ user.id }}/send-welcome-mail"
onclick="return confirm('Willst du wirklich das Willkommensmail an {{ user.name }} ausschicken?');">Willkommensmail verschicken</a> onclick="return confirm('Willst du wirklich das Willkommensmail an {{ user.name }} ausschicken?');">Willkommensmail verschicken</a>
</form> </form>
{% endif %}
</span>
</span>
<form action="/admin/user"
method="post"
enctype="multipart/form-data"
class="w-full mt-2">
{% if user.pw %}
<a class="block my-1 font-normal text-[#f43f5e] dark:text-primary-200 hover:text-primary-900 dark:hover:text-primary-300 underline"
href="/admin/user/{{ user.id }}/reset-pw"
onclick="return confirm('Willst du wirklich das Passwort zurücksetzen?');">Passwort zurücksetzen</a>
{% endif %} {% endif %}
<div class="w-full grid gap-3 mt-3"> </span>
<input type="hidden" name="id" value="{{ user.id }}" /> </span>
<div class="grid sm:grid-cols-2 lg:grid-cols-4 gap-3"> <form action="/admin/user"
{% for cluster, cluster_roles in roles | group_by(attribute="cluster") %} method="post"
<label for="cluster_{{ loop.index }}">{{ cluster }}</label> enctype="multipart/form-data"
{# Determine the initially selected role within the cluster #} class="w-full mt-2">
{% set_global selected_role_id = "none" %} {% if user.pw %}
{% for role in cluster_roles %} <a class="block my-1 font-normal text-[#f43f5e] dark:text-primary-200 hover:text-primary-900 dark:hover:text-primary-300 underline"
{% if selected_role_id == "none" and role.name in user.roles %} href="/admin/user/{{ user.id }}/reset-pw"
{% set_global selected_role_id = role.id %} onclick="return confirm('Willst du wirklich das Passwort zurücksetzen?');">Passwort zurücksetzen</a>
{% endif %} {% endif %}
{% endfor %} <div class="w-full grid gap-3 mt-3">
{# Set default name to the selected role ID or first role if none selected #} <input type="hidden" name="id" value="{{ user.id }}" />
<select id="cluster_{{ loop.index }}" <div class="grid sm:grid-cols-2 lg:grid-cols-4 gap-3">
{% if selected_role_id == 'none' %} {% else %} name="roles[{{ selected_role_id }}]" {% endif %} {% for cluster, cluster_roles in roles | group_by(attribute="cluster") %}
{% if allowed_to_edit == false %}disabled{% endif %} <label for="cluster_{{ loop.index }}">{{ cluster }}</label>
onchange=" if (this.value === '') { this.removeAttribute('name'); } else { this.name = 'roles[' + this.options[this.selectedIndex].getAttribute('data-role-id') + ']'; }"> {# Determine the initially selected role within the cluster #}
<option value="" {% set_global selected_role_id = "none" %}
data-role-id="none" {% for role in cluster_roles %}
{% if selected_role_id == 'none' %}selected="selected"{% endif %}> {% if selected_role_id == "none" and role.name in user.roles %}
None {% set_global selected_role_id = role.id %}
</option> {% endif %}
{% for role in cluster_roles %}
<option value="on"
data-role-id="{{ role.id }}"
{% if role.id == selected_role_id %}selected="selected"{% endif %}>
{{ role.name }}
</option>
{% endfor %}
</select>
{% endfor %} {% endfor %}
</div> {# Set default name to the selected role ID or first role if none selected #}
<select id="cluster_{{ loop.index }}"
{% if selected_role_id == 'none' %} {% else %} name="roles[{{ selected_role_id }}]" {% endif %}
{% if allowed_to_edit == false %}disabled{% endif %}
onchange=" if (this.value === '') { this.removeAttribute('name'); } else { this.name = 'roles[' + this.options[this.selectedIndex].getAttribute('data-role-id') + ']'; }">
<option value=""
data-role-id="none"
{% if selected_role_id == 'none' %}selected="selected"{% endif %}>
None
</option>
{% for role in cluster_roles %}
<option value="on"
data-role-id="{{ role.id }}"
{% if role.id == selected_role_id %}selected="selected"{% endif %}>
{{ role.name }}
</option>
{% endfor %}
</select>
{% endfor %}
</div> </div>
</form> </div>
</form>
</div> </div>
</div> </div>
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5" <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"