From 1594ba93277825a02d1b989df2db34ae98a54429 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Tue, 26 Jul 2022 15:36:22 +0200 Subject: [PATCH] _checked_out: move get_connecting_trains call to controller --- lib/Travelynx/Controller/Traveling.pm | 11 ++++++++++- templates/_checked_out.html.ep | 10 ++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm index 991526e..eb8a657 100755 --- a/lib/Travelynx/Controller/Traveling.pm +++ b/lib/Travelynx/Controller/Traveling.pm @@ -362,7 +362,16 @@ sub status_card { ); } else { - $self->render( '_checked_out', journey => $status ); + my @connecting_trains; + my $now = DateTime->now( time_zone => 'Europe/Berlin' ); + if ( $now->epoch - $status->{timestamp}->epoch < ( 30 * 60 ) ) { + @connecting_trains = $self->get_connecting_trains; + } + $self->render( + '_checked_out', + journey => $status, + connections => \@connecting_trains + ); } } diff --git a/templates/_checked_out.html.ep b/templates/_checked_out.html.ep index ca9373d..1d8b0e5 100644 --- a/templates/_checked_out.html.ep +++ b/templates/_checked_out.html.ep @@ -3,12 +3,10 @@ Ausgecheckt

Aus <%= $journey->{train_type} %> <%= $journey->{train_no} %> bis <%= $journey->{arr_name} %>

- % if (now()->epoch - $journey->{timestamp}->epoch < (30*60)) { - % if (my @connections = get_connecting_trains()) { - Verbindungen -

Zug auswählen zum Einchecken mit Zielwahl.

- %= include '_connections', connections => \@connections, checkin_from => $journey->{arr_ds100}; - % } + % if (my @connections = @{stash('connections') // []}) { + Verbindungen +

Zug auswählen zum Einchecken mit Zielwahl.

+ %= include '_connections', connections => \@connections, checkin_from => $journey->{arr_ds100}; % }