Merge branch 'single-user-edit-page' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into single-user-edit-page

frontend/scss/components/_links.scss

@@ -10,4 +10,8 @@
   &-white {
     @apply text-white hover:text-primary-100 underline;
   }
+
+  &-no-underline {
+    @apply no-underline;
+  }
 }

templates/admin/user/index.html.tera

@@ -67,22 +67,10 @@
         {% for user in users %}
             <div data-filterable="true"
                  data-filter="{{ user.name }} {% for role in roles %} {% if role.name in user.roles %} yes-role:{{ role.name }} {% else %} no-role:{{ role.name }} {% endif %} role-{{ role }} {% endfor %} {% if user.membership_pdf %}has-membership-pdf{% else %}has-no-membership-pdf{% endif %}"
-                 class="border-t bg-white dark:bg-primary-900 py-3 px-4 relative">
+                 class="border-t bg-white dark:bg-primary-900 py-3 px-4 relative flex justify-between items-center">
-                <details class="block dark:text-white w-full">
-                    <summary>
                 <span class="text-black dark:text-white cursor-pointer">
                     <span class="font-bold">
                         {{ user.name }}
-                                {% if not user.last_access and allowed_to_edit and user.mail %}
-                                    <form action="/admin/user"
-                                          method="post"
-                                          enctype="multipart/form-data"
-                                          class="inline">
-                                        &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"
-    onclick="return confirm('Willst du wirklich das Willkommensmail an {{ user.name }} ausschicken?');">Willkommensmail verschicken</a>
-                                    </form>
-                                {% endif %}
                         {% if user.last_access %}&bullet; ⏳&nbsp;{{ user.last_access | date }}{% endif %}
                     </span>
                     <small class="block text-gray-600 dark:text-gray-100">
@@ -93,89 +81,7 @@
                         {% endfor %}
                     </small>
                 </span>
-                    </summary>
+                <a href="/admin/user/{{ user.id }}" class="btn btn-dark ml-3">{% include "includes/pencil" %}</a>
-                    <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 }}">✏️</a>
-                    <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 %}
-                        <div class="w-full grid gap-3 mt-3">
-                            <input type="hidden" name="id" value="{{ user.id }}" />
-                            <div class="grid sm:grid-cols-2 lg:grid-cols-4 gap-3">
-                                {% for cluster, cluster_roles in roles | group_by(attribute="cluster") %}
-                                    <label for="cluster_{{ loop.index }}">{{ cluster }}</label>
-                                    {# Determine the initially selected role within the cluster #}
-                                    {% set_global selected_role_id = "none" %}
-                                    {% for role in cluster_roles %}
-                                        {% if selected_role_id == "none" and role.name in user.roles %}
-                                            {% set_global selected_role_id = role.id %}
-                                        {% endif %}
-                                    {% endfor %}
-                                    {# 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 %}
-                                {% for role in roles %}
-                                    {% if not role.cluster %}
-                                        {{ macros::checkbox(label=role.name, name="roles[" ~ role.id ~ "]", id=loop.index , checked=role.name in user.roles, disabled=allowed_to_edit == false) }}
-                                    {% endif %}
-                                {% endfor %}
-                                <hr class="sm:col-span-2 lg:col-span-4 my-3" />
-                                {% if user.membership_pdf %}
-                                    <a href="/admin/user/{{ user.id }}/membership"
-                                       class="text-black dark:text-white">Beitrittserklärung herunterladen</a>
-                                {% else %}
-                                    {{ macros::input(label='Beitrittserklärung', name='membership_pdf', id=loop.index, type="file", readonly=allowed_to_edit == false, accept='application/pdf') }}
-                                {% endif %}
-                                {{ macros::input(label='DOB', name='dob', id=loop.index, type="text", value=user.dob, readonly=allowed_to_edit == false) }}
-                                {{ macros::input(label='Weight (kg)', name='weight', id=loop.index, type="text", value=user.weight, readonly=allowed_to_edit == false) }}
-                                {{ macros::input(label='Sex', name='sex', id=loop.index, type="text", value=user.sex, readonly=allowed_to_edit == false) }}
-                                {{ macros::input(label='Mitglied seit', name='member_since_date', id=loop.index, type="text", value=user.member_since_date, readonly=allowed_to_edit == false) }}
-                                {{ macros::input(label='Geburtsdatum', name='birthdate', id=loop.index, type="text", value=user.birthdate, readonly=allowed_to_edit == false) }}
-                                {{ macros::input(label='Mail', name='mail', id=loop.index, type="text", value=user.mail, readonly=allowed_to_edit == false) }}
-                                {{ macros::input(label='Nickname', name='nickname', id=loop.index, type="text", value=user.nickname, readonly=allowed_to_edit == false) }}
-                                {{ macros::input(label='Notizen', name='notes', id=loop.index, type="text", value=user.notes, readonly=allowed_to_edit == false) }}
-                                {{ macros::input(label='Telefon', name='phone', id=loop.index, type="text", value=user.phone, readonly=allowed_to_edit == false) }}
-                                {{ macros::input(label='Adresse', name='address', id=loop.index, type="text", value=user.address, readonly=allowed_to_edit == false) }}
-                                {% if allowed_to_edit %}
-                                    {{ 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') }}
-                                {% endif %}
-                            </div>
-                        </div>
-                        {% if allowed_to_edit %}
-                            <div class="mt-3 text-right">
-                                <a href="/admin/user/{{ user.id }}/delete"
-                                   class="w-28 btn btn-alert"
-                                   onclick="return confirm('Wirklich löschen?');">
-                                    {% include "includes/delete-icon" %}
-                                    Löschen
-                                </a>
-                                <input value="Ändern" type="submit" class="w-28 btn btn-primary ml-1" />
-                            </div>
-                        {% endif %}
-                    </form>
-                </details>
             </div>
         {% endfor %}
     </div>

templates/admin/user/view.html.tera

@@ -3,6 +3,10 @@
 {% extends "base" %}
 {% block content %}
     <div class="max-w-screen-lg w-full">
+        {% if "admin" in loggedin_user.roles or "Vorstand" in loggedin_user.roles %}
+            <a href="/admin/user"
+                class="link link-primary link-no-underline">&larr; Userverwaltung</a>
+        {% endif %}
         <h1 class="h1">{{ user.name }}</h1>
         <div class="grid sm:grid-cols-2 gap-3">
             <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5">
@@ -30,7 +34,7 @@
                         </form>
                         <span>Notizen: to be replaced with activity :-)</span>
                         {% if user.pw and allowed_to_edit %}
-                            <div class="text-right">
+                            <div>
                                 <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>
@@ -60,7 +64,7 @@
                         {% endif %}
                     </small>
                 </h2>
-                <div class="mx-3 divide-y divide-gray-200 dark:divide-primary-600">
+                <div class="mx-3">
                     {% if is_clubmember %}
                         <div class="py-3 grid gap-3">
                             <form action="/admin/user/{{ user.id }}/change-member-since" method="post">
@@ -78,7 +82,7 @@
                         </div>
                         <div class="py-3">
                             {% if user.membership_pdf %}
-                                <a href="/admin/user/{{ user.id }}/membership" class="link link-primary">Beitrittserklärung herunterladen</a>
+                                <a href="/admin/user/{{ user.id }}/membership" class="link link-primary link-no-underline">Beitrittserklärung herunterladen &darr;</a>
                             {% else %}
                                 ⚠️ Aktuell gibt's keine Beitrittserklärung 😢
                                 {% if allowed_to_edit %}
@@ -98,6 +102,9 @@
                         {% if allowed_to_edit %}
                             <div class="py-3">
                                 <div class="mt-3 text-right">
+                                    <button type="button"
+                                        onclick="document.getElementById('change-member-type').showModal()"
+                                        class="btn btn-dark">Mitgliedstyp ändern</button>
                                     <a href="/admin/user/{{ user.id }}/delete"
                                        class="btn btn-alert"
                                        onclick="return confirm('Ist {{ user.name }} wirklich aus dem Verein ausgetreten?');">
@@ -106,6 +113,42 @@
                                     </a>
                                 </div>
                             </div>
+                        <dialog id="change-member-type"
+                                class="max-w-screen-sm w-full dark:bg-primary-600 dark:text-white rounded-md"
+                                onclick="document.getElementById('change-member-type').close()">
+                            <div onclick="event.stopPropagation();" class="p-3">
+                                <button type="button"
+                                        onclick="document.getElementById('change-member-type').close()"
+                                        title="Schließen"
+                                        class="sidebar-close border-0 bg-primary-100 focus:bg-primary-50 text-black flex items-center justify-center transform rotate-45 absolute right-0 mr-3">
+                                    <svg class="inline h-5 w-5"
+                                         width="16"
+                                         height="16"
+                                         fill="currentColor"
+                                         viewBox="0 0 16 16">
+                                        <path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z"></path>
+                                    </svg>
+                                </button>
+                                <div class="mt-8">
+                                    <form action="/admin/user/{{ user.id }}/change-membertype"
+                                          method="post"
+                                          enctype="multipart/form-data"
+                                          class="grid gap-3">
+                                        <div>
+                                            <label for="membertype" class="text-sm text-gray-600 dark:text-gray-100">Mitgliedstyp</label>
+                                            <select name="membertype" id="membertype" class="input rounded-md ">
+                                                <option selected="" value="regular">Reguläres Vereinsmitglied</option>
+                                                <option value="unterstuetzend">Unterstützendes Vereinsmitglied</option>
+                                                <option value="foerdend">Förderndes Vereinsmitglied</option>
+                                            </select>
+                                        </div>
+                                        <input value="Ändern"
+                                               type="submit"
+                                               class="btn btn-primary" />
+                                    </form>
+                                </div>
+                            </div>
+                        </dialog>
                         {% endif %}
                     {% elif "Scheckbuch" in member %}
                         <div class="grid gap-3 pb-3">

templates/includes/macros.html.tera

@@ -198,7 +198,10 @@ function setChoiceByLabel(choicesInstance, label) {
                    {% if pattern %}pattern="{{ pattern }}"{% endif %}
                    readonly />
             {% if allowed_to_edit %}
-                <button type="button" class="btn btn-dark rounded-l-none-important edit-js">{% include "includes/pencil" %}</button>
+                <button type="button" class="btn btn-dark rounded-l-none-important edit-js">
+                  {% include "includes/pencil" %}
+                  <span class="sr-only">Bearbeiten</span>
+                </button>
                 <input value="x"
                        type="reset"
                        class="edit-js btn btn-alert btn-hidden rounded-none-important" />
@@ -244,7 +247,10 @@ function setChoiceByLabel(choicesInstance, label) {
                 {% if new_last_entry %}<option value="-1">{{ new_last_entry }}</option>{% endif %}
             </select>
             {% if allowed_to_edit %}
-                <button type="button" class="btn btn-dark rounded-l-none-important edit-js">{% include "includes/pencil" %}</button>
+                <button type="button" class="btn btn-dark rounded-l-none-important edit-js">
+                  {% include "includes/pencil" %}
+                  <span class="sr-only">Bearbeiten</span>
+                </button>
                 <input value="x"
                        type="reset"
                        class="edit-js btn btn-alert btn-hidden rounded-none-important" />