diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2020-01-25 14:55:51 +0100 | 
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2020-01-25 14:55:51 +0100 | 
| commit | 1028e47a35a472fc4835f324f3ad195970b45b17 (patch) | |
| tree | 09cb4b0c3a018227cfee423037cad86e0497843a | |
| parent | ee1285e8fa684c35b62dd32854f66515cd62a269 (diff) | |
map: list skipped journeys1.13.7
| -rwxr-xr-x | lib/Travelynx/Controller/Traveling.pm | 8 | ||||
| -rw-r--r-- | templates/history_map.html.ep | 18 | 
2 files changed, 26 insertions, 0 deletions
| diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm index 198d66e..421032f 100755 --- a/lib/Travelynx/Controller/Traveling.pm +++ b/lib/Travelynx/Controller/Traveling.pm @@ -445,6 +445,7 @@ sub map_history {  		$self->render(  			template            => 'history_map',  			with_map            => 1, +			skipped_journeys    => [],  			station_coordinates => [],  			polyline_groups     => [],  		); @@ -465,6 +466,8 @@ sub map_history {  	my @station_pairs;  	my %seen; +	my @skipped_journeys; +  	for my $journey (@journeys) {  		my @route      = map { $_->[0] } @{ $journey->{route} }; @@ -474,6 +477,8 @@ sub map_history {  		if (   $from_index == -1  			or $to_index == -1 )  		{ +			push( @skipped_journeys, +				[ $journey, 'Start/Ziel nicht in Route gefunden' ] );  			next;  		} @@ -491,6 +496,8 @@ sub map_history {  			and @route <= 2  			and not $include_manual )  		{ +			push( @skipped_journeys, +				[ $journey, 'Manueller Eintrag ohne Unterwegshalte' ] );  			next;  		} @@ -527,6 +534,7 @@ sub map_history {  	$self->render(  		template            => 'history_map',  		with_map            => 1, +		skipped_journeys    => \@skipped_journeys,  		station_coordinates => \@station_coordinates,  		polyline_groups     => [  			{ diff --git a/templates/history_map.html.ep b/templates/history_map.html.ep index 747912f..c0eea4c 100644 --- a/templates/history_map.html.ep +++ b/templates/history_map.html.ep @@ -29,3 +29,21 @@  		</div>  	</div>  %= end + +% if (@{$skipped_journeys // []}) { +	<div class="row"> +		<div class="col s12"> +			<p> +				Die folgenden Zugfahrten wurden nicht eingezeichnet: +			</p> +			<p> +				<ul> +					% for my $pair (@{$skipped_journeys}) { +						% my ($journey, $reason) = @{$pair}; +						<li><a href="/journey/<%= $journey->{id} %>"><%= $journey->{type} %> <%= $journey->{no} %> <%= $journey->{from_name} %> → <%= $journey->{to_name} %></a>: <%= $reason %></li> +					% } +				</ul> +			</p> +		</div> +	</div> +% } | 
