From 540c122248ea999be724b3609a601783af9dcc87 Mon Sep 17 00:00:00 2001
From: Marie Birner <mb@studiomitte.com>
Date: Sat, 3 May 2025 12:44:46 +0200
Subject: [PATCH] [TASK] refactor ui user detail page

---
 frontend/main.ts                    |  13 +-
 templates/admin/user/view.html.tera | 285 ++++++++++++++--------------
 templates/includes/macros.html.tera |  45 ++++-
 3 files changed, 193 insertions(+), 150 deletions(-)

diff --git a/frontend/main.ts b/frontend/main.ts
index 82c38e9..62fa9ba 100644
--- a/frontend/main.ts
+++ b/frontend/main.ts
@@ -50,11 +50,16 @@ function editReadOnlyField() {
       Array.prototype.forEach.call(editBtns, (btn: HTMLButtonElement) => {
         btn.addEventListener("click", function () {
           let wrapper = btn.parentElement;
-          let input = wrapper?.querySelector('input');
+          let input = <HTMLInputElement> wrapper?.querySelector('input.input'),
+              select = <HTMLSelectElement> wrapper?.querySelector('select.input'),
+              attribute = 'readonly';
+          
+          if(select) attribute = 'disabled';
+          let element = input ? input : select;
 
-          wrapper?.classList.toggle('editable')
-          input?.toggleAttribute('readonly');
-          if(!input?.hasAttribute('readonly')) input?.focus();
+          element?.toggleAttribute(attribute);
+          if(!element?.hasAttribute(attribute)) element?.focus();
+          wrapper?.classList.toggle('editable');
         });
       });
     }
diff --git a/templates/admin/user/view.html.tera b/templates/admin/user/view.html.tera
index f870461..f749ae5 100644
--- a/templates/admin/user/view.html.tera
+++ b/templates/admin/user/view.html.tera
@@ -4,50 +4,48 @@
 {% block content %}
     <div class="max-w-screen-lg w-full">
         <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"
              role="alert">
-            <h2 class="h2">Grunddaten</h2>
-            <div class="mx-2 divide-y divide-gray-200 dark:divide-primary-600">
-                <div class="py-3">
+            <h2 class="h2">
+                Grunddaten
+                <br/>
+                <small class="inline-block text-xs  text-gray-500 dark:text-gray-100 ">
                     {% if user.last_access %}
                         Zuletzt eingeloggt am {{ user.last_access | date(format="%d. %m. %Y") }}
                     {% else %}
                         {{ user.name }} hat sich noch nie eingeloggt.
                     {% endif %}
-                </div>
-                <div class="py-3">
-                    <ul class="grid gap-3">
-                        <li>
-                            <form action="/admin/user/{{ user.id }}/change-mail" method="post">
-                                {{ macros::inputgroup(label='Mailadresse', name='mail', type="text", value=user.mail, readonly=not allowed_to_edit) }}
-                            </form>
-                        </li>
-                        <li>
-                            <form action="/admin/user/{{ user.id }}/change-phone" method="post">
-                                {{ macros::inputgroup(label='Telefonnummer', name='phone', type="text", value=user.phone, readonly=not allowed_to_edit) }}
-                            </form>
-                        </li>
-                        <li>
-                            <form action="/admin/user/{{ user.id }}/change-nickname" method="post">
-                                {{ macros::inputgroup(label='Spitzname', name='nickname', type="text", value=user.nickname, readonly=not allowed_to_edit) }}
-                            </form>
-                        </li>
-                        <li>Notizen: to be replaced with activity :-)</li>
-                    </ul>
+                </small>
+            </h2>
+            <div class="mx-2 divide-y divide-gray-200 dark:divide-primary-600">
+                <div class="py-3 grid gap-3">
+                    <form action="/admin/user/{{ user.id }}/change-mail" method="post">
+                        {{ macros::inputgroup(label='Mailadresse', name='mail', type="text", value=user.mail, readonly=not allowed_to_edit) }}
+                    </form>
+                    <form action="/admin/user/{{ user.id }}/change-phone" method="post">
+                        {{ macros::inputgroup(label='Telefonnummer', name='phone', type="text", value=user.phone, readonly=not allowed_to_edit) }}
+                    </form>   
+                    <form action="/admin/user/{{ user.id }}/change-nickname" method="post">
+                        {{ macros::inputgroup(label='Spitzname', name='nickname', type="text", value=user.nickname, readonly=not allowed_to_edit) }}
+                    </form>     
+                    <span>Notizen: to be replaced with activity :-)</span>
                 </div>
                 <div class="py-3">
                     Rollen:
-                    <ul class="list-disc ms-4">
+                    <ul>
                         {% for role in user.proper_roles -%}
                             {% if not role.cluster and not role.hide_in_lists %}
-                                <li>
+                                <li class="flex my-2 w-full justify-between items-center hover:bg-gray-100">
+                                    <span>
                                     <strong>
                                         {% if role.formatted_name %}
                                             {{ role.formatted_name }}
                                         {% else %}
                                             {{ role.name }}
                                         {% endif %}
-                                    </strong>  {{ role.desc }}
+                                    </strong><br/><small>{{ role.desc }}</small>
+                                    </span>
                                     {% if allowed_to_edit %}
                                         <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>
@@ -83,10 +81,125 @@
                 </div>
             </div>
         </div>
+            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
+                 role="alert">
+                <h2 class="h2">Mitgliedschaft
+                  <br/>
+                  <small class="inline-block text-xs  text-gray-500 dark:text-gray-100 ">
+                    {% if "SchnupperInterest" in member %}
+                        Interessiert am Schnupperkurs
+                    {% elif "Schnupperant" in member %}
+                        Beim nächsten Schnupperkurs angemeldet
+                    {% elif "Scheckbuch" in member %}
+                        {% set logbook = member["Scheckbuch"] %}
+                        Scheckbuch (Ausfahrten: {{ logbook | length }})
+                    {% elif "Regular" in member %}
+                        Reguläres Vereinsmitglied
+                    {% elif "Foerdernd" in member %}
+                        Förderndes Vereinsmitglied
+                    {% elif "Unterstuetzend" in member %}
+                        Unterstützendes Vereinsmitglied
+                    {% endif %}
+                    </small>
+                </h2>
+                <div class="mx-2 divide-y divide-gray-200 dark:divide-primary-600">
+                    
+                            {% if is_clubmember %}
+                            <div class="py-3 grid gap-3">
+                              <form action="/admin/user/{{ user.id }}/change-member-since" method="post">
+                                  {{ macros::inputgroup(label='Mitglied seit', name='member_since', type="date", value=user.member_since_date, readonly=not allowed_to_edit) }}
+                              </form>
+                              <form action="/admin/user/{{ user.id }}/change-birthdate" method="post">
+                                    {{ macros::inputgroup(label='Geburtsdatum', name='birthdate', type="date", value=user.birthdate, readonly=not allowed_to_edit) }}
+                              </form>
+                              <form action="/admin/user/{{ user.id }}/change-address" method="post">
+                                  {{ macros::inputgroup(label='Adresse', name='address', type="text", value=user.address, readonly=not allowed_to_edit) }}
+                              </form>
+
+                              <form action="/admin/user/{{ user.id }}/change-family" method="post">
+                                    {{ macros::selectgroup(label="Familie", data=families, name='family_id', selected_id=user.family_id, display=['names'], default="Keine Familie", new_last_entry='Neue Familie anlegen', readonly=not allowed_to_edit) }}
+                              </form>
+                            </div>
+                            <div class="py-3">
+                        {% if user.membership_pdf %}
+                            <a href="/admin/user/{{ user.id }}/membership"
+                               class="link link-primary">Beitrittserklärung herunterladen</a>
+                        {% else %}
+                            ⚠️ Aktuell gibt's keine Beitrittserklärung 😢
+                            {% if allowed_to_edit %}
+                                Das kannst du hier ändern ⤵️
+                                <form action="/admin/user/{{ user.id }}/add-membership-pdf"
+                                      method="post"
+                                      enctype="multipart/form-data"
+                                      class="grid gap-3">
+                                    <fieldset>
+                                        {{ macros::input(label='Neue Beitrittserklärung hochladen', name='membership_pdf', type="file", accept='application/pdf') }}
+                                    </fieldset>
+                                    <input value="Hochladen" type="submit" class="btn btn-primary" />
+                                </form>
+                            {% endif %}
+                        {% endif %}
+                    </div>
+                    {% if allowed_to_edit %}
+                        <div class="py-3">
+                            <div class="mt-3 text-right">
+                                <a href="/admin/user/{{ user.id }}/delete"
+                                   class="btn btn-alert"
+                                   onclick="return confirm('Ist {{ user.name }} wirklich aus dem Verein ausgetreten?');">
+                                    {% include "includes/delete-icon" %}
+                                    Mitglied ist ausgetreten
+                                </a>
+                            </div>
+                        </div>
+                    {% endif %}
+                            {% elif "Scheckbuch" in member %}
+                            <div class="grid gap-3 pb-3">
+                            {% for log in logbook %}
+                                {{ log::show_old(log=log, state="completed", only_ones=false, index=loop.index, allowed_to_edit=false) }}
+                            {% endfor %}
+                            
+                            <button type="button" onclick="document.getElementById('call-for-action').showModal()" class="btn btn-primary">Zu Vereinsmitglied umwandeln</button>
+                            </div>
+                            <dialog id="call-for-action"
+                        class="max-w-screen-sm w-full dark:bg-primary-600 dark:text-white rounded-md"
+                        onclick="document.getElementById('call-for-action').close()">
+                    <div onclick="event.stopPropagation();" class="p-3">
+                        <button type="button"
+                                onclick="document.getElementById('call-for-action').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 }}/scheckbook-to-regular"
+                                      method="post"
+                                      enctype="multipart/form-data" class="grid gap-3">
+                                    Type: Select -> normales Mitglied, förderndes Mitglied, unterstützendes Mitglied
+                                    {{ macros::input(label='Mitglied seit', name='member_since', type="date", value=now() | date(), required=true) }}
+                                    {{ macros::input(label='Geburtsdatum', name='birthdate', type="date", value=user.birthdate, required=true) }}
+                                    {{ macros::input(label='Telefonnummer', name='phone', type="text", value=user.phone, required=true) }}
+                                    {{ macros::input(label='Adresse', name='address', type="text", value=user.address, required=true) }}
+                                    {{ macros::input(label='Beitrittserklärung', name='membership_pdf', type="file", accept='application/pdf', required=true) }}
+                                    <input value="Als neues, reguläres Mitglied anlegen"
+                                          type="submit"
+                                          class="btn btn-primary" />
+                                </form>
+                        </div>
+                    </div>
+                </dialog>
+                            {% endif %}
+                </div>
+            </div>
         {% if supposed_to_pay %}
             <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
                  role="alert">
-                <h2 class="h2">💸</h2>
+                <h2 class="h2">💸-Beitrag</h2>
                 <div class="mx-2 divide-y divide-gray-200 dark:divide-primary-600">
                     <div class="py-3">
                         {% if fee %}
@@ -120,123 +233,6 @@
                 </div>
             </div>
         {% endif %}
-        {% if is_clubmember %}
-            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
-                 role="alert">
-                <h2 class="h2">Vereinsmitglied</h2>
-                <div class="mx-2 divide-y divide-gray-200 dark:divide-primary-600">
-                    <div class="py-3">
-                        <ul class="grid gap-3">
-                            <li>
-                                <form action="/admin/user/{{ user.id }}/change-member-since" method="post">
-                                    {{ macros::inputgroup(label='Mitglied seit', name='member_since', type="date", value=user.member_since_date, readonly=not allowed_to_edit) }}
-                                </form>
-                            </li>
-                            <li>
-                                <form action="/admin/user/{{ user.id }}/change-birthdate" method="post">
-                                    {{ macros::inputgroup(label='Geburtsdatum', name='birthdate', type="date", value=user.birthdate, readonly=not allowed_to_edit) }}
-                                </form>
-                            </li>
-                            <li>
-                                <form action="/admin/user/{{ user.id }}/change-address" method="post">
-                                    {{ macros::inputgroup(label='Adresse', name='address', type="text", value=user.address, readonly=not allowed_to_edit) }}
-                                </form>
-                            </li>
-                             <li>
-                                Familie:
-                                {% for family in families %}
-                                    {% if user.family_id == family.id %}{{ family.names }}{% endif %}
-                                {% endfor %}
-                                {% if allowed_to_edit %}
-                                    <details>
-                                        <summary>✏️</summary>
-                                        <form action="/admin/user/{{ user.id }}/change-family" method="post">
-                                            {{ 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') }}
-                                            <input value="Ändern" type="submit" class="btn btn-primary ml-1" />
-                                        </form>
-                                    </details>
-                                {% endif %}
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="py-3">
-                        {% if user.membership_pdf %}
-                            <a href="/admin/user/{{ user.id }}/membership"
-                               class="text-black dark:text-white">Beitrittserklärung</a>
-                        {% else %}
-                            ⚠️ Aktuell gibt's keine Beitrittserklärung 😢
-                            {% if allowed_to_edit %}
-                                Das kannst du hier ändern ⤵️
-                                <form action="/admin/user/{{ user.id }}/add-membership-pdf"
-                                      method="post"
-                                      enctype="multipart/form-data">
-                                    <fieldset>
-                                        {{ macros::input(label='Neue Beitrittserklärung hochladen', name='membership_pdf', type="file", accept='application/pdf') }}
-                                        <input value="Hochladen" type="submit" class="btn btn-primary ml-1" />
-                                    </fieldset>
-                                </form>
-                            {% endif %}
-                        {% endif %}
-                    </div>
-                    {% if allowed_to_edit %}
-                        <div class="py-3">
-                            <div class="mt-3 text-right">
-                                <a href="/admin/user/{{ user.id }}/delete"
-                                   class="btn btn-alert"
-                                   onclick="return confirm('Ist {{ user.name }} wirklich aus dem Verein ausgetreten?');">
-                                    {% include "includes/delete-icon" %}
-                                    Mitglied ist ausgetreten
-                                </a>
-                            </div>
-                        </div>
-                    {% endif %}
-                </div>
-            </div>
-        {% endif %}
-        <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
-             role="alert">
-            <h2 class="h2">Mitgliedstyp</h2>
-            <div class="mx-2 divide-y divide-gray-200 dark:divide-primary-600">
-                <div class="py-3">
-                    {{ user.name }}
-                    {% if "SchnupperInterest" in member %}
-                        ist interessiert am Schnupperkurs.
-                    {% elif "Schnupperant" in member %}
-                        ist beim nächsten Schnupperkurs angemeldet.
-                    {% elif "Scheckbuch" in member %}
-                        {% set logbook = member["Scheckbuch"] %}
-                        hat ein Scheckbuch und {{ logbook | length }} Ausfahrten absolviert.
-                        <details>
-                            <summary>Ausfahrten</summary>
-                            {% for log in logbook %}
-                                {{ log::show_old(log=log, state="completed", only_ones=false, index=loop.index, allowed_to_edit=false) }}
-                            {% endfor %}
-                        </details>
-                        <details>
-                            <summary>Zu reguläres Vereinsmitglied umwandeln</summary>
-                            <form action="/admin/user/{{ user.id }}/scheckbook-to-regular"
-                                  method="post"
-                                  enctype="multipart/form-data">
-                                {{ macros::input(label='Mitglied seit', name='member_since', type="date", value=now() | date()) }}
-                                {{ macros::input(label='Geburtsdatum', name='birthdate', type="date", value=user.birthdate) }}
-                                {{ macros::input(label='Telefonnummer', name='phone', type="text", value=user.phone) }}
-                                {{ macros::input(label='Adresse', name='address', type="text", value=user.address) }}
-                                {{ macros::input(label='Beitrittserklärung', name='membership_pdf', type="file", accept='application/pdf') }}
-                                <input value="Als neues, reguläres Mitglied anlegen"
-                                       type="submit"
-                                       class="btn btn-primary ml-1" />
-                            </form>
-                        </details>
-                    {% elif "Regular" in member %}
-                        ist ein reguläres Vereinsmitglied.
-                    {% elif "Foerdernd" in member %}
-                        ist ein förderndes Vereinsmitglied.
-                    {% elif "Unterstuetzend" in member %}
-                        ist ein unterstützendes Vereinsmitglied.
-                    {% endif %}
-                </div>
-            </div>
-        </div>
         <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
              role="alert">
             <h2 class="h2">Aktivität von und mit {{ user.name }}</h2>
@@ -324,5 +320,6 @@
                 </div>
             </div>
         </div>
+      </div>
     </div>
 {% endblock content %}
diff --git a/templates/includes/macros.html.tera b/templates/includes/macros.html.tera
index 1dcb298..6f189ca 100644
--- a/templates/includes/macros.html.tera
+++ b/templates/includes/macros.html.tera
@@ -199,14 +199,55 @@ function setChoiceByLabel(choicesInstance, label) {
                 {% if pattern %}pattern="{{ pattern }}"{% endif %}
                 readonly/>
           {% if allowed_to_edit %}
-              <button type="button" class="btn btn-primary rounded-l-none-important edit-js">Ändern</button>
+              <button type="button" class="btn btn-dark rounded-l-none-important edit-js">{% include "includes/pencil" %}</button>
               <input value="x" type="reset" class="edit-js btn btn-alert btn-hidden rounded-none-important"/>
               <input value="💾" type="submit" class="btn btn-primary btn-hidden rounded-l-none-important" />
           {% endif %}
         </div>
     </div>
 {% endmacro inputgroup %}
-
+{% macro selectgroup(label, data, name='trip_type', default='', id='', selected_id='', display='', extras='', class='', wrapper_class='', required=false, show_seats=false, new_last_entry='', nonSelectableDefault=false, only_ergo=false, readonly=false) %}
+    <div class="{{ wrapper_class }}">
+        <label for="{{ name }}" class="text-sm text-gray-600 dark:text-gray-100">{{ label }}</label>
+        {% if display == '' %}
+            {% set display = ["name"] %}
+        {% endif %}
+        <div class="input-group">
+          <select name="{{ name }}"
+                  {% if id %} id="{{ id }}" {% else %} id="{{ name }}" {% endif %}
+                  class="input {% if readonly %}rounded-md{% else %}rounded-l-md{% endif %} {{ class }}"
+                  {% if required %}required="required"{% endif %}
+                  disabled>
+              {% if default %}<option selected value>{{ default }}</option>{% endif %}
+              {% if nonSelectableDefault %}<option disabled selected value>{{ nonSelectableDefault }}</option>{% endif %}
+              {% for d in data %}
+                  <option value="{{ d.id }}"
+                          {% if only_ergo and d.id!=4 %}disabled{% endif %}
+                          {% if d.id == selected_id %}selected{% endif %}
+                          {% if extras != '' %} {% for extra in extras %} {% if extra != 'on_water' and d[extra] %} data- {{ extra }}={{ d[extra] }} {% else %} {% if d[extra] %}disabled{% endif %}
+                          {% endif %}
+                          {% endfor %}
+                          {% endif %}
+                          {% if show_seats %} data-custom-properties='{"amount_seats": {{ d["amount_seats"] }}, "owner": "{{ d["owner"] }}", "default_destination": "{{ d["default_destination"] }}", "boat_in_ottensheim": {{ d["location_id"] == 2 }}, "boat_reserved_today": {{ d["reserved_today"] }}, "convert_handoperated_possible": {{ d["convert_handoperated_possible"] }}, "default_handoperated": {{ d["default_shipmaster_only_steering"] }}}' {% endif %}>
+                      {% for displa in display -%}
+                          {%- if d[displa] -%}
+                              {{- d[displa] -}}
+                          {%- else -%}
+                              {{- displa -}}
+                          {%- endif -%}
+                      {%- endfor %}
+                  </option>
+              {% endfor %}
+              {% 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>
+              <input value="x" type="reset" class="edit-js btn btn-alert btn-hidden rounded-none-important"/>
+              <input value="💾" type="submit" class="btn btn-primary btn-hidden rounded-l-none-important" />
+          {% endif %}
+        </div>
+    </div>
+{% endmacro selectgroup %}
 
 {% macro checkbox(label, name, id='', checked=false, class='', disabled=false, readonly=false) %}
     <label for="{{ name }}{{ id }}"