Ruderverein-Donau-Linz/rowt
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Wiki Activity

1x boats: don't show 'Ruderer: ' in logbook; Fixes #362
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
Details
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
Details
CI/CD Pipeline / test (push) Has been cancelled
Details

Browse Source
This commit is contained in:
philipp 2024-04-15 11:23:07 +02:00
parent 8db9e020c8
commit d58d4642af
2 changed files with 56 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
templates/includes/forms/log.html.tera
View File

@ -218,18 +218,20 @@
{% if log.comments %}<span class="text-sm italic">- "{{ log.comments }}"</span>{% endif %} {% if log.comments %}<span class="text-sm italic">- "{{ log.comments }}"</span>{% endif %}
</div> </div>
{% if amount_guests > 0 or log.rowers | length > 0 %} {% if amount_guests > 0 or log.rowers | length > 0 %}
<div class="text-sm text-gray-600 dark:text-gray-100"> {% if not log.boat.amount_seats == 1 %}
Ruderer: <div class="text-sm text-gray-600 dark:text-gray-100">
{% for rower in log.rowers -%} Ruderer:
{{ rower.name -}} {% for rower in log.rowers -%}
{% if not loop.last or amount_guests > 0 and log.boat.name != 'Externes Boot' %},{% endif %} {{ rower.name -}}
{% endfor %} {% if not loop.last or amount_guests > 0 and log.boat.name != 'Externes Boot' %},{% endif %}
{% if amount_guests > 0 and log.boat.name != 'Externes Boot' %} {% endfor %}
Gäste {% if amount_guests > 0 and log.boat.name != 'Externes Boot' %}
<small class="text-gray-600 dark:text-gray-100">(ohne Account)</small>: Gäste
{{ amount_guests }} <small class="text-gray-600 dark:text-gray-100">(ohne Account)</small>:
{% endif %} {{ amount_guests }}
</div> {% endif %}
</div>
{% endif %}
{% endif %} {% endif %}
{% endif %} {% endif %}
</div> </div>

82
templates/includes/macros.html.tera
View File

@ -34,18 +34,18 @@
</a> </a>
</div> </div>
<div> <div>
<a href="#" <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" 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-sidebar="true"
data-trigger="sidebar" data-trigger="sidebar"
data-header="Menü" data-header="Menü"
data-body="#mobile-menu"> data-body="#mobile-menu">
{% include "includes/book" %} {% include "includes/book" %}
<span class="sr-only">Logbuch</span> <span class="sr-only">Logbuch</span>
</a> </a>
<div class="hidden"> <div class="hidden">
<div id="mobile-menu"> <div id="mobile-menu">
{% if "Donau Linz" in loggedin_user.roles %} {% if "Donau Linz" in loggedin_user.roles %}
<a href="/planned" class="block w-100 py-2 hover:text-primary-600">Geplante Ausfahrten</a> <a href="/planned" class="block w-100 py-2 hover:text-primary-600">Geplante Ausfahrten</a>
<a href="/log" class="block w-100 py-2 hover:text-primary-600 border-t">Ausfahrt eintragen</a> <a href="/log" class="block w-100 py-2 hover:text-primary-600 border-t">Ausfahrt eintragen</a>
<a href="/log/show" <a href="/log/show"
@ -57,35 +57,37 @@
class="block w-100 py-2 hover:text-primary-600 border-t">Bootsschaden</a> class="block w-100 py-2 hover:text-primary-600 border-t">Bootsschaden</a>
<a href="/boatreservation" <a href="/boatreservation"
class="block w-100 py-2 hover:text-primary-600 border-t">Bootsreservierung</a> class="block w-100 py-2 hover:text-primary-600 border-t">Bootsreservierung</a>
{% endif %} {% endif %}
{% if loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %} {% if loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
<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 %} {% endif %}
{% if "admin" in loggedin_user.roles or "Vorstand" in loggedin_user.roles %} {% if "admin" in loggedin_user.roles or "Vorstand" in loggedin_user.roles %}
<a href="/admin/user" <a href="/admin/user"
class="block w-100 py-2 hover:text-primary-600 border-t">Userverwaltung</a> class="block w-100 py-2 hover:text-primary-600 border-t">Userverwaltung</a>
{% endif %} {% endif %}
{% if "admin" in loggedin_user.roles %} {% if "admin" in loggedin_user.roles %}
<a href="/admin/boat" <a href="/admin/boat"
class="block w-100 py-2 hover:text-primary-600 border-t">Boote</a> class="block w-100 py-2 hover:text-primary-600 border-t">Boote</a>
{% endif %} {% endif %}
<a href="/auth/logout" <a href="/auth/logout"
class="block w-100 py-2 hover:text-primary-600 border-t">Ausloggen<svg class="inline h-4" class="block w-100 py-2 hover:text-primary-600 border-t">Ausloggen
width="24" <svg class="inline h-4"
height="24" width="24"
viewbox="0 0 24 24" height="24"
fill="none" viewbox="0 0 24 24"
stroke="currentColor" fill="none"
stroke-width="2" stroke="currentColor"
stroke-linecap="round" stroke-width="2"
stroke-linejoin="round" stroke-linecap="round"
class="feather feather-log-out"> stroke-linejoin="round"
<path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path> class="feather feather-log-out">
<polyline points="16 17 21 12 16 7"></polyline> <path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path>
<line x1="21" y1="12" x2="9" y2="12"></line> <polyline points="16 17 21 12 16 7"></polyline>
</svg></a> <line x1="21" y1="12" x2="9" y2="12"></line>
</div> </svg>
</a>
</div> </div>
</div>
</div> </div>
</div> </div>
</header> </header>