From 671aca48ddda43c95074a53f906a6f28b5ebd71f Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Mon, 23 Aug 2021 21:40:13 +0200 Subject: tripinfo: show planned times for cancelled departures --- templates/tripinfo.html | 52 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/templates/tripinfo.html b/templates/tripinfo.html index bfe46d0..e610224 100644 --- a/templates/tripinfo.html +++ b/templates/tripinfo.html @@ -2,33 +2,51 @@
{% if tripinfo.arrival %} -An: -{% if tripinfo.arrivalDelay %} -{{ tripinfo.arrival.strftime('%H:%M') }} -
Plan: {{ tripinfo.plannedArrival.strftime('%H:%M') }} -{% else %} -{{ tripinfo.arrival.strftime('%H:%M') }} -{% endif %} + An: + {% if tripinfo.arrivalDelay %} + {{ tripinfo.arrival.strftime('%H:%M') }} +
Plan: {{ tripinfo.plannedArrival.strftime('%H:%M') }} + {% else %} + {{ tripinfo.arrival.strftime('%H:%M') }} + {% endif %} +{% elif tripinfo.plannedArrival %} + {% if tripinfo.cancelled %} + An: ––:–– +
Plan: {{ tripinfo.plannedArrival.strftime('%H:%M') }} + {% else %} + An: ??:?? +
Plan: {{ tripinfo.plannedArrival.strftime('%H:%M') }} + {% endif %} {% endif %}
-{% if tripinfo.platform %} -Steig {{ tripinfo.platform }} +{% if tripinfo.cancelled %} + Fahrt fällt aus +{% elif tripinfo.platform %} + Steig {{ tripinfo.platform }} {% else %} -  +   {% endif %}
{% if tripinfo.arrival %} -Ab: -{% if tripinfo.departureDelay %} -{{ tripinfo.departure.strftime('%H:%M') }} -
Plan: {{ tripinfo.plannedDeparture.strftime('%H:%M') }} -{% else %} -{{ tripinfo.departure.strftime('%H:%M') }} -{% endif %} + Ab: + {% if tripinfo.departureDelay %} + {{ tripinfo.departure.strftime('%H:%M') }} +
Plan: {{ tripinfo.plannedDeparture.strftime('%H:%M') }} + {% else %} + {{ tripinfo.departure.strftime('%H:%M') }} + {% endif %} +{% elif tripinfo.plannedDeparture %} + {% if tripinfo.cancelled %} + Ab: ––:–– +
Plan: {{ tripinfo.plannedDeparture.strftime('%H:%M') }} + {% else %} + Ab: ??:?? +
Plan: {{ tripinfo.plannedDeparture.strftime('%H:%M') }} + {% endif %} {% endif %}
-- cgit v1.2.3