[BUGFIX] wordings

This commit is contained in:
Marie Birner 2023-09-27 15:55:17 +02:00
parent a77e6b93c2
commit d139bf9a60
2 changed files with 12 additions and 8 deletions

View File

@ -191,7 +191,7 @@
{% macro show_old(log, state, allowed_to_close=false, only_ones, index) %} {% macro show_old(log, state, allowed_to_close=false, only_ones, index) %}
<div class="border-t bg-white px-3 py-1" data-filterable="true" data-filter="{{ log.boat.name }} {{ log.shipmaster_user.name }} {% for rower in log.rowers %} {{ rower.name }} {% endfor %}"> <div class="border-t bg-white px-3 py-1" data-filterable="true" data-filter="{{ log.boat.name }} {{ log.shipmaster_user.name }} {% for rower in log.rowers %} {{ rower.name }} {% endfor %}">
<div> <div>
<strong>{{ log.boat.name }}</strong> <small class="text-gray-600">({{ log.shipmaster_user.name }}{% if log.shipmaster_only_steering %} - handgesteuer {% endif %})</small> <strong>{{ log.boat.name }}</strong> <small class="text-gray-600">({{ log.shipmaster_user.name }}{% if log.shipmaster_only_steering %} - handgesteuert {% endif %})</small>
<small class="block text-gray-600">{{ log.departure | date(format='%d.%m.%Y - %H:%M') }} {% if state == "completed" %}- {{ log.arrival | date(format='%d.%m.%Y - %H:%M') }}{% endif %}</small> <small class="block text-gray-600">{{ log.departure | date(format='%d.%m.%Y - %H:%M') }} {% if state == "completed" %}- {{ log.arrival | date(format='%d.%m.%Y - %H:%M') }}{% endif %}</small>
{% set amount_rowers = log.rowers | length %} {% set amount_rowers = log.rowers | length %}
{% set amount_guests = log.boat.amount_seats - amount_rowers -1 %} {% set amount_guests = log.boat.amount_seats - amount_rowers -1 %}
@ -209,18 +209,22 @@
{% endif %} {% endif %}
{% if amount_guests > 0 %} {% if amount_guests > 0 %}
{{ amount_guests }} {{ amount_guests }}
Gäste (ohne Account) Gäste (ohne Account),
{% endif %} {% endif %}
{% for rower in log.rowers %} {% for rower in log.rowers %}
{{ rower.name }} {{ rower.name }},
{% endfor %} {% endfor %}
{% if log.comments %} {% if log.comments %}
Kommentare: <div>
{{ log.comments }}<br/> Kommentare:
{{ log.comments }}
</div>
{% endif %} {% endif %}
{% if log.logtype %} {% if log.logtype %}
Logtype: <div>
{{ log.logtype }}<br/> Logtype:
{{ log.logtype }}
</div>
{% endif %} {% endif %}
{% endif %} {% endif %}
</div> </div>

View File

@ -11,7 +11,7 @@
{% for s in stat %} {% for s in stat %}
<li class="{% if loop.index % 2 == 0 %} bg-gray-200 {% else %} bg-white {% endif %} flex justify-between px-3 py-1"> <li class="{% if loop.index % 2 == 0 %} bg-gray-200 {% else %} bg-white {% endif %} flex justify-between px-3 py-1">
<span>{{s.name}}</span> <span>{{s.name}}</span>
<span>{{s.rowed_km}}km</span> <span>{{s.rowed_km}} km</span>
</li> </li>
{% endfor %} {% endfor %}
</ol> </ol>