diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2022-07-26 15:36:22 +0200 | 
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2022-07-26 15:36:22 +0200 | 
| commit | 1594ba93277825a02d1b989df2db34ae98a54429 (patch) | |
| tree | b62dfdb6901cc9f4fbe1229be86e069ccc2484ee | |
| parent | 960de27f0eca0fcb2549c8271a384230c4a6b06f (diff) | |
_checked_out: move get_connecting_trains call to controller
| -rwxr-xr-x | lib/Travelynx/Controller/Traveling.pm | 11 | ||||
| -rw-r--r-- | 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 @@  		<span class="card-title">Ausgecheckt</span>  		<p>Aus <%= $journey->{train_type} %> <%= $journey->{train_no} %>  			bis <a href="/s/<%= $journey->{arr_ds100} %>"><%= $journey->{arr_name} %></a></p> -		% if (now()->epoch - $journey->{timestamp}->epoch < (30*60)) { -			% if (my @connections = get_connecting_trains()) { -				<span class="card-title" style="margin-top: 2ex;">Verbindungen</span> -				<p>Zug auswählen zum Einchecken mit Zielwahl.</p> -				%= include '_connections', connections => \@connections, checkin_from => $journey->{arr_ds100}; -			% } +		% if (my @connections = @{stash('connections') // []}) { +			<span class="card-title" style="margin-top: 2ex;">Verbindungen</span> +			<p>Zug auswählen zum Einchecken mit Zielwahl.</p> +			%= include '_connections', connections => \@connections, checkin_from => $journey->{arr_ds100};  		% }  	</div>  	<div class="card-action"> | 
