Be able to update financial and skill; Fixes #974
This commit is contained in:
		@@ -31,6 +31,13 @@
 | 
			
		||||
                        <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>
 | 
			
		||||
                        <form action="/admin/user/{{ user.id }}/change-financial" method="post">
 | 
			
		||||
                        {% if user_financial %}
 | 
			
		||||
                                {{ macros::selectgroup(label="Finanzielles", data=financial, selected_id=user_financial.id, name='financial_id', display=['name'], default="Keine Ermäßigung", readonly=not allowed_to_edit) }}
 | 
			
		||||
                        {% else %}
 | 
			
		||||
                                {{ macros::selectgroup(label="Finanzielles", data=financial, name='financial_id', display=['name'], default="Keine Ermäßigung", readonly=not allowed_to_edit) }}
 | 
			
		||||
                                {% endif %}
 | 
			
		||||
                        </form>
 | 
			
		||||
                        {% if allowed_to_edit %}
 | 
			
		||||
                            <form action="/admin/user/{{ user.id }}/new-note" method="post">
 | 
			
		||||
                                {{ macros::inputgroup(label='Neue Notiz', name='note', type="text") }}
 | 
			
		||||
@@ -79,6 +86,14 @@
 | 
			
		||||
                            <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-skill" method="post">
 | 
			
		||||
                            {% if user_skill %}
 | 
			
		||||
                                {{ macros::selectgroup(label="Steuererlaubnis", data=skill, selected_id=user_skill.id, name='skill_id', display=['name'], default="Keine Steuerberechtigung", readonly=not allowed_to_edit) }}
 | 
			
		||||
                                {% else %}
 | 
			
		||||
                                {{ macros::selectgroup(label="Steuererlaubnis", data=skill, name='skill_id', display=['name'], default="Keine Steuerberechtigung", readonly=not allowed_to_edit) }}
 | 
			
		||||
 | 
			
		||||
                                {% endif %}
 | 
			
		||||
                            </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>
 | 
			
		||||
@@ -398,64 +413,6 @@
 | 
			
		||||
                    </div>
 | 
			
		||||
                </div>
 | 
			
		||||
            </div>
 | 
			
		||||
            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5">
 | 
			
		||||
                <h2 class="h2">TODO</h2>
 | 
			
		||||
                <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="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">
 | 
			
		||||
                                    • <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 %}
 | 
			
		||||
                        </span>
 | 
			
		||||
                    </span>
 | 
			
		||||
                    <form action="/admin/user"
 | 
			
		||||
                          method="post"
 | 
			
		||||
                          enctype="multipart/form-data"
 | 
			
		||||
                          class="w-full mt-2">
 | 
			
		||||
                        <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 %}
 | 
			
		||||
                            </div>
 | 
			
		||||
                        </div>
 | 
			
		||||
                    </form>
 | 
			
		||||
                </div>
 | 
			
		||||
            </div>
 | 
			
		||||
            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5">
 | 
			
		||||
                <h2 class="h2">Ergo-Challenge</h2>
 | 
			
		||||
                <div class="mx-3 divide-y divide-gray-200 dark:divide-primary-600">
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user