Compare commits
No commits in common. "9eb91ee2d40eaeb3af9fc2c7d1dbdeca97d08f48" and "431accb20eb3bc3d689ff83956bae1f2966a2c25" have entirely different histories.
9eb91ee2d4
...
431accb20e
@ -531,7 +531,7 @@ ORDER BY departure DESC
|
|||||||
db,
|
db,
|
||||||
&user,
|
&user,
|
||||||
&format!(
|
&format!(
|
||||||
"Ausfahrt am {}.{}.{} nach {} ({} km)",
|
"Neuer Logbucheintrag: Ausfahrt am {}.{}.{} nach {} ({} km)",
|
||||||
dep.day(),
|
dep.day(),
|
||||||
dep.month(),
|
dep.month(),
|
||||||
dep.year(),
|
dep.year(),
|
||||||
|
|||||||
@ -75,7 +75,7 @@ impl UserTrip {
|
|||||||
"{} hat sich für deine Ausfahrt am {} registriert",
|
"{} hat sich für deine Ausfahrt am {} registriert",
|
||||||
name_newly_registered_person, trip.day
|
name_newly_registered_person, trip.day
|
||||||
),
|
),
|
||||||
"Registrierung bei deiner Ausfahrt",
|
"Registrierung bei Ausfahrt",
|
||||||
None,
|
None,
|
||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
|
|||||||
@ -16,176 +16,196 @@
|
|||||||
<header class="bg-primary-900 text-white flex justify-center p-3 fixed w-full z-10">
|
<header class="bg-primary-900 text-white flex justify-center p-3 fixed w-full z-10">
|
||||||
<div class="max-w-screen-xl w-full flex justify-between items-center">
|
<div class="max-w-screen-xl w-full flex justify-between items-center">
|
||||||
<div class="w-1/3 truncate">
|
<div class="w-1/3 truncate">
|
||||||
<a href="/">
|
{% if "Donau Linz" in loggedin_user.roles %}
|
||||||
Hü
|
<a href="/planned">
|
||||||
{{ loggedin_user.name }}
|
{% else %}
|
||||||
</a>
|
<a href="/">
|
||||||
</div>
|
{% endif %}
|
||||||
<div>
|
Hü
|
||||||
{% if "scheckbuch" in loggedin_user.roles and loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
|
{{ loggedin_user.name }}
|
||||||
<a href="#"
|
|
||||||
class="inline-flex justify-center rounded-md bg-primary-600 mx-1 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer"
|
|
||||||
data-sidebar="true"
|
|
||||||
data-trigger="sidebar"
|
|
||||||
data-header="Ergo Challenge"
|
|
||||||
data-body="#mobile-menu-guest">
|
|
||||||
{% include "includes/book" %}
|
|
||||||
<span class="sr-only">Ergo</span>
|
|
||||||
</a>
|
</a>
|
||||||
<div class="hidden">
|
</div>
|
||||||
<div id="mobile-menu-guest">
|
<div>
|
||||||
<a href="/ergo" class="block w-100 py-2 hover:text-primary-600 border-t">Ergo</a>
|
<a href="https://wiki.rudernlinz.at/ruderassistent#faq"
|
||||||
</div>
|
target="_blank"
|
||||||
</div>
|
class="inline-flex justify-center rounded-md bg-primary-600 mx-1 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer">
|
||||||
{% endif %}
|
{% include "includes/question-icon" %}
|
||||||
{% if "scheckbuch" not in loggedin_user.roles %}
|
<span class="sr-only">FAQs</span>
|
||||||
<a href="#"
|
|
||||||
class="inline-flex justify-center rounded-md bg-primary-600 mx-1 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer"
|
|
||||||
data-sidebar="true"
|
|
||||||
data-trigger="sidebar"
|
|
||||||
data-header="Menü"
|
|
||||||
data-body="#mobile-menu">
|
|
||||||
{% include "includes/book" %}
|
|
||||||
<span class="sr-only">Logbuch</span>
|
|
||||||
</a>
|
</a>
|
||||||
<div class="hidden">
|
{% if "scheckbuch" in loggedin_user.roles and loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
|
||||||
<div id="mobile-menu">
|
<a href="#"
|
||||||
<a href="/log" class="block w-100 py-2 hover:text-primary-600">Ausfahrt eintragen</a>
|
class="inline-flex justify-center rounded-md bg-primary-600 mx-1 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer"
|
||||||
<a href="/log/show"
|
data-sidebar="true"
|
||||||
class="block w-100 py-2 hover:text-primary-600 border-t">Logbuch</a>
|
data-trigger="sidebar"
|
||||||
{% if "admin" in loggedin_user.roles or "Vorstand" in loggedin_user.roles %}
|
data-header="Ergo Challenge"
|
||||||
<a href="/admin/user"
|
data-body="#mobile-menu-guest">
|
||||||
class="block w-100 py-2 hover:text-primary-600 border-t">Userverwaltung</a>
|
{% include "includes/book" %}
|
||||||
{% endif %}
|
<span class="sr-only">Ergo</span>
|
||||||
{% if loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
|
</a>
|
||||||
|
<div class="hidden">
|
||||||
|
<div id="mobile-menu-guest">
|
||||||
<a href="/ergo" class="block w-100 py-2 hover:text-primary-600 border-t">Ergo</a>
|
<a href="/ergo" class="block w-100 py-2 hover:text-primary-600 border-t">Ergo</a>
|
||||||
{% endif %}
|
</div>
|
||||||
<a href="/stat" class="block w-100 py-2 hover:text-primary-600 border-t">Statistik</a>
|
|
||||||
<a href="/stat/boats"
|
|
||||||
class="block w-100 py-2 hover:text-primary-600 border-t">Bootsauswertung</a>
|
|
||||||
{% if "admin" in loggedin_user.roles %}
|
|
||||||
<a href="/admin/boat"
|
|
||||||
class="block w-100 py-2 hover:text-primary-600 border-t">Boote</a>
|
|
||||||
{% endif %}
|
|
||||||
<a href="/boatdamage"
|
|
||||||
class="block w-100 py-2 hover:text-primary-600 border-t">Bootsschaden</a>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
{% endif %}
|
||||||
{% endif %}
|
{% if "scheckbuch" not in loggedin_user.roles %}
|
||||||
<a href="/auth/logout"
|
<a href="#"
|
||||||
class="inline-flex justify-center rounded-md bg-gray-200 ml-1 px-3 py-2 text-sm font-semibold text-primary-950 hover:bg-gray-300 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer">
|
class="inline-flex justify-center rounded-md bg-primary-600 mx-1 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer"
|
||||||
<svg class="inline h-4"
|
data-sidebar="true"
|
||||||
width="24"
|
data-trigger="sidebar"
|
||||||
height="24"
|
data-header="Menü"
|
||||||
viewbox="0 0 24 24"
|
data-body="#mobile-menu">
|
||||||
fill="none"
|
{% include "includes/book" %}
|
||||||
stroke="currentColor"
|
<span class="sr-only">Logbuch</span>
|
||||||
stroke-width="2"
|
</a>
|
||||||
stroke-linecap="round"
|
<div class="hidden">
|
||||||
stroke-linejoin="round"
|
<div id="mobile-menu">
|
||||||
class="feather feather-log-out">
|
<a href="/log" class="block w-100 py-2 hover:text-primary-600">Ausfahrt eintragen</a>
|
||||||
<path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path>
|
<a href="/log/show"
|
||||||
<polyline points="16 17 21 12 16 7"></polyline>
|
class="block w-100 py-2 hover:text-primary-600 border-t">Logbuch</a>
|
||||||
<line x1="21" y1="12" x2="9" y2="12"></line>
|
{% if loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
|
||||||
</svg>
|
<a href="/ergo" class="block w-100 py-2 hover:text-primary-600 border-t">Ergo</a>
|
||||||
<span class="sr-only">Ausloggen</span>
|
{% endif %}
|
||||||
</a>
|
<a href="/stat" class="block w-100 py-2 hover:text-primary-600 border-t">Statistik</a>
|
||||||
|
<a href="/stat/boats"
|
||||||
|
class="block w-100 py-2 hover:text-primary-600 border-t">Bootsauswertung</a>
|
||||||
|
{% if "admin" in loggedin_user.roles %}
|
||||||
|
<a href="/admin/boat"
|
||||||
|
class="block w-100 py-2 hover:text-primary-600 border-t">Boote</a>
|
||||||
|
{% endif %}
|
||||||
|
<a href="/boatdamage"
|
||||||
|
class="block w-100 py-2 hover:text-primary-600 border-t">Bootsschaden</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% if "admin" in loggedin_user.roles or "Vorstand" in loggedin_user.roles %}
|
||||||
|
<a href="/admin/user"
|
||||||
|
class="inline-flex justify-center rounded-md bg-primary-600 mx-1 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer">
|
||||||
|
<svg class="inline h-4"
|
||||||
|
width="16"
|
||||||
|
height="16"
|
||||||
|
fill="currentColor"
|
||||||
|
class="bi bi-person-lines-fill"
|
||||||
|
viewbox="0 0 16 16">
|
||||||
|
<path d="M6 8a3 3 0 1 0 0-6 3 3 0 0 0 0 6zm-5 6s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H1zM11 3.5a.5.5 0 0 1 .5-.5h4a.5.5 0 0 1 0 1h-4a.5.5 0 0 1-.5-.5zm.5 2.5a.5.5 0 0 0 0 1h4a.5.5 0 0 0 0-1h-4zm2 3a.5.5 0 0 0 0 1h2a.5.5 0 0 0 0-1h-2zm0 3a.5.5 0 0 0 0 1h2a.5.5 0 0 0 0-1h-2z" />
|
||||||
|
</svg>
|
||||||
|
<span class="sr-only">Userverwaltung</span>
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
<a href="/auth/logout"
|
||||||
|
class="inline-flex justify-center rounded-md bg-gray-200 ml-1 px-3 py-2 text-sm font-semibold text-primary-950 hover:bg-gray-300 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer">
|
||||||
|
<svg class="inline h-4"
|
||||||
|
width="24"
|
||||||
|
height="24"
|
||||||
|
viewbox="0 0 24 24"
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-width="2"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
class="feather feather-log-out">
|
||||||
|
<path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path>
|
||||||
|
<polyline points="16 17 21 12 16 7"></polyline>
|
||||||
|
<line x1="21" y1="12" x2="9" y2="12"></line>
|
||||||
|
</svg>
|
||||||
|
<span class="sr-only">Ausloggen</span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</header>
|
||||||
|
<div class="h-8"></div>
|
||||||
|
{% endmacro header %}
|
||||||
|
{% macro input(label, name, type, required=false, class='rounded-md', value='', min='', hide_label=false, id='', autofocus=false, wrapper_class='', pattern='', readonly=false, accept='') %}
|
||||||
|
<div class="{{ wrapper_class }}">
|
||||||
|
<label for="{{ name }}"
|
||||||
|
class="{% if hide_label %} sr-only {% else %} text-sm text-gray-600 dark:text-white {% endif %}">
|
||||||
|
{{ label }}
|
||||||
|
</label>
|
||||||
|
<input {% if type=='datetime-local' %}onclick='if (!this.value) setCurrentdate(this)'{% endif %}
|
||||||
|
{% if id %} id="{{ id }}" {% else %} id="{{ name }}" {% endif %}
|
||||||
|
name="{{ name }}"
|
||||||
|
type="{{ type }}"
|
||||||
|
{% if required %}required{% endif %}
|
||||||
|
value="{{ value }}"
|
||||||
|
class="input {{ class }}"
|
||||||
|
placeholder="{% if hide_label %}{{ label }}{% endif %}"
|
||||||
|
{% if min is defined %}min="{{ min }}"{% endif %}
|
||||||
|
{% if autofocus %}autofocus{% endif %}
|
||||||
|
{% if accept %}accept="{{ accept }}"{% endif %}
|
||||||
|
{% if pattern %}pattern="{{ pattern }}"{% endif %}
|
||||||
|
{% if readonly %}readonly{% endif %}>
|
||||||
</div>
|
</div>
|
||||||
</header>
|
{% endmacro input %}
|
||||||
<div class="h-8"></div>
|
{% macro checkbox(label, name, id='', checked=false, class='', disabled=false) %}
|
||||||
{% endmacro header %}
|
<label for="{{ name }}{{ id }}"
|
||||||
{% macro input(label, name, type, required=false, class='rounded-md', value='', min='', hide_label=false, id='', autofocus=false, wrapper_class='', pattern='', readonly=false, accept='') %}
|
class="flex items-center cursor-pointer text-black dark:text-white hover:text-gray-900 dark:hover:text-gray-100 {{ class }}">
|
||||||
<div class="{{ wrapper_class }}">
|
<input type="checkbox"
|
||||||
<label for="{{ name }}"
|
id="{{ name }}{{ id }}"
|
||||||
class="{% if hide_label %} sr-only {% else %} text-sm text-gray-600 dark:text-white {% endif %}">
|
name="{{ name }}"
|
||||||
|
{% if checked %}checked{% endif %}
|
||||||
|
{% if disabled %}disabled{% endif %}
|
||||||
|
class="h-4 w-4 accent-primary-600 dark:accent-primary-200 mr-2" />
|
||||||
{{ label }}
|
{{ label }}
|
||||||
</label>
|
</label>
|
||||||
<input {% if type=='datetime-local' %}onclick='if (!this.value) setCurrentdate(this)'{% endif %}
|
{% endmacro checkbox %}
|
||||||
{% if id %} id="{{ id }}" {% else %} id="{{ name }}" {% endif %}
|
{% macro select(label, data, name='trip_type', default='', id='', selected_id='', display='', extras='', class='', wrapper_class='', required=false, show_seats=false, new_last_entry='') %}
|
||||||
name="{{ name }}"
|
<div class="{{ wrapper_class }}">
|
||||||
type="{{ type }}"
|
<label for="{{ name }}" class="text-sm text-gray-600 dark:text-gray-100">{{ label }}</label>
|
||||||
{% if required %}required{% endif %}
|
{% if display == '' %}
|
||||||
value="{{ value }}"
|
{% set display = ["name"] %}
|
||||||
class="input {{ class }}"
|
{% endif %}
|
||||||
placeholder="{% if hide_label %}{{ label }}{% endif %}"
|
<select name="{{ name }}"
|
||||||
{% if min is defined %}min="{{ min }}"{% endif %}
|
{% if id %} id="{{ id }}" {% else %} id="{{ name }}" {% endif %}
|
||||||
{% if autofocus %}autofocus{% endif %}
|
class="input rounded-md {{ class }}"
|
||||||
{% if accept %}accept="{{ accept }}"{% endif %}
|
{% if required %}required="required"{% endif %}>
|
||||||
{% if pattern %}pattern="{{ pattern }}"{% endif %}
|
{% if default %}<option selected value>{{ default }}</option>{% endif %}
|
||||||
{% if readonly %}readonly{% endif %}>
|
{% for d in data %}
|
||||||
</div>
|
<option value="{{ d.id }}" {% 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 }}}'{% endif %}>
|
||||||
{% endmacro input %}
|
{% for displa in display -%}
|
||||||
{% macro checkbox(label, name, id='', checked=false, class='', disabled=false) %}
|
{%- if d[displa] -%}
|
||||||
<label for="{{ name }}{{ id }}"
|
{{- d[displa] -}}
|
||||||
class="flex items-center cursor-pointer text-black dark:text-white hover:text-gray-900 dark:hover:text-gray-100 {{ class }}">
|
{%- else -%}
|
||||||
<input type="checkbox"
|
{{- displa -}}
|
||||||
id="{{ name }}{{ id }}"
|
{%- endif -%}
|
||||||
name="{{ name }}"
|
{%- endfor %}
|
||||||
{% if checked %}checked{% endif %}
|
</option>
|
||||||
{% if disabled %}disabled{% endif %}
|
{% endfor %}
|
||||||
class="h-4 w-4 accent-primary-600 dark:accent-primary-200 mr-2" />
|
{% if new_last_entry %}<option value="-1">{{ new_last_entry }}</option>{% endif %}
|
||||||
{{ label }}
|
</select>
|
||||||
</label>
|
</div>
|
||||||
{% endmacro checkbox %}
|
{% endmacro select %}
|
||||||
{% macro select(label, data, name='trip_type', default='', id='', selected_id='', display='', extras='', class='', wrapper_class='', required=false, show_seats=false, new_last_entry='') %}
|
{% macro alert(message, type, class='') %}
|
||||||
<div class="{{ wrapper_class }}">
|
<div class="{{ class }} alert-{{ type }} text-white px-3 py-1 rounded-md text-center">{{ message }}</div>
|
||||||
<label for="{{ name }}" class="text-sm text-gray-600 dark:text-gray-100">{{ label }}</label>
|
{% endmacro alert %}
|
||||||
{% if display == '' %}
|
{% macro box(participants, empty_seats='', header='Freie Plätze:', text='Keine Ruderer angemeldet', bg='primary-600', color='white', trip_details_id='', allow_removing=false) %}
|
||||||
{% set display = ["name"] %}
|
<div class="text-{{ color }} bg-{{ bg }} text-center p-1 mt-1 rounded-t-md">
|
||||||
{% endif %}
|
{{ header }}
|
||||||
<select name="{{ name }}"
|
{{ empty_seats }}
|
||||||
{% if id %} id="{{ id }}" {% else %} id="{{ name }}" {% endif %}
|
</div>
|
||||||
class="input rounded-md {{ class }}"
|
<div class="p-2 border border-t-0 border-{{ bg }} mb-4 rounded-b-md">
|
||||||
{% if required %}required="required"{% endif %}>
|
{% if participants | length > 0 %}
|
||||||
{% if default %}<option selected value>{{ default }}</option>{% endif %}
|
{% for rower in participants %}
|
||||||
{% for d in data %}
|
{{ rower.name }}
|
||||||
<option value="{{ d.id }}" {% 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 }}}'{% endif %}>
|
{% if rower.is_guest %}<small class="text-gray-600 dark:text-gray-100">(Scheckbuch)</small>{% endif %}
|
||||||
{% for displa in display -%}
|
{% if rower.is_real_guest %}
|
||||||
{%- if d[displa] -%}
|
<small class="text-gray-600 dark:text-gray-100">(Gast)</small>
|
||||||
{{- d[displa] -}}
|
{% if allow_removing %}
|
||||||
{%- else -%}
|
<a href="/planned/remove/{{ trip_details_id }}/{{ rower.name }}"
|
||||||
{{- displa -}}
|
class="btn btn-attention btn-fw">Abmelden</a>
|
||||||
{%- endif -%}
|
{% endif %}
|
||||||
{%- endfor %}
|
|
||||||
</option>
|
|
||||||
{% endfor %}
|
|
||||||
{% if new_last_entry %}<option value="-1">{{ new_last_entry }}</option>{% endif %}
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
{% endmacro select %}
|
|
||||||
{% macro alert(message, type, class='') %}
|
|
||||||
<div class="{{ class }} alert-{{ type }} text-white px-3 py-1 rounded-md text-center">{{ message }}</div>
|
|
||||||
{% endmacro alert %}
|
|
||||||
{% macro box(participants, empty_seats='', header='Freie Plätze:', text='Keine Ruderer angemeldet', bg='primary-600', color='white', trip_details_id='', allow_removing=false) %}
|
|
||||||
<div class="text-{{ color }} bg-{{ bg }} text-center p-1 mt-1 rounded-t-md">
|
|
||||||
{{ header }}
|
|
||||||
{{ empty_seats }}
|
|
||||||
</div>
|
|
||||||
<div class="p-2 border border-t-0 border-{{ bg }} mb-4 rounded-b-md">
|
|
||||||
{% if participants | length > 0 %}
|
|
||||||
{% for rower in participants %}
|
|
||||||
{{ rower.name }}
|
|
||||||
{% if rower.is_guest %}<small class="text-gray-600 dark:text-gray-100">(Scheckbuch)</small>{% endif %}
|
|
||||||
{% if rower.is_real_guest %}
|
|
||||||
<small class="text-gray-600 dark:text-gray-100">(Gast)</small>
|
|
||||||
{% if allow_removing %}
|
|
||||||
<a href="/planned/remove/{{ trip_details_id }}/{{ rower.name }}"
|
|
||||||
class="btn btn-attention btn-fw">Abmelden</a>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
<span class="hidden">(angemeldet seit
|
||||||
<span class="hidden">(angemeldet seit
|
{{ rower.registered_at }})</span>
|
||||||
{{ rower.registered_at }})</span>
|
<br />
|
||||||
<br />
|
{% endfor %}
|
||||||
{% endfor %}
|
{% else %}
|
||||||
{% else %}
|
{{ text }}
|
||||||
{{ text }}
|
{% endif %}
|
||||||
{% endif %}
|
</div>
|
||||||
</div>
|
{% endmacro box %}
|
||||||
{% endmacro box %}
|
{% macro faq(question, answer) %}
|
||||||
{% macro faq(question, answer) %}
|
<div>
|
||||||
<div>
|
<h2 class="flex mb-4 text-lg font-bold text-primary-900">{{ question }}</h2>
|
||||||
<h2 class="flex mb-4 text-lg font-bold text-primary-900">{{ question }}</h2>
|
<p class="text-primary-950">{{ answer | safe }}</p>
|
||||||
<p class="text-primary-950">{{ answer | safe }}</p>
|
</div>
|
||||||
</div>
|
{% endmacro faq %}
|
||||||
{% endmacro faq %}
|
|
||||||
|
|||||||
@ -1,30 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
|
||||||
<svg width="100%"
|
|
||||||
class="flex-shrink-0 w-6 h-6 inline-block"
|
|
||||||
height="100%"
|
|
||||||
viewBox="0 0 583 1024"
|
|
||||||
version="1.1"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
|
||||||
xml:space="preserve"
|
|
||||||
xmlns:serif="http://www.serif.com/"
|
|
||||||
style="fill-rule:evenodd;
|
|
||||||
clip-rule:evenodd;
|
|
||||||
stroke-linejoin:round;
|
|
||||||
stroke-miterlimit:2">
|
|
||||||
<g transform="matrix(1,0,0,1,-1574,-536.199)">
|
|
||||||
<g transform="matrix(1,0,0,1,0,10.8235)">
|
|
||||||
<g transform="matrix(0.948324,0.317305,0.307947,-0.920356,-304.665,1886.18)">
|
|
||||||
<rect x="1838.29" y="1006.52" width="17.353" height="644.204" style="fill:white;fill-opacity:0.7;" />
|
|
||||||
</g>
|
|
||||||
<path d="M1944.68,934.772C1921.09,896.523 1932.18,782.181 1974.56,655.531C1990.23,608.676 2009.04,563.787 2029.1,525.376L2156.88,568.132C2149.78,610.876 2137.79,658.046 2122.11,704.901C2079.26,832.966 2018.43,931.728 1976.52,946.409L2085.08,568.504L1944.68,934.772Z" style="fill:white;fill-opacity:0.7;" />
|
|
||||||
</g>
|
|
||||||
<g transform="matrix(-1,0,0,1,3730.88,10.8235)">
|
|
||||||
<g transform="matrix(0.948324,0.317305,0.307947,-0.920356,-304.665,1886.18)">
|
|
||||||
<rect x="1838.29" y="1006.52" width="17.353" height="644.204" style="fill:white;fill-opacity:0.7;" />
|
|
||||||
</g>
|
|
||||||
<path d="M1944.68,934.772C1921.09,896.523 1932.18,782.181 1974.56,655.531C1990.23,608.676 2009.04,563.787 2029.1,525.376L2156.88,568.132C2149.78,610.876 2137.79,658.046 2122.11,704.901C2079.26,832.966 2018.43,931.728 1976.52,946.409L2085.08,568.504L1944.68,934.772Z" style="fill:white;fill-opacity:0.7;" />
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.7 KiB |
@ -3,177 +3,197 @@
|
|||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="max-w-screen-lg w-full">
|
<div class="max-w-screen-lg w-full">
|
||||||
<h1 class="h1">Ruderassistent</h1>
|
<h1 class="h1">Ruderassistent</h1>
|
||||||
<div class="grid gap-3 my-5">
|
<div class="grid gap-3">
|
||||||
<div class="m-auto">
|
|
||||||
<a href="/planned"
|
|
||||||
class="btn btn-primary flex items-center justify-center">
|
|
||||||
{% include "includes/rowing-icon" %}
|
|
||||||
<span class="text-xl px-3">Geplante Ausfahrten</span>
|
|
||||||
</a>
|
|
||||||
</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"
|
||||||
role="alert">
|
role="alert">
|
||||||
<h2 class="h2">Nachrichten</h2>
|
<h2 class="h2">Nachrichten</h2>
|
||||||
<div class="divide-y">
|
<div class="text-sm p-3">
|
||||||
{% for notification in notifications %}
|
{% for notification in notifications %}
|
||||||
{% if not notification.read_at %}
|
{% if not notification.read_at %}
|
||||||
<div class="relative flex justify-between items-center p-3">
|
<div class="relative flex bg-clip-border rounded-xl bg-white text-gray-700 shadow-md w-full flex-row">
|
||||||
<div class="grow me-4">
|
<div class="p-6">
|
||||||
<small class="uppercase text-gray-600 dark:text-gray-100">
|
<h6 class="block mb-4 font-sans text-base antialiased font-semibold leading-relaxed tracking-normal text-gray-700 uppercase">
|
||||||
<strong>{{ notification.category }}</strong> • {{ notification.created_at | date(format="%d.%m.%Y %H:%M") }}
|
{{ notification.category }}
|
||||||
</small>
|
</h6>
|
||||||
<div class="mt-1">{{ notification.message }}</div>
|
<h4 class="block mb-2 font-sans text-2xl antialiased font-semibold leading-snug tracking-normal text-blue-gray-900">
|
||||||
</div>
|
{{ notification.message }}
|
||||||
<div>
|
</h4>
|
||||||
|
<p class="block mb-8 font-sans text-base antialiased font-normal leading-relaxed text-gray-700">
|
||||||
|
{{ notification.created_at | date(format="%d.%m.%Y %H:%M") }}
|
||||||
|
</p>
|
||||||
{% if not notification.read_at %}
|
{% if not notification.read_at %}
|
||||||
<a href="/notification/{{ notification.id }}/read" class="inline-block">
|
<a href="/notification/{{ notification.id }}/read" class="inline-block">
|
||||||
<button class="btn btn-primary" type="button">
|
<button class="flex items-center gap-2 px-6 py-3 font-sans text-xs font-bold text-center text-gray-900 uppercase align-middle transition-all rounded-lg select-none disabled:opacity-50 disabled:shadow-none disabled:pointer-events-none hover:bg-gray-900/10 active:bg-gray-900/20"
|
||||||
✓
|
type="button">Als gelesen markieren</button>
|
||||||
<span class="sr-only">Notification gelesen</span>
|
|
||||||
</button>
|
|
||||||
</a>
|
</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
<details>
|
||||||
<details class="py-3 bg-gray-200 dark:bg-primary-950 rounded-b-md">
|
<summary>Vergangene Nachrichten</summary>
|
||||||
<summary class="px-3">Vergangene Nachrichten</summary>
|
|
||||||
<div class="divide-y text-sm">
|
|
||||||
{% for notification in notifications %}
|
{% for notification in notifications %}
|
||||||
{% if notification.read_at %}
|
{% if notification.read_at %}
|
||||||
<div class="p-3 relative">
|
<div class="relative flex bg-clip-border rounded-xl bg-white text-gray-700 shadow-md w-full flex-row">
|
||||||
<small class="uppercase text-gray-600 dark:text-gray-100">
|
<div class="p-6">
|
||||||
<strong>{{ notification.category }}</strong> • {{ notification.created_at | date(format="%d.%m.%Y %H:%M") }}
|
<h6 class="block mb-4 font-sans text-base antialiased font-semibold leading-relaxed tracking-normal text-gray-700 uppercase">
|
||||||
</small>
|
{{ notification.category }}
|
||||||
<div class="mt-1">{{ notification.message }}</div>
|
</h6>
|
||||||
|
<h4 class="block mb-2 font-sans text-2xl antialiased font-semibold leading-snug tracking-normal text-blue-gray-900">
|
||||||
|
{{ notification.message }}
|
||||||
|
</h4>
|
||||||
|
<p class="block mb-8 font-sans text-base antialiased font-normal leading-relaxed text-gray-700">
|
||||||
|
{{ notification.created_at | date(format="%d.%m.%Y %H:%M") }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</details>
|
||||||
</details>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% if loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
|
</div>
|
||||||
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
|
<div class="grid gap-3">
|
||||||
role="alert">
|
|
||||||
<h2 class="h2">Ergo</h2>
|
|
||||||
<div class="p-3">
|
|
||||||
<ul class="list-none ms-2">
|
|
||||||
<li class="py-1">
|
|
||||||
<a href="/ergo" class="block w-100 py-2 hover:text-primary-600">Ergo</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{% if "Donau Linz" in loggedin_user.roles and "Unterstützend" not in loggedin_user.roles and "Förderndes Mitglied" not in loggedin_user.roles %}
|
|
||||||
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
|
|
||||||
role="alert">
|
|
||||||
<h2 class="h2">Aktives Vereinsmitglied</h2>
|
|
||||||
<ul class="list-none ms-2 divide-y divide-gray-200 dark:divide-primary-600">
|
|
||||||
<li class="py-1">
|
|
||||||
<a href="/planned" class="block w-100 py-2 hover:text-primary-600">Geplante Ausfahrten</a>
|
|
||||||
</li>
|
|
||||||
<li class="py-1">
|
|
||||||
<a href="/log" class="block w-100 py-2 hover:text-primary-600">Ausfahrt eintragen</a>
|
|
||||||
</li>
|
|
||||||
<li class="py-1">
|
|
||||||
<a href="/log/show" class="block w-100 py-2 hover:text-primary-600">Logbuch</a>
|
|
||||||
</li>
|
|
||||||
<li class="py-1">
|
|
||||||
<a href="/stat" class="block w-100 py-2 hover:text-primary-600">Statistik</a>
|
|
||||||
</li>
|
|
||||||
<li class="py-1">
|
|
||||||
<a href="/stat/boats" class="block w-100 py-2 hover:text-primary-600">Bootsauswertung</a>
|
|
||||||
</li>
|
|
||||||
<li class="py-1">
|
|
||||||
<a href="/boatdamage" class="block w-100 py-2 hover:text-primary-600">Bootsschaden</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{% if "scheckbuch" in loggedin_user.roles %}
|
|
||||||
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
|
|
||||||
role="alert">
|
|
||||||
<h2 class="h2">Scheckbuch</h2>
|
|
||||||
<ul class="list-none ms-2 divide-y divide-gray-200 dark:divide-primary-600">
|
|
||||||
<li class="py-1">
|
|
||||||
<a href="/planned" class="block w-100 py-2 hover:text-primary-600">Geplante Ausfahrten</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{% if "schnupper-betreuer" in loggedin_user.roles %}
|
|
||||||
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
|
|
||||||
role="alert">
|
|
||||||
<h2 class="h2">Schnupper-Betreuer</h2>
|
|
||||||
<ul class="list-none ms-2 divide-y divide-gray-200 dark:divide-primary-600">
|
|
||||||
<li class="py-1">
|
|
||||||
<a href="/admin/schnupper"
|
|
||||||
class="block w-100 py-2 hover:text-primary-600">Schnuppern</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{% if "Vorstand" in loggedin_user.roles %}
|
|
||||||
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
|
|
||||||
role="alert">
|
|
||||||
<h2 class="h2">Vorstand</h2>
|
|
||||||
<ul class="list-none ms-2 divide-y divide-gray-200 dark:divide-primary-600">
|
|
||||||
<li class="py-1">
|
|
||||||
<a href="/admin/user/fees"
|
|
||||||
class="block w-100 py-2 hover:text-primary-600">Übersicht User Gebühren</a>
|
|
||||||
</li>
|
|
||||||
<li class="py-1">
|
|
||||||
<a href="/admin/user/scheckbuch"
|
|
||||||
class="block w-100 py-2 hover:text-primary-600">Scheckbuch</a>
|
|
||||||
</li>
|
|
||||||
<li class="py-1">
|
|
||||||
<a href="/admin/user" class="block w-100 py-2 hover:text-primary-600">User</a>
|
|
||||||
</li>
|
|
||||||
<li class="py-1">
|
|
||||||
<a href="/board/boathouse"
|
|
||||||
class="block w-100 py-2 hover:text-primary-600">Bootshaus</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{% if "admin" in loggedin_user.roles %}
|
|
||||||
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
|
|
||||||
role="alert">
|
|
||||||
<h2 class="h2">Admin</h2>
|
|
||||||
<ul class="list-none ms-2 divide-y divide-gray-200 dark:divide-primary-600">
|
|
||||||
<li class="py-1">
|
|
||||||
<a href="/admin/boat" class="block w-100 py-2 hover:text-primary-600">Boote</a>
|
|
||||||
</li>
|
|
||||||
<li class="py-1">
|
|
||||||
<a href="/admin/user" class="block w-100 py-2 hover:text-primary-600">User</a>
|
|
||||||
</li>
|
|
||||||
<li class="py-1">
|
|
||||||
<a href="/admin/mail" class="block w-100 py-2 hover:text-primary-600">Mail (beautifully layouted)</a>
|
|
||||||
</li>
|
|
||||||
<li class="py-1">
|
|
||||||
<a href="/admin/rss" class="block w-100 py-2 hover:text-primary-600">Logs</a>
|
|
||||||
</li>
|
|
||||||
<li class="py-1">
|
|
||||||
<a href="/admin/list" class="block w-100 py-2 hover:text-primary-600">Fingerabdruck-Liste überprüfen</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
<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"
|
||||||
role="alert">
|
role="alert">
|
||||||
<h2 class="h2">Allgemein</h2>
|
<h2 class="h2">Allgemein</h2>
|
||||||
<div class="p-3">
|
<div class="text-sm p-3">
|
||||||
<ul class="list-none ms-2">
|
<ul class="list-disc ms-2">
|
||||||
<li class="py-1">
|
<li class="py-1">
|
||||||
<a href="https://wiki.rudernlinz.at/ruderassistent#faq"
|
<a href="https://wiki.rudernlinz.at/ruderassistent#faq"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
class="block w-100 py-2 hover:text-primary-600">FAQ (extern)</a>
|
class="link-primary">FAQ (extern)</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endblock content %}
|
{% if loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
|
||||||
|
<div class="grid 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">Ergo</h2>
|
||||||
|
<div class="text-sm p-3">
|
||||||
|
<ul class="list-disc ms-2">
|
||||||
|
<li class="py-1">
|
||||||
|
<a href="/ergo" class="link-primary">Ergo</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% if "Donau Linz" in loggedin_user.roles and "Unterstützend" not in loggedin_user.roles and "Förderndes Mitglied" not in loggedin_user.roles %}
|
||||||
|
<div class="grid 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">Aktives Vereinsmitglied</h2>
|
||||||
|
<div class="text-sm p-3">
|
||||||
|
<ul class="list-disc ms-2">
|
||||||
|
<li class="py-1">
|
||||||
|
<a href="/planned" class="link-primary">Geplante Ausfahrten</a>
|
||||||
|
</li>
|
||||||
|
<li class="py-1">
|
||||||
|
<a href="/log" class="link-primary">Ausfahrt eintragen</a>
|
||||||
|
</li>
|
||||||
|
<li class="py-1">
|
||||||
|
<a href="/log/show" class="link-primary">Logbuch</a>
|
||||||
|
</li>
|
||||||
|
<li class="py-1">
|
||||||
|
<a href="/stat" class="link-primary">Statistik</a>
|
||||||
|
</li>
|
||||||
|
<li class="py-1">
|
||||||
|
<a href="/stat/boats" class="link-primary">Bootsauswertung</a>
|
||||||
|
</li>
|
||||||
|
<li class="py-1">
|
||||||
|
<a href="/boatdamage" class="link-primary">Bootsschaden</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% if "scheckbuch" in loggedin_user.roles %}
|
||||||
|
<div class="grid 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">Scheckbuch</h2>
|
||||||
|
<div class="text-sm p-3">
|
||||||
|
<ul class="list-disc ms-2">
|
||||||
|
<li class="py-1">
|
||||||
|
<a href="/planned" class="link-primary">Geplante Ausfahrten</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% if "schnupper-betreuer" in loggedin_user.roles %}
|
||||||
|
<div class="grid 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">Schnupper-Betreuer</h2>
|
||||||
|
<div class="text-sm p-3">
|
||||||
|
<ul class="list-disc ms-2">
|
||||||
|
<li class="py-1">
|
||||||
|
<a href="/admin/schnupper" class="link-primary">Schnuppern</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% if "Vorstand" in loggedin_user.roles %}
|
||||||
|
<div class="grid 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">Vorstand</h2>
|
||||||
|
<div class="text-sm p-3">
|
||||||
|
<ul class="list-disc ms-2">
|
||||||
|
<li class="py-1">
|
||||||
|
<a href="/admin/user/fees" class="link-primary">Übersicht User Gebühren</a>
|
||||||
|
</li>
|
||||||
|
<li class="py-1">
|
||||||
|
<a href="/admin/user/scheckbuch" class="link-primary">Scheckbuch</a>
|
||||||
|
</li>
|
||||||
|
<li class="py-1">
|
||||||
|
<a href="/admin/user" class="link-primary">User</a>
|
||||||
|
</li>
|
||||||
|
<li class="py-1">
|
||||||
|
<a href="/board/boathouse" class="link-primary">Bootshaus</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% if "admin" in loggedin_user.roles %}
|
||||||
|
<div class="grid 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">Admin</h2>
|
||||||
|
<div class="text-sm p-3">
|
||||||
|
<ul class="list-disc ms-2">
|
||||||
|
<li class="py-1">
|
||||||
|
<a href="/admin/boat" class="link-primary">Boote</a>
|
||||||
|
</li>
|
||||||
|
<li class="py-1">
|
||||||
|
<a href="/admin/user" class="link-primary">User</a>
|
||||||
|
</li>
|
||||||
|
<li class="py-1">
|
||||||
|
<a href="/admin/mail" class="link-primary">Mail (beautifully layouted)</a>
|
||||||
|
</li>
|
||||||
|
<li class="py-1">
|
||||||
|
<a href="/admin/rss" class="link-primary">Logs</a>
|
||||||
|
</li>
|
||||||
|
<li class="py-1">
|
||||||
|
<a href="/admin/list" class="link-primary">Fingerabdruck-Liste überprüfen</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
{% endblock content %}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user