From 1028e47a35a472fc4835f324f3ad195970b45b17 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Sat, 25 Jan 2020 14:55:51 +0100 Subject: map: list skipped journeys --- lib/Travelynx/Controller/Traveling.pm | 8 ++++++++ templates/history_map.html.ep | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+) 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 @@ %= end + +% if (@{$skipped_journeys // []}) { +
+
+

+ Die folgenden Zugfahrten wurden nicht eingezeichnet: +

+

+

+

+
+
+% } -- cgit v1.2.3