This commit is contained in:
Edward Betts 2023-08-10 14:05:07 +01:00
parent a5195cba1a
commit 7599f655ad
6 changed files with 72 additions and 26 deletions

View file

@ -30,7 +30,7 @@ a:link {
<body>
<div class="m-3">
<p>{{ days_until_start }} days / {{ (days_until_start / 7) | int }} weeks / {{ "{:.1f}".format(days_until_start / 30.5) }} months until start of Dodainville week: Friday 5 May 2022</p>
<p>{{ days_until_start }} days / {{ (days_until_start / 7) | int }} weeks / {{ "{:.1f}".format(days_until_start / 30.5) }} months until start of Dodainville week: Friday 29 Sept 2023</p>
{#
<p><a href="{{ url_for(other + "_page") }}">{{ other }}</a></p>
@ -52,7 +52,11 @@ a:link {
{% for dep, arr, days in data %}
<h4>{{ dep.title() }} to {{ arr.title() }}</h4>
{{ route_table(dep, arr, days) }}
{% if days %}
{{ route_table(dep, arr, days) }}
{% else %}
<p>not available</p>
{% endif %}
{% endfor %}
<!--

View file

@ -42,7 +42,8 @@ a:link {
<th>description</th>
<th>births</th>
<th>quantity<br/>available</th>
<th class="text-end">price</th>
<th class="text-end">cabin<br/>price</th>
<th class="text-end">total<br/>price</th>
</tr>
{% for a in accommodations if a.quantityAvailable > 0 %}
<tr>
@ -57,10 +58,12 @@ a:link {
{% endif %}
</td>
<td class="text-end">£{{ a.unitCost.amount }}</td>
<td class="text-end">£{{ a.unitCost.amount + crossing.flexiPrice.amount }}</td>
</tr>
{% endfor %}
</table>
{% if pet_accommodations %}
<h4>Pet accommodations</h4>
{% set pets = {"G": "stay in car", "B": "large kennel", "K": "small kennel" } %}
@ -71,6 +74,8 @@ a:link {
{% endfor %}
</ul>
{% endif %}
<h4>Sailing</h4>
<ul>

View file

@ -11,10 +11,12 @@
<div class="m-3">
<ul>
<li><a href="{{ url_for("outbound1_page") }}">Outbound: 5 May</a>
<li><a href="{{ url_for("return1_page") }}">Return: 12 May</a>
<li><a href="{{ url_for("outbound1_page") }}">Outbound: 29 September</a>
<li><a href="{{ url_for("return1_page") }}">Return: 6 October</a>
{#
<li><a href="{{ url_for("outbound3_page") }}">Outbound: 29 September</a>
<li><a href="{{ url_for("return2_page") }}">Return: 6 October</a>
<li><a href="{{ url_for("return2_page") }}">Return: </a>
#}
</ul>
</div>

View file

@ -6,6 +6,7 @@
<th>arrive</th>
<th>duration</th>
<th>ship</th>
<th>type</th>
<th>economy</th>
<th>standard</th>
<th>flexi</th>
@ -38,6 +39,9 @@
<td class="text-nowrap">
{{ crossing.shipName }}
</td>
<td class="text-nowrap">
{{ crossing.shipType }}
</td>
<td class="text-nowrap">
{% if crossing.economyPrice %}
<a href="{{ cabins_url(dep, arr, crossing, "ECONOMY") }}">