From 43c191fc9435a11f4349be86fe6844354f5bbca0 Mon Sep 17 00:00:00 2001 From: Birte Kristina Friesel Date: Fri, 26 Dec 2025 20:44:04 +0100 Subject: remove old (blocking) connection code; only show departure baord connections Background worker-based information about connecting departures while still checked in will come eventually, but won't recycle the existing code either way. --- templates/_cancelled_departure.html.ep | 4 -- templates/_checked_in.html.ep | 12 ------ templates/_checked_out.html.ep | 10 ----- templates/_connections.html.ep | 76 ---------------------------------- templates/_connections_hafas.html.ep | 57 ------------------------- templates/_suggestions_iris.html.ep | 44 ++++++++++++++++++++ templates/departures.html.ep | 19 ++++----- 7 files changed, 51 insertions(+), 171 deletions(-) delete mode 100644 templates/_connections.html.ep delete mode 100644 templates/_connections_hafas.html.ep create mode 100644 templates/_suggestions_iris.html.ep (limited to 'templates') diff --git a/templates/_cancelled_departure.html.ep b/templates/_cancelled_departure.html.ep index db6cc5c..d47385a 100644 --- a/templates/_cancelled_departure.html.ep +++ b/templates/_cancelled_departure.html.ep @@ -5,9 +5,5 @@ in <%= $journey->{dep_name} %> entfällt. Der Ausfall der Fahrt nach <%= $journey->{arr_name} %> wurde bereits dokumentiert.

- % if (my @connections = @{stash('connections_iris') // []}) { -

Alternative Reisemöglichkeiten:

- %= include '_connections', connections => \@connections, checkin_from => $journey->{dep_eva}; - % } diff --git a/templates/_checked_in.html.ep b/templates/_checked_in.html.ep index 69754e3..f057a0a 100644 --- a/templates/_checked_in.html.ep +++ b/templates/_checked_in.html.ep @@ -221,18 +221,6 @@

% } - % if (@{stash('connections_iris') // [] } or @{stash('connections_hafas') // []}) { - Verbindungen - % if ($journey->{arrival_countdown} < 0) { -

Fahrt auswählen zum Einchecken mit Zielwahl.

- % } - % if (@{stash('connections_iris') // [] }) { - %= include '_connections', connections => stash('connections_iris'), checkin_from => $journey->{arrival_countdown} < 0 ? $journey->{arr_eva} : undef; - % } - % if (@{stash('connections_hafas') // [] }) { - %= include '_connections_hafas', connections => stash('connections_hafas'), checkin_from => $journey->{arrival_countdown} < 0 ? $journey->{arr_eva} : undef; - % } - % } % if (defined $journey->{arrival_countdown} and $journey->{arrival_countdown} <= 0) {

%= L('status.delayed-auto-checkout') diff --git a/templates/_checked_out.html.ep b/templates/_checked_out.html.ep index 21db335..fcac6f8 100644 --- a/templates/_checked_out.html.ep +++ b/templates/_checked_out.html.ep @@ -4,16 +4,6 @@

Aus %= include '_format_train', journey => $journey bis <%= $journey->{arr_name} %>

- % if (@{stash('connections_iris') // [] } or @{stash('connections_hafas') // []}) { - Verbindungen -

Fahrt auswählen zum Einchecken mit Zielwahl.

- % if (@{stash('connections_iris') // [] }) { - %= include '_connections', connections => stash('connections_iris'), checkin_from => $journey->{arr_eva}; - % } - % if (@{stash('connections_hafas') // [] }) { - %= include '_connections_hafas', connections => stash('connections_hafas'), checkin_from => $journey->{arr_eva}; - % } - % }
diff --git a/templates/_connections.html.ep b/templates/_connections.html.ep deleted file mode 100644 index 1dd2718..0000000 --- a/templates/_connections.html.ep +++ /dev/null @@ -1,76 +0,0 @@ - diff --git a/templates/_connections_hafas.html.ep b/templates/_connections_hafas.html.ep deleted file mode 100644 index 3b995b5..0000000 --- a/templates/_connections_hafas.html.ep +++ /dev/null @@ -1,57 +0,0 @@ - diff --git a/templates/_suggestions_iris.html.ep b/templates/_suggestions_iris.html.ep new file mode 100644 index 0000000..8aea570 --- /dev/null +++ b/templates/_suggestions_iris.html.ep @@ -0,0 +1,44 @@ + diff --git a/templates/departures.html.ep b/templates/departures.html.ep index 0d57039..b1390b3 100644 --- a/templates/departures.html.ep +++ b/templates/departures.html.ep @@ -81,24 +81,19 @@
% } -% elsif (not param('train') and (@{stash('connections_iris') // []} or @{stash('connections_hafas') // []} or @{stash('suggestions') // []}) ) { +% elsif (not param('train') and @{stash('suggestions') // []} ) { % $have_connections = 1;

Häufig genutzte Verbindungen – Fahrt auswählen zum Einchecken mit Zielwahl

- % if (@{stash('connections_iris') // []}) { - %= include '_connections', connections => stash('connections_iris'), checkin_from => $eva; + % if ($dbris) { + %= include '_suggestions_dbris', suggestions => stash('suggestions'), checkin_from => $eva; % } - % if (@{stash('connections_hafas') // []}) { - %= include '_connections_hafas', connections => stash('connections_hafas'), checkin_from => $eva; + % elsif ($efa) { + %= include '_suggestions_efa', suggestions => stash('suggestions'), checkin_from => $eva; % } - % if (@{stash('suggestions') // []}) { - % if ($dbris) { - %= include '_suggestions_dbris', suggestions => stash('suggestions'), checkin_from => $eva; - % } - % elsif ($efa) { - %= include '_suggestions_efa', suggestions => stash('suggestions'), checkin_from => $eva; - % } + % else { + %= include '_suggestions_iris', suggestions => stash('suggestions'), checkin_from => $eva; % }
-- cgit v1.2.3