[TASK] text no boats on water

This commit is contained in:
Marie Birner 2023-09-28 14:53:08 +02:00 committed by philipp
parent fedbc00dc5
commit f46e6b47c7
3 changed files with 22 additions and 11 deletions

View File

@ -6,8 +6,11 @@
# Notes / Bugfixes # Notes / Bugfixes
## Frontend ## Frontend
- [] support esc to close sidebar - [] support esc to close sidebar
- [] after an hour(?) of inactivity -> show large popup w/ "maybe old data (ignore) (reload page)" (ignore bc maybe use is actively doing something -> don't throw input away!) - [] reload page -> don't throw input away!
## Backend
- [] variable for kiosk mode (needed especially for header)
- [] Logbuch form -> can't be submitted if arrival date is set (needed for Nachtrag)
# Nice to have # Nice to have
## Frontend ## Frontend

View File

@ -30,9 +30,13 @@
<h2 class="h2">Am Wasser</h2> <h2 class="h2">Am Wasser</h2>
<div> <div>
{% for log in on_water %} {% if on_water | length > 0 %}
{{ log::show(log=log, state="on_water", allowed_to_close=true, only_ones=false) }} {% for log in on_water %}
{% endfor %} {{ log::show(log=log, state="on_water", allowed_to_close=true, only_ones=false) }}
{% endfor %}
{% else %}
<p class="p-3 text-center">Kein Boot am Wasser</p>
{% endif %}
</div> </div>
</div> </div>
</div> </div>

View File

@ -31,13 +31,17 @@
<div class="bg-white rounded-md shadow"> <div class="bg-white rounded-md shadow">
<h2 class="h2">Am Wasser</h2> <h2 class="h2">Am Wasser</h2>
{% for log in on_water %} {% if on_water | length > 0 %}
{% if log.shipmaster == loggedin_user.id %} {% for log in on_water %}
{{ log::show(log=log, state="on_water", allowed_to_close=true, only_ones=loggedin_user.is_cox==false) }} {% if log.shipmaster == loggedin_user.id %}
{% else %} {{ log::show(log=log, state="on_water", allowed_to_close=true, only_ones=loggedin_user.is_cox==false) }}
{{ log::show(log=log, state="on_water", only_ones=true) }} {% else %}
{% endif %} {{ log::show(log=log, state="on_water", only_ones=true) }}
{% endfor %} {% endif %}
{% endfor %}
{% else %}
<p class="p-3 text-center">Kein Boot am Wasser</p>
{% endif %}
</div> </div>
</div> </div>
</div> </div>