update #703

Merged
philipp merged 80 commits from update into main 2024-08-21 16:35:48 +02:00
2 changed files with 4 additions and 2 deletions
Showing only changes of commit 1e96a2d6e1 - Show all commits

View File

@ -13,7 +13,8 @@
<li class="py-1" <li class="py-1"
{% if "paid" in user.roles %}style="background-color: green;"{% endif %}> {% if "paid" in user.roles %}style="background-color: green;"{% endif %}>
{{ user.name }} ({{ user.mail }} {{ user.name }} ({{ user.mail }}
{%- if user.notes %} | {{ user.notes }}{% endif -%} {%- if user.notes %} | {{ user.notes }}
{% endif -%}
) )
<a class="btn btn-primary" <a class="btn btn-primary"
href="/admin/user/move/schnupperant/{{ user.id }}/to/scheckbuch" href="/admin/user/move/schnupperant/{{ user.id }}/to/scheckbuch"

View File

@ -279,7 +279,8 @@
{% macro home(log) %} {% macro home(log) %}
<form class="grid grid-cols-1 gap-3" <form class="grid grid-cols-1 gap-3"
action="/log/{{ log.id }}" action="/log/{{ log.id }}"
method="post"> method="post"
onsubmit="var distance = parseFloat(document.getElementById('distance_in_km{{ log.id }}js').value); var logtype = document.getElementById('logtype{{ log.id }}js').value; if (distance > 50 && (!logtype || logtype === 'Normal')) { return confirm('Die eingegebene Distanz beträgt mehr als 50 km und es wurde kein Typ (Wanderfahrt, Regatta, ...) ausgewählt. Wenn es eine Wanderfahrt war, stell dies bitte unter \'Details ändern\' ein. Möchtest du das NICHT tun und den Eintrag OHNE Typ speichern?'); } return true;">
{{ macros::input(label='Ankunftszeit', name='arrival', type='datetime-local', required=true, class="change-id-js rounded-md current-date-time") }} {{ macros::input(label='Ankunftszeit', name='arrival', type='datetime-local', required=true, class="change-id-js rounded-md current-date-time") }}
<div> <div>
<label for="destination" class="text-sm text-gray-600 dark:text-gray-100">Ziel</label> <label for="destination" class="text-sm text-gray-600 dark:text-gray-100">Ziel</label>