Unverified Commit 2da48e05 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

move get_connecting_trains call from _checkeed_in to controller

parent 52ff7565

lib/Travelynx/Controller/Traveling.pm

+22 −1
Original line number Diff line number Diff line
@@ -17,9 +17,20 @@ use Travel::Status::DE::IRIS::Stations; 
sub homepage {

	my ($self) = @_;

	if ( $self->is_user_authenticated ) {

		my $status = $self->get_user_status;

		my @connecting_trains;

		if ( $status->{checked_in} ) {

			if ( defined $status->{arrival_countdown}

				and $status->{arrival_countdown} < ( 20 * 60 ) )

			{

				@connecting_trains = $self->get_connecting_trains();

			}

		}

		$self->render(

			'landingpage',

			version           => $self->app->config->{version} // 'UNKNOWN',

			status            => $status,

			connections       => \@connecting_trains,

			with_autocomplete => 1,

			with_geolocation  => 1

		);
@@ -348,7 +359,17 @@ sub status_card { 
	delete $self->stash->{layout};



	if ( $status->{checked_in} ) {

		$self->render( '_checked_in', journey => $status );

		my @connecting_trains;

		if ( defined $status->{arrival_countdown}

			and $status->{arrival_countdown} < ( 20 * 60 ) )

		{

			@connecting_trains = $self->get_connecting_trains();

		}

		$self->render(

			'_checked_in',

			journey     => $status,

			connections => \@connecting_trains

		);

	}

	elsif ( $status->{cancellation} ) {

		my @connecting_trains = $self->get_connecting_trains(

templates/_checked_in.html.ep

+5 −7
Original line number Diff line number Diff line
@@ -193,15 +193,13 @@ 
					</ul>

				</p>

			% }

			% if (defined $journey->{arrival_countdown} and $journey->{arrival_countdown} < (20*60)) {

				% if (my @connections = get_connecting_trains()) {

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

				<span class="card-title" style="margin-top: 2ex;">Verbindungen</span>

				% if ($journey->{arrival_countdown} < 0) {

					<p>Zug auswählen zum Einchecken mit Zielwahl.</p>

				% }

				%= include '_connections', connections => \@connections, checkin_from => $journey->{arrival_countdown} < 0 ? $journey->{arr_ds100} : undef;

			% }

			% }

			% if (defined $journey->{arrival_countdown} and $journey->{arrival_countdown} <= 0) {

				<p style="margin-top: 2ex;">

					Der automatische Checkout erfolgt wegen gelegentlich veralteter

templates/landingpage.html.ep

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
	% }

	<div class="row">

		<div class="col s12 statuscol">

			% my $status = get_user_status();

			% if ($status->{checked_in}) {

				%= include '_checked_in', journey => $status;

			% }