move get_connecting_trains out of _cancelled_departure template

2 files changed, 21 insertions, 5 deletions

diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm
index 937c740..991526e 100755
--- a/lib/Travelynx/Controller/Traveling.pm
+++ b/lib/Travelynx/Controller/Traveling.pm
@@ -351,8 +351,15 @@ sub status_card {
 		$self->render( '_checked_in', journey => $status );
 	}
 	elsif ( $status->{cancellation} ) {
-		$self->render( '_cancelled_departure',
-			journey => $status->{cancellation} );
+		my @connecting_trains = $self->get_connecting_trains(
+			eva              => $status->{cancellation}{dep_eva},
+			destination_name => $status->{cancellation}{arr_name}
+		);
+		$self->render(
+			'_cancelled_departure',
+			journey     => $status->{cancellation},
+			connections => \@connecting_trains
+		);
 	}
 	else {
 		$self->render( '_checked_out', journey => $status );
@@ -628,8 +635,17 @@ sub station {
 				  = grep { $_->type . ' ' . $_->train_no eq $train } @results;
 			}
 			else {
-				@connecting_trains = $self->get_connecting_trains(
-					eva => $status->{station_eva} );
+				my $user = $self->get_user_status;
+				if ( $user->{cancellation} ) {
+					@connecting_trains = $self->get_connecting_trains(
+						eva              => $user->{cancellation}{dep_eva},
+						destination_name => $user->{cancellation}{arr_name}
+					);
+				}
+				else {
+					@connecting_trains = $self->get_connecting_trains(
+						eva => $status->{station_eva} );
+				}
 			}
 
 			$self->render(
diff --git a/templates/_cancelled_departure.html.ep b/templates/_cancelled_departure.html.ep
index 220c49d..1d5c76a 100644
--- a/templates/_cancelled_departure.html.ep
+++ b/templates/_cancelled_departure.html.ep
@@ -5,7 +5,7 @@
 			in <a href="/s/<%= $journey->{dep_ds100} %>"><%= $journey->{dep_name} %></a>
 			entfällt. Der Zugausfall auf der Fahrt nach <%= $journey->{arr_name} %> wurde bereits dokumentiert.
 		</p>
-		% if (my @connections = get_connecting_trains(eva => $journey->{dep_eva}, destination_name => $journey->{arr_name})) {
+		% if (my @connections = @{stash('connections') // []}) {
 			<p>Alternative Reisemöglichkeiten:</p>
 			%= include '_connections', connections => \@connections, checkin_from => $journey->{dep_ds100};
 		% }