fix failed merge....

This commit is contained in:
philipp 2023-03-12 13:21:23 +01:00
parent 56544996d7
commit b86d80c3dd

View File

@ -14,61 +14,6 @@
<div class="bg-gray p-3 mb-1 data-block" data-needed="{{ cox_needed}}"> <div class="bg-gray p-3 mb-1 data-block" data-needed="{{ cox_needed}}">
<strong class="block">{{ day.day | date(format="%d.%m.%Y")}}</strong> <strong class="block">{{ day.day | date(format="%d.%m.%Y")}}</strong>
{% if day.planned_amount_cox > 0%}
{% set cox = trips | filter(attribute="user.is_cox", value=true) %}
{% set amount_cox = cox | length %}
{% set rowers = trips | filter(attribute="user.is_cox", value=false) | sort(attribute="trip.created") %}
{% if amount_cox < day.planned_amount_cox %}
{% set cox_left = day.planned_amount_cox - amount_cox %}
Es {{ cox_left | pluralize(singular="wird", plural="werden")}} noch {{ cox_left }} Steuerperson{{ cox_left | pluralize(plural="en")}} gesucht!<br />
{% endif %}
Geplante Abfahrtszeit: {{ day.planned_starting_time }}<br />
{{ trips | length }} angemeldete Person{{ trips | length | pluralize(plural="en") }}: {{ cox | length }} Steuerperson{{ cox | length | pluralize(plural="en") }} ({% for c in cox %}{{ c.user.name }} {% endfor %}), {{ rowers | length }} Ruderer:
<ol>
{% for r in rowers %}
<li>
{{ r.user.name }} (angemeldet seit {{ r.trip.created | date(format="%d.%m. %H:%M", timezone="Europe/Vienna") }})
{% if r.user.name == user.name %}
<form method="post" action="/register">
<input type="hidden" name="_method" value="delete" />
<input type="hidden" name="day" value="{{ day.day}}" />
<input type="hidden" name="user" value="{{ r.user.id}}" />
<input type="submit" value="LÖSCHEN" />
</form>
{% endif %}
</li>
{% endfor %}
</ol>
{% if day.open_registration or user.is_cox %}
<details>
<summary class="button">&plus;</summary>
<form method="post" action="/register">
<input type="hidden" name="_method" value="put" />
<input type="hidden" name="day" value="{{ day_string }}" />
<div class="row">
<div class="six columns">
<label for="name">Name</label>
<input class="u-full-width" type="text" id="name" name="name" value="{{ user.name }}" />
</div>
<div class="six columns">
<input class="button-primary" type="submit" value="Speichern">
</div>
</div>
</form>
</details>
{% else %}
Anmeldung an diesem Tag leider nicht möglich (zB bei USI Kursen)
{% endif %}
{% else %}
(Noch) keine Ausfahrt geplant
{% endif %}
{% if user.is_admin %} {% if user.is_admin %}
<details class="text-right" style="margin-top: -3rem;"> <details class="text-right" style="margin-top: -3rem;">
<summary class="button">&#x270e;</summary> <summary class="button">&#x270e;</summary>
@ -98,7 +43,7 @@
{% endif %} {% endif %}
{% if day.planned_amount_cox > 0%} {% if day.planned_amount_cox > 0%}
{% set rowers = trips | filter(attribute="user.is_cox", value=false) %} {% set rowers = trips | filter(attribute="user.is_cox", value=false) | sort(attribute="trip.created") %}
{% if cox_needed %} {% if cox_needed %}
{% set cox_left = day.planned_amount_cox - amount_cox %} {% set cox_left = day.planned_amount_cox - amount_cox %}
<div class="block text-red">Es {{ cox_left | pluralize(singular="wird", plural="werden")}} noch {{ cox_left }} Steuerperson{{ cox_left | pluralize(plural="en")}} gesucht!</div> <div class="block text-red">Es {{ cox_left | pluralize(singular="wird", plural="werden")}} noch {{ cox_left }} Steuerperson{{ cox_left | pluralize(plural="en")}} gesucht!</div>